* lib/autoconf/autoheader.m4 (_AH_TEMPLATE_OLD, _AH_VERBATIM_OLD):

Remove.
We _have_ to stop using the old compatibility scheme that tried to
avoid useless backslashes because Libtool 1.4.3 contains a
AC_DEFINE([error_t], [int],
[Define to a type to use for `error_t' if it is not
otherwise available.])
We _have_ to quote the single quote and backslashes with .  The
old compatibility scheme saw that ` was backslashed, and therefore
did not quote the single quote.  Hence before this patch, Autoconf
was not compatible with Libtool.

diff --git a/ChangeLog b/ChangeLog
index e9ec8df564c6619b1b00cd05b22eefb4d6af1dce..d4eaa9823ba86276f326cb69dce81bd939eaecf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-11-05  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/autoheader.m4 (_AH_TEMPLATE_OLD, _AH_VERBATIM_OLD):
+       Remove.
+       We _have_ to stop using the old compatibility scheme that tried to
+       avoid useless backslashes because Libtool 1.4.3 contains a
+       AC_DEFINE([error_t], [int],
+       [Define to a type to use for \`error_t' if it is not
+       otherwise available.])
+       We _have_ to quote the single quote and backslashes with \.  The
+       old compatibility scheme saw that ` was backslashed, and therefore
+       did not quote the single quote.  Hence before this patch, Autoconf
+       was not compatible with Libtool.
+
 2002-11-04  Paul Eggert  <eggert@twinsun.com>
 
        * lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Set the following variables,

diff --git a/Makefile.in b/Makefile.in
index 0bbf8402fdc05a5f1423854183daacf1cf1f0aef..2d89f2921b43eaa36542d69212039c2aee10fdfb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.7a from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -143,7 +143,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
        Makefile.in NEWS README-alpha THANKS TODO aclocal.m4 configure \
        configure.ac
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = bin tests . lib config man doc
 all: all-recursive
 
 .SUFFIXES:
@@ -158,7 +158,7 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
        cd $(srcdir) && $(AUTOCONF)
 
 $(ACLOCAL_M4):  configure.ac config/m4.m4
@@ -350,7 +350,7 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d $(distdir)/$$subdir \
            || mkdir $(distdir)/$$subdir \

diff --git a/NEWS b/NEWS
index b0547e2744b86d23723de5d715f97666a34f6a72..338fb87fac454c620b368a2f8fb6e47ad0228cd7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
-* Major changes in Autoconf 2.54d                       -*- outline -*-
+* Major changes in Autoconf 2.54c                       -*- outline -*-
 \f
 
 Release tips:
 
            Have your configure.ac checked by autoscan ("autoscan").
-             Try the warning options ("autoreconf -fv -Wall").
+             Try the warning options ("autoreconf -fv -Wall").
 
 ** Documentation
 
@@ -58,6 +58,24 @@ Release tips:
   should be avoided in configure.ac.  Running autoupdate is advised.
   AC_DECL_SYS_SIGLIST.
 
+- AC_DEFINE/AC_DEFINE_UNQUOTED
+
+  We have to stop using the old compatibility scheme --that tried to
+  avoid useless backslashes-- because Libtool 1.4.3 contains a
+
+  AC_DEFINE([error_t], [int],
+            [Define to a type to use for \`error_t' if it is not
+             otherwise available.])
+
+  We have to quote the single quotes and backslashes with \.  The old
+  compatibility scheme saw that ` was backslashed, and therefore did
+  not quote the single quote...  Failure.  Hence, Autoconf 2.54 is not
+  compatible with Libtool.  Autoconf 2.55 is, but in some cases might
+  produce more \ than wanted.
+
+  Please, note that in the future the same problem will happen with
+  AC_MSG_*: use `autoreconf -f -Wall'.
+
 ** Bug Fixes
 
 - Portability of the Autoconf package to Solaris.
@@ -101,6 +119,13 @@ Release tips:
   Autoconf 2.55 on it, and report the results to
   bug-autoconf@gnu.org.
 
+- AC_MSG_*
+
+  Special characters in AC_MSG_* need not be quoted.  Currently,
+  Autoconf has heuristics to decide when a string is escaped, or has
+  to be escaped.  This scheme is fragile, and will be removed; the
+  only risk is uglified messages.  Please, run `autoreconf -f -Wall'
+  to find occurrences that will be affected.
 
 * Major changes in Autoconf 2.54
 

diff --git a/aclocal.m4 b/aclocal.m4
index e0e73336651088a7661d2d77a389b61469c09937..a879cb688b6fa1c0398a6d072975de659bbe222c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.7a -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -153,14 +153,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7a"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # 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.7.1])])
+        [AM_AUTOMAKE_VERSION([1.7a])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 

diff --git a/configure b/configure
index 07a162f2ea9a837f3ddd5f27d3b26bb2ca937d0d..ba108455d6f81db07beda2d53c0c62d4b46c2177 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54d for GNU Autoconf 2.54d.
+# Generated by GNU Autoconf 2.54c for GNU Autoconf 2.54d.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -38,10 +38,7 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
 do
   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
@@ -857,7 +854,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Autoconf configure 2.54d
-generated by GNU Autoconf 2.54d
+generated by GNU Autoconf 2.54c
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -872,7 +869,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Autoconf $as_me 2.54d, which was
-generated by GNU Autoconf 2.54d.  Invocation command line was
+generated by GNU Autoconf 2.54c.  Invocation command line was
 
   $ $0 $@
 
@@ -1233,7 +1230,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
           ac_config_files="$ac_config_files config/Makefile"
 
 
-am__api_version="1.7"
+am__api_version="1.7a"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2099,10 +2096,7 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
 do
   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
@@ -2319,7 +2313,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Autoconf $as_me 2.54d, which was
-generated by GNU Autoconf 2.54d.  Invocation command line was
+generated by GNU Autoconf 2.54c.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2376,7 +2370,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.54d
-configured by $0, generated by GNU Autoconf 2.54d,
+configured by $0, generated by GNU Autoconf 2.54c,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001

diff --git a/lib/autoconf/autoheader.m4 b/lib/autoconf/autoheader.m4
index b31bee3859cf530f93e11ccc295816b49a3595b6..fee8be2d584b0381e7700d7ed4efdf1dc3e47364 100644 (file)
--- a/lib/autoconf/autoheader.m4
+++ b/lib/autoconf/autoheader.m4
@@ -72,17 +72,6 @@ m4_define([AH_VERBATIM],
 ])
 
 
-# _AH_VERBATIM_OLD(KEY, TEMPLATE)
-# -------------------------------
-# Same as above, but with bugward compatibility.
-#
-# Quote for Perl '' strings, which are those used by Autoheader.
-m4_define([_AH_VERBATIM_OLD],
-[AS_LITERAL_IF([$1],
-               [AH_OUTPUT([$1], _AS_QUOTE([[$2]], [\\'']))])
-])
-
-
 # AH_TEMPLATE(KEY, DESCRIPTION)
 # -----------------------------
 # Issue an autoheader template for KEY, i.e., a comment composed of
@@ -93,15 +82,6 @@ m4_define([AH_TEMPLATE],
 #undef $1])])
 
 
-# _AH_TEMPLATE_OLD(KEY, DESCRIPTION)
-# ----------------------------------
-# Same as above, but with bugward compatibility.
-m4_define([_AH_TEMPLATE_OLD],
-[_AH_VERBATIM_OLD([$1],
-                  m4_text_wrap([$2 */], [   ], [/* ])[
-#undef $1])])
-
-
 # AH_TOP(TEXT)
 # ------------
 # Output TEXT at the top of `config.h.in'.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 864b85e0f6442b43ef0be19e74e1c8d1e17d67ba..6d2dd84a0bd3b247d4534d7dc6ea32d17a93e749 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1857,7 +1857,7 @@ m4_define([AC_DEFINE_TRACE],
 # die.  The third argument is used by autoheader.
 m4_define([AC_DEFINE],
 [AC_DEFINE_TRACE([$1])dnl
-m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
+m4_ifval([$3], [AH_TEMPLATE([$1], [$3])])dnl
 cat >>confdefs.h <<\_ACEOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 _ACEOF
@@ -1869,7 +1869,7 @@ _ACEOF
 # Similar, but perform shell substitutions $ ` \ once on VALUE.
 m4_define([AC_DEFINE_UNQUOTED],
 [AC_DEFINE_TRACE([$1])dnl
-m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
+m4_ifval([$3], [AH_TEMPLATE([$1], [$3])])dnl
 cat >>confdefs.h <<_ACEOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 _ACEOF