[Quilt-dev] [patch 2/8] Unmerged patches regenerated against CVS HEAD

[Gary V. Vaughan]

QUILT_COMPAT_PROG_PATH(AWK, awk, [gawk awk]) find gawk on my machine,
and correctly sets AWK=gawk.  The quilt scripts now call 'awk' literally,
but with syntax that is incompatible with the awk binary.  This patch
makes QUILT_COMPAT_PROG_PATH add a link in such cases (awk->gawk in this
case) so that the discovered program is actually called.

 aclocal.m4 |    3 +++
 1 files changed, 3 insertions(+)

Index: quilt-HEAD/aclocal.m4
===================================================================
--- quilt-HEAD.orig/aclocal.m4
+++ quilt-HEAD/aclocal.m4
@@ -20,6 +20,9 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
       AC_PATH_PROG($1,$2,,$PATH:$4)
     ],[
       AC_PATH_PROGS($1,$3,,$PATH:$4)
+      if test `expr "$$1" : '.*/\([[^/]]*\)$'` != "$2"; then
+       COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+      fi
     ])
     m4_if([$4],[],[],[
       if test -n "$$1"; then

--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook