05-bye-bye-2.13.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        Drop Autoconf 2.13 compatibility.

        * configure.in (changeword): No need to undefine it, as anyway if
        it's defined, M4sugar moved it as m4_changeword.
        And anyway, proper quotation is enough.
        (m4_pattern_allow): As it exists in 2.50, just use it.
        (AC_OUTPUT): Split in AC_CONFIG_FILES and AC_CONFIG_COMMANDS.
        Don't handle Gettext's duties, let it handle them.
        * config/gnu-obstack.h: Use m4_pattern_allow directly.

--- /tmp/m4-1.4q/configure.in   Thu Aug 16 17:22:26 2001
+++ configure.in        Thu Aug 16 17:08:42 2001
@@ -1,6 +1,6 @@
 # Configure template for GNU m4.                       -*-Autoconf-*-
 # Copyright 1991-1994, 2000, 2001  Free Software Foundation, Inc.
-#  
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -16,19 +16,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-define([MY_NAME],    [m4])
-define([MY_VERSION], [1.4q])
-
 AC_PREREQ(2.52)
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_cv_])])dnl
-ifdef([changeword], [undefine([changeword])])dnl
+m4_pattern_allow([^m4_cv_])
 
-AC_INIT(MY_NAME, MY_VERSION, address@hidden)
+AC_INIT([GNU M4], [1.4q], address@hidden)
 AC_CONFIG_SRCDIR([src/m4.h])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h:config-h.in)
 
-AM_INIT_AUTOMAKE(MY_NAME, MY_VERSION)
+AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
 
 AC_PROG_CC
 AC_ISC_POSIX
@@ -36,8 +32,10 @@
 AC_PROG_CPP
 AC_PROG_CC_C_O
 
+# Gettext.
 ALL_LINGUAS="cs de el fr it ja nl pl ru sv"
 AM_GNU_GETTEXT
+AC_CONFIG_FILES(po/Makefile.in intl/Makefile)
 
 pkglibexecdir='${libexecdir}'/$PACKAGE
 AC_SUBST(pkglibexecdir)
@@ -79,10 +77,10 @@
 AC_REPLACE_FUNCS(strtol xmalloc xstrdup)
 
 M4OBJS=
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_getopt_h$])])dnl
+m4_pattern_allow([^m4_getopt_h$])dnl
 m4_getopt_h=src/getopt.h
 rm -f $m4_getopt_h
-AC_CHECK_FUNC(getopt_long, [], 
+AC_CHECK_FUNC(getopt_long, [],
 [M4OBJS="getopt1.$ac_objext getopt.$ac_objext"
 echo linking src/gnu-getopt.h to $m4_getopt_h
 $LN_S ./gnu-getopt.h $m4_getopt_h])
@@ -94,8 +92,8 @@
 
 M4_AC_SYS_STACKOVF
 
-AC_MSG_CHECKING(if changeword is wanted)
-AC_ARG_ENABLE(changeword,
+AC_MSG_CHECKING([[if changeword is wanted]])
+AC_ARG_ENABLE([[changeword]],
 [  --enable-changeword     enable -W and changeword() builtin],
 [if test "$enableval" = yes; then
   AC_MSG_RESULT(yes)
@@ -106,7 +104,7 @@
 fi], [AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for modules to preload)
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_default_preload$])])dnl
+m4_pattern_allow([^m4_default_preload$])dnl
 m4_default_preload="m4 traditional gnu"
 AC_ARG_WITH(modules,
 [  --with-modules=MODULES preload MODULES [default: $m4_default_preload]],
@@ -126,26 +124,18 @@
 fi
 AC_SUBST(DLPREOPEN)
 
-dnl This is for the modules
+# This is for the modules
 AC_STRUCT_TM
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gethostname mktime uname)
 AC_CHECK_FUNCS(setenv unsetenv putenv clearenv)
-
-
 AM_WITH_GMP
-
 AM_WITH_DMALLOC
-
 if test "$USE_INCLUDED_LIBINTL" = yes; then
-  INTLINCL='-I$(top_srcdir)/intl'
-
-  AC_SUBST(INTLINCL)
+  AC_SUBST([INTLINCL], ['-I$(top_srcdir)/intl'])
 fi
 
 
-dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-
 Xsed="sed -e s/^X//"
 LTLIBOBJS=`echo X"$LIBOBJS" | \
 [$Xsed -e 's,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,']`
@@ -153,23 +143,13 @@
 
 AC_SUBST(ac_aux_dir)
 
-# Big hack below: 2.13 does not guarantee the value of $srcdir, so
-# do not use `sh $srcdir/tests/mkconfig.sh' since if we build
-# in a separate dir, it points to srcdir for... `examples/'!
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_top_srcdir$])])dnl
-AC_OUTPUT(
-Makefile
-config/Makefile
-intl/Makefile
-po/Makefile.in
-doc/Makefile
-m4/Makefile
-src/Makefile
-modules/Makefile
-tests/Makefile
-examples/Makefile,
-[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \
-sh $m4_top_srcdir/tests/mkconfig.sh; \
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in],
-[m4_top_srcdir=$srcdir])
-
+# Outputs.
+AC_CONFIG_FILES(Makefile config/Makefile doc/Makefile m4/Makefile
+                src/Makefile modules/Makefile tests/Makefile
+                examples/Makefile)
+
+m4_pattern_allow([^m4_top_srcdir$])dnl
+AC_CONFIG_COMMANDS([tests/config.sh],
+                   [$SHELL $m4_top_srcdir/tests/mkconfig.sh],
+                   [m4_top_srcdir=$srcdir])
+AC_OUTPUT
--- /tmp/m4-1.4q/config/gnu-obstack.m4  Thu Aug 16 17:21:01 2001
+++ config/gnu-obstack.m4       Thu Aug 16 17:15:40 2001
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-#serial 4
+# serial 5
 
 # FIXME: This might not be portable...  When obstack.h is found, we
 # want to use the system's obstack.h.  But we don't want to install
@@ -36,8 +36,8 @@
 # Use the libc supplied version of obstacks if available.
 AC_DEFUN([M4_AC_FUNC_OBSTACK],
 [AC_CHECK_HEADER(obstack.h)
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_cv_func_obstack])])dnl
-ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_obstack_h])])dnl
+m4_pattern_allow([^m4_cv_func_obstack$])dnl
+m4_pattern_allow([^m4_obstack_h$])dnl
 AC_CACHE_CHECK([for obstack in libc], m4_cv_func_obstack,
                [AC_TRY_LINK([#include "obstack.h"],
                            [struct obstack *mem;obstack_free(mem,(char *) 0)],