* configure.in: Require 2.52g.

M4 is not needed, but AUTOM4TE is.
* m4/m4.m4: Remove.
* tests/Makefile.am: Adjust.
This commit is contained in:
Akim Demaille
2001-12-10 09:00:36 +00:00
parent f693ad146e
commit 80df876864
6 changed files with 14 additions and 30 deletions

View File

@@ -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> 2001-12-10 Akim Demaille <akim@epita.fr>
One structure for states is enough, even though theoretically One structure for states is enough, even though theoretically

View File

@@ -18,7 +18,7 @@
# 02111-1307 USA # 02111-1307 USA
# We need a recent Autoconf to run a recent Autotest. # 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_INIT([GNU Bison], [1.49a], [bug-bison@gnu.org])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
@@ -28,7 +28,7 @@ AM_CONFIG_HEADER(config.h:config.hin)
# Initialize the test suite. # Initialize the test suite.
AC_CONFIG_TESTDIR(tests) 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]) AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
# Needed by tests/atlocal.in. # Needed by tests/atlocal.in.
AC_SUBST([GCC]) AC_SUBST([GCC])
@@ -39,12 +39,7 @@ AC_MINIX
AC_ISC_POSIX AC_ISC_POSIX
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_PROG_RANLIB AC_PROG_RANLIB
# GNU M4 is needed to build the testsuite. AM_MISSING_PROG([AUTOM4TE], [autom4te])
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
AC_ARG_ENABLE(gcc-warnings, AC_ARG_ENABLE(gcc-warnings,
[ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)], [ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)],

View File

@@ -9,7 +9,6 @@ glibc21.m4 \
iconv.m4 \ iconv.m4 \
isc-posix.m4 \ isc-posix.m4 \
lcmessage.m4 \ lcmessage.m4 \
m4.m4 \
malloc.m4 \ malloc.m4 \
mbrtowc.m4 \ mbrtowc.m4 \
mbstate_t.m4 \ mbstate_t.m4 \

View File

@@ -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

View File

@@ -20,7 +20,7 @@
EXTRA_DIST = $(TESTSUITE_AT) testsuite EXTRA_DIST = $(TESTSUITE_AT) testsuite
DISTCLEANFILES = atconfig atlocal bison package.m4 DISTCLEANFILES = atconfig bison package.m4
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE) MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
TESTSUITE_AT = \ TESTSUITE_AT = \
@@ -28,7 +28,6 @@ TESTSUITE_AT = \
output.at reduce.at calc.at torture.at regression.at output.at reduce.at calc.at torture.at regression.at
TESTSUITE = $(srcdir)/testsuite TESTSUITE = $(srcdir)/testsuite
AUTOM4TE = autom4te
AUTOTEST = $(AUTOM4TE) --language=autotest AUTOTEST = $(AUTOM4TE) --language=autotest
$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT) $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp

View File

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