* tests/defs (ACLOCAL): Point to the installed aclocaldir is

libtool is required.
* tests/lex.test: Run AC_INIT once.
* tests/ldflags.test, tests/listval.test, tests/suffix2.test:
Libtool is required.
* tests/header.test: Built a correct configure.in.
* tests/defun2.test (configure.in): Be a bit respectful with
Autoconf, close the macro invocations.
* tests/confdeps.test: Even when not using aclocal, aclocal.m4
must be correct.
* automake.in (scan_autoconf_traces): Add support for
AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, A[CM]_PROG_LIBTOOL,
AM_CONFIG_HEADER, AM_MAINTAINER_MODE.
* tests/condincl.test (target): Better pattern, to avoid matching
the definition of `target_alias' which is now properly discovered
as an AC_SUBST by traces.
* cond4.test: Better grep pattern: After all, why shouldn't
TWO_FALSE be AC_SUBST properly.
* tests/installsh.test (AUTOMAKE, ACLOCAL): Adjust.

1 files changed, 8 insertions, 6 deletions

diff --git a/tests/confdeps.test b/tests/confdeps.test
index e6763f26a..3ad6bb7e3 100755
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -7,15 +7,17 @@
 echo "FOO = foo"        > Makefile.am
 set -e
 
-echo "$me: Not generated by aclocal..."
-echo "Hello, universe!" > aclocal.m4
-$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
-
-
 echo "$me: Generated by aclocal..."
 $ACLOCAL
 $AUTOMAKE
 grep '^\$(ACLOCAL_M4):' Makefile.in
 
+echo "$me: Not generated by aclocal..."
+# Pretend it is not from aclocal (remove the signature),
+# but keep it correct, i.e., with AM_INIT_AUTOMAKE etc.
+sed -n '3,$p' aclocal.m4 >aclocal.m4t
+mv aclocal.m4t aclocal.m4
+$AUTOMAKE
+grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
+
 exit 0