Index: quilt/Makefile.in
===================================================================
--- quilt.orig/Makefile.in
+++ quilt/Makefile.in
@@ -36,7 +36,6 @@ RPMBUILD :=	@RPMBUILD@
 MTA :=		@MTA@
 
 COMPAT_SYMLINKS  := @COMPAT_SYMLINKS@
-COMPAT_FUNCTIONS := @COMPAT_FUNCTIONS@
 COMPAT_PROGRAMS  := @COMPAT_PROGRAMS@
 
 default: all
@@ -136,13 +135,6 @@ all : scripts
 $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o)
 	$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
 
-.PHONY :: compat
-compat :
-	@rm -f compat/compatfns
-ifneq ($(COMPAT_FUNCTIONS),)
-	cat $(COMPAT_FUNCTIONS:%=compat/%.sh) > compat/compatfns
-endif
-
 scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) $(SCRIPTS:%=scripts/%) compat \
 	  $(LIB:%=lib/%) $(DOC:%=doc/%) $(MAN1)
 
@@ -298,14 +290,11 @@ install-main: scripts
 
 install-compat:
 	@rm -rf $(BUILD_ROOT)$(COMPAT_DIR)
-ifneq ($(COMPAT_PROGRAMS)$(COMPAT_FUNCTIONS)$(COMPAT_SYMLINKS),)
+ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),)
 	$(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR)
 ifneq ($(COMPAT_PROGRAMS),)
 	$(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR)
 endif
-ifneq ($(COMPAT_FUNCTIONS),)
-	$(INSTALL) -m 644 compat/compatfns $(BUILD_ROOT)$(COMPAT_DIR)
-endif
 endif
 
 install: scripts install-main install-compat $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
Index: quilt/aclocal.m4
===================================================================
--- quilt.orig/aclocal.m4
+++ quilt/aclocal.m4
@@ -1,13 +1,9 @@
-
 dnl Allow configure to specify a specific binary
 dnl 1: Environment variable
 dnl 2: binary name
 dnl 3: optional list of alternatives
 AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
-  m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in compat/$2.sh 2>/dev/null)])
-  m4_if(internal_$2_cmd,[],[],
-    m4_define([internal_$2_shell_func],[esyscmd(ls compat/$2.sh 2>/dev/null)])
-  )
+  m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)])
 
   AC_ARG_WITH($2, AC_HELP_STRING(
     [--with-$2], [name of the $2 executable to use]
@@ -27,13 +23,9 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
       AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2'])
     ],[
       AC_MSG_WARN([Using internal $2 mechanism.  Use option '--with-$2' to override])
-      m4_if(internal_$2_shell_func,[],[
-        COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"],[
-	COMPAT_FUNCTIONS="$COMPAT_FUNCTIONS $2"]);
+      COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
       $1=$2
     ])
   fi
   AC_SUBST($1)
 ])
-
-
Index: quilt/bin/quilt.in
===================================================================
--- quilt.orig/bin/quilt.in
+++ quilt/bin/quilt.in
@@ -21,10 +21,6 @@ fi
 if [ -d @QUILT@/compat ]
 then
 	export PATH="@QUILT@/compat:$PATH"
-	if [ -r @QUILT@/compat/compatfns ]
-	then
-		source @QUILT@/compat/compatfns
-	fi
 fi
 
 usage()
