FYI: CVS Autotest

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * bootstrap (aclocal_apilibdir): New, to cope with Automake's new
        APIVERSION scheme.
        * tests/Makefile.am (package.m4): New.
        * tests/atlocal.in: Adjust to CVS Autotest.
        * config/gnu-obstack.m4 (M4_AC_FUNC_OBSTACK): Use AC_LIBOBJ.
        * configure.ac: LIBOBJ is a forbidden string.
        Simplify AM_INIT_AUTOMAKE invocation.
        * config/Makefile.am (ACLOCAL_MACROS): Add amversion.m4 and
        options.m4.

Index: bootstrap
===================================================================
RCS file: /cvsroot/m4/m4/bootstrap,v
retrieving revision 1.14
diff -u -u -r1.14 bootstrap
--- bootstrap 17 Oct 2001 17:37:41 -0000 1.14
+++ bootstrap 22 Jan 2002 16:24:19 -0000
@@ -14,9 +14,12 @@
 
 # Make a copy of each Automake/Gettext m4 file we need.
 aclocal_libdir=`aclocal --print-ac-dir`
+aclocal_version=`aclocal --version | sed 's/^.* //;q'`
+aclocal_apilibdir=$aclocal_libdir-$aclocal_version
 for i in `make -f config/Makefile.am spy SPIED=ACLOCAL_MACROS`
 do
-  cp $aclocal_libdir/$i config ||
+  cp $aclocal_apilibdir/$i config 2>/dev/null ||
+    cp $aclocal_libdir/$i config  2>/dev/null ||
     echo "$0: cannot find $i" >&2
 done
 
@@ -54,6 +57,8 @@
   echo '# Help Automake understand includes.'
   echo "ifelse("
   echo "  ["
+  echo "    # It doesn't see its own version."
+  echo "    AM_AUTOMAKE_VERSION([$aclocal_version])"
   echo "    # It doesn't see AC_SUBSTs."
   autoconf -t AC_SUBST:'    AC_SUBST([$1])' | sort -u
   echo "    # It doesn't see AM_CONDITIONALs."
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.5
diff -u -u -r1.5 configure.ac
--- configure.ac 7 Oct 2001 12:39:49 -0000 1.5
+++ configure.ac 22 Jan 2002 16:24:19 -0000
@@ -94,7 +94,7 @@
 ## ------------------------ ##
 ## Automake Initialisation. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 
 
 
@@ -214,7 +214,7 @@
 ## Make sure LTLIBOBJS is up to date. ##
 ## ---------------------------------- ##
 Xsed="sed -e s/^X//"
-LTLIBOBJS=`echo X"$LIBOBJS" | \
+LTLIBOBJS=`echo X"$LIB@&address@hidden" | \
     $Xsed -e 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
 AC_SUBST([LTLIBOBJS])
 
Index: config/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/config/Makefile.am,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.am
--- config/Makefile.am 30 Sep 2001 14:23:27 -0000 1.9
+++ config/Makefile.am 22 Jan 2002 16:24:19 -0000
@@ -27,6 +27,7 @@
 $(STANDARD_TOOLS)
 
 ACLOCAL_MACROS =                               \
+amversion.m4                                   \
 auxdir.m4                                      \
 ccstdc.m4                                      \
 codeset.m4                                     \
@@ -46,6 +47,7 @@
 ltdl.m4                                                \
 make.m4                                                \
 missing.m4                                     \
+options.m4                                     \
 progtest.m4                                    \
 protos.m4                                      \
 sanity.m4                                      \
Index: config/gnu-obstack.m4
===================================================================
RCS file: /cvsroot/m4/m4/config/gnu-obstack.m4,v
retrieving revision 1.8
diff -u -u -r1.8 gnu-obstack.m4
--- config/gnu-obstack.m4 6 Sep 2001 20:13:12 -0000 1.8
+++ config/gnu-obstack.m4 22 Jan 2002 16:24:19 -0000
@@ -69,7 +69,7 @@
   fi
 
   # In the absence of a system implementation, we must compile our own:
-  LIBOBJS="$LIBOBJS obstack.$ac_objext"
+  AC_LIBOBJ(obstack)
 
 fi
 AC_SUBST(OBSTACK_H)
Index: po/ChangeLog
from  gettextize  <address@hidden>

        * Makefile.in.in: Upgrade to gettext-0.10.40.

Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/tests/Makefile.am,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile.am
--- tests/Makefile.am 13 Oct 2001 08:55:55 -0000 1.33
+++ tests/Makefile.am 22 Jan 2002 16:24:19 -0000
@@ -22,12 +22,32 @@
 EXTRA_DIST = generate.awk atlocal.in \
        $(OTHER_FILES) $(TESTSUITE_AT) $(TESTSUITE)
 
-DISTCLEANFILES       = atconfig atlocal package.m4 m4
+DISTCLEANFILES       = atconfig atlocal m4
 MAINTAINERCLEANFILES = Makefile.in generated.at $(TESTSUITE)
 
 OTHER_FILES = \
        iso8859.m4 stackovf.test
 
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
+       } >$(srcdir)/package.m4
+
+EXTRA_DIST += package.m4
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
 TESTSUITE_AT = \
        testsuite.at \
        macros.at builtins.at options.at others.at modules.at generated.at
@@ -49,7 +69,7 @@
 
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+$(srcdir)/$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT)
        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@
 
 # Run the test suite on the *installed* tree.
Index: tests/m4.in
===================================================================
RCS file: /cvsroot/m4/m4/tests/m4.in,v
retrieving revision 1.4
diff -u -u -r1.4 m4.in
--- tests/m4.in 5 Oct 2001 07:50:26 -0000 1.4
+++ tests/m4.in 22 Jan 2002 16:24:19 -0000
@@ -2,8 +2,8 @@
 # @configure_input@
 # Wrapper around a non installed m4 to make it work as an installed one.
 
-"@top_buildpath@/src/m4" \
-      --module-directory="@top_buildpath@/modules" \
+"@abs_top_builddir@/src/m4" \
+      --module-directory="@abs_top_builddir@/modules" \
       ${1+"$@"} 2>/tmp/m4-$$
 status=$?
 # Normalize stderr.