* m4/header.m4 (_AM_DIRNAME, _AM_STAMP, _AM_CONFIG_HEADER,

_AM_CONFIG_HEADER_INSINUATE): Remove them all.  Leave just ...
(AM_CONFIG_HEADER): ... this new definition for compatibility.
* m4/init.m4: Don't call _AM_CONFIG_HEADER_INSINUATE.
(_AC_AM_CONFIG_HEADER_HOOK): New macro.
* tests/confh5.tests: Delete.
* tests/Makefile.am (TESTS): Remove confh5.tests.

1 files changed, 0 insertions, 36 deletions

diff --git a/tests/confh5.test b/tests/confh5.test
deleted file mode 100755
index 4e460da71..000000000
--- a/tests/confh5.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-# Make sure that calling AM_CONFIG_HEADER or AC_CONFIG_HEADERS
-# before AM_INIT_AUTOMAKE is not allowed and that the error
-# message says so.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT(nonesuch, nonesuch)
-AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE
-AC_OUTPUT
-END
-
-: > config.h.in
-
-$ACLOCAL || exit 1
-# Autoconf (at least up to 2.53) treats this error as a warning.
-# Hence we don't `&& exit 1'.
-$AUTOCONF >output 2>&1
-cat output
-grep 'AC_CONFIG_HEADERS.*before.*AM_INIT_AUTOMAKE' output || exit 1
-
-
-cat > configure.in << 'END'
-AC_INIT(nonesuch, nonesuch)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE
-AC_OUTPUT
-END
-
-$ACLOCAL || exit 1
-$AUTOCONF >output 2>&1 && exit 1
-cat output
-grep 'AM_CONFIG_HEADER.*before.*AM_INIT_AUTOMAKE' output || exit 1