summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2004-05-03 06:50:48 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2004-05-03 06:50:48 +0000
commitb3b81694da563f4d807c1a348ac01000d9b4a598 (patch)
treea9fccde578428e9a51f808039c5de270ba196f15
parent1963bcf261989e77d5b9db222426bb5e27846dc6 (diff)
downloadautoconf-b3b81694da563f4d807c1a348ac01000d9b4a598.tar.gz
Regenerate.
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in1
-rw-r--r--config/Makefile.in1
-rwxr-xr-xconfigure2
-rw-r--r--doc/Makefile.in1
-rw-r--r--lib/Autom4te/Makefile.in1
-rw-r--r--lib/Makefile.in1
-rw-r--r--lib/emacs/Makefile.in1
-rw-r--r--man/Makefile.in1
9 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69b21c49..2d99530d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
(_AC_PROG_GREP): Assume 3rd arg is properly quoted for the shell.
All callers changed. Append /usr/xpg4/bin to the PATH, for
Solaris.
+ (_AC_FEATURE_CHECK_LENGTH): Discard stderr, so we don't bother
+ the user with complaints about multiple -e options.
* tests/local.at (AC_STATE_SAVE): Use $GREP, not grep.
Define it with AC_PROG_GREP.
* configure.ac (AC_PROG_GREP): Add.
diff --git a/Makefile.in b/Makefile.in
index bc03c19d..9553eef6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/config/Makefile.in b/config/Makefile.in
index e08843d5..2e1f2745 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -61,6 +61,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/configure b/configure
index 3ba1a931..3a833e91 100755
--- a/configure
+++ b/configure
@@ -2422,7 +2422,7 @@ else
mv "$tmp/conftest.tmp" "$tmp/conftest.in"
cp "$tmp/conftest.in" "$tmp/conftest.nl"
echo 'GREP' >> "$tmp/conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "$tmp/conftest.nl" >"$tmp/conftest.out" || break
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "$tmp/conftest.nl" >"$tmp/conftest.out" 2>/dev/null || break
diff "$tmp/conftest.out" "$tmp/conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
if test $ac_count -gt ${ac_path_GREP_max-0}; then
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e2e5b720..284fcfd6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in
index e9c64826..aa8af61a 100644
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -66,6 +66,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9053d331..f0ff5847 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -72,6 +72,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index 0d16cce2..b18cc4a3 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -68,6 +68,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/man/Makefile.in b/man/Makefile.in
index 41bb04bd..66c97b43 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -64,6 +64,7 @@ ECHO_T = @ECHO_T@
EMACS = @EMACS@
EMACSLOADPATH = @EMACSLOADPATH@
EXPR = @EXPR@
+GREP = @GREP@
HELP2MAN = @HELP2MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@