Update TODO.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e1a6918cc74b43b1090e715f3bf2907675b55288..83d2e69d5970cd6e6a83a1060fa0009d2b0c7586 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,11 @@ 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])
+# 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.
@@ -47,23 +51,23 @@ 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])
   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 
@@ -75,7 +79,7 @@ AC_ARG_ENABLE([yacc],
   , [enable_yacc=yes])
 case $enable_yacc in
 yes)
-  YACC_SCRIPT=yacc
+  YACC_SCRIPT=src/yacc
   YACC_LIBRARY=liby.a;;
 *)
   YACC_SCRIPT=
@@ -130,7 +134,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
@@ -141,17 +145,12 @@ 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([Makefile
-                build-aux/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
+                lib/Makefile
+                doc/yacc.1])
 AC_OUTPUT