* data/lalr1.cc: Reinstall the former ctor, for sake of

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 866edfe6c2c9ee9e4ba40f3d9bd140d498826e77..4b3737f95513fe115a7fec09c6f1fc71d5793e24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,14 +17,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 

-# We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.57)
+# This file uses AC_CONFIG_MACRO_DIR, so we need Autoconf 2.58 or better.
+# But Autoconf 2.58 has a bug in the way that it generates tests: it
+# puts the wrong absolute path names in the tests.  So we need at
+# least Autoconf 2.59.
+AC_PREREQ(2.59)

 
 AC_INIT([GNU Bison], [1.875e], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 
 
 AC_INIT([GNU Bison], [1.875e], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 

-AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
+# We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
+AM_INIT_AUTOMAKE([1.8 check-news readme-alpha dist-bzip2])

 AC_CONFIG_HEADERS([config.h:config.hin])
 
 gl_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_HEADERS([config.h:config.hin])
 
 gl_USE_SYSTEM_EXTENSIONS


@@ -103,7 +107,8 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET

-AM_GNU_GETTEXT_VERSION([0.14.1])
+# We use po/Makevars.template, so we need at least gettext 0.12.
+AM_GNU_GETTEXT_VERSION([0.12])

 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)


@@ -117,6 +122,8 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
 AC_SUBST([GCC])
 O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
 AC_SUBST([O0CFLAGS])
 AC_SUBST([GCC])
 O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
 AC_SUBST([O0CFLAGS])

+O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[0-9] *//'`
+AC_SUBST([O0CXXFLAGS])

 
 AC_CONFIG_FILES([Makefile
                  config/Makefile
 
 AC_CONFIG_FILES([Makefile
                  config/Makefile