From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 30 Oct 2013 04:47:45 +0000 (+1300)
Subject: tests: use TESTS_ENVIRONMENT for EGREP and FGREP.
X-Git-Tag: v2.4.2.444~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e1ba2182cbbae47d5da09984c776774ab2616ea;p=thirdparty%2Flibtool.git

tests: use TESTS_ENVIRONMENT for EGREP and FGREP.

Be consistent about passing commands to the testsuite, and use
TESTS_ENVIRONMENT consistent.
* Makefile.am (TESTS_ENVIRONMENT): Add EGREP and FGREP.
* tests/testsuite.at: Remove EGREP and FGREP extractions from
generated libtool script.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/Makefile.am b/Makefile.am
index c59fe3043..a210a750b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -691,7 +691,8 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
 	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
 	AR="$(AR)" \
-	GREP="$(GREP)" SED="$(SED)" STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
+	EGREP="$(EGREP)" FGREP="$(FGREP)" GREP="$(GREP)" SED="$(SED)" \
+	STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
 	MANIFEST_TOOL="$(MANIFEST_TOOL)" \
 	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
 	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 835f2535b..2215eb3a7 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -35,8 +35,7 @@ for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do
   if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi
 done
 export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
-eval `$LIBTOOL --config | $GREP '^EGREP='`
-eval `$LIBTOOL --config | $EGREP '^(FGREP|objdir|objext)'`
+eval `$LIBTOOL --config | $EGREP '^(objdir|objext)'`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|to_host_file_cmd|to_tool_file_cmd)='`
 configure_options=--prefix=/nonexistent
 if test -n "$host_alias"; then