* doc/bison.texinfo (Bison Options): Escape `@' in `$@'.

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d4bfb0c7bdd3237f47fc5e7528a7b4a6d223e5df..7a661f2eaeeb82d8d02b11eae1add1c72dc14e78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.57)
 
-AC_INIT([GNU Bison], [1.875b], [bug-bison@gnu.org])
+AC_INIT([GNU Bison], [1.875c], [bug-bison@gnu.org])
 AC_CONFIG_AUX_DIR(config)
 
 AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
@@ -46,16 +46,18 @@ if test "${enableval}" = yes; then
   WARNING_CFLAGS=
   BISON_WARNING(-Wall)
   BISON_WARNING(-W)
-  BISON_WARNING(-Wbad-function-cast)
   BISON_WARNING(-Wcast-align)
   BISON_WARNING(-Wcast-qual)
   BISON_WARNING(-Wformat)
-  BISON_WARNING(-Wmissing-declarations)
   BISON_WARNING(-Wmissing-prototypes)
-  BISON_WARNING(-Wnested-externs)
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
+  AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS])
+  # The following warnings are not suitable for C++.
+  BISON_WARNING(-Wbad-function-cast)
+  BISON_WARNING(-Wmissing-declarations)
+  BISON_WARNING(-Wnested-externs)
   AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
 fi
 
@@ -87,7 +89,7 @@ AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])
-AC_HEADER_STDBOOL
+AM_STDBOOL_H
 
 # Checks for compiler characteristics.
 AC_C_INLINE
@@ -101,7 +103,6 @@ AC_CHECK_DECLS([free, getenv, getopt,
                 stpcpy, strchr, strspn, strnlen,
                 malloc, memchr, memrchr])
 AC_REPLACE_FUNCS(strchr strrchr strspn)
-AC_FUNC_ERROR_AT_LINE
 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
@@ -125,15 +126,15 @@ jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
 # Gettext.
-AM_GNU_GETTEXT(external, need-ngettext)
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION(0.12.1)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
-AC_CHECK_PROGS([CXX], [g++])
+AC_PROG_CXX
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])