diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-18 18:28:57 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-18 18:28:57 +0000 |
| commit | d69a93f70ed185f1183c467584e41576941dbddd (patch) | |
| tree | fa288163d0f7a49dcf7119a3c43b3b3b8118d54f /configure.ac | |
| parent | 2322bd31228d667607ef819b499ce8d7dddb364a (diff) | |
| download | wireshark-d69a93f70ed185f1183c467584e41576941dbddd.tar.gz | |
Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.
svn path=/trunk/; revision=52676
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 746b637dd7..cc380b1968 100644 --- a/configure.ac +++ b/configure.ac @@ -816,7 +816,9 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-pointer-sign, C) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Warray-bounds) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wformat-security) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wold-style-definition, C) -AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wshorten-64-to-32) +# The Qt headers generate a ton of shortening errors on 64-bit systems +# so only enable this for C for now. +AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wshorten-64-to-32, C) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wstrict-prototypes, C) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wjump-misses-init, C) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wvla) @@ -831,20 +833,6 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wwrite-strings) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long) AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wc++-compat, C) -# The Qt headers generate a ton of shortening errors on 64-bit systems. -# See if we can add the flag. -# We could first check if we're 64-bit or not... -CXXFLAGS_save="$CXXFLAGS" -AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-shorten-64-to-32, CXX) -if test "$CXXFLAGS" != "$CXXFLAGS_save" -then - CXX_NO_SHORTEN_WARNING_FLAGS=-Wno-shorten-64-to-32 -else - CXX_NO_SHORTEN_WARNING_FLAGS= -fi -AC_SUBST(CXX_NO_SHORTEN_WARNING_FLAGS) -CXXFLAGS="$CXXFLAGS_save" - # # XXX - OK for C++? # |