Use AX_CHECK_COMPILE_FLAG, add more checks

Disable pointless deprecation warnings for std::auto_ptr.

1 files changed, 23 insertions, 16 deletions

diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
index c7838a7f..849ffd7a 100644
--- a/infrastructure/m4/boxbackup_tests.m4
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -10,22 +10,30 @@ solaris*)
   ;;
 esac
 
-if test "x$GXX" = "xyes"; then
-  # Use -Wall if we have gcc. This gives better warnings
-  CXXFLAGS_STRICT='-Wall -Wundef'
-
-  # Check whether gcc accepts -Werror=return-type, and if so add it to CXXFLAGS_STRICT
-  my_save_cflags="$CXXFLAGS"
-  CXXFLAGS="-Werror=return-type"
-  AC_MSG_CHECKING([whether $CXX accepts $CXXFLAGS])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-      [AC_MSG_RESULT([yes])]
-      [CXXFLAGS_STRICT="$CXXFLAGS_STRICT $CXXFLAGS"],
-      [AC_MSG_RESULT([no])]
-  )
-  CXXFLAGS="$my_save_cflags"
-  AC_SUBST([CXXFLAGS_STRICT])
+# Enable some compiler flags if the compiler supports them. This gives better warnings
+# and detects some problems early.
+AX_CHECK_COMPILE_FLAG(-Wall, [cxxflags_strict="$cxxflags_strict -Wall"])
+# -Wundef would be a good idea, but Boost is full of undefined variable use, so we need
+# to disable it for now so that we can concentrate on real errors:
+dnl AX_CHECK_COMPILE_FLAG(-Wundef, [cxxflags_strict="$cxxflags_strict -Wundef"])
+AX_CHECK_COMPILE_FLAG(-Werror=return-type,
+	[cxxflags_strict="$cxxflags_strict -Werror=return-type"])
+AX_CHECK_COMPILE_FLAG(-Werror=delete-non-virtual-dtor,
+	[cxxflags_strict="$cxxflags_strict -Werror=delete-non-virtual-dtor"])
+AX_CHECK_COMPILE_FLAG(-Werror=undefined-bool-conversion,
+	[cxxflags_strict="$cxxflags_strict -Werror=undefined-bool-conversion"])
+# We should really enable -Werror=sometimes-uninitialized, but QDBM violates it:
+dnl AX_CHECK_COMPILE_FLAG(-Werror=sometimes-uninitialized,
+dnl 	[cxxflags_strict="$cxxflags_strict -Werror=sometimes-uninitialized"])
+# This error is detected by MSVC, but not usually by GCC/Clang:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58114
+AX_CHECK_COMPILE_FLAG(-Werror=delete-incomplete,
+	[cxxflags_strict="$cxxflags_strict -Werror=delete-incomplete"])
+AX_CHECK_COMPILE_FLAG(-Wno-deprecated-declarations,
+	[cxxflags_strict="$cxxflags_strict -Wno-deprecated-declarations"])
+AC_SUBST([CXXFLAGS_STRICT], [$cxxflags_strict])
 
+if test "x$GXX" = "xyes"; then
   # Don't check for gcc -rdynamic on Solaris as it's broken, but returns 0.
   # On Cygwin it does nothing except cause gcc to emit a warning message.
   case $build_os in
@@ -49,7 +57,6 @@ if test "x$GXX" = "xyes"; then
     LDFLAGS=$save_LDFLAGS
     ;;
   esac
-
 fi
 
 AC_PATH_PROG([PERL], [perl], [AC_MSG_ERROR([[perl executable was not found]])])