Add ability to follow UDP stream by index
[metze/wireshark/wip.git] / configure.ac
index 76762dd8ae48390851f3cbdad78e0e1d7bf1c20d..89a15d44478e32a1fca70b05762adc53bb9d9155 100644 (file)
@@ -1,13 +1,19 @@
-# $Id$
+#
+# Autoconf script for Wireshark
 #
 
+#
+# Define variables for the components of the Wireshark version number.
+#
 m4_define([version_major], [1])
-m4_define([version_minor], [11])
-m4_define([version_micro], [1])
+m4_define([version_minor], [99])
+m4_define([version_micro], [2])
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 
 AC_INIT(wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)
+CONFIG_ARGS="$*"
+AC_SUBST(CONFIG_ARGS)
 
 # Minimum autoconf version we require.
 AC_PREREQ(2.60)
@@ -51,7 +57,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CPP
-AC_WIRESHARK_CLANG_CHECK
+AC_PROG_MKDIR_P
 
 dnl Work around libtool bug (fixed in the version 1.5a?)
 AC_DEFUN([AC_PROVIDE_AC_LIBTOOL_DLOPEN], )
@@ -96,7 +102,7 @@ fi
 AC_PATH_PROG(PERL, perl)
 
 # Check for Python.
-AC_PATH_PROG(PYTHON, python)
+AC_PATH_PROGS(PYTHON, python, python3)
 if test ! -z "$PYTHON"; then
        #
        # OK, we found Python; is it Python 2.5 or later?
@@ -113,6 +119,8 @@ if test ! -z "$PYTHON"; then
        else
                AC_MSG_RESULT(yes)
        fi
+else
+       AC_MSG_ERROR(I couldn't find python; make sure it's installed and in your path)
 fi
 
 #
@@ -210,28 +218,6 @@ if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
        ac_supports_gcc_flags=yes
 fi
 
-#
-# Set "ac_supports_W_linker_passthrough" if the compiler is known to
-# support "-Wl,{options}" to pass options through to the linker.
-# Currently, we assume GCC, xlc, and clang do; other compilers should
-# be added here.
-#
-if test "x$GCC" = "xyes" -o "x$CC" = "xxlc" -o "x$CC" = "xclang" ; then
-       ac_supports_W_linker_passthrough=yes
-fi
-
-#
-# Set "ac_supports_attribute_unused" if the compiler is known to
-# support "__attribute__(unused)".
-# Currently, we assume GCC and clang do; other compilers should
-# be added here.
-#
-# XXX - do this with a compiler test?
-#
-if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
-       ac_supports_W_linker_passthrough=yes
-fi
-
 if test "x$CC_FOR_BUILD" = x
 then
        CC_FOR_BUILD=$CC
@@ -253,6 +239,9 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes)
 # the comments in acolocal.m4
 #
 PKG_PROG_PKG_CONFIG
+if test -z "$PKG_CONFIG"; then
+       AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path)
+fi
 
 AC_ARG_ENABLE(osx-deploy-target,
   AC_HELP_STRING( [--enable-osx-deploy-target],
@@ -371,6 +360,9 @@ then
                ;;
 
        *)
+               #
+               # Look for the oldest SDK we can find that's
+               # for an OS equal to or later than this one.
                #
                # XXX - for 10.4, do we need 10.4u?  We're
                # not currently doing fat builds (we'd need
@@ -378,22 +370,72 @@ then
                # that to be useful), but, if we do, we'd
                # need to use 10.4u.
                #
-               for i in /Developer/SDKs \
+
+               #
+               # Get the real version - strip off the "10.".
+               # We'll worry about that if, as, and when there's ever
+               # an OS XI.
+               #
+               deploy_real_version=`echo "$deploy_target" | sed -n 's/10\.\(.*\)/\1/p'`
+
+               #
+               # Search each directory that might contain SDKs.
+               #
+               sdkpath=""
+               for sdksdir in /Developer/SDKs \
                    /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs \
                    /Library/Developer/CommandLineTools/SDKs
                do
-                       if test -d "$i"/"MacOSX$deploy_target.sdk"
+                       #
+                       # Get a list of all the SDKs.
+                       #
+                       if ! test -d "$sdksdir"
                        then
-                               SDKPATH="$i"/"MacOSX$deploy_target.sdk"
-                               break
+                               #
+                               # There is no directory with that name.
+                               # Move on to the next one in the list,
+                               # if any.
+                               #
+                               continue
                        fi
+
+                       #
+                       # Get a list of all the SDKs in that directory,
+                       # if any.
+                       #
+                       # We have to use @<:@ for [ and @:>@ for ] to
+                       # avoid m4 removing the square brackets.
+                       #
+                       sdklist=`(cd "$sdksdir"; ls -d MacOSX10.@<:@0-9@:>@*.sdk 2>/dev/null)`
+
+                       for sdk in $sdklist
+                       do
+                               #
+                               # Get the real version for this SDK.
+                               #
+                               sdk_real_version=`echo "$sdk" | sed -n 's/MacOSX10\.\(.*\)\.sdk/\1/p'`
+
+                               #
+                               # Is it for the deployment target or
+                               # some later release?
+                               #
+                               if test "$sdk_real_version" -ge "$deploy_real_version"
+                               then
+                                       #
+                                       # Yes, use it.
+                                       #
+                                       sdkpath="$sdksdir/$sdk"
+                                       break 2
+                               fi
+                       done
                done
-               if test -z "$SDKPATH"
+               if test -z "$sdkpath"
                then
                        AC_MSG_RESULT(no)
-                       AC_MSG_ERROR([We couldn't find the SDK for OS X $deploy_target])
+                       AC_MSG_ERROR([We couldn't find an SDK for OS X $deploy_target or later])
                fi
-               AC_MSG_RESULT(yes)
+               SDKPATH="$sdkpath"
+               AC_MSG_RESULT([yes, with the 10.$sdk_real_version SDK])
                ;;
        esac
 
@@ -467,6 +509,23 @@ AC_SUBST(OSX_MIN_VERSION)
 #
 AC_SYS_LARGEFILE
 
+#
+# Look for math functions; use libm if necessary.
+#
+AC_SEARCH_LIBS(floor, m)
+AC_SEARCH_LIBS(ceil, m)
+AC_SEARCH_LIBS(exp, m)
+AC_SEARCH_LIBS(log, m)
+AC_SEARCH_LIBS(log10, m)
+AC_SEARCH_LIBS(floorl, m,
+  [
+    FLOORL_LO=""
+    AC_DEFINE(HAVE_FLOORL, 1, [Define if you have the floorl function.])
+  ],
+  FLOORL_LO="floorl.lo")
+AC_SUBST(FLOORL_LO)
+
+
 #
 # GUI toolkit options
 #
@@ -487,12 +546,17 @@ AC_ARG_WITH([gtk3],
 
 # GnuTLS
 # Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to
-# LGPLv2.1+ in version 3.1.10
+# LGPLv2.1+ in version 3.1.10.
+# GnuTLS depends on GMP which switched from LGPLv2.1+ to LGPLv3+ in
+# version 4.2.2, the switched to LGPLv3+ / GPLv2+ in version 6.0.0.
+
 tls_message="no"
+want_gnutls="if_available"
 AC_ARG_WITH([gnutls],
   AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@],
-                 [use GnuTLS library @<:@default=yes@:>@]),
-  with_gnutls="$withval", with_gnutls="yes")
+                 [use GnuTLS library @<:@default=yes, if available@:>@]),
+  [ with_gnutls="$withval"; want_gnutls="yes" ], with_gnutls="yes")
+
 if test "x$with_gnutls" = "xyes"; then
   have_license_compatible_gnutls="no"
   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.10 ],
@@ -512,15 +576,22 @@ if test "x$with_gnutls" = "xyes"; then
   else
     echo "GnuTLS with compatible license not found, disabling SSL decryption"
     tls_message="no"
+
+    # Error out if the user explicitly requested gnutls
+    if test "x$want_gnutls" = "xyes"; then
+       AC_MSG_ERROR([GnuTLS crypto library was requested, but is not available])
+    fi
   fi
 fi
 
 # libgrypt
 gcrypt_message="no"
+want_gcrypt="if_available"
 AC_ARG_WITH([gcrypt],
   AC_HELP_STRING( [--with-gcrypt=@<:@yes/no@:>@],
-                 [use gcrypt library @<:@default=yes@:>@]),
-  with_gcrypt="$withval", with_gcrypt="yes")
+                 [use gcrypt library @<:@default=yes, if available@:>@]),
+  [ with_gcrypt="$withval"; want_gcrypt="yes" ], with_gcrypt="yes")
+
 if test "x$with_gcrypt" = "xyes"; then
   AM_PATH_LIBGCRYPT(1.1.92,
         [
@@ -535,6 +606,11 @@ if test "x$with_gcrypt" = "xyes"; then
                         echo "libgcrypt not found, disabling ipsec decryption"
                         gcrypt_message="no"
                 fi
+
+               # Error out if the user explicitly requested gcrypt
+               if test "x$want_gcrypt" = "xyes"; then
+                   AC_MSG_ERROR([libgcrypt library was requested, but is not available])
+               fi
         ]
   )
 fi
