Index: ChangeLog
from  Akim Demaille  <address@hidden>

	* configure.in: Require Autoconf 2.52.
	(AC_ARG_PROGRAM): Remove, handled by Automake.
	(m4_getopt): Rename as...
	(m4_getopt_h): this.
	Allow the tokens `m4_cv_*', `m4_top_srcdir', and `m4_getopt_h'.
	Undefine `changeword' only if defined.
	* config/gnu-obstack.m4: Require Autoconf 2.52.
	(M4_AC_FUNC_OBSTACK): Rename `m4_obstack' and `m4_obstack_h'.
	Allow this token.

Index: configure.in
--- configure.in Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ configure.in Fri, 10 Aug 2001 14:23:00 +0200 akim
@@ -15,8 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
-
-undefine([changeword])
+AC_PREREQ(2.52)
+ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_cv_])])dnl
+ifdef([changeword], [undefine([changeword])])dnl

 AC_INIT(src/m4.h)
 AC_CONFIG_AUX_DIR(config)
@@ -33,8 +34,6 @@
 ALL_LINGUAS="cs de el fr it ja nl pl ru sv"
 AM_GNU_GETTEXT

-AC_ARG_PROGRAM
-
 pkglibexecdir='${libexecdir}'/$PACKAGE
 AC_SUBST(pkglibexecdir)

@@ -75,12 +74,13 @@
 AC_REPLACE_FUNCS(strtol xmalloc xstrdup)

 M4OBJS=
-m4_getopt=src/getopt.h
-rm -f $m4_getopt
+ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_getopt_h$])])dnl
+m4_getopt_h=src/getopt.h
+rm -f $m4_getopt_h
 AC_CHECK_FUNC(getopt_long, [],
 [M4OBJS="getopt1.$ac_objext getopt.$ac_objext"
-echo linking src/gnu-getopt.h to $m4_getopt
-$LN_S ./gnu-getopt.h $m4_getopt])
+echo linking src/gnu-getopt.h to $m4_getopt_h
+$LN_S ./gnu-getopt.h $m4_getopt_h])
 AC_SUBST(M4OBJS)

 M4_AC_FUNC_OBSTACK
@@ -108,6 +108,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_default_preload="m4 traditional gnu"
 AC_ARG_WITH(modules,
 [  --with-modules=MODULES preload MODULES [default: $m4_default_preload]],
@@ -157,6 +158,7 @@
 # Big hack below: 2.13 does not garantee the value of $srcdir, so
 # do not use `sh $srcdir/tests/mkconfig.sh' since in case 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
Index: config/gnu-obstack.m4
--- config/gnu-obstack.m4 Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ config/gnu-obstack.m4 Fri, 10 Aug 2001 14:23:04 +0200 akim
@@ -18,12 +18,14 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.

-#serial 2
+#serial 3

 # FIXME: This is not portable I guess.  There is no reason for all
 # the CPP in the world to support #include_next.  So?  Copy the
 # actual content of obstack.h if CPP does not support 'include_next'?

+AC_PREREQ(2.52)
+
 # M4_AC_FUNC_OBSTACK
 # ------------------
 # Use the libc supplied version of obstacks if available.
@@ -35,18 +37,19 @@ AC_DEFUN([M4_AC_FUNC_OBSTACK],
 	                    m4_cv_func_obstack=yes,
 	                    m4_cv_func_obstack=no)])
 OBSTACK_H=
-m4_obstack=m4/obstack.h
-rm -f $m4_obstack
+ifdef([m4_pattern_allow], [m4_pattern_allow([^m4_obstack_h])])dnl
+m4_obstack_h=m4/obstack.h
+rm -f $m4_obstack_h
 if test $m4_cv_func_obstack = yes; then
   AC_DEFINE(HAVE_OBSTACK, 1, [Define if libc includes obstacks.])
-  cat >$m4_obstack <<EOF
+  cat >$m4_obstack_h <<EOF
 /* The native header works properly. */
 #include_next <obstack.h>
 EOF
 else
   LIBOBJS="$LIBOBJS obstack.$ac_objext"
-  echo linking src/gnu-obstack.h to $m4_obstack
-  $LN_S ./gnu-obstack.h $m4_obstack
+  echo linking src/gnu-obstack.h to $m4_obstack_h
+  $LN_S ./gnu-obstack.h $m4_obstack_h

   if test x"$ac_cv_header_obstack_h" != xyes; then
     OBSTACK_H=obstack.h