tests: fix invalid assignment when using variants in C++11

[bison.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index df5670cd5d7167b4f6762c270e1577550028671f..f7319a153d52f6c6f6bb53fe7fd98fd5684f75c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,9 @@ if test "$enable_gcc_warnings" = yes; then
   done
   # Clang++ 3.2+ reject C code generated by Flex.
   gl_WARN_ADD([-Wno-null-conversion], [FLEX_SCANNER_CXXFLAGS])
   done
   # Clang++ 3.2+ reject C code generated by Flex.
   gl_WARN_ADD([-Wno-null-conversion], [FLEX_SCANNER_CXXFLAGS])

-  # So does G++ 4.8 in std=c++11 mode.
+  # So does G++ 4.8...
+  gl_WARN_ADD([-Wno-sign-compare], [FLEX_SCANNER_CXXFLAGS])
+  # ... possiby in std=c++11 mode.

   gl_WARN_ADD([-Wno-zero-as-null-pointer-constant], [FLEX_SCANNER_CXXFLAGS])
   CXXFLAGS=$save_CXXFLAGS
   AC_LANG_POP([C++])
   gl_WARN_ADD([-Wno-zero-as-null-pointer-constant], [FLEX_SCANNER_CXXFLAGS])
   CXXFLAGS=$save_CXXFLAGS
   AC_LANG_POP([C++])


@@ -228,10 +230,16 @@ case $VALGRIND:$host_os in
   '':*) ;;
   *:darwin*)
     # See README-hacking.
   '':*) ;;
   *:darwin*)
     # See README-hacking.

-    # VALGRIND+=' --suppressions=$(abs_top_srcdir)/build-aux/darwin11.4.0.valgrind'
+    # VALGRIND+='-q --suppressions=$(abs_top_srcdir)/build-aux/darwin11.4.0.valgrind'

     VALGRIND=;;
   *:*)
     VALGRIND=;;
   *:*)

-    AC_SUBST([VALGRIND_PREBISON], ["$VALGRIND -q"]);;
+    suppfile=build-aux/$host_os.valgrind
+    if test -f "$srcdir/$suppfile"; then
+      VALGRIND="$VALGRIND --gen-suppressions=all"
+      VALGRIND="$VALGRIND --suppressions=\$(abs_top_srcdir)/$suppfile"
+    fi
+    AC_SUBST([VALGRIND_PREBISON], ["$VALGRIND -q"])
+    ;;

 esac
 
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 esac
 
 AM_MISSING_PROG([AUTOM4TE], [autom4te])