- Makefile.in: Fix compat/tail symlink creation. Fix variable exporting

  bashism.
- configure.ac: Use grep >/dev/null instead of grep -q for compatibility.
  Test for grep -q, some quilt scripts need it.
- test/Makefile: Fix varible exporting and script sourcing bashisms.

4 files changed, 41 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index c535c66..d24abbb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ GETOPT :=	@GETOPT@
 PERL :=		@PERL@
 BASH :=		@BASH@
 GREP :=		@GREP@
+TAIL :=		@TAIL@
 SED :=		@SED@
 AWK :=		@AWK@
 DIFF :=		@DIFF@
@@ -180,8 +181,9 @@ doc/README : doc/README.in $(QUILT:%=quilt/%)
 
 doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) compat-programs
 	@echo "quilt.1.in -> quilt.1"
-	@export PATH="`pwd`/compat:$$PATH";		\
-	here=`pwd`;                                     \
+	@here=`pwd`;                                     \
+	PATH="$$here/compat:$$PATH";		         \
+	export PATH;                                     \
 	 while read line; do                             \
 	  case "$$line" in                               \
 	    '@REFERENCE''@')                             \
@@ -209,7 +211,8 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) compat-programs
 
 .PHONY :: reference
 reference : $(QUILT:%=quilt/%) compat-programs scripts/patchfns
-	@export PATH="`pwd`/compat:$$PATH"; \
+	@PATH="`pwd`/compat:$$PATH"; \
+	export PATH; \
 	dir=$(CURDIR); \
 	for i in $(QUILT:%=quilt/%); \
 	do \
diff --git a/configure.ac b/configure.ac
index ce91341..6a0c793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org])
 AC_CONFIG_AUX_DIR(config)
 AC_PREREQ(2.53)
-AC_REVISION ($Revision: 1.56 $)
+AC_REVISION ($Revision: 1.57 $)
 
 PACKAGE_RELEASE=1
 AC_SUBST(PACKAGE_RELEASE)
@@ -55,6 +55,20 @@ fi
 
 QUILT_COMPAT_PROG_PATH(PERL, perl, [perl perl5])
 QUILT_COMPAT_PROG_PATH(GREP, grep)
+
+AC_MSG_CHECKING([whether $GREP -q works])
+if echo first | $GREP -q first 2>/dev/null; then
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([
+Sorry, you have a version of grep which doesn't understand -q.
+$PACKAGE_NAME needs it.  If you have access to a version of grep which does
+understand -q, you can supply its path with the '--with-grep=' option.
+Solaris users can use /usr/xpg4/bin/grep.
+])
+fi
+
 QUILT_COMPAT_PROG_PATH(TAIL, tail)
 
 # Solaris' /usr/bin/tail doesn't understand -n.
@@ -80,9 +94,9 @@ QUILT_COMPAT_PROG_PATH(GETOPT, getopt)
 if test -z "$INTERNAL_GETOPT"; then
   AC_MSG_CHECKING(for getopt --long syntax)
   dnl check GNU syntax
-  $GETOPT -o t --long test -- --test | grep -q 'illegal option'
+  $GETOPT -o t --long test -- --test | grep 'illegal option' >/dev/null
   getopt_long_errors=$?
-  $GETOPT -o t --long test -- --test | grep -q '^ *--test *--'
+  $GETOPT -o t --long test -- --test | grep '^ *--test *--' >/dev/null
   getopt_long_works=$?
   if test $getopt_long_errors -eq 1 -a $getopt_long_works -eq 0; then
     AC_MSG_RESULT(yes)
@@ -120,7 +134,7 @@ QUILT_COMPAT_PROG_PATH(PATCH, patch)
 # Sun's patch is a mess, issue a warning.  But we are going to continue with
 # the build because you might just be lucky.
 AC_MSG_CHECKING([whether $PATCH will work])
-if $PATCH -v 2>&1 | grep -q "Sun" >/dev/null 2>&1; then
+if $PATCH -v 2>&1 | grep "Sun" >/dev/null; then
 	AC_MSG_RESULT(no)
 	AC_MSG_WARN([
 Sorry, you have a Sun version of patch which is notoriously buggy.  $PACKAGE_NAME
@@ -128,7 +142,7 @@ may function correctly, or minor errors may occur due to Sun's patch tool.
 Please consider upgrading to GNU patch, if you already have GNU patch then you
 can supply its path with the '--with-patch=' option.
 ])
-elif $PATCH --version 2>&1 | grep -q "patch 2.0" >/dev/null 2>&1; then
+elif $PATCH --version 2>&1 | grep "patch 2.0" >/dev/null; then
 	AC_MSG_RESULT(no)
 	AC_MSG_WARN([
 Sorry, the version of patch you are using can cause severe problems when a patch
diff --git a/quilt.changes b/quilt.changes
index caefa68..472ee58 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Tue Sep 20 19:57:43 CEST 2005 - khali@linux-fr.org
+
+- Makefile.in: Fix compat/tail symlink creation. Fix variable 
+  exporting bashism.
+- configure.ac: Use grep >/dev/null instead of grep -q for
+  compatibility. Test for grep -q, some quilt scripts need it.
+- test/Makefile: Fix varible exporting and script sourcing
+  bashisms.
+
+-------------------------------------------------------------------
 Mon Sep 19 21:02:53 CEST 2005 - agruen@suse.de
 
 - Makefile.in: Fix when COMPAT_PROGRAMS is empty.
diff --git a/test/Makefile b/test/Makefile
index 17d62d7..96f7aa8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,11 @@
 TESTS=$(shell ls -tr *.test)
 
-export QUILTRC=$(CURDIR)/test.quiltrc
-ifneq ($(shell source $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
-export P=patches/
-export _P=../patches/
+QUILTRC=$(CURDIR)/test.quiltrc
+export QUILTRC
+ifneq ($(shell . $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
+P=patches/
+_P=../patches/
+export P _P
 endif
 $(warning P=$(P))