#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.7.0)
+AC_INIT(wireshark, 1.7.2)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
AC_SYS_LARGEFILE
# GnuTLS
+# Version 3.0 switched from LGPLv2.1+ to LGPLv3+.
tls_message="no"
AC_ARG_WITH([gnutls],
AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@],
[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],
+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
[
echo "GnuTLS found, enabling SSL decryption"
AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
)
fi
+AC_ARG_WITH([qt],
+ AC_HELP_STRING( [--with-qt=@<:@yes/no@:>@],
+ [use Qt instead of GTK+ @<:@default=no@:>@]),
+ with_qt="$withval", with_qt="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
# FIXME: currently the path argument to with-libsmi is being ignored
# AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wunreachable-code)
# AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wunsafe-loop-optimizations)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-long-long)
- AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wbad-function-cast)
+ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wbad-function-cast, C)
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(-Wignored-qualifiers)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wpragmas)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wredundant-decls)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wvla)
- AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wc++-compat)
- AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wjump-misses-init)
+ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wc++-compat, C)
+ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wjump-misses-init, C)
#
# epan/dissectors/packet-ncp2222.inc blocks this one
# for now.
],)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wall -W) # -W is now known as -Wextra
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wextra) # -W is now known as -Wextra
-AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdeclaration-after-statement)
+AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wdeclaration-after-statement, C)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wendif-labels)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wpointer-arith)
-AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-pointer-sign)
+AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-pointer-sign, C)
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(-Wold-style-definition, C)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-error=unused-but-set-variable) ## for now
-AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-error=unused-but-set-parameter) ## 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,
# annoying warnings.
#
if test "x$CC" != "xclang" ; then
-AC_WIRESHARK_GCC_CFLAGS_CHECK(-fexcess-precision=fast)
+ AC_WIRESHARK_GCC_CFLAGS_CHECK(-fexcess-precision=fast)
fi
AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
#
# If we're running GCC or clang, add '-D_U_="__attribute__((unused))"' to
-# CFLAGS as well, so we can use _U_ to flag unused function arguments and
+# CPPFLAGS as well, so we can use _U_ to flag unused function arguments and
# not get warnings about them. Otherwise, add '-D_U_=""', so that _U_ used
# to flag an unused function argument will compile with non-GCC, non-clang
# compilers.
# XXX - other compilers?
#
if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
- CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS"
+ CPPFLAGS="-D_U_=\"__attribute__((unused))\" $CPPFLAGS"
else
- CFLAGS="-D_U_=\"\" $CFLAGS"
+ CPPFLAGS="-D_U_=\"\" $CPPFLAGS"
+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
+ CPPFLAGS="-D_FORTIFY_SOURCE=2 $CPPFLAGS"
fi
#
solaris*)
# the X11 headers don't automatically include prototype info
# and a lot don't include the return type
- CFLAGS="$CFLAGS -Wno-return-type -DFUNCPROTO=15"
+ CPPFLAGS="$CPPFLAGS -DFUNCPROTO=15"
+ CFLAGS="$CFLAGS -Wno-return-type"
+ CXXFLAGS="$CXXFLAGS -Wno-return-type"
AC_MSG_RESULT(GCC on Solaris - added -Wno-return-type -DFUNCPROTO=15)
;;
darwin*)
# "-Ae" for ANSI C plus extensions such as "long long".
# "+O2", for optimization. XXX - works with "-g"?
#
+ # HP's ANSI C++ compiler doesn't support "-Ae", but
+ # does support "+O2", at least according to the
+ # documentation I can find online.
+ #
CFLAGS="-Ae +O2 $CFLAGS"
+ CXXFLAGS="+O2 $CFLAGS"
AC_MSG_RESULT(HP ANSI C compiler - added -Ae +O2)
;;
darwin*)
# Arrange that we search for header files in "$prefix/include", as
# various packages we use may have been installed under "$prefix/include".
#
- CFLAGS="$CFLAGS -I$prefix/include"
CPPFLAGS="$CPPFLAGS -I$prefix/include"
#
#
# 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"
CPPFLAGS="$CPPFLAGS -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@:>@]),
enable_wireshark=$enableval,enable_wireshark=yes)
-if test x$enable_wireshark = xyes; then
- CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
- if test "x$with_gtk3" != "xyes"; then
- # Enable GSEAL when not building with GTK3
- CFLAGS="-DGSEAL_ENABLE $CFLAGS"
- fi
-fi
-
-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])
- CFLAGS="-DGTK_DISABLE_DEPRECATED $CFLAGS"
-fi
AC_ARG_ENABLE(packet-editor,
AC_HELP_STRING( [--enable-packet-editor],
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=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@:>@]),
if test "x$GCC" = "xyes" -o "x$CLANG" = "xyes" ; then
AC_MSG_RESULT(yes)
CFLAGS=" -pg $CFLAGS"
+ CXXFLAGS=" -pg $CXXFLAGS"
else
AC_MSG_RESULT(no)
echo "Building profile binaries currently only supported for GCC and clang."
)`
AC_DEFINE_UNQUOTED(DOC_DIR, "$docdir", [Directory for docs])
-# 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+.
+# GTK+ and Qt checks; we require GTK+ 2.12 or later, and, for now,
+# don't require any particular version of Qt (except perhaps by
+# implication, as older versions might not support pkgconfig).
+#
+# We only do those if we're going to be building Wireshark;
+# otherwise, we don't have any GUI to build, so we don't use
+# GTK+ or Qt.
+#
+# We don't add $GTK_LIBS or $Qt_LIBS to LIBS, because we don't want to
+# force all programs to be built with GTK+ or Qt.
#
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_qt" = "xyes"; then
+ PKG_CHECK_MODULES([Qt], [QtCore QtGui],
+ [
+ CFLAGS="$CFLAGS $Qt_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $Qt_CFLAGS"
+ #
+ # XXX - greasy hack to make ui/gtk/recent.c
+ # compile.
+ #
+ CPPFLAGS="-DQT_GUI_LIB $CPPFLAGS"
+ have_qt=yes
+ ],
+ [
+ AC_MSG_ERROR([Qt is not available])
+ ])
+ #
+ # We don't know whether we have GTK+, but we
+ # won't be using it, so it's as if we don't
+ # have it.
+ #
+ have_gtk=no
+ else
+ #
+ # Not Qt - either GTK+ 3.x or 2.x.
+ #
+ 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
+ fi
else
- AM_PATH_GTK_2_0(2.12.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_qt=no
+ have_gtk=no
fi
# GLib checks; we require GLib 2.14 or later, and require gmodule
# 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
- # that, unless they explicitly indicated that they don't want
- # Wireshark, we stop so they know they won't be getting
- # Wireshark unless they fix the GTK+ problem).
#
- if test "x$enable_wireshark" = "xyes"; then
- 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])
+ if test "$have_qt" = "yes" ; then
+ #
+ # However, we do have Qt, and thus will be building
+ # Wireshark (if the user had explicitly disabled
+ # Wireshark, we wouldn't have looked for Qt, so we
+ # wouldn't think we had it, and thus wouldn't be here).
+ #
+ wireshark_bin="wireshark\$(EXEEXT)"
+ wireshark_man="wireshark.1"
+ wireshark_SUBDIRS="codecs ui/qt"
+ else
+ #
+ # We don't have Qt, either, which means we have no UI
+ # toolkit.
+ #
+ # If they didn't explicitly say "--disable-wireshark",
+ # fail (so that, unless they explicitly indicated that
+ # they don't want Wireshark, we stop so they know they
+ # won't be getting Wireshark unless they fix the GTK+/Qt
+ # problem).
+ #
+ if test "x$enable_wireshark" = "xyes"; then
+ 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([Neither Qt nor GTK+ 2.12 or later are available, so Wireshark can't be compiled])
+ fi
fi
+ wireshark_bin=""
+ wireshark_man=""
fi
- wireshark_bin=""
- wireshark_man=""
# Use GLIB_CFLAGS
AM_PATH_GLIB_2_0(2.14.0,
[
], 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
- # user explicitly disabled it.
+ # We have GTK+, and thus will be building Wireshark (if the user
+ # had explicitly disabled Wireshark, we wouldn't have looked for
+ # GTK+, so we wouldn't think we had it, and thus wouldn't be here).
#
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.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
+
+ CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+ ## 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
+ CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+ fi
+ # CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+ 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.)
+ CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
+ fi
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.
+CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+
+# Error out on the usage of deprecated glib functions
+CPPFLAGS="-DG_DISABLE_DEPRECATED $CPPFLAGS"
+
#
# Check whether GLib modules are supported, to determine whether we
# can support plugins.
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_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_WIRESHARK_PCAP_CHECK
fi
-# Enable/disable dumpcap
+
+dnl Check for airpcap
+AC_MSG_CHECKING(whether to include airpcap support)
+AC_ARG_ENABLE(airpcap,
+ AC_HELP_STRING( [--enable-airpcap],
+ [use AirPcap in Wireshark @<:@default=yes@:>@]),
+ enable_airpcap=$enableval, enable_airpcap=yes)
+
+if test x$enable_airpcap = xyes; then
+ if test "x$want_pcap" = "xno" ; then
+ enable_airpcap=no
+ AC_MSG_RESULT(pcap not available - disabling airpcap)
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
+ fi
+else
+ AC_MSG_RESULT(no)
+fi
+
dnl dumpcap check
AC_MSG_CHECKING(whether to build dumpcap)
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=no@:>@]),
-[
- if test $withval = no
- then
- want_pcre=no
- elif test $withval = yes
- then
- want_pcre=yes
- else
- want_pcre=yes
- pcre_dir=$withval
- fi
-],[
- want_pcre=no
- 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)
- fi
-fi
-
-
dnl Lua check
AC_MSG_CHECKING(whether to use liblua for the Lua scripting plugin)
AC_ARG_WITH(python,
AC_HELP_STRING( [--with-python@<:@=DIR@:>@],
- [use Python interpreter (installed in DIR, if supplied) @<:@default=yes, if available@:>@ (EXPERIMENTAL)]),
+ [use Python interpreter (installed in DIR, if supplied) @<:@default=no@:>@ (BROKEN/UNSTABLE)]),
[
pythondir='${libdir}/wireshark/python/${VERSION}'
if test "x$withval" = "xno"
pythondir="$withval"
fi
],[
+ # By default (user didn't explicitly enable Python), don't enable
+ # Python support.
#
- # Use the embeddable Python interpreter if it's present,
- # otherwise don't.
- #
- want_pythin=ifavailable
- pythondir='${libdir}/wireshark/python/${VERSION}'
+ want_python=no
+ #pythondir='${libdir}/wireshark/python/${VERSION}'
])
if test "x$want_python" = "xno" ; then
AC_MSG_RESULT(no)
#
AC_DEFINE(WS_MSVC_NORETURN,, [Define as the string to precede declarations of routines that never return])
-AC_ARG_ENABLE(airpcap,
- AC_HELP_STRING( [--enable-airpcap],
- [use AirPcap in Wireshark @<:@default=no@:>@]),
- enable_airpcap=$enableval
- if test x$enable_airpcap != xno; then
- AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
- fi
-)
-
dnl Checks for typedefs, structures, and compiler characteristics.
# AC_C_CONST
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"
)
PLUGIN_LIBS=""
AC_SUBST(PLUGIN_LIBS)
+#
+# Check if (emem) memory allocations must be 8-byte aligned.
+# I haven't been able to write C code that reliably makes that determination
+# (different versions of GCC with or without optimization give different
+# results) so just assume everything except (32-bit) x86 needs 8-byte
+# alignment (64-bit x86 will get 8-byte alignment from G_MEM_ALIGN anyway).
+#
+AC_MSG_CHECKING(whether we need memory allocations to be 8-byte aligned)
+if test x$host_cpu != xi386
+then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(NEED_8_BYTE_ALIGNMENT, 1, [Define if we need memory allocations to be 8-byte aligned])
+else
+ AC_MSG_RESULT(no)
+fi
+
dnl libtool defs
#
# Yes, AM_PROG_LIBTOOL is redundant with newer version(s) of some tool(s)
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/Makefile
+ ui/doxygen.cfg
+ ui/gtk/Makefile
+ ui/gtk/doxygen.cfg
+ ui/cli/Makefile
+ ui/qt/Makefile
+ ui/qt/doxygen.cfg
help/Makefile
packaging/Makefile
packaging/macosx/Info.plist
plugins/wimax/Makefile
plugins/wimaxasncp/Makefile
tools/Makefile
- tools/idl2wrs.sh
tools/lemon/Makefile
wiretap/Makefile
wsutil/Makefile
# Pretty messages
+if test "x$have_qt" = "xyes"; then
+ gui_lib_message=" (with Qt)"
+else
+ 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
+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
- pcre_message="no (using GRegex instead)"
-else
- pcre_message="yes"
-fi
-
if test "x$want_lua" = "xyes" ; then
lua_message="yes"
else
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 " 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 / metze / wireshark / wip.git / blobdiff