#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.7.0)
+AC_INIT(wireshark, 1.7.1)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
#
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"
]
)
AC_ARG_WITH([gtk3],
AC_HELP_STRING( [--with-gtk3=@<:@yes/no@:>@],
[use GTK+ 3.0 instead of 2.0 @<:@default=no@:>@]),
- with_gtk3="$withval", with_gtk="no")
+ with_gtk3="$withval", with_gtk3="no")
# libsmi
#
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
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wbad-function-cast)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-qual)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Waddress)
+ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wattributes)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdiv-by-zero)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security)
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,
CFLAGS="-D_U_=\"\" $CFLAGS"
fi
+# If we're running GCC or CLang, always use FORTIFY_SOURCE=2
+# See: http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+# Note: FORTIFY_SOURCE is only effective for gcc -O2 (and -O1 ?)
+if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
+ CFLAGS="-D_FORTIFY_SOURCE=2 $CFLAGS"
+fi
+
#
# If the compiler supports GCC-style flags, enable a barrier "stop on
# warning".
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"
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)
#
# Arrange that we search for header files in the source directory
# and in its "wiretap" subdirectory, as well as in "/usr/local/include",
- # as various packages we use ("libpcap", "zlib", "adns", "pcre")
+ # as various packages we use ("libpcap", "zlib", "adns")
# may have been installed under "/usr/local/include".
#
CFLAGS="$CFLAGS -I/usr/local/include"
esac
fi
-# Enable/disable tshark
+# Enable/disable wireshark
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(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])
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)
-
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)
)`
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+.
#
if test "x$enable_wireshark" = "xyes"; then
-if test "x$with_gtk3" = "xyes"; then
- AM_PATH_GTK_3_0(3.0.0,
- [
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
- AC_DEFINE(HAVE_GTK, 1, [Define to 1 if compiling with GTK])
- ], GTK_OK=no, gthread)
+ if test "x$with_gtk3" = "xyes"; then
+ AM_PATH_GTK_3_0(3.0.0,
+ [
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+ have_gtk=yes
+ AC_DEFINE(HAVE_GTK, 1,
+ [Define to 1 if compiling with GTK])
+ ], have_gtk=no)
+ else
+ AM_PATH_GTK_2_0(2.12.0,
+ [
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+ have_gtk=yes
+ AC_DEFINE(HAVE_GTK, 1,
+ [Define to 1 if compiling with GTK])
+ ], have_gtk=no)
+ fi
else
- AM_PATH_GTK_2_0(2.4.0,
- [
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
- AC_DEFINE(HAVE_GTK, 1, [Define to 1 if compiling with GTK])
- ], GTK_OK=no, gthread)
-fi
-else
- GTK_OK=no
+ have_gtk=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
# We don't add $GLIB_LIBS to LIBS, because we don't want to force all
# programs to be built with GLib.
#
-if test "$GTK_OK" = "no" ; then
+if test "$have_gtk" = "no" ; then
#
# We don't have GTK+.
# If they didn't explicitly say "--disable-wireshark", fail (so
# 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
#
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_man="wireshark.1"
- wireshark_SUBDIRS="codecs gtk"
+ wireshark_SUBDIRS="codecs ui/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)
+ AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
+
+ CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
+ ## Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2
+ ## GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.
+ if test $gtk_config_major_version -eq 2 -o $gtk_config_minor_version -lt 2; 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
-#
-# 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
+# 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)
+# is used.
+CFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CFLAGS"
- 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)
-fi
+# Error out on the usage of deprecated glib functions
+CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
#
# Check whether GLib modules are supported, to determine whether we
AC_MSG_RESULT($ac_cv_dladdr_finds_executable_path)
fi
-if test "x$no_gtk" != "xyes"
+if test "x$have_gtk" = "xyes"
then
#
# We have GTK+; do we want the OS X integration functions and,
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
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
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
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
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
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
AC_SUBST(text2pcap_bin)
AC_SUBST(text2pcap_man)
-# Enable/disable idl2wrs
-
-AC_ARG_ENABLE(idl2wrs,
- AC_HELP_STRING( [--enable-idl2wrs],
- [build idl2wrs. @<:@default=yes@:>@]),
- enable_idl2wrs=$enableval,enable_idl2wrs=yes)
-
-if test "x$enable_idl2wrs" = "xyes" ; then
- idl2wrs_bin="idl2wrs"
- idl2wrs_man="idl2wrs.1"
-else
- idl2wrs_bin=""
- idl2wrs_man=""
-fi
-AC_SUBST(idl2wrs_bin)
-AC_SUBST(idl2wrs_man)
-
# Enable/disable dftest
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
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
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
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
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
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)
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
],[
#
fi
fi
-dnl pcre check
-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@:>@]),
-[
- if test $withval = no
- then
- want_pcre=no
- elif test $withval = yes
- then
- want_pcre=yes
- else
- want_pcre=yes
- 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
- pcre_dir=
-])
-if test "x$want_pcre" = "xno" ; then
- AC_MSG_RESULT(no)
-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)
- 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
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
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)
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
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
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
fi
],[
#
- # Use kerberos if specified, otherwise don't.
+ # Use Kerberos library if available, otherwise don't.
#
want_krb5=ifavailable
krb5_dir=
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
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
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
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=no@:>@ (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
+],[
+ # 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
- 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)
#
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])
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"
)
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
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
asn1/acse/Makefile
asn1/ansi_map/Makefile
asn1/ansi_tcap/Makefile
+ asn1/c1222/Makefile
asn1/camel/Makefile
asn1/cdt/Makefile
asn1/charging_ase/Makefile
asn1/cmp/Makefile
asn1/crmf/Makefile
asn1/cms/Makefile
+ asn1/credssp/Makefile
asn1/dap/Makefile
asn1/disp/Makefile
asn1/dop/Makefile
asn1/idmp/Makefile
asn1/inap/Makefile
asn1/kerberos/Makefile
+ asn1/lcsap/Makefile
asn1/ldap/Makefile
asn1/logotypecertextn/Makefile
+ asn1/lpp/Makefile
+ asn1/lppa/Makefile
asn1/lte-rrc/Makefile
+ asn1/m3ap/Makefile
asn1/mms/Makefile
asn1/mpeg-audio/Makefile
asn1/mpeg-pes/Makefile
asn1/rua/Makefile
asn1/s1ap/Makefile
asn1/sabp/Makefile
+ asn1/sbc-ap/Makefile
asn1/smrse/Makefile
asn1/snmp/Makefile
asn1/spnego/Makefile
asn1/sv/Makefile
+ asn1/t124/Makefile
asn1/t125/Makefile
asn1/t38/Makefile
asn1/tcap/Makefile
doc/Makefile
docbook/Makefile
epan/Makefile
- epan/crc/Makefile
epan/crypt/Makefile
epan/doxygen.cfg
epan/dfilter/Makefile
epan/wslua/Makefile
epan/wspython/Makefile
codecs/Makefile
- gtk/Makefile
- gtk/doxygen.cfg
+ ui/gtk/Makefile
+ ui/gtk/doxygen.cfg
help/Makefile
packaging/Makefile
packaging/macosx/Info.plist
plugins/ethercat/Makefile
plugins/giop/Makefile
plugins/gryphon/Makefile
- plugins/interlink/Makefile
plugins/irda/Makefile
plugins/m2m/Makefile
plugins/mate/Makefile
plugins/wimax/Makefile
plugins/wimaxasncp/Makefile
tools/Makefile
- tools/idl2wrs.sh
tools/lemon/Makefile
wiretap/Makefile
wsutil/Makefile
# Pretty messages
+if test "x$have_gtk" = "xyes"; then
+ if test "x$with_gtk3" = "xyes"; then
+ gui_lib_message=" (with GTK+ 3"
+ else
+ gui_lib_message=" (with GTK+ 2"
+ fi
+ if test "x$have_ige_mac" = "xyes"; then
+ gui_lib_message="$gui_lib_message and Mac OS X integration)"
+ else
+ gui_lib_message="$gui_lib_message)"
+ fi
+fi
+
if test "x$enable_setcap_install" = "xyes" ; then
setcap_message="yes"
else
setcap_message="no"
fi
-
if test "x$enable_setuid_install" = "xyes" ; then
setuid_message="yes"
else
zlib_message="yes"
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
-else
- pcre_message="yes"
-fi
-
if test "x$want_lua" = "xyes" ; then
lua_message="yes"
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
echo ""
echo "The Wireshark package has been configured with the following options."
-echo " Build wireshark : $enable_wireshark"
+echo " Build wireshark : $enable_wireshark""$gui_lib_message"
echo " Build tshark : $enable_tshark"
echo " Build capinfos : $enable_capinfos"
echo " Build editcap : $enable_editcap"
echo " Build dumpcap : $enable_dumpcap"
echo " Build mergecap : $enable_mergecap"
echo " Build text2pcap : $enable_text2pcap"
-echo " Build idl2wrs : $enable_idl2wrs"
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"
echo " Use pcap library : $want_pcap"
echo " Use zlib library : $zlib_message"
-echo " Use pcre library : $pcre_message"
echo " Use kerberos library : $krb5_message"
echo " Use c-ares library : $c_ares_message"
echo " Use GNU ADNS library : $adns_message"
git.samba.org / obnox / wireshark / wip.git / blobdiff