Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
[metze/wireshark/wip.git] / configure.in
index d5fc646331213ecdf733b8bea1cca6f4b539d48d..d59ff6f7d2c1e8cb9febd72f4b3198a5a4094f6b 100644 (file)
@@ -177,21 +177,21 @@ AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes)
 #
 AC_SYS_LARGEFILE
 
-# gnu tls
+# GnuTLS
 tls_message="no"
 AC_ARG_WITH([gnutls],
   AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@],
-                 [use gnutls library @<:@default=yes@:>@]),
+                 [use GnuTLS library @<:@default=yes@:>@]),
   with_gnutls="$withval", with_gnutls="yes")
 if test "x$with_gnutls" = "xyes"; then
   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
         [
-                echo "gnuTLS found, enabling ssl decryption"
-                AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library])
+                echo "GnuTLS found, enabling SSL decryption"
+                AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
                 tls_message="yes"
         ]
         , [
-                echo "gnuTLS not found, disabling ssl decryption"
+                echo "GnuTLS not found, disabling SSL decryption"
                 tls_message="no"
         ]
   )
@@ -311,7 +311,7 @@ AC_SUBST(HAVE_OSX_PACKAGING)
 #
 AC_ARG_ENABLE(extra-gcc-checks,
   AC_HELP_STRING( [--enable-extra-gcc-checks],
-                 [Do additional -W checks in GCC.  @<:@default=no@:>@]),
+                 [do additional -W checks in GCC @<:@default=no@:>@]),
 [
        wireshark_extra_gcc_flags=$enableval
        if test $enableval != no
@@ -370,7 +370,7 @@ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-align)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security)
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wold-style-definition)
-
+AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-error=unused-but-set-variable)    ##  for now
 #
 # 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,
@@ -414,7 +414,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@:>@]),
+                 [treat warnings as errors (only for GCC or clang) @<:@default=yes@:>@]),
 [
   if test "x$ac_supports_gcc_flags" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
     with_warnings_as_errors="yes"
@@ -646,7 +646,7 @@ dnl search path as this causes gcc 3.2 on Linux to complain about a change
 dnl of the system search order for includes
 AC_ARG_ENABLE(usr-local,
   AC_HELP_STRING( [--enable-usr-local],
-                  [look for headers and libs in /usr/local tree @<:@default=yes@:>@]),
+                  [look for headers and libs in /usr/local tree @<:@default=yes@:>@]),
     ac_cv_enable_usr_local=$enableval,ac_cv_enable_usr_local=yes)
 
 AC_MSG_CHECKING(whether to use /usr/local for headers and libraries)
@@ -728,12 +728,20 @@ fi
 
 AC_ARG_ENABLE(wireshark,
   AC_HELP_STRING( [--enable-wireshark],
-                  [build GTK+-based wireshark.  @<:@default=yes, if GTK+ available@:>@]),
+                  [build GTK+-based Wireshark @<:@default=yes, if GTK+ available@:>@]),
     enable_wireshark=$enableval,enable_wireshark=yes)
 
+AC_ARG_ENABLE(ui-manager,
+  AC_HELP_STRING( [--enable-ui-manager],
+                  [use ui-manager in Wireshark (experimental) @<:@default=no@:>@]),
+    enable_uimanager=$enableval,enable_uimanager=no)
+if test x$enable_uimanager = xyes; then
+       AC_DEFINE(MAIN_MENU_USE_UIMANAGER, 1, [Use GTK ui-manager])
+fi
+
 AC_ARG_ENABLE(packet-editor,
   AC_HELP_STRING( [--enable-packet-editor],
-                  [add support for packet editor in wireshark.  @<:@default=no@:>@]),
+                  [add support for packet editor in Wireshark @<:@default=no@:>@]),
     enable_packet_editor=$enableval,enable_packet_editor=no)
 if test x$enable_packet_editor = xyes; then
        AC_DEFINE(WANT_PACKET_EDITOR, 1, [Support for packet editor])
@@ -741,13 +749,15 @@ fi
 
 AC_ARG_ENABLE(threads,
   AC_HELP_STRING( [--enable-threads],
-                  [use threads in wireshark.  @<:@default=no@:>@]),
-    enable_threads=$enableval,enable_threads=no)
-AM_CONDITIONAL(USE_THREADS, test x$enable_threads = xyes)
+                  [use threads in Wireshark @<:@default=yes@:>@]),
+    enable_threads=$enableval,enable_threads=yes)
+if test x$enable_threads = xyes; then
+       AC_DEFINE(USE_THREADS, 1, [Support for threads])
+fi
 
 AC_ARG_ENABLE(profile-build,
   AC_HELP_STRING( [--enable-profile-build],
-                 [build profile-ready binaries @<:@default=no@:>@]),
+                 [build profile-ready binaries @<:@default=no@:>@]),
     enable_profile_build=$enableval,enable_profile_build=no)
 AM_CONDITIONAL(USE_PROFILE_BUILD, test x$enable_profile_build = xyes)
 AC_MSG_CHECKING(if profile builds must be generated)
@@ -786,7 +796,7 @@ docdir=`(
 )`
 AC_DEFINE_UNQUOTED(DOC_DIR, "$docdir", [Directory for docs])
 
-# GTK checks; we require GTK+ 2.4 or later.
+# GTK checks; we require GTK+ 2.12 or later.
 # We don't add $GLIB_LIBS to LIBS, because we don't want to force all
 # programs to be built with GTK+.
 #
@@ -800,7 +810,7 @@ if test "x$with_gtk3" = "xyes"; then
         ], GTK_OK=no, gthread)
 
 else
-       AM_PATH_GTK_2_0(2.4.0,
+       AM_PATH_GTK_2_0(2.12.0,
        [
                CFLAGS="$CFLAGS $GTK_CFLAGS"
                CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
@@ -811,7 +821,7 @@ else
        GTK_OK=no
 fi
 
-# GLib checks; we require GLib 2.4 or later, and require gmodule
+# GLib checks; we require GLib 2.14 or later, and require gmodule
 # support, as we need that for dynamically loading plugins.
 # If we found GTK+, this doesn't add GLIB_CFLAGS to CFLAGS, because
 # AM_PATH_GTK will add GTK_CFLAGS to CFLAGS, and GTK_CFLAGS is a
@@ -833,16 +843,20 @@ if test "$GTK_OK" = "no" ; then
        # Wireshark unless they fix the GTK+ problem).
        #
        if test "x$enable_wireshark" = "xyes"; then
-               AC_MSG_ERROR([GTK+ 2.4 or later isn't available, so Wireshark can't be compiled])
+               if test "x$with_gtk3" = "xyes"; then
+                       AC_MSG_ERROR([GTK+ 3.0 or later isn't available, so Wireshark can't be compiled])
+               else
+                       AC_MSG_ERROR([GTK+ 2.12 or later isn't available, so Wireshark can't be compiled])
+               fi
        fi
        wireshark_bin=""
        wireshark_man=""
        # Use GLIB_CFLAGS
-       AM_PATH_GLIB_2_0(2.4.0,
+       AM_PATH_GLIB_2_0(2.14.0,
        [
                CFLAGS="$CFLAGS $GLIB_CFLAGS"
                CXXFLAGS="$CXXFLAGS $GLIB_CFLAGS"
-       ], AC_MSG_ERROR(GLib 2.4 or later distribution not found.), gthread gmodule)
+       ], AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
 else
        #
        # We have GTK+, and thus will be building Wireshark unless the
@@ -852,29 +866,18 @@ 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 gmodule)
-fi
-
-#
-# Check whether GLib includes GRegex support.
-# We just assume that everybody builds GLib 2.14.0 and later
-# with GRegex support; it's possible to compile GLib without
-# GRegex but it doesn't look as if anyone does.
-#
-AC_MSG_CHECKING(for GLIB - version >= 2.14.0)
-if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-       echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-       enable_glibtest=no
-    fi
+       AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
 
-    if $PKG_CONFIG --atleast-version 2.14.0 glib-2.0; then
-       have_gregex=yes
-    else
-       have_gregex=no
-    fi
-    AC_MSG_RESULT($have_gregex)
+       CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
+       if test x$enable_uimanager = xyes; then
+               CFLAGS="-DGTK_DISABLE_DEPRECATED $CFLAGS"
+       fi
+       # CFLAGS="-DGDK_DISABLE_DEPRECATED $CFLAGS"
+       if test $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -ge 20; then
+               # Enable GSEAL when building with GTK > 2.20 and < 3.0
+               # (Versions prior to 2.22 lacked some necessary accessors.)
+               CFLAGS="-DGSEAL_ENABLE $CFLAGS"
+       fi
 fi
 
 #
@@ -885,6 +888,8 @@ AC_MSG_CHECKING(whether GLib supports loadable modules)
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
+# Error out on the usage of deprecated glib functions
+CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
 LIBS="$GLIB_LIBS $LIBS"
 AC_TRY_RUN([
 #include <glib.h>
@@ -961,7 +966,7 @@ then
 
     AC_ARG_WITH(osx-integration,
       AC_HELP_STRING( [--with-osx-integration],
-                      [use OS X integration functions (@<:@default=yes, if available@:>@]),
+                      [use OS X integration functions @<:@default=yes, if available@:>@]),
     [
         if test $withval = no
         then
@@ -988,7 +993,7 @@ AC_SUBST(wireshark_man)
 
 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
@@ -1009,7 +1014,7 @@ AC_SUBST(wiresharkfilter_man)
 
 AC_ARG_ENABLE(editcap,
   AC_HELP_STRING( [--enable-editcap],
-                  [build editcap @<:@default=yes@:>@]),
+                  [build editcap @<:@default=yes@:>@]),
     enable_editcap=$enableval,enable_editcap=yes)
 
 if test "x$enable_editcap" = "xyes" ; then
@@ -1029,7 +1034,7 @@ AC_SUBST(editcap_man)
 
 AC_ARG_ENABLE(capinfos,
   AC_HELP_STRING( [--enable-capinfos],
-                  [build capinfos @<:@default=yes@:>@]),
+                  [build capinfos @<:@default=yes@:>@]),
     enable_capinfos=$enableval,enable_capinfos=yes)
 
 if test "x$enable_capinfos" = "xyes" ; then
@@ -1047,7 +1052,7 @@ AC_SUBST(capinfos_man)
 
 AC_ARG_ENABLE(mergecap,
   AC_HELP_STRING( [--enable-mergecap],
-                  [build mergecap @<:@default=yes@:>@]),
+                  [build mergecap @<:@default=yes@:>@]),
     enable_mergecap=$enableval,enable_mergecap=yes)
 
 if test "x$enable_mergecap" = "xyes" ; then
@@ -1065,7 +1070,7 @@ AC_SUBST(mergecap_man)
 
 AC_ARG_ENABLE(text2pcap,
   AC_HELP_STRING( [--enable-text2pcap],
-                  [build text2pcap @<:@default=yes@:>@]),
+                  [build text2pcap @<:@default=yes@:>@]),
     text2pcap=$enableval,enable_text2pcap=yes)
 
 if test "x$enable_text2pcap" = "xyes" ; then
@@ -1082,7 +1087,7 @@ AC_SUBST(text2pcap_man)
 
 AC_ARG_ENABLE(idl2wrs,
   AC_HELP_STRING( [--enable-idl2wrs],
-                  [build idl2wrs @<:@default=yes@:>@]),
+                  [build idl2wrs @<:@default=yes@:>@]),
     enable_idl2wrs=$enableval,enable_idl2wrs=yes)
 
 if test "x$enable_idl2wrs" = "xyes" ; then
@@ -1100,7 +1105,7 @@ AC_SUBST(idl2wrs_man)
 
 AC_ARG_ENABLE(dftest,
   AC_HELP_STRING( [--enable-dftest],
-                  [build dftest @<:@default=yes@:>@]),
+                  [build dftest @<:@default=yes@:>@]),
     enable_dftest=$enableval,enable_dftest=yes)
 
 if test "x$enable_dftest" = "xyes" ; then
@@ -1118,7 +1123,7 @@ AC_SUBST(dftest_man)
 
 AC_ARG_ENABLE(randpkt,
   AC_HELP_STRING( [--enable-randpkt],
-                  [build randpkt @<:@default=yes@:>@]),
+                  [build randpkt @<:@default=yes@:>@]),
     enable_randpkt=$enableval,enable_randpkt=yes)
 
 if test "x$enable_randpkt" = "xyes" ; then
@@ -1146,7 +1151,7 @@ AC_MSG_CHECKING(whether to use libpcap for packet capture)
 
 AC_ARG_WITH(pcap,
   AC_HELP_STRING( [--with-pcap@<:@=DIR@:>@],
-                  [use libpcap for packet capturing @<:@default=yes@:>@]),
+                  [use libpcap for packet capturing @<:@default=yes@:>@]),
 [
        if test $withval = no
        then
@@ -1176,7 +1181,7 @@ AC_MSG_CHECKING(whether to build dumpcap)
 
 AC_ARG_ENABLE(dumpcap,
   AC_HELP_STRING( [--enable-dumpcap],
-                  [build dumpcap @<:@default=yes@:>@]),
+                  [build dumpcap @<:@default=yes@:>@]),
     enable_dumpcap=$enableval,enable_dumpcap=yes)
 
 if test "x$enable_dumpcap" = "xyes" ; then
@@ -1207,7 +1212,7 @@ AC_MSG_CHECKING(whether to build rawshark)
 
 AC_ARG_ENABLE(rawshark,
   AC_HELP_STRING( [--enable-rawshark],
-                  [build rawshark @<:@default=yes@:>@]),
+                  [build rawshark @<:@default=yes@:>@]),
     rawshark=$enableval,enable_rawshark=yes)
 
 if test "x$enable_rawshark" = "xyes" ; then
@@ -1231,6 +1236,14 @@ fi
 AC_SUBST(rawshark_bin)
 AC_SUBST(rawshark_man)
 
+dnl Use pcap-ng by default
+AC_ARG_ENABLE(pcap-ng-default,
+  AC_HELP_STRING( [--enable-pcap-ng-default],
+                  [use the pcap-ng file format by default instead of pcap @<:@default=yes@:>@]),
+    enable_pcap_ng_default=$enableval,enable_pcap_ng_default=yes)
+if test x$enable_pcap_ng_default = xyes; then
+       AC_DEFINE(PCAP_NG_DEFAULT, 1, [Support for pcap-ng])
+fi
 
 dnl pcap remote check
 AC_MSG_CHECKING(whether to use libpcap remote capturing feature)
@@ -1260,17 +1273,17 @@ AC_MSG_CHECKING(whether to use zlib for gzip compression and decompression)
 
 AC_ARG_WITH(zlib,
   AC_HELP_STRING([--with-zlib@<:@=DIR@:>@],
-                 [use zlib (located in directory DIR, if supplied) for gzip compression and decompression .  @<:@default=yes, if available@:>@]),
+                 [use zlib (located in directory DIR, if supplied) for gzip compression and decompression @<:@default=yes, if available@:>@]),
 [
-       if test $withval = no
+       if test "x$withval" = "xno"
        then
                want_zlib=no
-       elif test $withval = yes
+       elif test "x$withval" = "xyes"
        then
                want_zlib=yes
        else
                want_zlib=yes
-               zlib_dir=$withval
+               zlib_dir="$withval"
        fi
 ],[
        #
@@ -1298,7 +1311,7 @@ AC_MSG_CHECKING(whether to use libpcre for regular expressions in dfilters)
 
 AC_ARG_WITH(pcre,
   AC_HELP_STRING( [--with-pcre@<:@=DIR@:>@],
-                  [use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. Not needed if you have GLib 2.14 or later. @<:@default=yes, if available and GLib < 2.14@:>@]),
+                  [use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. Not needed if you have GLib 2.14 or later @<:@default=no@:>@]),
 [
        if test $withval = no
        then
@@ -1311,14 +1324,7 @@ AC_ARG_WITH(pcre,
                pcre_dir=$withval
        fi
 ],[
-       #
-       # Use libpcre if it's present and GRegex isn't, otherwise don't.
-       #
-       if test $have_gregex = yes ; then
-               want_pcre=no
-       else
-               want_pcre=ifavailable
-       fi
+       want_pcre=no
        pcre_dir=
 ])
 if test "x$want_pcre" = "xno" ; then
@@ -1327,17 +1333,17 @@ else
         AC_MSG_RESULT(yes)
         AC_WIRESHARK_LIBPCRE_CHECK
        if test "x$want_pcre" = "xno" ; then
-               AC_MSG_RESULT(libpcre not found - disabling support for perl compatible regular expressions in dfilters)
+               AC_MSG_RESULT(libpcre not found)
        fi
 fi
 
 
-dnl lua check
-AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin)
+dnl Lua check
+AC_MSG_CHECKING(whether to use liblua for the Lua scripting plugin)
 
 AC_ARG_WITH(lua,
   AC_HELP_STRING( [--with-lua@<:@=DIR@:>@],
-                  [use liblua (located in directory DIR, if supplied) for the lua scripting plugin.  @<:@default=yes, if available@:>@]),
+                  [use liblua (located in directory DIR, if supplied) for the Lua scripting plugin @<:@default=yes, if available@:>@]),
 [
        if test $withval = no
        then
@@ -1373,7 +1379,7 @@ AC_MSG_CHECKING(whether to use libportaudio for the rtp_player)
 
 AC_ARG_WITH(portaudio,
   AC_HELP_STRING( [--with-portaudio@<:@=DIR@:>@],
-                  [use libportaudio (located in directory DIR, if supplied) for the rtp_player @<:@default=yes, if available@:>@]),
+                  [use libportaudio (located in directory DIR, if supplied) for the rtp_player @<:@default=yes, if available@:>@]),
 [
        if test $withval = no
        then
@@ -1407,7 +1413,7 @@ AM_CONDITIONAL(HAVE_LIBPORTAUDIO, test x$want_portaudio = xyes)
 dnl ipv6 check
 AC_ARG_ENABLE(ipv6,
   AC_HELP_STRING( [--enable-ipv6],
-                  [use ipv6 name resolution, if available.  @<:@default=yes@:>@]),
+                  [use IPv6 name resolution, if available @<:@default=yes@:>@]),
     enable_ipv6=$enableval,enable_ipv6=yes)
 
 AC_MSG_CHECKING(whether to enable ipv6 name resolution if available)
@@ -1489,7 +1495,7 @@ AC_MSG_CHECKING(whether to use the libcap capabilities library)
 
 AC_ARG_WITH(libcap,
   AC_HELP_STRING( [--with-libcap@<:@=DIR@:>@],
-                  [use libcap (located in directory DIR, if supplied) for POSIX.1e capabilities management.   @<:@default=yes, if present@:>@]),
+                  [use libcap (located in directory DIR, if supplied) for POSIX.1e capabilities management @<:@default=yes, if present@:>@]),
 [
 if   test "x$withval" = "xno";  then
        want_libcap=no
@@ -1520,7 +1526,7 @@ AC_MSG_CHECKING(whether to use SSL library)
 
 AC_ARG_WITH(ssl,
   AC_HELP_STRING( [--with-ssl@<:@=DIR@:>@],
-                  [use SSL crypto library (located in directory DIR, if supplied).   @<:@default=no@:>@]),
+                  [use SSL crypto library (located in directory DIR, if supplied) @<:@default=no@:>@]),
 [
 if test "x$withval" = "xno";  then
        want_ssl=no
@@ -1548,11 +1554,11 @@ fi
 AC_SUBST(SSL_LIBS)
 
 dnl kerberos check
-AC_MSG_CHECKING(whether to use kerberos)
+AC_MSG_CHECKING(whether to use Kerberos library)
 
 AC_ARG_WITH(krb5,
   AC_HELP_STRING( [--with-krb5@<:@=DIR@:>@],
-                  [use kerberos (located in directory DIR, if supplied) to use in kerberos dissection  @<:@default=yes@:>@]),
+                  [use Kerberos library (located in directory DIR, if supplied) to use in Kerberos dissection @<:@default=yes@:>@]),
 [
        if test $withval = no
        then
@@ -1566,7 +1572,7 @@ AC_ARG_WITH(krb5,
        fi
 ],[
        #
-       # Use kerberos if specified, otherwise don't.
+       # Use Kerberos library if available, otherwise don't.
        #
        want_krb5=ifavailable
        krb5_dir=
@@ -1585,7 +1591,7 @@ AC_MSG_CHECKING(whether to use the c-ares library if available)
 
 AC_ARG_WITH(c-ares,
   AC_HELP_STRING( [--with-c-ares@<:@=DIR@:>@],
-                  [use c-ares (located in directory DIR, if supplied). Supersedes --with-adns.   @<:@default=yes, if present@:>@]),
+                  [use c-ares (located in directory DIR, if supplied) - supersedes --with-adns @<:@default=yes, if present@:>@]),
 [
 if   test "x$withval" = "xno";  then
        want_c_ares=no
@@ -1610,7 +1616,7 @@ AC_MSG_CHECKING(whether to use the GNU ADNS library if available)
 
 AC_ARG_WITH(adns,
   AC_HELP_STRING( [--with-adns@<:@=DIR@:>@],
-                  [use GNU ADNS (located in directory DIR, if supplied).   @<:@default=yes, if present@:>@]),
+                  [use GNU ADNS (located in directory DIR, if supplied) @<:@default=yes, if present@:>@]),
 [
 if   test "x$withval" = "xno";  then
        want_adns=no
@@ -1635,7 +1641,7 @@ AC_MSG_CHECKING(whether to use the GeoIP IP address mapping library if available
 
 AC_ARG_WITH(geoip,
   AC_HELP_STRING( [--with-geoip@<:@=DIR@:>@],
-                  [use GeoIP (located in directory DIR, if supplied).   @<:@default=yes, if present@:>@]),
+                  [use GeoIP (located in directory DIR, if supplied) @<:@default=yes, if present@:>@]),
 [
 if   test "x$withval" = "xno";  then
        want_geoip=no
@@ -1655,23 +1661,38 @@ fi
 AC_SUBST(GEOIP_LIBS)
 
 dnl Python devel Check
+AC_MSG_CHECKING(whether to use the Python interpreter for scripting)
+
 AC_ARG_WITH(python,
     AC_HELP_STRING( [--with-python@<:@=DIR@:>@],
-                    [use python interpreter (installed in DIR, if supplied). @<:@default=yes@:>@ (EXPERIMENTAL)]),
+                    [use Python interpreter (installed in DIR, if supplied) @<:@default=yes, if available@:>@ (EXPERIMENTAL)]),
 [
-pythondir='${libdir}/wireshark/python/${VERSION}'
-if test "x$withval" = "xno"; then
-  want_python=no
-elif test "x$withval" != "xyes"; then
-  pythondir="$withval"
-  want_python=yes
-  AC_WIRESHARK_PYTHON_CHECK
+       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
+],[
+       #
+       # Use the embeddable Python interpreter if it's present,
+       # otherwise don't.
+       #
+       want_pythin=ifavailable
+       pythondir='${libdir}/wireshark/python/${VERSION}'
+])
+if test "x$want_python" = "xno" ; then
+        AC_MSG_RESULT(no)
 else
-  want_python=yes
-  AC_WIRESHARK_PYTHON_CHECK
+        AC_MSG_RESULT(yes)
+       AC_WIRESHARK_PYTHON_CHECK
 fi
-])
-AM_CONDITIONAL(HAVE_LIBPY, test x$want_python = xyes)
+AM_CONDITIONAL(HAVE_LIBPY, test x$want_python != xno)
 AC_SUBST(pythondir)
 
 #
@@ -1693,7 +1714,7 @@ AC_DEFINE(WS_MSVC_NORETURN,, [Define as the string to precede declarations of ro
 
 AC_ARG_ENABLE(airpcap,
   AC_HELP_STRING( [--enable-airpcap],
-                  [use airpcap in wireshark.  @<:@default=no@:>@]),
+                  [use AirPcap in Wireshark @<:@default=no@:>@]),
   enable_airpcap=$enableval
   if test x$enable_airpcap != xno; then
        AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
@@ -1721,7 +1742,7 @@ AC_PROG_GCC_TRADITIONAL
 GETOPT_LO=""
 AC_CHECK_FUNC(getopt,
   [GETOPT_LO=""
-   AC_DEFINE(HAVE_GETOPT_H, 1, [Define to 1 if you have the <getopt.h> header file.])
+   AC_DEFINE(HAVE_GETOPT, 1, [Define to 1 if you have the getopt function.])
   ],
   GETOPT_LO="wsgetopt.lo"
 )
@@ -1731,16 +1752,6 @@ fi
 AM_CONDITIONAL(NEED_GETOPT_LO, test "x$ac_cv_func_getopt" = "xno")
 AC_SUBST(GETOPT_LO)
 
-AC_CHECK_FUNC(strerror, STRERROR_LO="",
-  [STRERROR_LO="strerror.lo"
-   AC_DEFINE(NEED_STRERROR_H, 1, [Define if strerror.h needs to be included])
-])
-if test "$ac_cv_func_strerror" = no ; then
-  STRERROR_LO="strerror.lo"
-fi
-AM_CONDITIONAL(NEED_STRERROR_LO, test "x$ac_cv_func_strerror" = "xno")
-AC_SUBST(STRERROR_LO)
-
 AC_CHECK_FUNC(strncasecmp, STRNCASECMP_LO="",
   STRNCASECMP_LO="strncasecmp.lo")
 if test "$ac_cv_func_strncasecmp" = no ; then
@@ -1848,7 +1859,7 @@ dnl we don't wish to expand ${libdir} yet
 plugindir='${libdir}/wireshark/plugins/${VERSION}'
 AC_ARG_WITH(plugins,
   AC_HELP_STRING( [--with-plugins@<:@=DIR@:>@],
-                  [support plugins (installed in DIR, if supplied).   @<:@default=yes, if possible@:>@]),
+                  [support plugins (installed in DIR, if supplied) @<:@default=yes, if possible@:>@]),
 [
   if test "x$withval" = "xno"; then
     have_plugins=no
@@ -2075,12 +2086,7 @@ else
 fi
 
 if test "x$want_pcre" = "xno" ; then
-       if test $have_gregex = yes
-       then
-               pcre_message="no (using GRegex instead)"
-       else
-               pcre_message="no"
-       fi
+       pcre_message="no (using GRegex instead)"
 else
        pcre_message="yes"
 fi
@@ -2091,10 +2097,10 @@ else
        lua_message="no"
 fi
 
-if test "x$want_python" = "xyes"; then
-        python_message="yes"
-else
+if test "x$want_python" = "xno"; then
         python_message="no"
+else
+        python_message="yes"
 fi
 
 if test "x$want_portaudio" = "xyes" ; then
@@ -2157,12 +2163,13 @@ echo "                      Build randpkt : $enable_randpkt"
 echo "                       Build dftest : $enable_dftest"
 echo "                     Build rawshark : $enable_rawshark"
 echo ""
+echo "   Save files as pcap-ng by default : $enable_pcap_ng_default"
 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 lua library : $lua_message"
-echo "                 Use python binding : $python_message"
+echo "                    Use Lua library : $lua_message"
+echo "                 Use Python binding : $python_message"
 echo "                   Build rtp_player : $portaudio_message"
 echo "                        Use threads : $enable_threads"
 echo "             Build profile binaries : $enable_profile_build"