diff options
author | Chris Wilson <chris+github@qwirx.com> | 2017-06-18 19:42:43 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2017-06-22 20:27:51 +0100 |
commit | d8422a8b053b62c67e5fe2e861a09d2c792b657a (patch) | |
tree | 8e7c6004f0b604936999a22c82f70bd9bcf5371c /infrastructure | |
parent | 25e445a6848a870aabd89a3b8a013265aa3cf17b (diff) |
Use AX_CHECK_COMPILE_FLAG, add more checks
Disable pointless deprecation warnings for std::auto_ptr.
Diffstat (limited to 'infrastructure')
-rw-r--r-- | infrastructure/m4/ax_check_compile_flag.m4 | 72 | ||||
-rw-r--r-- | infrastructure/m4/boxbackup_tests.m4 | 39 |
2 files changed, 95 insertions, 16 deletions
diff --git a/infrastructure/m4/ax_check_compile_flag.m4 b/infrastructure/m4/ax_check_compile_flag.m4 new file mode 100644 index 00000000..c3a8d695 --- /dev/null +++ b/infrastructure/m4/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS 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]])]) |