Merge remote-tracking branch 'origin/maint'

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6a0e9c457b41632a3f509bb993b310f8c5fbcad6..aec681ad5d3d726a4e373e9a0797de84cb291827 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,9 @@ 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.
 # 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-xz silent-rules]
+AM_INIT_AUTOMAKE([1.11.1 dist-xz nostdinc
+                 color-tests parallel-tests
+                 silent-rules]

                  m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
                            [gnu], [gnits]))
 AM_SILENT_RULES([yes])
                  m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
                            [gnu], [gnits]))
 AM_SILENT_RULES([yes])


@@ -71,7 +73,20 @@ if test "$enable_gcc_warnings" = yes; then
   warn_c='-Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes
     -Wshadow -Wstrict-prototypes'
   warn_cxx='-Wnoexcept'
   warn_c='-Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes
     -Wshadow -Wstrict-prototypes'
   warn_cxx='-Wnoexcept'

+

   AC_LANG_PUSH([C])
   AC_LANG_PUSH([C])

+  # Clang supports many of GCC's -W options, but only issues warnings
+  # on the ones it does not recognize.  In that case, gl_WARN_ADD
+  # thinks the option is supported, and unknown options are then added
+  # to CFLAGS.  But then, when -Werror is added in the test suite for
+  # instance, the warning about the unknown option turns into an
+  # error.
+  #
+  # This should be addressed by gnulib's gl_WARN_ADD, but in the
+  # meanwhile, turn warnings about unknown options into errors in
+  # CFLAGS, and restore CFLAGS after the tests.
+  save_CFLAGS=$CFLAGS
+  gl_WARN_ADD([-Werror=unknown-warning-option], [CFLAGS])

   for i in $warn_common $warn_c;
   do
     gl_WARN_ADD([$i], [WARN_CFLAGS])
   for i in $warn_common $warn_c;
   do
     gl_WARN_ADD([$i], [WARN_CFLAGS])


@@ -80,24 +95,29 @@ if test "$enable_gcc_warnings" = yes; then
   # Warnings for the test suite only.
   gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST])
   gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST])
   # Warnings for the test suite only.
   gl_WARN_ADD([-Wundef], [WARN_CFLAGS_TEST])
   gl_WARN_ADD([-pedantic], [WARN_CFLAGS_TEST])

+  CFLAGS=$save_CFLAGS

   AC_LANG_POP([C])
 
   AC_LANG_PUSH([C++])
   AC_LANG_POP([C])
 
   AC_LANG_PUSH([C++])

+  save_CXXFLAGS=$CXXFLAGS
+  gl_WARN_ADD([-Werror=unknown-warning-option], [CXXFLAGS])

   for i in $warn_common $warn_cxx;
   do
     gl_WARN_ADD([$i], [WARN_CXXFLAGS])
   done
   for i in $warn_common $warn_cxx;
   do
     gl_WARN_ADD([$i], [WARN_CXXFLAGS])
   done

-  gl_WARN_ADD([ -Wzero-as-null-pointer-constant], [WARN_CXXFLAGS],
+  gl_WARN_ADD([-Wzero-as-null-pointer-constant], [WARN_CXXFLAGS],

               [AC_LANG_PROGRAM([], [nullptr])])
   gl_WARN_ADD([-Werror], [WERROR_CXXFLAGS])
   # Warnings for the test suite only.
   gl_WARN_ADD([-Wundef], [WARN_CXXFLAGS_TEST])
   gl_WARN_ADD([-pedantic], [WARN_CXXFLAGS_TEST])
               [AC_LANG_PROGRAM([], [nullptr])])
   gl_WARN_ADD([-Werror], [WERROR_CXXFLAGS])
   # Warnings for the test suite only.
   gl_WARN_ADD([-Wundef], [WARN_CXXFLAGS_TEST])
   gl_WARN_ADD([-pedantic], [WARN_CXXFLAGS_TEST])

+  CXXFLAGS=$save_CXXFLAGS

   AC_LANG_POP([C++])
 fi
 
 BISON_TEST_FOR_WORKING_C_COMPILER
 BISON_TEST_FOR_WORKING_CXX_COMPILER
   AC_LANG_POP([C++])
 fi
 
 BISON_TEST_FOR_WORKING_C_COMPILER
 BISON_TEST_FOR_WORKING_CXX_COMPILER

+BISON_C_COMPILER_POSIXLY_CORRECT

 
 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],
 
 AC_ARG_ENABLE([yacc],
   [AC_HELP_STRING([--disable-yacc],


@@ -105,8 +125,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=;;


@@ -165,7 +185,7 @@ 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])
 case $VALGRIND:$host_os in
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
 case $VALGRIND:$host_os in


@@ -182,17 +202,10 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 

-gt_JAVACOMP([1.3])
+gt_JAVACOMP([1.3], [1.4])

 gt_JAVAEXEC
 
 AC_CONFIG_FILES([Makefile
 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])
+                 po/Makefile.in
+                 doc/yacc.1])

 AC_OUTPUT
 AC_OUTPUT