@@ -650,6 +726,12 @@ linux*)
            [enum nl80211_commands x = NL80211_CMD_SET_CHANNEL;],
            [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_NL80211_CMD_SET_CHANNEL, 1, [SET_CHANNEL is supported])],
            [AC_MSG_RESULT(no)])
+
+       AC_MSG_CHECKING([for NL80211_SPLIT_WIPHY_DUMP])
+         AC_TRY_COMPILE([#include <linux/nl80211.h>],
+           [enum nl80211_protocol_features x = NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP;],
+           [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_NL80211_SPLIT_WIPHY_DUMP, 1, [SPLIT_WIPHY_DUMP is supported])],
+           [AC_MSG_RESULT(no)])
        ;;
 
 *)
@@ -747,21 +829,40 @@ fi
 AC_SUBST(HAVE_OSX_PACKAGING)
 
 #
-# Some compilers have to be told to fail on unknown warning errors;
+# Use this as a proxy for "is this OS X" (just in case somebody actually
+# built and installed Darwin as an OS, perhaps with some X11-based GUI,
+# don't look for Darwin).
+#
+AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no")
+AM_CONDITIONAL(NOT_OS_X, test "x$have_sw_vers" = "xno")
+
+#
+# Some compilers have to be told to fail when passed an unknown -W flag;
 # make sure we do that.
 #
 AC_WIRESHARK_CHECK_UNKNOWN_WARNING_OPTION_ERROR
 
 #
-# Try to add some additional gcc checks to CFLAGS
+# Some C++ compilers have to be told to fail when passed a -W flag that
+# they don't think should apply to C++; make sure we do that.
 #
-AC_ARG_ENABLE(extra-gcc-checks,
-  AC_HELP_STRING( [--enable-extra-gcc-checks],
-                 [do additional -W checks in GCC @<:@default=no@:>@]),
+AC_WIRESHARK_CHECK_NON_CXX_WARNING_OPTION_ERROR
+
+#
+# Try to add some additional checks to CFLAGS.
+# These are not enabled by default, because the warnings they produce
+# are very hard or impossible to eliminate.
+#
+AC_ARG_ENABLE(extra-compiler-warnings,
+  AC_HELP_STRING( [--enable-extra-compiler-warnings],
+                 [do additional compiler warnings @<:@default=no@:>@]),
 [
-       wireshark_extra_gcc_flags=$enableval
+       wireshark_extra_flags=$enableval
        if test $enableval != no
        then
+               #
+               # The following are for C and C++
+               #
                AC_WIRESHARK_COMPILER_FLAGS_CHECK(-pedantic)
                #
                # Various code blocks this one.
@@ -769,21 +870,11 @@ AC_ARG_ENABLE(extra-gcc-checks,
                AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Woverflow)
                AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fstrict-overflow -Wstrict-overflow=4)
                #
-               # Some memset() calls to clear out structures
-               # on the stack are getting flagged as "will never
-               # be executed" by this, at least by Apple's
-               # i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on
-               # Apple Inc. build 5658) (LLVM build 2336.11.00), for
-               # some unknown reason.
-               #
-               AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunreachable-code)
-               #
                # Due to various places where APIs we don't control
                # require us to cast away constness, we can probably
-               # never enable these ones with -Werror.
+               # never enable this one with -Werror.
                #
                AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wcast-qual)
