regen

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e89f9e64559a6aa2eed973c8019d825c022771df..b9d2ea69798e4fa9fd01b665eea6c63a2e7e55e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,10 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2012 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
 # 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,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,


@@ -14,54 +13,91 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # 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)
+# In order for some versions of Sun Studio to compile our C++ test cases
+# correctly, we need Autoconf 2.64 or better to handle the restrict
+# keyword in at least string.h from gnulib.  We need Autoconf 2.68 or
+# better to avoid a typo in the `configure --help' entry for the YACC
+# environment variable.
+AC_PREREQ([2.68])
+m4_pattern_forbid([^gl_[A-Z]])
+
+AC_INIT([GNU Bison],
+        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+        [bug-bison@gnu.org])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2012])
+AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT_YEAR], [$PACKAGE_COPYRIGHT_YEAR],
+                   [The copyright year for this package])

 
 

-AC_INIT([GNU Bison], [2.3+], [bug-bison@gnu.org])

 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
 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.
-AM_INIT_AUTOMAKE([1.8 check-news readme-alpha dist-bzip2])
-AC_CONFIG_HEADERS([config.h:config.hin])
-
-gl_USE_SYSTEM_EXTENSIONS
+# Automake 1.10.3 and 1.11.1 fix a security flaw discussed here:
+#
+#   http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131
+#
+# To avoid 1.11, we make 1.11.1 the minimum version.
+#
+# We want gnits strictness only when rolling a stable release.  For
+# release candidates, we use version strings like 2.4.3_rc1, but gnits
+# doesn't like that, so we let the underscore disable gnits.  Between
+# releases, we want to be able run make dist without being required to
+# add a bogus NEWS entry.  In that case, the version string
+# automatically contains a dash, which we also let disable gnits.
+AM_INIT_AUTOMAKE([1.11.1 dist-xz silent-rules]
+                 m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
+                           [gnu], [gnits]))
+AM_SILENT_RULES([yes])
+AC_CONFIG_HEADERS([lib/config.h:lib/config.in.h])

 
 # Checks for the compiler.
 
 # Checks for the compiler.

-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_ARG_ENABLE(gcc-warnings,
+AC_PROG_CC_STDC
+AC_PROG_CXX
+
+# Gnulib (early checks).
+gl_EARLY
+
+AC_ARG_ENABLE([gcc-warnings],

 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],

-[case "${enableval}" in
+[case $enable_gcc_warnings in

    yes|no) ;;
    yes|no) ;;

-   *)      AC_MSG_ERROR([bad value ${enableval} for gcc-warnings option]) ;;
+   *)  AC_MSG_ERROR([invalid value for --gcc-warnings: $enable_gcc_warnings]);;

  esac],
  esac],

-              [enableval=no])
-if test "${enableval}" = yes; then
-  gl_WARNING_CFLAGS([-Werror])
-  AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
-  WARNING_CFLAGS=
-  gl_WARNING_CFLAGS([-W])
-  gl_WARNING_CFLAGS([-Wall])
-  gl_WARNING_CFLAGS([-Wcast-align])
-  gl_WARNING_CFLAGS([-Wcast-qual])
-  gl_WARNING_CFLAGS([-Wformat])
-  gl_WARNING_CFLAGS([-Wwrite-strings])
-  AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
-  # The following warnings are not suitable for C++.
-  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.])
+              [enable_gcc_warnings=no])
+if test "$enable_gcc_warnings" = yes; then
+  warn_common='-Wall -Wextra -Wno-sign-compare -Wcast-align
+    -Wcast-qual -Wformat -Wpointer-arith -Wwrite-strings'
+  warn_c='-Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes
+    -Wshadow -Wstrict-prototypes'
+  warn_cxx='-Wnoexcept'
+  AC_LANG_PUSH([C])
+  for i in $warn_common $warn_c;
+  do
+    gl_WARN_ADD([$i], [WARN_CFLAGS])
+  done
+  gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
+  # Warnings for the test suite only.
+  gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST])
+  gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST])
+  AC_LANG_POP([C])
+
+  AC_LANG_PUSH([C++])
+  for i in $warn_common $warn_cxx;
+  do
+    gl_WARN_ADD([$i], [WARN_CXXFLAGS])
+  done
+  gl_WARN_ADD([ -Wzero-as-null-pointer-constant], [WARN_CXXFLAGS],
+              [AC_LANG_PROGRAM([], [nullptr])])
+  gl_WARN_ADD([-Werror], [WERROR_CXXFLAGS])
+  # Warnings for the test suite only.
+  gl_WARN_ADD([-Wundef], [WARN_CXXFLAGS_TEST])
+  gl_WARN_ADD([-pedantic], [WARN_CXXFLAGS_TEST])
+  AC_LANG_POP([C++])

 fi
 
 BISON_TEST_FOR_WORKING_C_COMPILER
 fi
 
 BISON_TEST_FOR_WORKING_C_COMPILER