Index: quilt/compat/column.in
===================================================================
--- /dev/null
+++ quilt/compat/column.in
@@ -0,0 +1,3 @@
+#! @BASH@
+
+cat
Index: quilt/compat/column.sh
===================================================================
--- quilt.orig/compat/column.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-column()
-{
-	cat
-}
-
Index: quilt/compat/mktemp.in
===================================================================
--- /dev/null
+++ quilt/compat/mktemp.in
@@ -0,0 +1,27 @@
+#! @BASH@
+
+if [ x"$1" = x"-d" ]
+then
+	for ((n=0 ; $n<100 ; n++))
+	do
+		try=${2%XXXXXX}$RANDOM
+		mkdir -m 700 $try 2>/dev/null && break
+	done
+else
+	user_mask=$(umask)
+	umask 077
+	set -o noclobber
+	for ((n=0 ; $n<100 ; n++))
+	do
+		try=${1%XXXXXX}$RANDOM
+		echo -n "" 2> /dev/null > $try && break
+	done
+	set +o noclobber
+	umask $user_mask
+fi
+if [ $n -lt 100 ]
+then
+	echo $try
+else
+	exit 1
+fi
Index: quilt/compat/mktemp.sh
===================================================================
--- quilt.orig/compat/mktemp.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-
-mktemp()
-{
-	local try n
-	if [ x"$1" = x"-d" ]
-	then
-		for ((n=0 ; $n<100 ; n++))
-		do
-			try=${2%XXXXXX}$RANDOM
-			mkdir -m 700 $try 2>/dev/null && break
-		done
-	else
-		local user_mask=$(umask)
-		umask 077
-		set -o noclobber
-		for ((n=0 ; $n<100 ; n++))
-		do
-			try=${1%XXXXXX}$RANDOM
-			echo -n "" 2> /dev/null > $try && break
-		done
-		set +o noclobber
-		umask $user_mask
-	fi
-	if [ $n -lt 100 ]
-	then
-		echo $try
-	else
-		return 1
-	fi
-}
-
Index: quilt/configure.ac
===================================================================
--- quilt.orig/configure.ac
+++ quilt/configure.ac
@@ -53,14 +53,10 @@ version of bash from ftp.gnu.org
 ])
 fi
 
-dnl Check for Perl
 QUILT_COMPAT_PROG_PATH(PERL, perl, [perl perl5])
 QUILT_COMPAT_PROG_PATH(GREP, grep)
-dnl Check for sed
 QUILT_COMPAT_PROG_PATH(SED, sed)
-dnl Check for awk
 QUILT_COMPAT_PROG_PATH(AWK, awk, [gawk awk])
-
 QUILT_COMPAT_PROG_PATH(POD2MAN, pod2man)
 QUILT_COMPAT_PROG_PATH(COLUMN, column)
 QUILT_COMPAT_PROG_PATH(GETOPT, getopt)
@@ -85,9 +81,7 @@ internal getopt.
   fi
 fi
 
-dnl Checks for mktemp (for creating temporary files and directories)
 QUILT_COMPAT_PROG_PATH(MKTEMP, mktemp)
-
 if test -n "$MKTEMP" ; then
     AC_MSG_CHECKING(whether $MKTEMP -d works)
     if tempdir=`$MKTEMP -d /tmp/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \
@@ -104,9 +98,7 @@ internal tempfile generation mechanism.
     fi
 fi
 
-dnl Check for diff
 QUILT_COMPAT_PROG_PATH(DIFF, diff)
-dnl Check for patch
 QUILT_COMPAT_PROG_PATH(PATCH, patch)
 
 # Sun's patch is a mess, issue a warning.  But we are going to continue with
@@ -134,7 +126,6 @@ else
 	AC_MSG_RESULT(yes)
 fi
 
-dnl Check for diffstat
 AC_ARG_WITH(diffstat, AC_HELP_STRING(
     [--with-diffstat], [name of the diffstat executable to use]),
     [
@@ -200,7 +191,6 @@ that is not in the search path you can s
     MTA="sendmail"
 fi
 
-dnl Check for NLS
 AC_ARG_ENABLE(nls, AC_HELP_STRING(
     [--enable-nls], [include natural language support]))
 if test "$enableval" != "no"; then
@@ -231,7 +221,6 @@ AC_SUBST(RPMBUILD)
 
 AC_SUBST(COMPAT_SYMLINKS)
 AC_SUBST(COMPAT_PROGRAMS)
-AC_SUBST(COMPAT_FUNCTIONS)
 
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
Index: quilt/scripts/patchfns.in
===================================================================
--- quilt.orig/scripts/patchfns.in
+++ quilt/scripts/patchfns.in
@@ -27,10 +27,6 @@ DB_VERSION=2
 if [ -d @QUILT@/compat ]
 then
 	export PATH="@QUILT@/compat:$PATH"
-	if [ -r @QUILT@/compat/compatfns ]
-	then
-		source @QUILT@/compat/compatfns
-	fi
 fi
 
 unset CDPATH