Fix compilation with gcc 4.5.
gcc 4.5 enables some warnings with -Wall that didn't even exist in previous versions (so we can't just disable them generally). This adds a new autoconf macro to check for compiler flags, and adds -Wno-switch and -Wno-enum-compare to the compiler flags if they exist. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10597 4a71c877-e1ca-e34f-864e-861f7616d084master
Christian Ohm
Git SVN Gateway
parent
88f167a51a
commit
f99a338ea6
|
|
@ -205,6 +205,13 @@ AC_ARG_ENABLE([debug],
|
|||
AC_MSG_CHECKING([whether to compile in debug mode])
|
||||
AC_MSG_RESULT([${enable_debug}])
|
||||
|
||||
# gcc 4.5 added some warnings to -Wall that weren't even valid in previous
|
||||
# versions. The -Werror is necessary since otherwise gcc prints a warning that
|
||||
# the option is only valid for c++/objc++, but the test succeeds. The order is
|
||||
# also important, it doesn't work if -Werror comes last.
|
||||
AX_C_CHECK_FLAG([-Werror -Wno-switch], , , CFLAGS_IGNORE_WARNINGS="${CFLAGS_IGNORE_WARNINGS} -Wno-switch")
|
||||
AX_C_CHECK_FLAG([-Werror -Wno-enum-compare], , , CFLAGS_IGNORE_WARNINGS="${CFLAGS_IGNORE_WARNINGS} -Wno-enum-compare")
|
||||
|
||||
if test "x$enable_debug" = "xyes" ; then
|
||||
if test "x$cc_icc" = "xyes" ; then
|
||||
WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"
|
||||
|
|
@ -212,6 +219,7 @@ if test "x$enable_debug" = "xyes" ; then
|
|||
else
|
||||
WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wall -Werror -Wno-unused-label -Wno-pointer-to-int-cast -Wmissing-field-initializers -Wcast-align -Wwrite-strings"
|
||||
WZ_CFLAGS="${WZ_CFLAGS} -Wmissing-declarations -Wstrict-prototypes -Wpointer-arith -Wno-format-security -Wdeclaration-after-statement"
|
||||
WZ_CFLAGS="${WZ_CFLAGS} ${CFLAGS_IGNORE_WARNINGS}"
|
||||
WZ_C99FLAGS="${WZ_C99FLAGS} -Wno-declaration-after-statement"
|
||||
WZ_CPPFLAGS="${WZ_CPPFLAGS} -DDEBUG"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
# ===========================================================================
|
||||
# http://www.gnu.org/software/autoconf-archive/ax_c_check_flag.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_C_CHECK_FLAG(FLAG-TO-CHECK,[PROLOGUE],[BODY],[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# This macro tests if the C compiler supports the flag FLAG-TO-CHECK. If
|
||||
# successfull execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE.
|
||||
# PROLOGUE and BODY are optional and should be used as in AC_LANG_PROGRAM
|
||||
# macro.
|
||||
#
|
||||
# This code is inspired from KDE_CHECK_COMPILER_FLAG macro. Thanks to
|
||||
# Bogdan Drozdowski <bogdandr@op.pl> for testing and bug fixes.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
|
||||
#
|
||||
# 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 2 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 6
|
||||
|
||||
AC_DEFUN([AX_C_CHECK_FLAG],[
|
||||
AC_PREREQ([2.61])
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
flag=`echo "$1" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
|
||||
|
||||
AC_CACHE_CHECK([whether the C compiler accepts the $1 flag],
|
||||
[ax_cv_c_check_flag_$flag],[
|
||||
|
||||
AC_LANG_PUSH([C])
|
||||
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $1"
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([$2],[$3])
|
||||
],[
|
||||
eval "ax_cv_c_check_flag_$flag=yes"
|
||||
],[
|
||||
eval "ax_cv_c_check_flag_$flag=no"
|
||||
])
|
||||
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
AC_LANG_POP
|
||||
|
||||
])
|
||||
|
||||
AS_IF([eval "test \"`echo '$ax_cv_c_check_flag_'$flag`\" = yes"],[
|
||||
:
|
||||
$4
|
||||
],[
|
||||
:
|
||||
$5
|
||||
])
|
||||
])
|
||||
Loading…
Reference in New Issue