(%expect with reduce conflicts): New test.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1a54406d0e911105629e1f341941373e82f6ba6d..b1a39015cefdfa0debe54d4719ba03bb8a6b64e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,34 +20,19 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.54)
 
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.54)
 

-AC_INIT([GNU Bison], [1.49d], [bug-bison@gnu.org])
+AC_INIT([GNU Bison], [1.75f], [bug-bison@gnu.org])

 AC_CONFIG_AUX_DIR(config)
 
 AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
 AC_CONFIG_HEADERS([config.h:config.hin])
 
 AC_CONFIG_AUX_DIR(config)
 
 AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
 AC_CONFIG_HEADERS([config.h:config.hin])
 

-# Initialize the test suite.
-AC_CONFIG_TESTDIR(tests)
-AC_CONFIG_FILES([tests/Makefile tests/atlocal])
-AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
-# Needed by tests/atlocal.in.
-AC_SUBST([GCC])
-
-# Checks for programs.
+# Checks for the compiler.

 AC_PROG_CC
 AC_PROG_CC

-AM_PROG_LEX
-AC_PROG_YACC
-AC_MINIX
+# Remove with Automake 1.8.

 AC_ISC_POSIX
 AC_ISC_POSIX

+AC_GNU_SOURCE
+AC_MINIX

 AM_PROG_CC_STDC
 AM_PROG_CC_STDC

-AC_PROG_RANLIB
-AM_MISSING_PROG([AUTOM4TE], [autom4te])
-BISON_PROG_GNU_M4
-if test x"$ac_cv_prog_gnu_m4" != xyes; then
-  AC_MSG_ERROR([GNU M4 1.4 is required])
-fi
-AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
-

 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 [case "${enableval}" in
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 [case "${enableval}" in


@@ -71,45 +56,67 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)

+  AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])

 fi
 
 fi
 

-# Checks for libraries.
-AC_DEFINE([_GNU_SOURCE],1,[Define to 1 for GNU C library extensions.])
+# Checks for programs.
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_RANLIB
+BISON_PROG_GNU_M4
+if test x"$ac_cv_prog_gnu_m4" != xyes; then
+  AC_MSG_ERROR([GNU M4 1.4 is required])
+fi
+AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])

 
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])

+AC_HEADER_STDBOOL

 
 # Checks for compiler characteristics.
 
 # Checks for compiler characteristics.

-AC_C_CONST

 AC_C_INLINE
 AC_C_INLINE

-AM_C_PROTOTYPES
+
+# Checks for types.
+AC_CHECK_TYPES([uintptr_t])

 
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_OBSTACK
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRNLEN
 
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_OBSTACK
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRNLEN

-UTILS_FUNC_MKSTEMP

 AC_CHECK_FUNCS(setlocale)
 AC_CHECK_DECLS([free, getenv, getopt,
                 stpcpy, strchr, strspn, strnlen,
                 malloc, memchr, memrchr])
 AC_REPLACE_FUNCS(memchr memrchr \
 AC_CHECK_FUNCS(setlocale)
 AC_CHECK_DECLS([free, getenv, getopt,
                 stpcpy, strchr, strspn, strnlen,
                 malloc, memchr, memrchr])
 AC_REPLACE_FUNCS(memchr memrchr \

-                 strchr stpcpy strrchr strspn strtol)
+                 strchr stpcpy strrchr strspn strtol strtoul)

 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC

+jm_PREREQ_MBSWIDTH

 jm_PREREQ_QUOTEARG
 jm_FUNC_ARGMATCH
 jm_PREREQ_ERROR
 jm_PREREQ_QUOTEARG
 jm_FUNC_ARGMATCH
 jm_PREREQ_ERROR

-jm_PREREQ_TEMPNAME

 AM_WITH_DMALLOC
 AM_WITH_DMALLOC

+BISON_PREREQ_SUBPIPE

 BISON_PREREQ_TIMEVAR
 
 # Gettext.
 AM_GNU_GETTEXT(external, need-ngettext)
 AM_GNU_GETTEXT_VERSION(0.11.5)
 
 BISON_PREREQ_TIMEVAR
 
 # Gettext.
 AM_GNU_GETTEXT(external, need-ngettext)
 AM_GNU_GETTEXT_VERSION(0.11.5)
 

+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
+AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
+AC_CHECK_PROGS([VALGRIND], [valgrind])
+AC_CHECK_PROGS([GXX], [g++])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+# Needed by tests/atlocal.in.
+AC_SUBST([GCC])
+O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
+AC_SUBST([O0CFLAGS])
+

 AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in
 AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in