* m4/m4.m4: Remove.

* configure.in: M4 is no longer needed, but autom4te is.
* tests/Makefile.am (AUTOTEST): Don't define AUTOM4TE, let
AC_SUBST do it.

diff --git a/ChangeLog b/ChangeLog
index 6681eebbe56e7914f975f3cd43ff20f5b53392db..22a13eedcbfce17aa8c63246e75f6a6f85356d58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-10  Akim Demaille  <akim@epita.fr>
+
+       * m4/m4.m4: Remove.
+       * configure.in: M4 is no longer needed, but autom4te is.
+       * tests/Makefile.am (AUTOTEST): Don't define AUTOM4TE, let
+       AC_SUBST do it.
+
 2001-10-10  Akim Demaille  <akim@epita.fr>
 
        Bump to 1.29e.

diff --git a/Makefile.in b/Makefile.in
index 896e00e308195174edee48e41601350e5e84efcf..ad63793030e9a729ee0fb9d4c27c25638568eb9f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -156,7 +156,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
        @if test ! -f $@; then \

diff --git a/aclocal.m4 b/aclocal.m4
index c54ac7f7e6009d3744cb2f2ad7737cd33da59c80..c66e1f358c88b470a39dd10bd03219ee8aa0bf37 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -820,23 +820,6 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
-# 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
-
 AC_DEFUN(BISON_WARNING,
 [AC_MSG_CHECKING(whether compiler accepts $1)
 AC_SUBST(WARNING_CFLAGS)

diff --git a/config/Makefile.in b/config/Makefile.in
index c5522fa8346a340867d22f8497e20d19020785ee..4f8b63535967c5f34cd7b9228544fbbfe89f7c9b 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@

diff --git a/configure b/configure
index b1620ddfcc16e2ed25cc120b1c10b9441254430f..ea6ad2bea68cd47250cc87e3edb76ab90c5257b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3036,71 +3036,7 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-# GNU M4 is needed to build the testsuite.
-for ac_prog in gm4 gnum4 m4
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_M4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $M4 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_M4="$M4" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-M4=$ac_cv_path_M4
-
-if test -n "$M4"; then
-  echo "$as_me:$LINENO: result: $M4" >&5
-echo "${ECHO_T}$M4" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$M4" && break
-done
-test -n "$M4" || M4="m4"
-
-echo "$as_me:$LINENO: checking whether m4 supports frozen files" >&5
-echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
-if test "${ac_cv_prog_gnu_m4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_m4" >&5
-echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
-
-if test "$ac_cv_prog_gnu_m4" != yes; then
-  missing_dir=`cd $ac_aux_dir && pwd`
-  M4="$missing_dir/missing m4"
-fi
+AUTOM4TE=${AUTOM4TE-"${am_missing_run}autom4te"}
 
 # Check whether --enable-gcc-warnings or --disable-gcc-warnings was given.
 if test "${enable_gcc_warnings+set}" = set; then
@@ -9098,7 +9034,7 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@CPP@,$CPP,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@M4@,$M4,;t t
+s,@AUTOM4TE@,$AUTOM4TE,;t t
 s,@WARNING_CFLAGS@,$WARNING_CFLAGS,;t t
 s,@U@,$U,;t t
 s,@ANSI2KNR@,$ANSI2KNR,;t t

diff --git a/configure.in b/configure.in
index 01f5ee80dcf819319f791378b73881db6b2d5348..9689cbe3ed9f0c1a164f2027c7adf87b9d125b18 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,12 +34,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/doc/Makefile.in b/doc/Makefile.in
index 95bceac0f9bb41c6901c2cdd231d48e9f9502e2c..205c3b4e5b784d6245069cc5528b1ecfac346a14 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 993682e8090d689f711586e9089c182baa1737be..57643be9d3365e4a73e2f17be25abc8989b44d56 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@

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/Makefile.in b/m4/Makefile.in
index 7f7fe82a68bb024cc142faca632251efa39e361d..95a5bfcbe313915c4aba104ba655caa9f179e26f 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -109,7 +109,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/src/Makefile.in b/src/Makefile.in
index e8bc45c01533268eab8c1cd786fb7ea67e209473..9b18665c247f9e5f781c4558ed0c9b29bffd082d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eefd1f96498d96ec074f80e826cec6ca94cfa26d..ead2e33ca6f78078b910e52029bde267e04ded6a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,6 @@ TESTSUITE_AT = \
        output.at calc.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 f61791e595a03a0c7d8879713cd931abd3aa761e..2178284345ad119b4988bc764f1efc355cbd167d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -63,6 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
+AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -83,7 +84,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
-M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -110,7 +110,6 @@ TESTSUITE_AT = \
 
 TESTSUITE = $(srcdir)/testsuite
 
-AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs