From e.yimjia via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9289 :

[metze/wireshark/wip.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index eb73e9818768279942418535b802260658454d19..6909f974962c8e92462679a93b443ba44df066c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,8 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CPP
+AC_WIRESHARK_CLANG_CHECK
+
 dnl Work around libtool bug (fixed in the version 1.5a?)
 AC_DEFUN([AC_PROVIDE_AC_LIBTOOL_DLOPEN], )
 AC_LIBTOOL_DLOPEN
@@ -814,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)
@@ -829,10 +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)
 
-if test "x$CLANG" = "xyes" ; then
-       AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Qunused-arguments)
-fi
-
 #
 # XXX - OK for C++?
 #
@@ -1348,7 +1348,7 @@ if test "x$enable_wireshark" = "xyes"; then
                [
                        CFLAGS="$CFLAGS $Qt_CFLAGS"
                        CXXFLAGS="$CXXFLAGS $Qt_CFLAGS"
-                       have_qt=yes             
+                       have_qt=yes
                        GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt"
                        OSX_APP_FLAGS="$OSX_APP_FLAGS -qt"
                        OSX_DMG_FLAGS="-qt"
@@ -2707,6 +2707,7 @@ AC_OUTPUT(
   asn1/HI2Operations/Makefile
   asn1/hnbap/Makefile
   asn1/idmp/Makefile
+  asn1/ilp/Makefile
   asn1/inap/Makefile
   asn1/isdn-sup/Makefile
   asn1/kerberos/Makefile