Undo last commit.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0eb3e48173e242b87391082203a75214f2626b6..36d4dc1182fbce062aa36a75f92a5a18dc8c448d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

-# Copyright (C) 2001, 2002, 2003, 2004, 2005 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
 #
 # 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,17 +15,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 #
 # 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
-# puts the wrong absolute path names in the tests.  So we need at
-# least Autoconf 2.59.
-AC_PREREQ(2.59)
+# We use macros like AC_CHECK_HEADERS_ONCE, so we need Autoconf 2.60 or better.
+AC_PREREQ(2.60)

 
 

-AC_INIT([GNU Bison], [2.0a], [bug-bison@gnu.org])
-AC_CONFIG_AUX_DIR([config])
+AC_INIT([GNU Bison], [2.3+], [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.
 AC_CONFIG_MACRO_DIR([m4])
 
 # We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.


@@ -44,26 +42,28 @@ AC_ARG_ENABLE(gcc-warnings,
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then

-  BISON_WARNING(-Werror)
+  gl_WARNING_CFLAGS([-Werror])

   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=
   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=

-  BISON_WARNING(-W)
-  BISON_WARNING(-Wall)
-  BISON_WARNING(-Wcast-align)
-  BISON_WARNING(-Wcast-qual)
-  BISON_WARNING(-Wformat)
-  BISON_WARNING(-Wwrite-strings)
+  gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare])
+  gl_WARNING_CFLAGS([-Wall])
+  gl_WARNING_CFLAGS([-Wcast-align])
+  gl_WARNING_CFLAGS([-Wcast-qual])
+  gl_WARNING_CFLAGS([-Wformat])
+  gl_WARNING_CFLAGS([-Wpointer-arith])
+  gl_WARNING_CFLAGS([-Wwrite-strings])

   AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
   # The following warnings are not suitable for C++.
   AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
   # The following warnings are not suitable for C++.

-  BISON_WARNING(-Wbad-function-cast)
-  BISON_WARNING(-Wmissing-declarations)
-  BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wnested-externs)
-  BISON_WARNING(-Wshadow)
-  BISON_WARNING(-Wstrict-prototypes)
+  gl_WARNING_CFLAGS([-Wbad-function-cast])
+  gl_WARNING_CFLAGS([-Wmissing-declarations])
+  gl_WARNING_CFLAGS([-Wmissing-prototypes])
+  gl_WARNING_CFLAGS([-Wshadow])
+  gl_WARNING_CFLAGS([-Wstrict-prototypes])

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

+BISON_TEST_FOR_WORKING_C_COMPILER
+

 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],
      [do not build a yacc command or an -ly library])],
 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],
      [do not build a yacc command or an -ly library])],


@@ -96,9 +96,6 @@ AM_STDBOOL_H
 # Checks for compiler characteristics.
 AC_C_INLINE
 
 # Checks for compiler characteristics.
 AC_C_INLINE
 

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

 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])
 AM_WITH_DMALLOC
 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])
 AM_WITH_DMALLOC


@@ -107,8 +104,15 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET

-# We use po/Makevars.template, so we need at least gettext 0.12.
-AM_GNU_GETTEXT_VERSION([0.12])
+# We've never tested with gettext versions before 0.15, so play it safe.
+AM_GNU_GETTEXT_VERSION([0.15])
+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)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)


@@ -126,8 +130,10 @@ O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`
 AC_SUBST([O0CXXFLAGS])
 
 AC_CONFIG_FILES([Makefile
 AC_SUBST([O0CXXFLAGS])
 
 AC_CONFIG_FILES([Makefile

-                 config/Makefile
+                 build-aux/Makefile

                  po/Makefile.in
                  data/Makefile
                  po/Makefile.in
                  data/Makefile

+                examples/Makefile
+                   examples/calc++/Makefile

                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT
                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT