Be a bit more systematic about using 'abort'.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 33e822d9d11a61c3d8712f26b73c001be3a0adb9..c051ccbcf803bb3f1d4e54b0d48dd8e0eeb1a3e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,8 +15,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301  USA
 
 # 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
@@ -23,8 +24,8 @@
 # least Autoconf 2.59.
 AC_PREREQ(2.59)
 
-AC_INIT([GNU Bison], [2.0a], [bug-bison@gnu.org])
-AC_CONFIG_AUX_DIR([config])
+AC_INIT([GNU Bison], [2.1a], [bug-bison@gnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
 # We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
@@ -58,7 +59,6 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wbad-function-cast)
   BISON_WARNING(-Wmissing-declarations)
   BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wnested-externs)
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
@@ -107,8 +107,15 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
-# We use po/Makevars.template, so we need at least gettext 0.12.
+# We use po/Makevars, so we need at least gettext 0.12.
 AM_GNU_GETTEXT_VERSION([0.12])
+BISON_I18N
+
+# Internationalized parsers.
+AC_CONFIG_FILES([runtime-po/Makefile.in])
+# Autoconf macros for packages using internationalized parsers.
+aclocaldir='${datadir}/aclocal'
+AC_SUBST([aclocaldir])
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
@@ -120,14 +127,16 @@ BISON_TEST_FOR_WORKING_CXX_COMPILER
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
-O0CFLAGS=`echo $CFLAGS | sed 's/-O[0-9] *//'`
+O0CFLAGS=`echo $CFLAGS | sed 's/-O[[0-9]] *//'`
 AC_SUBST([O0CFLAGS])
-O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[0-9] *//'`
+O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`
 AC_SUBST([O0CXXFLAGS])
 
 AC_CONFIG_FILES([Makefile
-                 config/Makefile
+                 build-aux/Makefile
                  po/Makefile.in
                  data/Makefile
+                examples/Makefile
+                   examples/calc++/Makefile
                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT