Improve --version output for old-style AC_INIT

diff --git a/ChangeLog b/ChangeLog
index 08dcdc17b1d7085ec38366affe8d67b04446bf93..69b87979befd1933567444df4eb93203adfa4ae8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 2006-04-01  Noah Misch  <noah@cs.caltech.edu>
 
+       * lib/autoconf/general.m4 (_AC_INIT_VERSION): Emit script name and
+       Autoconf version number despite a zero- or one-argument AC_INIT.
+
        * bin/autoreconf.in (parse_args): Multiple -v send --verbose to
        subordinate tools.
        * lib/Autom4te/General.pm (getopt): Make -v and -d incremental.
        * doc/autoconf.texi (autoreconf Invocation): Document it.
 
-2006-04-01  Noah Misch  <noah@cs.caltech.edu>
-
        * doc/autoconf.texi: Use `Cygwin', `MinGW', and `license' consistently.
        Append LocalWords so ispell-buffer passes cleanly.  Spelling fixes.
 
@@ -22,8 +23,6 @@
        the correct lines of the input file by subtracting..
        (_au__first_line): ..this new definition.
 
-2006-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-
        * lib/autoconf/general.m4 (AC_COMPILE_CHECK): Prefer
        AC_MSG_CHECKING over obsolete AC_CHECKING in autoupdated code.
        Remove stray newline in output.
@@ -107,8 +106,6 @@
 
        * doc/autoconf.texi (Installation Directory Variables): Fix typo.
 
-2006-03-21  Stepan Kasal  <kasal@ucw.cz>
-
        * lib/autoscan/autoscan.list: Refreshed.
 
 2006-03-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
@@ -148,28 +145,20 @@
        * tests/local.at (AT_CHECK_MACRO_CROSS): Avoid this warning.
        * tests/semantics.at (AC_C_BIGENDIAN): Likewise.
 
-2006-03-17  Stepan Kasal  <kasal@ucw.cz>
-
        * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Do not special
          case `ac_delim' when writing the sed script.
 
-2006-03-17  Stepan Kasal  <kasal@ucw.cz>
-
        * lib/m4sugar/m4sh.m4 (AS_BOURNE_COMPATIBLE): Removed BIN_SH=xpg4,
          moved DUALCASE=1 ...
        (AS_SHELL_SANITIZE): ... here.
        * doc/autoconf.texi (Special Shell Variables) <BIN_SH>: Do not say
          that it is set.
 
-2006-03-17  Stepan Kasal  <kasal@ucw.cz>
-
        * lib/autoconf/programs.m4 (AC_CHECK_PROG): Quote the parameter of
          AC_SUBST.
        (_AC_PATH_PROG): Store the result to VARIABLE.
        (AC_PATH_PROG): No need to set VARIABLE again.
 
-2006-03-17  Stepan Kasal  <kasal@ucw.cz>
-
        * tests/local.at (AT_CHECK_MACRO_CROSS): New macro, creates two tests:
          the first one is usual AT_CHECK_MACRO test, the second one checks
          that the same works when cross-compiling.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 294cbdcc3b96e4424e5b1cff811b527b41070d69..fad2d2df7e660992a7cd7bce6429cb9911dc9063 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1090,13 +1090,10 @@ m4_divert_pop([HELP_END])dnl
 m4_define([_AC_INIT_VERSION],
 [m4_divert_text([VERSION_BEGIN],
 [if $ac_init_version; then
-  cat <<\_ACEOF])dnl
-m4_ifset([AC_PACKAGE_STRING],
-        [m4_divert_text([VERSION_BEGIN],
-                        [dnl
+  cat <<\_ACEOF
 m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])configure[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-generated by m4_PACKAGE_STRING])])
+generated by m4_PACKAGE_STRING])
 m4_divert_text([VERSION_END],
 [_ACEOF
   exit