* tests/actest.m4 (AC_ENV_SAVE): Use multiple -e instead of

multiple egrep.

diff --git a/ChangeLog b/ChangeLog
index 805f2966342a74dc7f8b3ba99d2e9f9a04f40c15..f91c11f48d05a7c92f8c38f4db8a232652f32573 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01  Akim Demaille  <akim@epita.fr>
+
+       * tests/actest.m4 (AC_ENV_SAVE): Use multiple -e instead of
+       multiple egrep.
+
 2000-03-01  Akim Demaille  <akim@epita.fr>
 
        * config.guess: Updated for master repository.

diff --git a/tests/actest.m4 b/tests/actest.m4
index 5b4fe9a4754d9c80730d16701abb6c9e5e1bd5b6..dc63f14849617055f24cde58d47af54df6f6e7bd 100644 (file)
--- a/tests/actest.m4
+++ b/tests/actest.m4
@@ -9,26 +9,31 @@ dnl Additional Autoconf macros to ease testing.
 # FIXME: There are surely better ways.  Explore for instance if
 # we can ask help from AC_SUBST.  We have the right to touch what
 # is AC_SUBST.
+# - ^ac_
+#   Autoconf's shell name space.
+# - ALLOCA|NEED_SETGID|KMEM_GROUP
+#   AC_FUNCs from acspecific.
+# - AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|RANLIB|SET_MAKE|YACC
+#   AC_PROGs from acspecific
+# - _|OLDPWD|PIPESTATUS|SECONDS
+#   Some variables some shells use and change
+
 AC_DEFUN(AC_ENV_SAVE,
 [(set) 2>&1 |
-  # This is Autoconf's shell name space, OK.
-  grep -v '^ac_' |
-  # Some variables we are allowed to touch
-  egrep -v '^(CC|CFLAGS|CPP|GCC|CXX|CXXFLAGS|CXXCPP|GXX|F77|FFLAGS|FLIBS|G77)=' |
-  egrep -v '^(LIBS|LIBOBJS|LDFLAGS)=' |
-  egrep -v '^INSTALL(_(DATA|PROGRAM|SCRIPT))?=' |
-  egrep -v '^(CYGWIN|ISC|MINGW32|MINIX|EMXOS2|EXEEXT|OBJEXT)=' |
-  egrep -v '^(X_(CFLAGS|(|EXTRA_|PRE_)LIBS)|x_(includes|libraries)|have_x)=' |
-  egrep -v '^(host|build|target)(_(alias|cpu|vendor|os))?=' |
-  egrep -v '^(cross_compiling)=' |
-  egrep -v '^(interpval)=' |
-  egrep -v '^(f77_(case|underscore))=' |
-  # AC_FUNCs from acspecific.
-  egrep -v '^(ALLOCA|NEED_SETGID|KMEM_GROUP)=' |
-  # AC_PROGs from acspecific.
-  egrep -v '^(AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|RANLIB|SET_MAKE|YACC)=' |
-  # Some variables some shells use and change.
-  egrep -v '^(_|OLDPWD|PIPESTATUS|SECONDS)=' |
+  egrep -v \
+  -e '^ac_' \
+  -e '^(CC|CFLAGS|CPP|GCC|CXX|CXXFLAGS|CXXCPP|GXX|F77|FFLAGS|FLIBS|G77)=' \
+  -e '^(LIBS|LIBOBJS|LDFLAGS)=' \
+  -e '^INSTALL(_(DATA|PROGRAM|SCRIPT))?=' \
+  -e '^(CYGWIN|ISC|MINGW32|MINIX|EMXOS2|EXEEXT|OBJEXT)=' \
+  -e '^(X_(CFLAGS|(|EXTRA_|PRE_)LIBS)|x_(includes|libraries)|have_x)=' \
+  -e '^(host|build|target)(_(alias|cpu|vendor|os))?=' \
+  -e '^(cross_compiling)=' \
+  -e '^(interpval)=' \
+  -e '^(f77_(case|underscore))=' \
+  -e '^(ALLOCA|NEED_SETGID|KMEM_GROUP)=' \
+  -e '^(AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|RANLIB|SET_MAKE|YACC)=' \
+  -e '^(_|OLDPWD|PIPESTATUS|SECONDS)=' |
   # There maybe variables spread on several lines, eg IFS, remove the dead
   # lines
   fgrep = >$1