Regenerate.

diff --git a/Makefile.in b/Makefile.in
index 27f59d9a3314ddb3cb7175fe52768f5fc8f80a3e..0b4e57ff525ed9625a2086b06f04c8e658c81148 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -92,7 +92,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -143,9 +142,9 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
-# bin/ and tests/ must be run first, as they build the tests executables
-# (tests/autom4te etc.), that we happen to use here.
-SUBDIRS = bin tests . lib config man doc
+# bin/ must be run first, as it builds executables needed for tests.
+# autom4te uses autotest.m4f to generate `testsuite', so build tests last.
+SUBDIRS = bin . lib config man doc tests
 ACLOCAL_AMFLAGS = -I config
 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \

diff --git a/aclocal.m4 b/aclocal.m4
index 1dd32e4b8a9133d1fbabac25d9602f4a7e01153d..2e30c5d8c556e43dc135380c804b7070ae0c2989 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.9.1])])
+        [AM_AUTOMAKE_VERSION([1.9.3])])
 
 # AM_AUX_DIR_EXPAND
 

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 2e2343155dc1302408a1e4f135314f7a302fd2e2..f52545214a5caaeda10af583ae16faafb1de7f2a 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,7 +66,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -178,6 +177,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 bin_SCRIPTS = autom4te \
              autoconf autoheader autoreconf ifnames autoscan autoupdate
 

diff --git a/config/Makefile.in b/config/Makefile.in
index 8aec3373f10981a0bcef8e19855bd9cdcbd06a1d..df3d1436dcae88b888e6dfd711f694015b13452d 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61,7 +61,6 @@ 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 8affb2b7ef177098b7755f463ae6493d18a7e84b..e41670ce9987816eab2fe54623ba01c7749cf081 100755 (executable)
--- a/configure
+++ b/configure
@@ -2432,9 +2432,8 @@ do
   for ac_prog in grep ggrep; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    test -f "$ac_path_GREP" || continue
-    $ac_path_GREP_found || if $as_executable_p "$ac_path_GREP"; then
-  # Check for GNU ac_path_GREP and select it if it is found.
+    $as_executable_p "$ac_path_GREP" || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 if "$ac_path_GREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:
@@ -2460,7 +2459,6 @@ else
   done
 fi
 
-fi
 
     $ac_path_GREP_found && break 3
   done

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2a05ed89b67d0044b89ae2460591655bb2881416..86de52c5a92a059b6677a24e59fead6d2daebbeb 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,7 +74,6 @@ 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 a8d46f025370e2d8851b9ff79fe7397fed44cdcb..27bed454c86944a6e8b38d1474299b910d2d30ac 100644 (file)
--- a/lib/Autom4te/Makefile.in
+++ b/lib/Autom4te/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,7 +72,6 @@ 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 776a2d288b8b12416a265ebee8adcdaf18ad67f7..45486b959df6bb01f7fba160eb8b4680d818803c 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -78,7 +78,6 @@ 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/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index 9f7b0a7ad765427c87b3853839272744eac2b2e9..9b9db2dfb96ca648bd8ccd27e8459063862d9687 100644 (file)
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,7 +74,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -200,6 +199,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 all: all-am
 
 .SUFFIXES:

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 17554f1a3bae72a94d5e3f0c6ce18931e82d8009..d4a760cb3328db74ff0dab4a8f93ac4a88c14694 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -70,7 +70,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -186,6 +185,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 all: all-am
 
 .SUFFIXES:

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 6483ca084fa0a9ac89e2b75da15c821714347b19..753c6e81ab93a3092f04eb845679313b8ae559f5 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,7 +74,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -194,6 +193,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 all: all-am
 
 .SUFFIXES:

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index fb559dcfd564d2f8b0e5c8d55197a2a69854578b..8d7b69fa57c29e99cbc96d622870d8c1c976ed1b 100644 (file)
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,7 +74,6 @@ 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/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index f29f5af2117f38c1e964c78d02ffd5a6fc010b19..d4df1aa090aba1ae7b4d24b717274eff48ccaac2 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -74,7 +74,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -194,6 +193,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 all: all-am
 
 .SUFFIXES:

diff --git a/man/Makefile.in b/man/Makefile.in
index 628ae30dd403817bfbaf7304379054b48a970877..e6fcbdf867c7e186c69b0b23bb828661b9171c6e 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,7 +64,6 @@ 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/tests/Makefile.in b/tests/Makefile.in
index 84d14a85401329b0f0ffd7910a6a53cef962c35a..4653787205fe207832dbe275ca873f6b38dc54b6 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -62,7 +62,6 @@ ECHO_T = @ECHO_T@
 EMACS = @EMACS@
 EMACSLOADPATH = @EMACSLOADPATH@
 EXPR = @EXPR@
-GREP = @GREP@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -186,6 +185,7 @@ ETAGS_FOR_AUTOCONF = \
   --regex='/\(A[CU]_DEFUN\|AU_ALIAS\)(\[\([^]]*\)\]/\2/' \
   --regex='/AN_\(FUNCTION\|HEADER\|IDENTIFIER\|LIBRARY\|MAKEVAR\|PROGRAM\)(\[\([^]]*\)\]/\2/'
 
+GREP = @GREP@
 TESTSUITE_GENERATED_AT = \
        aclang.at acc.at acfortran.at \
        acgeneral.at acstatus.at \
@@ -470,7 +470,7 @@ check-local: atconfig atlocal $(TESTSUITE)
        $(SHELL) $(TESTSUITE)
 
 # Run the test suite on the *installed* tree.
-installcheck-local:
+installcheck-local: atconfig atlocal $(TESTSUITE)
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 
 $(TESTSUITE_GENERATED_AT): mktests.sh $(AUTOCONF_FILES)