-               AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wbad-function-cast, C)
                #
                # Some generated ASN.1 dissectors block this one;
                # multiple function declarations for the same
@@ -805,23 +896,41 @@ AC_ARG_ENABLE(extra-gcc-checks,
                # this one for now.
                #
                AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wcast-align)
+               #
+               # Works only with Clang
+               #
+               AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunreachable-code)
+               #
+               # Works only with Clang but generates a lot of warnings
+               # (about glib library not using Doxygen)
+               #
+               AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdocumentation)
+
+               #
+               # The following are C only, not C++
+               #
+               # Due to various places where APIs we don't control
+               # require us to cast away constness, we can probably
+               # never enable this one with -Werror.
+               #
+               AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wbad-function-cast, C)
        fi
 ],)
+
+#
+# The following are for C and C++
+#
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wall -W) # -W is now known as -Wextra
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wextra) # -W is now known as -Wextra
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdeclaration-after-statement, C)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wendif-labels)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wpointer-arith)
-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)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wstrict-prototypes, C)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wjump-misses-init, C)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fwrapv)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fno-strict-overflow)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fno-delete-null-pointer-checks)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wvla)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Waddress)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Warray-bounds)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wattributes)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdiv-by-zero)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wignored-qualifiers)
@@ -829,7 +938,13 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wpragmas)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-overlength-strings)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wwrite-strings)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wheader-guard)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wunused-const-variable)
+#
+# The following are C only, not C++
+#
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wc++-compat, C)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdeclaration-after-statement, C)
 
 #
 # XXX - OK for C++?
@@ -855,6 +970,10 @@ foo(int a)
   ],
   [warns about variables in function declarations shadowing other variables])
 
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-pointer-sign, C)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wold-style-definition, C)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wstrict-prototypes, C)
+
 # Unfortunately some versions of gcc generate logical-op warnings when strchr()
 # is given a constant string.
 # gcc versions 4.3.2 and 4.4.5 are known to have the problem.
@@ -882,32 +1001,39 @@ bar(void)
   ],
   [generates warnings from strchr()])
 
-
-#
-# On OS X, suppress warnings about deprecated declarations, because
-# they apparently think everything on OS X is Shiny Happy Apple-
-# Framework-Based Apps and are deprecating some perfectly OK
-# multi-platform open-source libraries that we use in our multi-platform
-# open-source application in favor of various frameworks that are
-# OS X-only.
-#
-case "$host_os" in
-darwin*)
-       AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-deprecated-declarations)
-       ;;
-esac
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wjump-misses-init, C)
+# 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)
 
 #
 # Use the faster pre gcc 4.5 floating point precision if available.
 #
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fexcess-precision=fast)
 
-CFLAGS_before_fvhidden=$CFLAGS
+#
+# Try to have the compiler default to hiding symbols, so that only
+# symbols explicitly exported with WS_DLL_PUBLIC will be visible
+# outside (shared) libraries; that way, more UN*X builds will catch
+# failures to export symbols, rather than having that fail only on
+# Windows.
+#
+CFLAGS_before_fvhidden="$CFLAGS"
+#
+# GCC and GCC-compatible compilers
+#
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fvisibility=hidden)
-if test "x$CLFAGS" = "x$CFLAGS_before_fvhidden"
+if test "x$CFLAGS" = "x$CFLAGS_before_fvhidden"
 then
-       # TODO add other ways of hiding symbols
-       AC_MSG_WARN(Compiler will export all symbols from shared libraries)
+       #
+       # Sun^WOracle C.
+       #
+       AC_WIRESHARK_COMPILER_FLAGS_CHECK(-xldscope=hidden)
+       if test "x$CFLAGS" = "x$CFLAGS_before_fvhidden"
+       then
+               # TODO add other ways of hiding symbols
+               AC_MSG_WARN(Compiler will export all symbols from shared libraries)
+       fi
 fi
 
 AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
@@ -923,14 +1049,14 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
 # privileges, and using PIE means the OS can run it at random locations
 # in the address space to make attacks more difficult.
 #
-CFLAGS_before_pie=$CFLAGS
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE, C)
-if test "x$CLFAGS" != "x$CFLAGS_before_pie"
+CFLAGS_before_pie="$CFLAGS"
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE)
+if test "x$CFLAGS" != "x$CFLAGS_before_pie"
 then
        # Restore CFLAGS
-       CFLAGS=$CFLAGS_before_pie
+       CFLAGS="$CFLAGS_before_pie"
 
-       LDFLAGS_before_pie=$LDFLAGS
+       LDFLAGS_before_pie="$LDFLAGS"
        AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie])
        if test "x$LDFLAGS" != "x$LDFLAGS_before_pie"
        then
@@ -939,13 +1065,43 @@ then
                PIE_LDFLAGS="-pie"
 
                # Restore LDFLAGS
-               LDFLAGS=$LDFLAGS_before_pie
+               LDFLAGS="$LDFLAGS_before_pie"
        fi
 
 fi
 AC_SUBST(PIE_CFLAGS)
 AC_SUBST(PIE_LDFLAGS)
 
