Work with M4 1.6 change to FIFO m4wrap.

* configure.ac (m4_wrap): Allow bootstrapping with autoconf 2.59.
* lib/m4sugar/m4sugar.m4 (m4_wrap): Force LIFO m4_wrap behavior
for 2.59 (2.60 already handles FIFO behavior).
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index fa71c426da01ef85da0e5887235dfc568508897c..bfcdb9f6ed658573ba19ac8b96ad227aac0697d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-24  Eric Blake  <ebb9@byu.net>
+
+       Work with M4 1.6 change to FIFO m4wrap.
+       * configure.ac (m4_wrap): Allow bootstrapping with autoconf 2.59.
+       * lib/m4sugar/m4sugar.m4 (m4_wrap): Force LIFO m4_wrap behavior
+       for 2.59 (2.60 already handles FIFO behavior).
+       Reported by Ralf Wildenhues.
+
 2003-11-06  Akim Demaille  <akim@epita.fr>
 
        Version 2.59.

diff --git a/configure.ac b/configure.ac
index e089281662fc0e35f7cc66ea388c5e0848bc67c9..f4935cae49a8de6b142222e77115f87cb1b2ec9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                                       -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2008
 # Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,14 @@
 # We need AC_CONFIG_TESTDIR.
 AC_PREREQ([2.57])
 
+# M4 1.6 and newer have FIFO m4wrap, as mandated by POSIX, but we want
+# LIFO m4_wrap.
+m4_define([m4_wrap],
+[m4_ifdef([_$0_text],
+  [m4_define([_$0_text], [$1]m4_defn([_$0_text]))],
+  [m4_define([_$0_text], [$1])m4_builtin([m4wrap],
+    [m4_default(m4_defn([_$0_text])m4_undefine([_$0_text]))])])])
+
 AC_INIT([GNU Autoconf], [2.59], [bug-autoconf@gnu.org])
 AC_SUBST([PACKAGE_NAME])dnl
 AC_CONFIG_SRCDIR([ChangeLog])

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 02c417d5a1fb5c14ccbe8725ec83d4254a2984c6..00c247853598d2454635cd152115ce36280e6e7e 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -3,7 +3,7 @@ divert(-1)#                                                  -*- Autoconf -*-
 # Base M4 layer.
 # Requires GNU M4.
 #
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2008 Free Software Foundation,
 # Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1748,6 +1748,13 @@ m4_if(m4_sysval, [0], [],
 ## 13. Setting M4sugar up.  ##
 ## ------------------------ ##
 
+# M4 1.6 and newer have FIFO m4wrap, as mandated by POSIX, but we want
+# LIFO m4_wrap.
+m4_define([m4_wrap],
+[m4_ifdef([_$0_text],
+  [m4_define([_$0_text], [$1]m4_defn([_$0_text]))],
+  [m4_define([_$0_text], [$1])m4_builtin([m4wrap],
+    [m4_default(m4_defn([_$0_text])m4_undefine([_$0_text]))])])])
 
 # m4_init
 # -------