X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/74c52fc8407ddc0300ac9ddc3467b72872a83810..8b9e021fd1e3b03568d4b2167c47f33ba822a1c8:/configure.ac diff --git a/configure.ac b/configure.ac index 5db7ed22..df6072f3 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 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2010 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,30 @@ # 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) +# testsuite -C appears in 2.62. +AC_PREREQ(2.62) -AC_INIT([GNU Bison], [2.3a+], [bug-bison@gnu.org]) -AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2007], +AC_INIT([GNU Bison], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [bug-bison@gnu.org]) +AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2010], [The copyright year for this package]) -AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2007]) +AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2010]) 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 formal release so that we can, +# for example, run make dist at other times without being required to add a +# bogus NEWS entry. +AM_INIT_AUTOMAKE([1.11.1 dist-bzip2] + m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [-], [gnu], [gnits])) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) # Checks for the compiler. @@ -45,23 +55,29 @@ 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]) + 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]) + 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]) AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.]) fi @@ -73,8 +89,8 @@ AC_ARG_ENABLE([yacc], , [enable_yacc=yes]) case $enable_yacc in yes) - YACC_SCRIPT=yacc - YACC_LIBRARY=liby.a;; + YACC_SCRIPT=src/yacc + YACC_LIBRARY=lib/liby.a;; *) YACC_SCRIPT= YACC_LIBRARY=;; @@ -86,11 +102,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 +127,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.17]) BISON_I18N # Internationalized parsers. @@ -128,7 +144,7 @@ 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/atlocal]) AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison]) AC_CHECK_PROGS([VALGRIND], [valgrind]) AC_PROG_CXX @@ -139,18 +155,19 @@ AC_SUBST([GCC]) AC_SUBST([O0CFLAGS], [`echo $CFLAGS | sed 's/-O[[0-9]] *//'`]) AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`]) -gt_JAVACOMP([1.3]) +gt_JAVACOMP([1.3], [1.4]) gt_JAVAEXEC -AC_CONFIG_FILES([.version - Makefile - build-aux/Makefile +# We use gnulib, but from lib/local.mk instead of lib/Makefile.am. +# So prefix paths with lib/. See also etc/prefix-gnulib-mk. +gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'` +for ac_var in ALLOCA_H ERRNO_H FCNTL_H GETOPT_H INTTYPES_H \ + STDBOOL_H STDINT_H SYS_WAIT_H WCHAR_H WCTYPE_H +do + eval "test 'x$ac_var' = x || $ac_var=lib/\$$ac_var" +done +AC_CONFIG_FILES([Makefile po/Makefile.in - data/Makefile - etc/Makefile - examples/Makefile - examples/calc++/Makefile - lib/Makefile src/Makefile - doc/Makefile - doc/yacc.1]) + examples/calc++/Makefile + doc/yacc.1]) AC_OUTPUT