+CFLAGS_before_simd="$CFLAGS"
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+if test "x$CFLAGS" != "x$CFLAGS_before_simd"
+then
+       AC_MSG_CHECKING([whether there is nmmintrin.h header])
+
+       AC_TRY_COMPILE(
+               [#include <nmmintrin.h>],
+               [return 0;],
+               [
+                       have_sse42=yes
+                       AC_DEFINE(HAVE_SSE4_2, 1, [Support SSSE4.2 (Streaming SIMD Extensions 4.2) instructions])
+                       CFLAGS_SSE42="-msse4.2"
+                       AC_MSG_RESULT([yes])
+               ],
+               [
+                       have_sse42=no
+                       AC_MSG_RESULT([no])
+               ]
+       )
+
+       # Restore CFLAGS
+       CFLAGS="$CFLAGS_before_simd"
+else
+       have_sse42=no
+fi
+dnl build libwsutil_sse42 only if there is SSE4.2
+AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes")
+AC_SUBST(CFLAGS_SSE42)
+
 #
 # If we're running GCC or clang define _U_ to be "__attribute__((unused))"
 # so we can use _U_ to flag unused function parameters and not get warnings
@@ -979,7 +1135,7 @@ warnings_as_errors_default="yes"
 AC_MSG_CHECKING(whether we should treat compiler warnings as errors)
 AC_ARG_ENABLE(warnings-as-errors,
   AC_HELP_STRING( [--enable-warnings-as-errors],
-                 [treat warnings as errors (only for GCC or clang) @<:@default=yes, unless extra warnings are enabled@:>@]),
+                 [treat warnings as errors (only for GCC or clang) @<:@default=yes, unless extra compiler warnings are enabled@:>@]),
 [
   if test "x$ac_supports_gcc_flags" = "xyes" -a "x$enableval" = "xyes"; then
     with_warnings_as_errors="yes"
@@ -990,7 +1146,7 @@ AC_ARG_ENABLE(warnings-as-errors,
   fi
 ],
 [
-  if test "x$ac_supports_gcc_flags" = "xyes" -a "x$wireshark_extra_gcc_flags" = "x" -a "x$warnings_as_errors_default" = "xyes"; then
+  if test "x$ac_supports_gcc_flags" = "xyes" -a "x$wireshark_extra_flags" = "x" -a "x$warnings_as_errors_default" = "xyes"; then
     with_warnings_as_errors="yes"
     AC_MSG_RESULT(yes)
   else
@@ -1062,6 +1218,9 @@ darwin*)
        #
        LDFLAGS_SHAREDLIB="-Wl,-single_module"
        #
+       # Add -Wl,-headerpad_max_install_names to the LDFLAGS, as
+       # code-signing issues is running out of padding space.
+       #
        # Add -Wl,-search_paths_first to make sure that if we search
        # directories A and B, in that order, for a given library, a
        # non-shared version in directory A, rather than a shared
@@ -1077,8 +1236,8 @@ darwin*)
        # libraries in the rpath, rather than having a script tweak
        # DYLD_LIBRARY_PATH.
        #
-       LDFLAGS="-Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,/usr/local/lib $LDFLAGS"
-       AC_MSG_RESULT([Apple linker - added -Wl,-single_module and -Wl,-search_paths_first, and rpaths])
+       LDFLAGS="-Wl,-headerpad_max_install_names -Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,/usr/local/lib $LDFLAGS"
+       AC_MSG_RESULT([Apple linker - added -Wl,-single_module to shared library linker flags and -Wl,-headerpad_max_install_names -Wl,-search_paths_first and rpaths to all linker flags])
        ;;
 cygwin*)
        #
@@ -1209,6 +1368,11 @@ esac
 #
 # Add any checks here that are necessary for other OSes.
 #
+AC_PATH_PROG(SED, sed)
+if test "x$SED" = x
+then
+       AC_MSG_ERROR(I couldn't find sed; make sure it's installed and in your path)
+fi
 AC_WIRESHARK_GNU_SED_CHECK
 if test "$HAVE_GNU_SED" = no ; then
        case "$host_os" in
@@ -1237,11 +1401,12 @@ AC_ARG_ENABLE(wireshark,
   AC_HELP_STRING( [--enable-wireshark],
                   [build the Wireshark GUI (with Gtk+, Qt, or both) @<:@default=yes@:>@]),
     enable_wireshark=$enableval,enable_wireshark=yes)
+AM_CONDITIONAL(BUILDING_WIRESHARK, test x$enable_wireshark = xyes)
 
 AC_ARG_ENABLE(packet-editor,
   AC_HELP_STRING( [--enable-packet-editor],
-                  [add support for packet editor in Wireshark @<:@default=no@:>@]),
-    enable_packet_editor=$enableval,enable_packet_editor=no)
+                  [add support for packet editor in Wireshark @<:@default=yes@:>@]),
+    enable_packet_editor=$enableval,enable_packet_editor=yes)
 if test x$enable_packet_editor = xyes; then
        AC_DEFINE(WANT_PACKET_EDITOR, 1, [Support for packet editor])
 fi
@@ -1305,6 +1470,7 @@ AC_SUBST(QT_MIN_VERSION)
 # force all programs to be built with GTK+ or Qt.
 #
 # Release dates for GTK+ versions:
+# http://en.wikipedia.org/wiki/GTK+#Releases
 # 2.12.0: 14 Sep 2007
 # 2.14.0: 04 Sep 2008
 # 2.16.0: 13 Mar 2009
@@ -1317,6 +1483,18 @@ AC_SUBST(QT_MIN_VERSION)
 # 3.4.0:  26 Mar 2012
 # 3.6.0:  24 Sep 2012
 # 3.8.0:  25 Mar 2013
+# 3.10.0: 23 Sep 2013
+# 3.12.0: 25 Mar 2014
+#
+# Release dates for Qt versions:
+# http://en.wikipedia.org/wiki/List_of_Qt_releases
+# 4.6.0:  01 Dec 2009
+# 4.7.0:  21 Sep 2010
+# 4.8.0:  15 Dec 2011
+# 5.0.0:  19 Dec 2012
+# 5.1.0:  03 Jul 2013
+# 5.2.0:  12 Dec 2013
+# 5.3.0:  20 May 2014
 
 have_qt=no
 have_gtk=no
@@ -1346,10 +1524,8 @@ 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"
                ],
                [AC_MSG_ERROR([Qt is not available])])
 
@@ -1426,30 +1602,34 @@ AC_SUBST(GLIB_MIN_VERSION)
 # 2.32.0: 24 Mar 2012
 # 2.34.0: 24 Sep 2012
 # 2.36.0: 25 Mar 2013
+# 2.38.0: 23 Sep 2013
+# 2.40.0: 24 Mar 2014
 
 use_glib_cflags="true"
 if test "$have_gtk" = "yes" -a "$have_qt" = "yes" ; then
        # We have both GTK and Qt and thus will be building both wireshark