+BISON_TEST_FOR_WORKING_CXX_COMPILER

 
 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],
 
 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],


@@ -80,31 +116,37 @@ AC_SUBST([YACC_LIBRARY])
 
 # Checks for programs.
 AC_PROG_LEX
 
 # Checks for programs.
 AC_PROG_LEX

+$LEX_IS_FLEX || AC_MSG_ERROR([Flex is required])

 AC_PROG_YACC
 AC_PROG_RANLIB
 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_PROG_GNU_M4

 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])

+AC_DEFINE_UNQUOTED([M4_GNU_OPTION], ["$M4_GNU"], [Define to "-g" if GNU M4
+supports -g, otherwise to "".])
+AM_MISSING_PROG([HELP2MAN], [help2man])
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+AC_SUBST([XSLTPROC])

 
 # Checks for header files.
 AC_CHECK_HEADERS_ONCE([locale.h])
 
 # Checks for header files.
 AC_CHECK_HEADERS_ONCE([locale.h])

-AM_STDBOOL_H

 
 # Checks for compiler characteristics.
 AC_C_INLINE
 
 
 # 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
 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])
 AM_WITH_DMALLOC

-BISON_PREREQ_SUBPIPE

 BISON_PREREQ_TIMEVAR
 
 BISON_PREREQ_TIMEVAR
 

-# gnulib and gettext.
-GNULIB_AUTOCONF_SNIPPET
-# We've never tested with gettext versions before 0.15, so play it safe.
-AM_GNU_GETTEXT_VERSION([0.15])
+# Gettext.
+# We use gnulib, which is only guaranteed to work properly with the
+# latest Gettext.
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.18])

 BISON_I18N
 
 # Internationalized parsers.
 BISON_I18N
 
 # Internationalized parsers.


@@ -113,26 +155,39 @@ AC_CONFIG_FILES([runtime-po/Makefile.in])
 aclocaldir='${datadir}/aclocal'
 AC_SUBST([aclocaldir])
 
 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])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 # 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_PROG_CXX
-BISON_TEST_FOR_WORKING_CXX_COMPILER
+case $VALGRIND:$host_os in
+  '':*) ;;
+  *:darwin*)
+    # See README-hacking.
+    # VALGRIND+=' --suppressions=$(abs_top_srcdir)/build-aux/darwin11.4.0.valgrind'
+    VALGRIND=;;
+  *:*)
+    AC_SUBST([VALGRIND_PREBISON], ["$VALGRIND -q"]);;
+esac
+

 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 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])
+
+gt_JAVACOMP([1.3])
+gt_JAVAEXEC

 
 AC_CONFIG_FILES([Makefile
 
 AC_CONFIG_FILES([Makefile

-                 build-aux/Makefile
-                 po/Makefile.in
-                 data/Makefile
+                build-aux/Makefile
+                po/Makefile.in
+                data/Makefile
+                etc/Makefile

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

-                 lib/Makefile src/Makefile doc/Makefile])
+                lib/Makefile src/Makefile
+                doc/Makefile
+                  doc/yacc.1])

 AC_OUTPUT
 AC_OUTPUT