Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorte...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52676 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/configure.ac b/configure.ac
index 746b637dd74850193ebfa31bfa303bf27a907317..cc380b1968f7a4be9cc47b1c09a5d3d1d6f637ff 100644 (file)
--- 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++?
 #

diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 01dedffd097f6ad459c81dfe834f64a1f16653ac..aaf10b2dd19222f3ef76a9cf9fa1701da86aa14a 100644 (file)
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -63,8 +63,9 @@ libqtui_a_DEPENDENCIES =
 
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
-       $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS) $(AM_CLEAN_CFLAGS) \
-       $(CXX_NO_SHORTEN_WARNING_FLAGS)
+       $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
+
+AM_CXXFLAGS = $(AM_CLEAN_CFLAGS)
 
 AM_V_MOC = $(am__v_MOC_@AM_V@)
 am__v_MOC_ = $(am__v_MOC_@AM_DEFAULT_V@)