X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/84f6a6ca7051c44d5f10aeb38d92b30c1ef190bd..09aa8a885b40a1edd6e849215fd398438945b62e:/configure.ac?ds=sidebyside diff --git a/configure.ac b/configure.ac index 6a0ba211..78284e93 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU Bison. -*-Autoconf-*- # -# Copyright (C) 2001-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 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 @@ -17,15 +17,18 @@ # 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. -AC_PREREQ(2.64) +# 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_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2011], - [The copyright year for this package]) -AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2011]) +AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2012]) +AC_DEFINE_UNQUOTED([PACKAGE_COPYRIGHT_YEAR], [$PACKAGE_COPYRIGHT_YEAR], + [The copyright year for this package]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -42,7 +45,7 @@ AC_CONFIG_MACRO_DIR([m4]) # 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-bzip2] +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]) @@ -59,7 +62,7 @@ AC_ARG_ENABLE(gcc-warnings, yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for gcc-warnings option]) ;; esac], - [enableval=no]) + [enableval=no]) if test "${enableval}" = yes; then gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) AC_SUBST([WERROR_CFLAGS]) @@ -80,10 +83,9 @@ if test "${enableval}" = yes; then AC_SUBST([WARN_CFLAGS]) # Warnings for the test suite only. gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST]) - WARN_CXXFLAGS_TEST="$WARN_CXXFLAGS $WARN_CFLAGS_TEST" - WARN_CFLAGS_TEST="$WARN_CFLAGS $WARN_CFLAGS_TEST" - AC_SUBST([WARN_CXXFLAGS_TEST]) - AC_SUBST([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 @@ -173,7 +175,7 @@ do eval "test x\$$ac_var = x || $ac_var=lib/\$$ac_var" done AC_CONFIG_FILES([Makefile - po/Makefile.in - examples/calc++/Makefile - doc/yacc.1]) + po/Makefile.in + examples/calc++/Makefile + doc/yacc.1]) AC_OUTPUT