X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=configure.in;h=d4ea6d846612c73cc1775170b1ad562f5f5430fd;hb=0c025db592c9ecb0a761b696b45706c26fd788f4;hp=056a63151565fd3800dd2be747739540d63ca07e;hpb=ad7667f91d3a37eb0ea3fdea474e9047b05390d3;p=obnox%2Fwireshark%2Fwip.git diff --git a/configure.in b/configure.in index 056a631515..d4ea6d8466 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.5.2) +AC_INIT(wireshark, 1.7.0) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or @@ -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 @@ -327,9 +327,7 @@ AC_ARG_ENABLE(extra-gcc-checks, 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(-Wdeclaration-after-statement) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdiv-by-zero) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wignored-qualifiers) @@ -343,7 +341,14 @@ AC_ARG_ENABLE(extra-gcc-checks, # for now. # AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wwrite-strings) + # + # GLib blocks this for now. + # AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wstrict-prototypes) + # + # All the registration functions block these for now. + # + AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wmissing-prototypes) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wmissing-declarations) # # epan/dissectors/packet-afs.c blocks this one for now. @@ -364,7 +369,15 @@ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-pointer-sign) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-align) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security) -# Use the faster pre gcc 4.5 floating point precision +AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wold-style-definition) +AC_WIRESHARK_GCC_CFLAGS_CHECK(-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, +# it just warns and ignores them, so this check doesn't cause us +# to omit -fexcess-precision=fast, which produces a pile of +# annoying warnings. +# if test "x$CC" != "xclang" ; then AC_WIRESHARK_GCC_CFLAGS_CHECK(-fexcess-precision=fast) fi @@ -391,6 +404,13 @@ else 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". @@ -401,7 +421,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" @@ -633,7 +653,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) @@ -643,7 +663,7 @@ if test "x$ac_cv_enable_usr_local" = "xyes" ; then # # 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" @@ -711,22 +731,32 @@ if test "$HAVE_GNU_SED" = no ; then 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@:>@]), + 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) + [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) @@ -765,7 +795,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+. # @@ -779,7 +809,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" @@ -790,7 +820,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 @@ -812,16 +842,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.), 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 @@ -831,30 +865,25 @@ 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.), 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" + CFLAGS="-DGTK_DISABLE_DEPRECATED $CFLAGS" + # 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 @@ -940,7 +969,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 @@ -967,7 +996,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 @@ -988,7 +1017,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 @@ -1008,7 +1037,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 @@ -1026,7 +1055,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 @@ -1044,7 +1073,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 @@ -1061,7 +1090,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 @@ -1079,7 +1108,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 @@ -1097,7 +1126,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 @@ -1125,7 +1154,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 @@ -1155,7 +1184,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 @@ -1186,7 +1215,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 @@ -1210,6 +1239,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) @@ -1239,17 +1276,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 ],[ # @@ -1268,55 +1305,16 @@ else else if test "x$ac_cv_func_inflatePrime" = "xno" ; then AC_MSG_RESULT(inflatePrime not found in zlib - disabling gzipped capture file support) - fi - fi -fi - -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 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 @@ -1352,7 +1350,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 @@ -1386,7 +1384,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) @@ -1452,6 +1450,9 @@ AC_ARG_WITH(dumpcap-group, if test "x$withval" = "xyes"; then AC_MSG_ERROR([No dumpcap group specified.]) elif test "x$withval" != "xno"; then + if test "x$enable_dumpcap" = "xno" ; then + AC_MSG_ERROR(dumpcap group install works only with dumpcap but dumpcap is disabled) + fi AC_MSG_RESULT($withval) DUMPCAP_GROUP="$withval" fi @@ -1465,7 +1466,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 @@ -1496,7 +1497,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 @@ -1524,11 +1525,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 @@ -1542,7 +1543,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= @@ -1561,7 +1562,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 @@ -1586,7 +1587,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 @@ -1611,7 +1612,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 @@ -1631,23 +1632,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) # @@ -1669,17 +1685,12 @@ 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=yes@:>@]), + [use AirPcap in Wireshark @<:@default=no@:>@]), enable_airpcap=$enableval if test x$enable_airpcap != xno; then AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap]) fi ) -# -# Define HAVE_AIRPDCAP -# We'll want to remove this eventually. -# -AC_DEFINE(HAVE_AIRPDCAP, 1, [Enable AirPDcap (WPA/WPA2 decryption)]) dnl Checks for typedefs, structures, and compiler characteristics. # AC_C_CONST @@ -1702,7 +1713,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 header file.]) + AC_DEFINE(HAVE_GETOPT, 1, [Define to 1 if you have the getopt function.]) ], GETOPT_LO="wsgetopt.lo" ) @@ -1712,16 +1723,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 @@ -1829,7 +1830,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 @@ -1878,11 +1879,15 @@ AC_CACHE_SAVE sinclude(plugins/Custom.m4) dnl ifdef(_CUSTOM_AC_OUTPUT_,, define(_CUSTOM_AC_OUTPUT_, )) dnl +sinclude(asn1/Custom.m4) dnl +ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl + AM_CONFIG_HEADER(config.h) AC_OUTPUT( Makefile doxygen.cfg asn1/Makefile + _CUSTOM_ASN1_AC_OUTPUT_ asn1/acp133/Makefile asn1/acse/Makefile asn1/ansi_map/Makefile @@ -1894,6 +1899,7 @@ AC_OUTPUT( asn1/cmp/Makefile asn1/crmf/Makefile asn1/cms/Makefile + asn1/credssp/Makefile asn1/dap/Makefile asn1/disp/Makefile asn1/dop/Makefile @@ -1920,6 +1926,7 @@ AC_OUTPUT( asn1/idmp/Makefile asn1/inap/Makefile asn1/kerberos/Makefile + asn1/lcsap/Makefile asn1/ldap/Makefile asn1/logotypecertextn/Makefile asn1/lte-rrc/Makefile @@ -1960,6 +1967,7 @@ AC_OUTPUT( asn1/snmp/Makefile asn1/spnego/Makefile asn1/sv/Makefile + asn1/t124/Makefile asn1/t125/Makefile asn1/t38/Makefile asn1/tcap/Makefile @@ -1975,7 +1983,6 @@ AC_OUTPUT( doc/Makefile docbook/Makefile epan/Makefile - epan/crc/Makefile epan/crypt/Makefile epan/doxygen.cfg epan/dfilter/Makefile @@ -2005,13 +2012,11 @@ AC_OUTPUT( plugins/ethercat/Makefile plugins/giop/Makefile plugins/gryphon/Makefile - plugins/interlink/Makefile plugins/irda/Makefile plugins/m2m/Makefile plugins/mate/Makefile plugins/opcua/Makefile plugins/profinet/Makefile - plugins/sercosiii/Makefile plugins/stats_tree/Makefile plugins/unistim/Makefile plugins/wimax/Makefile @@ -2053,27 +2058,16 @@ 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 @@ -2136,18 +2130,18 @@ 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"