X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8452fdd914e4a0ed6645f1bfa12134cf74c35a0b..847480ae0f5f105ae86d8990729916c589427552:/configure.ac diff --git a/configure.ac b/configure.ac index 4d3dc0e5..f2490c91 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ # Configure template for GNU Bison. -*-Autoconf-*- # -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2011 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 @@ -16,19 +15,38 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# 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_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2007], +# 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) + +AC_INIT([GNU Bison], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [bug-bison@gnu.org]) +AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2011], [The copyright year for this package]) -AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2007]) +AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2011]) 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]) +# 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] + m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]], + [gnu], [gnits])) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) # Checks for the compiler. @@ -45,24 +63,28 @@ AC_ARG_ENABLE(gcc-warnings, esac], [enableval=no]) if test "${enableval}" = yes; then - gl_WARNING_CFLAGS([-Werror]) - AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS]) - WARNING_CFLAGS= - 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]) - gl_WARNING_CFLAGS([-Wpointer-arith]) - gl_WARNING_CFLAGS([-Wwrite-strings]) - AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS]) + gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) + AC_SUBST([WERROR_CFLAGS]) + gl_WARN_ADD([-Wall]) + gl_WARN_ADD([-Wextra -Wno-sign-compare]) + gl_WARN_ADD([-Wcast-align]) + gl_WARN_ADD([-Wcast-qual]) + gl_WARN_ADD([-Wformat]) + gl_WARN_ADD([-Wpointer-arith]) + gl_WARN_ADD([-Wwrite-strings]) + AC_SUBST([WARN_CXXFLAGS], [$WARN_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.]) + gl_WARN_ADD([-Wbad-function-cast]) + gl_WARN_ADD([-Wmissing-declarations]) + gl_WARN_ADD([-Wmissing-prototypes]) + gl_WARN_ADD([-Wshadow]) + gl_WARN_ADD([-Wstrict-prototypes]) + AC_SUBST([WARN_CFLAGS]) + # Warnings for the test suite only. + gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST]) + gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST]) + AC_SUBST([WARN_CXXFLAGS_TEST], ["$WARN_CXXFLAGS $WARN_CFLAGS_TEST"]) + AC_SUBST([WARN_CFLAGS_TEST], ["$WARN_CFLAGS $WARN_CFLAGS_TEST"]) fi BISON_TEST_FOR_WORKING_C_COMPILER @@ -86,11 +108,10 @@ AC_SUBST([YACC_LIBRARY]) AC_PROG_LEX 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_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]) @@ -112,9 +133,10 @@ BISON_PREREQ_SUBPIPE BISON_PREREQ_TIMEVAR # 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]) +# 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. @@ -142,8 +164,7 @@ AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`]) gt_JAVACOMP([1.3]) gt_JAVAEXEC -AC_CONFIG_FILES([.version - Makefile +AC_CONFIG_FILES([Makefile build-aux/Makefile po/Makefile.in data/Makefile