* configure.in: Require 2.52g.

M4 is not needed, but AUTOM4TE is.
* m4/m4.m4: Remove.
* tests/Makefile.am: Adjust.

diff --git a/ChangeLog b/ChangeLog
index c4a4dc5ac2d449ca316eeb761bc65f72b5c77989..594e4d28549f9a511cc933dde504f7b14003de6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-10  Akim Demaille  <akim@epita.fr>
+
+       * configure.in: Require 2.52g.
+       M4 is not needed, but AUTOM4TE is.
+       * m4/m4.m4: Remove.
+       * tests/Makefile.am: Adjust.
+
+       
 2001-12-10  Akim Demaille  <akim@epita.fr>
 
        One structure for states is enough, even though theoretically

diff --git a/configure.in b/configure.in
index f59fe9846cf49eb01521dfae2ac5ff4d63c0fbdf..b6788873fb89035635f30d17168dbcfed7a30165 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@
 # 02111-1307  USA
 
 # We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.52e)
+AC_PREREQ(2.52g)
 
 AC_INIT([GNU Bison], [1.49a], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR(config)
@@ -28,7 +28,7 @@ AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
-AC_CONFIG_FILES(tests/Makefile tests/atlocal)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
@@ -39,12 +39,7 @@ AC_MINIX
 AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_RANLIB
-# GNU M4 is needed to build the testsuite.
-BISON_AC_PROG_GNU_M4
-if test "$ac_cv_prog_gnu_m4" != yes; then
-  missing_dir=`cd $ac_aux_dir && pwd`
-  M4="$missing_dir/missing m4"
-fi
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 261cc7d80290be471c40d0086c007264c3a96121..052697d674c3ddb79fe64c612a9fb21132429a52 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -9,7 +9,6 @@ glibc21.m4                                      \
 iconv.m4                                       \
 isc-posix.m4                                   \
 lcmessage.m4                                   \
-m4.m4                                          \
 malloc.m4                                      \
 mbrtowc.m4                                     \
 mbstate_t.m4                                   \

diff --git a/m4/m4.m4 b/m4/m4.m4
deleted file mode 100644 (file)
index 6cf4af1..0000000
--- a/m4/m4.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# serial 1                                                   -*- Autoconf -*-
-
-# BISON_AC_PROG_GNU_M4
-# --------------------
-# Check for GNU m4, at least 1.3 (supports frozen files).
-AC_DEFUN([BISON_AC_PROG_GNU_M4],
-[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
-AC_CACHE_CHECK([whether m4 supports frozen files],
-               [ac_cv_prog_gnu_m4],
-[ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
-  case `$M4 --help < /dev/null 2>&1` in
-    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
-  esac
-fi])
-])# BISON_AC_PROG_GNU_M4

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 485784ef3c60e5064b823fcdc9bec1dfba67ce12..0a4c0bc649acd403a8b07c41bc4a7bc4fb07e5ee 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite
 
-DISTCLEANFILES       = atconfig atlocal bison package.m4
+DISTCLEANFILES       = atconfig bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
@@ -28,7 +28,6 @@ TESTSUITE_AT = \
        output.at reduce.at calc.at torture.at regression.at
 TESTSUITE = $(srcdir)/testsuite
 
-AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index be9e3ac6b513bb5c3d4ac8b9c80a47261adc1cab..b97b4c51716f3f77f039b2b07900a0e85d0b7a1d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -64,6 +64,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -85,7 +86,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIB = @LIB@
 LIBICONV = @LIBICONV@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -103,7 +103,7 @@ install_sh = @install_sh@
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite
 
-DISTCLEANFILES = atconfig atlocal bison package.m4
+DISTCLEANFILES = atconfig bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
@@ -112,7 +112,6 @@ TESTSUITE_AT = \
 
 TESTSUITE = $(srcdir)/testsuite
 
-AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs