* 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.

diff --git a/ChangeLog b/ChangeLog
index 8003ef47c9ed53a55688d7557bc293965d664975..38225a762f129adee16e2eb202813f471e9b6291 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
+           Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
 2002-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (handle_single_transform_list): Typo.

diff --git a/NEWS b/NEWS
index 3542287e73096c49816659d6406dcc551757b536..2b9bbf67505282c5dae8cd76d5a2d42f1fda366a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,8 +14,7 @@ New in 1.6a:
   was defined for another condition.
 * It is no longer a requirement to use AM_CONFIG_HEADER instead of
   AC_CONFIG_HEADERS.  Although still supported, AM_CONFIG_HEADER is
-  obsolete.  It is now an error to call any of these macro before
-  AM_INIT_AUTOMAKE.
+  obsolete.
 * Use Autoconf's --trace interface to inspect configure.ac and get
   a more accurate view of it.
 * automake --output-dir is deprecated.

diff --git a/m4/header.m4 b/m4/header.m4
index 9f2e2348f5a4f3cc598bdabea67f78bf1ba834d1..3e0d5be97c355a0adf0bfb650df9aa39760b5389 100644 (file)
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -21,83 +21,5 @@ AC_PREREQ([2.52])
 
 # serial 6
 
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  We must strip everything past the first ":",
-# and everything past the last "/".
-
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
-       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-             m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
-                   m4_if(regexp([$1], [^/.*]), -1,
-                         [.],
-                         patsubst([$1], [^\(/\).*], [\1])),
-                   patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-             patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
-
-
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
-                               [:.*])))/stamp-h[]_AM_STAMP_Count])
-
-
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h.  But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-_AM_AC_CONFIG_HEADERS([$1],
-                  [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
-                  [$3])
-])# _AM_CONFIG_HEADER
-
-
-# _AM_CONFIG_HEADERS(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# ----------------------------------------------------------------
-AC_DEFUN([_AM_CONFIG_HEADERS],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# _AM_CONFIG_HEADERS
-
-# This is a false definition of AM_CONFIG_HEADER that will be
-# overridden by the real definition when _AM_CONFIG_HEADER_INSINUATE
-# is called (i.e. during AM_INIT_AUTOMAKE).
-AC_DEFUN([AM_CONFIG_HEADER],
-[m4_fatal([AM_CONFIG_HEADER called before AM_INIT_AUTOMAKE])])
-
-# _AM_CONFIG_HEADER_INSINUATE
-# ---------------------------
-# Replace AC_CONFIG_HEADERS with our AM_CONFIG_HEADER.
-# We don't care about AC_CONFIG_HEADER (without S): it's an obsolete
-# Autoconf macro which will simply call AC_CONFIG_HEADERS (with S).
-AC_DEFUN([_AM_CONFIG_HEADER_INSINUATE], [
-dnl Since the substitution is only effective after AM_INIT_AUTOMAKE,
-dnl make sure AC_CONFIG_HEADERS is not called before.
-AC_BEFORE([AM_INIT_AUTOMAKE], [AC_CONFIG_HEADERS])dnl
-dnl Save the previous AC_CONFIG_HEADERS definition
-dnl (Beware: this must be m4_copy, not m4_rename, because we will
-dnl lose the --trace bit of AC_CONFIG_HEADERS if we undefine it.)
-m4_copy([AC_CONFIG_HEADERS], [_AM_AC_CONFIG_HEADERS])dnl
-dnl Override AC_CONFIG_HEADERS with ours.
-AC_DEFUN([AC_CONFIG_HEADERS], [_AM_CONFIG_HEADERS($][@)])dnl
-dnl Define AM_CONFIG_HEADERS (obsolete) in terms of AC_CONFIG_HEADERS.
-dnl This way autoheader will `see' the calls to AM_CONFIG_HEADER.
-AC_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($][@)])dnl
-])
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AC_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

diff --git a/m4/init.m4 b/m4/init.m4
index 65e6e431ab0fef416833058ef357ee0736ca7b2e..261ac0c2bd67cb59aa0a41fd29a3ebff09441355 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -96,5 +96,16 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
-_AM_CONFIG_HEADER_INSINUATE
 ])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cea03ebd55db28cf9f023b3915378bc2de6aecd1..edd2a773b9c4470d1f8f3743d45146d0cd562d2d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,7 +100,6 @@ confdeps.test \
 confdist.test \
 confh.test \
 confh4.test \
-confh5.test \
 config.test \
 confincl.test \
 confsub.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3bfe8fe4fa7fb04d2be83c347ab38d4c0f2ce361..e49685a64604e5c2af1fcb341887f2d619a505e9 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -187,7 +187,6 @@ confdeps.test \
 confdist.test \
 confh.test \
 confh4.test \
-confh5.test \
 config.test \
 confincl.test \
 confsub.test \

diff --git a/tests/confh5.test b/tests/confh5.test
deleted file mode 100755 (executable)
index 4e460da..0000000
--- 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