Fix a couple (value) mistakes in value_strings. Found by Martin's patch on the ...

[obnox/wireshark/wip.git] / configure.in

diff --git a/configure.in b/configure.in
index 3aab467d2a6f176d3e149083a097dbfdbbf0ea12..ebc7ea47a883d5e04275a785365a7f2c28ec4ef4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.5.2)
+AC_INIT(wireshark, 1.7.0)
 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
@@ -329,7 +329,6 @@ AC_ARG_ENABLE(extra-gcc-checks,
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Waddress)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wattributes)
-               AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdeclaration-after-statement)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdiv-by-zero)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wignored-qualifiers)
@@ -343,7 +342,14 @@ AC_ARG_ENABLE(extra-gcc-checks,
                # for now.
                #
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wwrite-strings)
+               #
+               # GLib blocks this for now.
+               #
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wstrict-prototypes)
+               #
+               # All the registration functions block these for now.
+               #
+               AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wmissing-prototypes)
                AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wmissing-declarations)
                #
                # epan/dissectors/packet-afs.c blocks this one for now.
@@ -364,7 +370,16 @@ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-pointer-sign)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-align)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security)
-# Use the faster pre gcc 4.5 floating point precision
+AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wold-style-definition)
+AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdeclaration-after-statement)
+
+#
+# Use the faster pre gcc 4.5 floating point precision if available;
+# clang doesn't error out on -f options that it doesn't know about,
+# it just warns and ignores them, so this check doesn't cause us
+# to omit -fexcess-precision=fast, which produces a pile of
+# annoying warnings.
+#
 if test "x$CC" != "xclang" ; then
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-fexcess-precision=fast)
 fi
@@ -829,7 +844,7 @@ if test "$GTK_OK" = "no" ; then
        [
                CFLAGS="$CFLAGS $GLIB_CFLAGS"
                CXXFLAGS="$CXXFLAGS $GLIB_CFLAGS"
-       ], AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gthread)
+       ], AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gthread gmodule)
 else
        #
        # We have GTK+, and thus will be building Wireshark unless the
@@ -839,7 +854,7 @@ else
        wireshark_man="wireshark.1"
         wireshark_SUBDIRS="codecs gtk"
        # Don't use GLIB_CFLAGS
-       AM_PATH_GLIB_2_0(2.4.0, , AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gthread)
+       AM_PATH_GLIB_2_0(2.4.0, , AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gthread gmodule)
 fi
 
 #
@@ -1276,7 +1291,7 @@ else
        else
                if test "x$ac_cv_func_inflatePrime" = "xno" ; then
                        AC_MSG_RESULT(inflatePrime not found in zlib - disabling gzipped capture file support)
-               fi                      
+               fi
        fi
 fi
 
@@ -1460,6 +1475,9 @@ AC_ARG_WITH(dumpcap-group,
   if test "x$withval" = "xyes"; then
       AC_MSG_ERROR([No dumpcap group specified.])
   elif test "x$withval" != "xno"; then
+      if test "x$enable_dumpcap" = "xno" ; then
+          AC_MSG_ERROR(dumpcap group install works only with dumpcap but dumpcap is disabled)
+      fi
       AC_MSG_RESULT($withval)
       DUMPCAP_GROUP="$withval"
   fi