Fix tabs.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dccca007d7709ee51d81dabc057f1cc61f5cfd08..169891ca6c8d7ed50fc24326a8e3cfb45bd65630 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,9 @@
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -14,12 +14,10 @@
 # GNU General Public License for more details.
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# We use macros like AC_CHECK_HEADERS_ONCE, so we need Autoconf 2.60 or better.
-AC_PREREQ(2.60)
+# We have strange test case titles, so we need Autoconf 2.61 or better.
+AC_PREREQ(2.61)
 
 AC_INIT([GNU Bison], [2.3a+], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -27,13 +25,14 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # 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([lib/config.h:lib/config.hin])
 
 # Checks for the compiler.
-AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC_STDC
+
+# Gnulib (early checks).
+gl_EARLY
+
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 [case "${enableval}" in
@@ -45,8 +44,8 @@ if test "${enableval}" = yes; then
   gl_WARNING_CFLAGS([-Werror])
   AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
   WARNING_CFLAGS=
-  gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare])
   gl_WARNING_CFLAGS([-Wall])
+  gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare])
   gl_WARNING_CFLAGS([-Wcast-align])
   gl_WARNING_CFLAGS([-Wcast-qual])
   gl_WARNING_CFLAGS([-Wformat])
@@ -91,20 +90,23 @@ AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 
 # Checks for header files.
 AC_CHECK_HEADERS_ONCE([locale.h])
-AM_STDBOOL_H
 
 # Checks for compiler characteristics.
 AC_C_INLINE
 
+# Gnulib (later checks).  Putting them here rather than right after
+# gl_EARLY avoids some redundant checks.
+gl_INIT
+
 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])
 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 
-# gnulib and gettext.
-GNULIB_AUTOCONF_SNIPPET
+# Gettext.
 # We've never tested with gettext versions before 0.15, so play it safe.
+AM_GNU_GETTEXT([external], [need-formatstring-macros])
 AM_GNU_GETTEXT_VERSION([0.15])
 BISON_I18N
 
@@ -114,6 +116,9 @@ AC_CONFIG_FILES([runtime-po/Makefile.in])
 aclocaldir='${datadir}/aclocal'
 AC_SUBST([aclocaldir])
 
+# Create the benchmark script.
+AC_CONFIG_FILES([etc/bench.pl], [chmod +x etc/bench.pl])
+
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
@@ -129,10 +134,14 @@ AC_SUBST([O0CFLAGS])
 O0CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`
 AC_SUBST([O0CXXFLAGS])
 
+gt_JAVACOMP([1.3])
+gt_JAVAEXEC
+
 AC_CONFIG_FILES([Makefile
                  build-aux/Makefile
                  po/Makefile.in
                  data/Makefile
+                 etc/Makefile
                 examples/Makefile
                    examples/calc++/Makefile
                  lib/Makefile src/Makefile doc/Makefile])