-       # and wireshark-qt.
+       # and wireshark-gtk.
 
-       wireshark_bin="wireshark\$(EXEEXT) wireshark-qt\$(EXEEXT)"
+       wireshark_bin="wireshark\$(EXEEXT) wireshark-gtk\$(EXEEXT)"
        wireshark_man="wireshark.1"
        wireshark_SUBDIRS="codecs ui/qt ui/gtk"
 fi
 if test "$have_gtk" = "no" -a "$have_qt" = "yes" ; then
        # We don't have GTK+ but we have Qt.
 
-       wireshark_bin="wireshark-qt\$(EXEEXT)"
+       wireshark_bin="wireshark\$(EXEEXT)"
        wireshark_man="wireshark.1"
        wireshark_SUBDIRS="codecs ui/qt"
 fi
 if test "$have_gtk" = "yes" -a "$have_qt" = "no" ; then
        # We have GTK+ but not Qt.
 
-       wireshark_bin="wireshark\$(EXEEXT)"
+       wireshark_bin="wireshark-gtk\$(EXEEXT)"
        wireshark_man="wireshark.1"
        wireshark_SUBDIRS="codecs ui/gtk"
        use_glib_cflags="false"
+       OSX_APP_FLAGS="$OSX_APP_FLAGS -gtk"
+       OSX_DMG_FLAGS="-gtk"
 fi
 if test "$have_gtk" = "no" -a "$have_qt" = "no" ; then
        # We have neither GTK+ nor Qt.
@@ -1476,7 +1656,13 @@ if test "$have_gtk" = "yes" ; then
 
        CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
        CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-       CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+       if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+               ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
+               ##  The deprecations in Gtk 3.10 will not be fixed ...
+               CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
+       else
+               CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+       fi
        CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
        if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
                # Enable GSEAL when building with GTK > 2.20
@@ -1558,6 +1744,32 @@ then
        fi
 fi
 AC_SUBST(MOC)
+AC_PATH_PROG(RCC, rcc)
+if test "x$RCC" = x
+then
+       AC_PATH_PROG(RCC, rcc)
+       if test "x$RCC" = x
+       then
+               if test "x$with_qt" = "xyes"; then
+                       #
+                       # If you want to build with Qt, you'd better
+                       # have moc.
+                       #
+                       AC_MSG_ERROR(I couldn't find rcc; make sure it's installed and in your path)
+               else
+                       #
+                       # We shouldn't fail here, as the user's not
+                       # building with Qt, and we shouldn't force them
+                       # to have Qt installed if they're not doing so.
+                       # "make dist" will fail if they do that, but
+                       # we don't know whether they'll be doing that,
+                       # so this is the best we can do.
+                       #
+                       RCC=rcc
+               fi
+       fi
+fi
+AC_SUBST(RCC)
 
 # Error out if a glib header other than a "top level" header
 #  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
@@ -1598,10 +1810,13 @@ LIBS="$ac_save_LIBS"
 if test "$ac_cv_glib_supports_modules" = yes ; then
   AC_MSG_RESULT(yes)
   have_plugins=yes
+  plugins_dir="plugins"
 else
   AC_MSG_RESULT(no)
   have_plugins=no
+  plugins_dir=""
 fi
+AC_SUBST(plugins_dir)
 
 #
 # If we have <dlfcn.h>, check whether we have dladdr.
@@ -1707,12 +1922,10 @@ AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" = "yes")
 AC_SUBST(OSX_APP_FLAGS)
 AC_SUBST(OSX_DMG_FLAGS)
 
-
 # Enable/disable tshark
-
 AC_ARG_ENABLE(tshark,
   AC_HELP_STRING( [--enable-tshark],
-                  [build TShark @<:@default=yes@:>@]),
+                  [build tshark @<:@default=yes@:>@]),
     tshark=$enableval,enable_tshark=yes)
 
 if test "x$enable_tshark" = "xyes" ; then
@@ -1725,9 +1938,6 @@ else
 fi
 AC_SUBST(tshark_bin)
 AC_SUBST(tshark_man)
-AC_SUBST(wiresharkfilter_man)
-
-
 
 # Enable/disable editcap
 
@@ -1747,29 +1957,6 @@ AC_SUBST(editcap_bin)
 AC_SUBST(editcap_man)
 
 
-
-# Enable/disable echld
-
-AC_ARG_ENABLE(echld,
-  AC_HELP_STRING( [--enable-echld],
-                  [support echld]),
-    have_echld=$enableval,have_echld=no)
-
-AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes")
-if test "x$have_echld" = "xyes"
-then
-  AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled])
-  echld_test_bin="echld_test\$(EXEEXT)"
-  echld_dir="echld"
-else
-  have_echld="no"
-  echld_test_bin=""
-  echld_dir=""
-fi
-AC_SUBST(echld_test_bin)
-AC_SUBST(echld_dir)
-
-
 # Enabling/disabling of dumpcap is done later (after we know if we have PCAP
 # or not)
 
@@ -1790,6 +1977,22 @@ fi
 AC_SUBST(capinfos_bin)
 AC_SUBST(capinfos_man)
 
+# Enable/disable captype
+
+AC_ARG_ENABLE(captype,
+  AC_HELP_STRING( [--enable-captype],
+                  [build captype @<:@default=yes@:>@]),
+    enable_captype=$enableval,enable_captype=yes)
+
+if test "x$enable_captype" = "xyes" ; then
+       captype_bin="captype\$(EXEEXT)"
+       captype_man="captype.1"
+else
+       captype_bin=""
+       captype_man=""
+fi
+AC_SUBST(captype_bin)
+AC_SUBST(captype_man)
 
 # Enable/disable mergecap
 
@@ -1808,7 +2011,6 @@ fi
 AC_SUBST(mergecap_bin)
 AC_SUBST(mergecap_man)
 
