Factor %FLAG at scan level.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7272489846fe3b4875959a90d69d4bb8f469f5d5..5698606356236e12ec717b0dc3837d0cbd430005 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software

 # Foundation, Inc.
 #
 # 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,53 +14,60 @@
 # 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/>.

 
 

-# This file uses AC_CONFIG_MACRO_DIR, so we need Autoconf 2.58 or better.
-# But Autoconf 2.58 has a bug in the way that it generates tests: it
-# puts the wrong absolute path names in the tests.  So we need at
-# least Autoconf 2.59.
-AC_PREREQ(2.59)
+# testsuite -C appears in 2.62.
+AC_PREREQ(2.62)
+
+AC_INIT([GNU Bison],
+        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+        [bug-bison@gnu.org])
+AC_DEFINE([PACKAGE_COPYRIGHT_YEAR], [2008],
+          [The copyright year for this package])
+AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2008])

 
 

-AC_INIT([GNU Bison], [2.2a], [bug-bison@gnu.org])

 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.
 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
+# 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.8 dist-bzip2]
+                 m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [-], [gnu], [gnits]))
+AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])

 
 # Checks for the compiler.
 
 # 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
    yes|no) ;;
    *)      AC_MSG_ERROR([bad value ${enableval} for gcc-warnings option]) ;;
  esac],
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
 [case "${enableval}" in
    yes|no) ;;
    *)      AC_MSG_ERROR([bad value ${enableval} for gcc-warnings option]) ;;
  esac],

-              [enableval=no])
+             [enableval=no])

 if test "${enableval}" = yes; then
 if test "${enableval}" = yes; then

-  BISON_WARNING(-Werror)
-  AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
-  WARNING_CFLAGS=
-  BISON_WARNING(-W)
-  BISON_WARNING(-Wall)
-  BISON_WARNING(-Wcast-align)
-  BISON_WARNING(-Wcast-qual)
-  BISON_WARNING(-Wformat)
-  BISON_WARNING(-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++.
   # The following warnings are not suitable for C++.

-  BISON_WARNING(-Wbad-function-cast)
-  BISON_WARNING(-Wmissing-declarations)
-  BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wshadow)
-  BISON_WARNING(-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])

   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 
   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 


@@ -72,8 +79,8 @@ AC_ARG_ENABLE([yacc],
   , [enable_yacc=yes])
 case $enable_yacc in
 yes)
   , [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=;;
 *)
   YACC_SCRIPT=
   YACC_LIBRARY=;;


@@ -90,16 +97,19 @@ if test x"$ac_cv_prog_gnu_m4" != xyes; then
   AC_MSG_ERROR([GNU M4 1.4 is required])
 fi
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
   AC_MSG_ERROR([GNU M4 1.4 is required])
 fi
 AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])

+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
 

-# Checks for types.
-AC_CHECK_TYPES([uintptr_t])
+# 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])
 
 # Checks for library functions.
 AC_CHECK_FUNCS_ONCE([setlocale])


@@ -107,10 +117,10 @@ AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 

-# gnulib and gettext.
-GNULIB_AUTOCONF_SNIPPET
-# We use po/Makevars, so we need at least gettext 0.12.
-AM_GNU_GETTEXT_VERSION([0.12])
+# 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
 
 # Internationalized parsers.
 BISON_I18N
 
 # Internationalized parsers.


@@ -119,9 +129,12 @@ 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)
 # 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
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 AC_PROG_CXX


@@ -129,16 +142,20 @@ BISON_TEST_FOR_WORKING_CXX_COMPILER
 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])
-
+AC_SUBST([O0CFLAGS],   [`echo $CFLAGS   | sed 's/-O[[0-9]] *//'`])
+AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`])
+
+gt_JAVACOMP([1.3], [1.4])
+gt_JAVAEXEC
+
+AC_SUBST([gl_PREFIXED_LIBOBJS],
+         [$(echo "$gl_LIBOBJS" | sed -e 's, , lib/,g')])
+for ac_var in ERRNO_H GETOPT_H INTTYPES_H STDBOOL_H STDINT_H WCHAR_H WCTYPE_H
+do
+  eval "$ac_var=lib/\$$ac_var"
+done

 AC_CONFIG_FILES([Makefile
 AC_CONFIG_FILES([Makefile

-                 build-aux/Makefile
-                 po/Makefile.in
-                 data/Makefile
-                examples/Makefile
-                   examples/calc++/Makefile
-                 lib/Makefile src/Makefile doc/Makefile])
+                po/Makefile.in
+                examples/calc++/Makefile
+                doc/yacc.1])

 AC_OUTPUT
 AC_OUTPUT