* acgeneral.m4 (AH_VERBATIM, AH_TEMPLATE): New, use AS_ESCAPE, not

_AS_QUOTE.
(_AH_VERBATIM_OLD, _AH_TEMPLATE_OLD): New, used for bugward
compatibility in...
(AC_DEFINE, AC_DEFINE_UNQUOTED): here.

diff --git a/ChangeLog b/ChangeLog
index 4e32febb0fc8a22be582ce8957f105833293c3ec..282c74516fbd7e67e1882ad275d9cc7b53b1b556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AH_VERBATIM, AH_TEMPLATE): New, use AS_ESCAPE, not
+       _AS_QUOTE.
+       (_AH_VERBATIM_OLD, _AH_TEMPLATE_OLD): New, used for bugward
+       compatibility in...
+       (AC_DEFINE, AC_DEFINE_UNQUOTED): here.
+
 2001-02-26  Pavel Roskin  <proski@gnu.org>
 
        * autoupdate.in (&mktmpdir): Strip the newline from the output

diff --git a/acgeneral.m4 b/acgeneral.m4
index 09deb3900f0cfaa00f8c2637fab7040bb8604d29..d93fd2c3b42952b2f451dbab24de089d8e25e4ea 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -283,6 +283,15 @@ m4_define([AH_OUTPUT], [])
 # TEMPLATE associated to the KEY.  Otherwise, do nothing.  TEMPLATE is
 # output as is, with no formating.
 m4_define([AH_VERBATIM],
+[AS_LITERAL_IF([$1],
+               [AH_OUTPUT([$1], AS_ESCAPE([[$2]]))])
+])
+
+
+# _AH_VERBATIM_OLD(KEY, TEMPLATE)
+# -------------------------------
+# Same as above, but with bugward compatibility.
+m4_define([_AH_VERBATIM_OLD],
 [AS_LITERAL_IF([$1],
                [AH_OUTPUT([$1], _AS_QUOTE([[$2]]))])
 ])
@@ -298,6 +307,15 @@ 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'.
@@ -2045,7 +2063,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([$1], [$3])])dnl
+m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
 cat >>confdefs.h <<\EOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 EOF
@@ -2057,7 +2075,7 @@ EOF
 # Similar, but perform shell substitutions $ ` \ once on VALUE.
 m4_define([AC_DEFINE_UNQUOTED],
 [AC_DEFINE_TRACE([$1])dnl
-m4_ifval([$3], [AH_TEMPLATE([$1], [$3])])dnl
+m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
 cat >>confdefs.h <<EOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 EOF

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 09deb3900f0cfaa00f8c2637fab7040bb8604d29..d93fd2c3b42952b2f451dbab24de089d8e25e4ea 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -283,6 +283,15 @@ m4_define([AH_OUTPUT], [])
 # TEMPLATE associated to the KEY.  Otherwise, do nothing.  TEMPLATE is
 # output as is, with no formating.
 m4_define([AH_VERBATIM],
+[AS_LITERAL_IF([$1],
+               [AH_OUTPUT([$1], AS_ESCAPE([[$2]]))])
+])
+
+
+# _AH_VERBATIM_OLD(KEY, TEMPLATE)
+# -------------------------------
+# Same as above, but with bugward compatibility.
+m4_define([_AH_VERBATIM_OLD],
 [AS_LITERAL_IF([$1],
                [AH_OUTPUT([$1], _AS_QUOTE([[$2]]))])
 ])
@@ -298,6 +307,15 @@ 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'.
@@ -2045,7 +2063,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([$1], [$3])])dnl
+m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
 cat >>confdefs.h <<\EOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 EOF
@@ -2057,7 +2075,7 @@ EOF
 # Similar, but perform shell substitutions $ ` \ once on VALUE.
 m4_define([AC_DEFINE_UNQUOTED],
 [AC_DEFINE_TRACE([$1])dnl
-m4_ifval([$3], [AH_TEMPLATE([$1], [$3])])dnl
+m4_ifval([$3], [_AH_TEMPLATE_OLD([$1], [$3])])dnl
 cat >>confdefs.h <<EOF
 [@%:@define] $1 m4_if($#, 2, [$2], $#, 3, [$2], 1)
 EOF