-
 # Enable/disable reordercap
 
 AC_ARG_ENABLE(reordercap,
@@ -1826,7 +2028,6 @@ fi
 AC_SUBST(reordercap_bin)
 AC_SUBST(reordercap_man)
 
-
 # Enable/disable text2pcap
 
 AC_ARG_ENABLE(text2pcap,
@@ -1844,7 +2045,6 @@ fi
 AC_SUBST(text2pcap_bin)
 AC_SUBST(text2pcap_man)
 
-
 # Enable/disable dftest
 
 AC_ARG_ENABLE(dftest,
@@ -1862,7 +2062,6 @@ fi
 AC_SUBST(dftest_bin)
 AC_SUBST(dftest_man)
 
-
 # Enable/disable randpkt
 
 AC_ARG_ENABLE(randpkt,
@@ -1880,7 +2079,7 @@ fi
 AC_SUBST(randpkt_bin)
 AC_SUBST(randpkt_man)
 
-
+AC_SUBST(wiresharkfilter_man)
 
 dnl Checks for "gethostbyname()" - and "-lnsl", if we need it to get
 dnl "gethostbyname()".
@@ -1999,6 +2198,45 @@ fi
 AC_SUBST(rawshark_bin)
 AC_SUBST(rawshark_man)
 
+
+# Enable/disable echld
+AC_ARG_ENABLE(echld,
+  AC_HELP_STRING( [--enable-echld],
+                  [support echld (Experimental) @<:@default=no@:>@]),
+    have_echld=$enableval,have_echld=no)
+
+AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes")
+if test "x$have_echld" = "xyes"
+then
+  AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled])
+  echld_test_bin="echld_test\$(EXEEXT)"
+  echld_dir="echld"
+else
+  have_echld="no"
+  echld_test_bin=""
+  echld_dir=""
+fi
+AC_SUBST(echld_test_bin)
+AC_SUBST(echld_dir)
+
+# Enable/disable tfshark
+AC_ARG_ENABLE(tfshark,
+  AC_HELP_STRING( [--enable-tfshark],
+                  [build tfshark (Experimental) @<:@default=no@:>@]),
+    tfshark=$enableval,enable_tfshark=no)
+
+if test "x$enable_tfshark" = "xyes" ; then
+       tfshark_bin="tfshark\$(EXEEXT)"
+       tfshark_man="tfshark.1"
+       wiresharkfilter_man="wireshark-filter.4"
+else
+       tfshark_bin=""
+       tfshark_man=""
+fi
+AC_SUBST(tfshark_bin)
+AC_SUBST(tfshark_man)
+
+
 dnl Use pcap-ng by default
 AC_ARG_ENABLE(pcap-ng-default,
   AC_HELP_STRING( [--enable-pcap-ng-default],
@@ -2168,9 +2406,11 @@ if test "x$enable_setcap_install" = "xno" ; then
        AC_MSG_RESULT(no)
 else
        if test "x$SETCAP" = "x" ; then
-               AC_MSG_RESULT(no. Setcap not found)
+               AC_MSG_RESULT(setcap not found)
+               AC_MSG_ERROR([Setcap install was requested, but setcap was not found])
        elif test "x$enable_dumpcap" = "xno" ; then
-               AC_MSG_ERROR(Setcap install works only with dumpcap but dumpcap is disabled)
+               AC_MSG_RESULT(dumpcap disabled)
+               AC_MSG_ERROR([Setcap install works only with dumpcap, but dumpcap is disabled])
        else
                AC_MSG_RESULT(yes)
        fi
@@ -2190,9 +2430,11 @@ if test "x$enable_setuid_install" = "xno" ; then
 else
        if test "x$enable_setcap_install" = "xyes" ; then
                enable_setuid_install=no
-               AC_MSG_RESULT(no; using setcap instead)
+               AC_MSG_RESULT(setcap and setuid both selected)
+               AC_MSG_ERROR(You must choose one of setcap install and setuid install)
        elif test "x$enable_dumpcap" = "xno" ; then
-               AC_MSG_ERROR(Setuid install works only with dumpcap but dumpcap is disabled)
+               AC_MSG_RESULT(dumpcap disabled)
+               AC_MSG_ERROR([Setuid install works only with dumpcap, but dumpcap is disabled])
        else
                AC_MSG_RESULT(yes)
        fi
@@ -2392,46 +2634,6 @@ else
 fi
 AC_SUBST(GEOIP_LIBS)
 
-# Warning: this Python scripting appears to be broken (does not work at all).
-# Running it also causes Valgrind to complain about all sorts of memory errors.
-# Suggestion: do not enable it unless you are working on fixing it.
-#
-# An alternative might be https://code.google.com/p/pyreshark/
-#
-dnl Python devel Check
-AC_MSG_CHECKING(whether to use the Python interpreter for scripting)
-
-AC_ARG_WITH(broken-python,
-    AC_HELP_STRING( [--with-broken-python@<:@=DIR@:>@],
-                    [use the (BROKEN) Python interpreter (installed in DIR, if supplied) @<:@default=no@:>@]),
-[
-       pythondir='${libdir}/wireshark/python/${VERSION}'
-       if test "x$withval" = "xno"
-       then
-               want_python=no
-       elif test "x$withval" = "xyes"
-       then
-               want_python=yes
-       else
-               want_python=yes
-               pythondir="$withval"
-       fi
-],[
-       # By default (user didn't explicitly enable Python), don't enable
-       # Python support.
-       #
-       want_python=no
-       #pythondir='${libdir}/wireshark/python/${VERSION}'
-])
-if test "x$want_python" = "xno" ; then
-        AC_MSG_RESULT(no)
-else
-        AC_MSG_RESULT(yes)
-       AC_WIRESHARK_PYTHON_CHECK
-fi
-AM_CONDITIONAL(HAVE_LIBPY, test x$want_python != xno)
-AC_SUBST(pythondir)
-
 #
 # Define WS_MSVC_NORETURN appropriately for declarations of routines that
 # never return (just like Charlie on the MTA).
@@ -2466,38 +2668,41 @@ AC_C_BIGENDIAN
 # XXX - do we need this?
 AC_PROG_GCC_TRADITIONAL
 
-GETOPT_LO=""
-AC_CHECK_FUNC(getopt,
-  [GETOPT_LO=""
-   AC_DEFINE(HAVE_GETOPT, 1, [Define to 1 if you have the getopt function.])
+AC_CHECK_FUNC(getopt_long,
+  [
+    GETOPT_LO=""
+    AC_DEFINE(HAVE_GETOPT_LONG, 1, [Define to 1 if you have the getopt_long function.])
+
+    #
+    # Do we have optreset?
+    #
+    AC_MSG_CHECKING(whether optreset is defined)
+    AC_TRY_LINK([],
+      [
+        extern int optreset;
+
+        return optreset;
+      ],
+      ac_cv_pcap_debug_defined=yes,
+      ac_cv_pcap_debug_defined=no)
+    if test "$ac_cv_pcap_debug_defined" = yes ; then
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_OPTRESET, 1, [Define to 1 if you have the optreset variable])
+    else
+      AC_MSG_RESULT(no)
+    fi
   ],
-  GETOPT_LO="wsgetopt.lo"
-)
-if test "$ac_cv_func_getopt" = no ; then
-  GETOPT_LO="wsgetopt.lo"
-fi
-AM_CONDITIONAL(NEED_GETOPT_LO, test "x$ac_cv_func_getopt" = "xno")
+  GETOPT_LO="wsgetopt.lo")
 AC_SUBST(GETOPT_LO)
 
-AC_CHECK_FUNC(strncasecmp, STRNCASECMP_LO="",
-  STRNCASECMP_LO="strncasecmp.lo")
-if test "$ac_cv_func_strncasecmp" = no ; then
-  STRNCASECMP_LO="strncasecmp.lo"
-fi
-AM_CONDITIONAL(NEED_STRNCASECMP_LO, test "x$ac_cv_func_strncasecmp" = "xno")
-AC_SUBST(STRNCASECMP_LO)
-
 AC_CHECK_FUNCS(mkstemp mkdtemp)
 
-AC_SEARCH_LIBS(inet_aton, [socket nsl], have_inet_aton=yes,
-    have_inet_aton=no)
-if test "$have_inet_aton" = no; then
-  INET_ATON_LO="inet_aton.lo"
-  AC_DEFINE(HAVE_INET_ATON_H, 0, [Define unless inet/aton.h needs to be included])
-else
-  INET_ATON_LO=""
-fi
-AM_CONDITIONAL(NEED_INET_ATON_LO, test "x$have_inet_aton" = "xno")
+AC_SEARCH_LIBS(inet_aton, [socket nsl],
+  [
+    INET_ATON_LO=""
+    AC_DEFINE(HAVE_INET_ATON, 0, [Define to 1 if you have the inet_aton function.])
+  ],
+  INET_ATON_LO="inet_aton.lo")
 AC_SUBST(INET_ATON_LO)
 
 AC_SEARCH_LIBS(inet_pton, [socket nsl], [
@@ -2559,17 +2764,22 @@ extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [
 AM_CONDITIONAL(NEED_INET_NTOP_LO, test "x$INET_NTOP_LO" != "x")
 AC_SUBST(INET_NTOP_LO)
 
-AC_CHECK_FUNC(strptime, STRPTIME_LO="",
-  [STRPTIME_LO="strptime.lo"
-   AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included])
-])
-if test "$ac_cv_func_strptime" = no ; then
-  STRPTIME_LO="strptime.lo"
-fi
-AC_SUBST(STRPTIME_C)
-AM_CONDITIONAL(NEED_STRPTIME_LO, test "x$ac_cv_func_strptime" = "no")
+AC_CHECK_FUNC(strptime,
+  [
+    STRPTIME_LO=""
+    AC_DEFINE(HAVE_STRPTIME, 1, [Define if you have the strptime function.])
+  ],
+  STRPTIME_LO="strptime.lo")
 AC_SUBST(STRPTIME_LO)
 
+AC_CHECK_FUNC(popcount,
+  [
+    POPCOUNT_LO=""
+    AC_DEFINE(HAVE_POPCOUNT, 1, [Define if you have the popcount function.])
+  ],
+  POPCOUNT_LO="popcount.lo")
+AC_SUBST(POPCOUNT_LO)
+
 AC_CHECK_FUNCS(getprotobynumber gethostbyname2)
 AC_CHECK_FUNCS(issetugid)
 AC_CHECK_FUNCS(mmap mprotect sysconf)
@@ -2577,6 +2787,15 @@ AC_CHECK_FUNCS(mmap mprotect sysconf)
 dnl blank for now, but will be used in future
 AC_SUBST(wireshark_SUBDIRS)
 
+# Check Bluetooth SBC codec for RTP Player
+# git://git.kernel.org/pub/scm/bluetooth/sbc.git
+PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
+if (test "${have_sbc}" = "yes"); then
+    AC_DEFINE(HAVE_SBC, 1, [Define to support playing SBC by standalone BlueZ SBC library])
+    CFLAGS="$CFLAGS $(pkg-config sbc --cflags)"
+    LIBS="$LIBS $(pkg-config sbc --libs)"
+fi
+
 dnl
 dnl check whether plugins should be enabled and, if they should be,
 dnl check for plugins directory - stolen from Amanda's configure.ac
@@ -2601,7 +2820,7 @@ then
   AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled])
 fi
 AC_SUBST(plugindir)
-CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'"
+CPPFLAGS="$CPPFLAGS '-DPLUGIN_INSTALL_DIR=\"\$(plugindir)\"'"
 
 #
 # The plugin dissectors reside in ./plugins/PROTO/
@@ -2609,6 +2828,32 @@ CPPFLAGS="$CPPFLAGS '-DPLUGIN_DIR=\"\$(plugindir)\"'"
 PLUGIN_LIBS=""
 AC_SUBST(PLUGIN_LIBS)
 
+
+dnl Use extcap by default
+extcapdir='${datadir}/wireshark/extcap/'
+AC_ARG_WITH(extcap,
+  AC_HELP_STRING( [--with-extcap@<:@=DIR@:>@],
+                  [use extcap for external capture sources (installed in DIR, if supplied) @<:@default=yes, if possible@:>@]),
+[
+  if test "x$withval" = "xno"; then
+      have_extcap=no
+  elif test "x$withval" = "xyes"; then
+      have_extcap=yes
+  elif test "x$withval" != "xyes"; then
+      have_extcap=yes
+      extcapdir ="$withval"
+  fi
+],[
+    have_extcap=yes
+])
+AM_CONDITIONAL(HAVE_EXTCAP, test "x$have_extcap" = "xyes")
+if test "x$have_extcap" = "xyes"
+then
+  AC_DEFINE(HAVE_EXTCAP, 1, [Define if external capture sources should be enabled])
+  AC_DEFINE_UNQUOTED(EXTCAP_DIR,"$extcapdir", [Directory for extcap plugins])
+fi
+AC_SUBST(extcapdir)
+
 #
 # Check if (emem) memory allocations must be 8-byte aligned.
 # I haven't been able to write C code that reliably makes that determination
@@ -2650,6 +2895,23 @@ then
 fi
 AC_SUBST(ENABLE_STATIC)
 
+# Gather which GUI we're building for rpmbuild
+if test "x$have_gtk" = "xyes"; then
+       if test "x$with_gtk3" = "xyes"; then
+               RPMBUILD_WITH_ARGS="--with gtk3 --without gtk2"
+       else
+               RPMBUILD_WITH_ARGS="--without gtk3 --with gtk2"
+       fi
+else
+       RPMBUILD_WITH_ARGS="--without gtk2 --without gtk3"
+fi
+if test "x$have_qt" = "xyes" ; then
+       RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --with qt"
+else
+       RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --without qt"
+fi
+AC_SUBST(RPMBUILD_WITH_ARGS)
+
 dnl Save the cacheable configure results to config.cache before recursing
 AC_CACHE_SAVE
 
@@ -2687,7 +2949,6 @@ AC_OUTPUT(
   asn1/dsp/Makefile
   asn1/ess/Makefile
   asn1/ftam/Makefile
-  asn1/gnm/Makefile
   asn1/goose/Makefile
   asn1/gprscdr/Makefile
   asn1/gsm_map/Makefile
@@ -2705,6 +2966,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
@@ -2721,6 +2983,7 @@ AC_OUTPUT(
   asn1/mpeg-pes/Makefile
   asn1/nbap/Makefile
   asn1/ns_cert_exts/Makefile
+  asn1/novell_pkis/Makefile
   asn1/ocsp/Makefile
   asn1/p1/Makefile
   asn1/p22/Makefile
@@ -2767,9 +3030,14 @@ AC_OUTPUT(
   asn1/x509if/Makefile
   asn1/x509sat/Makefile
   asn1/x721/Makefile
+  capchild/Makefile
+  capchild/doxygen.cfg
+  caputils/Makefile
+  caputils/doxygen.cfg
   doc/Makefile
   docbook/Makefile
   epan/Makefile
+  epan/compress/Makefile
   epan/crypt/Makefile
   epan/doxygen.cfg
   epan/dfilter/Makefile
@@ -2777,9 +3045,9 @@ AC_OUTPUT(
   epan/dissectors/dcerpc/Makefile
   epan/dissectors/pidl/Makefile
   epan/ftypes/Makefile
+  epan/nghttp2/Makefile
   epan/wmem/Makefile
   epan/wslua/Makefile
-  epan/wspython/Makefile
   codecs/Makefile
   ui/Makefile
   ui/doxygen.cfg
@@ -2802,8 +3070,8 @@ AC_OUTPUT(
   packaging/svr4/checkinstall
   packaging/svr4/pkginfo
   plugins/Makefile
-  plugins/asn1/Makefile
   plugins/docsis/Makefile
+  plugins/easy_codec/Makefile
   plugins/ethercat/Makefile
   plugins/gryphon/Makefile
   plugins/irda/Makefile
@@ -2842,9 +3110,9 @@ if test "x$have_gtk" = "xyes"; then
 fi
 
 if test "x$have_qt" = "xyes" ; then
-       enable_qtshark="yes"
+       enable_wireshark_qt="yes"
 else
-       enable_qtshark="no"
+       enable_wireshark_qt="no"
 fi
 
 if test "x$enable_setcap_install" = "xyes" ; then
@@ -2877,12 +3145,6 @@ else
        lua_message="no"
 fi
 
-if test "x$want_python" = "xno"; then
-        python_message="no"
-else
-        python_message="yes"
-fi
-
 if test "x$want_portaudio" = "xyes" ; then
        portaudio_message="yes"
 else
@@ -2931,10 +3193,12 @@ fi
 
 echo ""
 echo "The Wireshark package has been configured with the following options."
-echo "             Build wireshark (Gtk+) : $have_gtk""$gtk_lib_message"
-echo "                 Build wireshark-qt : $enable_qtshark"
+echo "                    Build wireshark : $enable_wireshark_qt"
+echo "                Build wireshark-gtk : $have_gtk""$gtk_lib_message"
 echo "                       Build tshark : $enable_tshark"
+echo "                      Build tfshark : $enable_tfshark"
 echo "                     Build capinfos : $enable_capinfos"
+echo "                      Build captype : $enable_captype"
 echo "                      Build editcap : $enable_editcap"
 echo "                      Build dumpcap : $enable_dumpcap"
 echo "                     Build mergecap : $enable_mergecap"
@@ -2950,8 +3214,8 @@ echo "  Install dumpcap with capabilities : $setcap_message"
 echo "             Install dumpcap setuid : $setuid_message"
 echo "                  Use dumpcap group : $dumpcap_group_message"
 echo "                        Use plugins : $have_plugins"
+echo "       Use external capture sources : $have_extcap"
 echo "                    Use Lua library : $lua_message"
-echo "                 Use Python binding : $python_message"
 echo "                   Build rtp_player : $portaudio_message"
 echo "             Build profile binaries : $enable_profile_build"
 echo "                   Use pcap library : $want_pcap"
@@ -2967,3 +3231,4 @@ echo "                 Use gnutls library : $tls_message"
 echo "     Use POSIX capabilities library : $libcap_message"
 echo "                  Use GeoIP library : $geoip_message"
 echo "                     Use nl library : $libnl_message"
+echo "              Use SBC codec library : $have_sbc"