# Define variables for the components of the Wireshark version number.
#
m4_define([version_major], [2])
-m4_define([version_minor], [3])
+m4_define([version_minor], [5])
m4_define([version_micro], [0])
dnl Updated by make-version.pl
m4_define([version_extra], [])
# system, and AC_PROG_CXX looks for, among other things,
# "CC" as a C++ compiler, and, if you have a case-insensitive
# file system and a C compiler named "cc" (both true, by
- # default, on OS X), AC_PROG_CXX may end up thinking it's
+ # default, on macOS), AC_PROG_CXX may end up thinking it's
# the C++ compiler.
#
# So we check by feeding the purported C++ compiler a
fi
#
-# Add configure argument to select OSX deployment target.
+# Add configure argument to select macOS deployment target.
#
AC_WIRESHARK_OSX_DEPLOY_TARGET
fi
fi
-# libgrypt
-gcrypt_message="no"
-want_gcrypt="if_available"
-AC_ARG_WITH([gcrypt],
- AC_HELP_STRING( [--with-gcrypt=@<:@yes/no@:>@],
- [use gcrypt library @<:@default=yes, if available@:>@]),
- [ with_gcrypt="$withval"; want_gcrypt="yes" ], with_gcrypt="yes")
-
-if test "x$with_gcrypt" = "xyes"; then
- AM_PATH_LIBGCRYPT(1.4.2,
- [
- AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define to use libgcrypt])
- gcrypt_message="yes"
- ]
- , [
- if test x$libgcrypt_config_prefix != x ; then
- AC_MSG_ERROR([[libgcrypt not found; install libgcrypt-devel package for your system]])
- else
- AS_ECHO(["libgcrypt not found, disabling decryption for ipsec, ssl, etc."])
- gcrypt_message="no"
- fi
-
- # Error out if the user explicitly requested gcrypt
- if test "x$want_gcrypt" = "xyes"; then
- AC_MSG_ERROR([libgcrypt library was requested, but is not available])
- fi
- ]
- )
-fi
+# libgrypt (for decryption, MAC, etc. functionality).
+AM_PATH_LIBGCRYPT(1.4.2, [ ] , [
+ AC_MSG_ERROR([[libgcrypt not found; install libgcrypt-devel package for your system]])
+])
AC_ARG_WITH(libnl,
AC_HELP_STRING([--with-libnl@<:@=VERSION@:>@],
# Debian
AC_CHECK_PROG(HAVE_DPKG_BUILDPACKAGE, dpkg-buildpackage, "yes", "no")
-# OS X
+# macOS
AC_CHECK_PROG(HAVE_XCODEBUILD, xcodebuild, "yes", "no")
AC_CHECK_PROG(HAVE_HDIUTIL, hdiutil, "yes", "no")
AC_CHECK_PROG(HAVE_BLESS, bless, "yes", "no")
AC_SUBST(HAVE_OSX_PACKAGING)
#
-# Use this as a proxy for "is this OS X" (just in case somebody actually
+# Use this as a proxy for "is this macOS" (just in case somebody actually
# built and installed Darwin as an OS, perhaps with some X11-based GUI,
# don't look for Darwin).
#
AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no")
-AM_CONDITIONAL(NOT_OS_X, test "x$have_sw_vers" = "xno")
+AM_CONDITIONAL(NOT_MACOS, test "x$have_sw_vers" = "xno")
# Shellcheck
AC_CHECK_PROG(HAVE_SHELLCHECK, shellcheck, "yes", "no")
# so only enable this for C for now.
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wshorten-64-to-32, C)
+#
+# Implicit function declarations are an error in C++ and most
+# likely a programming error in C. Turn -Wimplicit-int and
+# -Wimplicit-function-declaration into an error by default.
+#
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Werror=implicit, C)
+
# Clang only. Avoid "argument unused during compilation" warnings
# (for example, when getting the -gsplit-dwarf option or
# when combining -fwrapv with -fno-strict-overflow)
# never enable this one with -Werror.
#
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wbad-function-cast, C)
+
+ # Works only with GCC 7
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wduplicated-branches)
+
fi
])
AC_SUBST(NO_SANITIZE_CFLAGS)
AC_SUBST(NO_SANITIZE_LDFLAGS)
+# Try to enable UndefinedBehaviorSanitizer.
+#
+AC_ARG_ENABLE(ubsan,
+ AC_HELP_STRING( [--enable-ubsan],
+ [Enable UndefinedBehaviorSanitizer (UBSan) for debugging@<:@default=no@:>@]),
+[
+ #
+ # Available since Clang >= 3.3 and GCC >= 4.9
+ #
+ # XXX shouldn't this also be added to LDFLAGS?
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fsanitize=undefined)
+
+])
+
# Add check hf conflict..
#
AC_ARG_ENABLE(checkhf-conflict,
#
AC_MSG_CHECKING(for platform-specific linker flags)
case "$host_os" in
+aix*)
+ #
+ # If this is GCC or Clang, Add -Wl,-bbigtoc for big libraries.
+ # XXX - what if we're using xlc? Is that necessary? The
+ # xlc 7.0 manual says "Specifying -qpic=large has the same
+ # effect as passing -bbigtoc to ld"; do we need to tell xlc,
+ # when it's compiling, to generate different code for a large
+ # TOC, or is that just a linker flag? For that matter, do we
+ # have to tell GCC or Clang to generate different code for a
+ # large TOC?
+ #
+ if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
+ LDFLAGS_BIGSHAREDLIB="-Wl,-bbigtoc"
+ AC_MSG_RESULT([AIX linker with GCC or Clang - added -Wl,-bbigtoc to large shared library linker flags and -Wl,-headerpad_max_install_names -Wl,-search_paths_first and -Wl,-headerpad_max_install_names to all linker flags])
+ fi
+ ;;
darwin*)
#
# Add -Wl,-single_module to the LDFLAGS used with shared
# undefined symbols.
#
WS_LDFLAGS="$WS_LDFLAGS -no-undefined"
- AC_MSG_RESULT(CygWin GNU ld - added -no-undefined)
+ AC_MSG_RESULT(Cygwin GNU ld - added -no-undefined)
;;
*)
AC_MSG_RESULT(none needed)
;;
esac
+AC_SUBST(LDFLAGS_BIGSHAREDLIB)
AC_SUBST(LDFLAGS_SHAREDLIB)
#
-# On "Darwin", which we assume to mean "OS X" rather than "iOS" or
+# On "Darwin", which we assume to mean "macOS" rather than "iOS" or
# "just Darwin" (as we don't currently support iOS, and as I don't
# think you can build and run "just Darwin" as an OS for PCs), we
# arrange to build some programs with Application Services so they
# get version information from plists and thus need Core Foundation
# to process those plists.
#
-have_os_x_frameworks=no
+have_macos_frameworks=no
case "$host_os" in
darwin*)
- have_os_x_frameworks=yes
- AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have OS X frameworks])
+ have_macos_frameworks=yes
+ AC_DEFINE(HAVE_MACOS_FRAMEWORKS, 1, [Define to 1 if you have macOS frameworks])
APPLICATIONSERVICES_FRAMEWORKS="-framework ApplicationServices"
SYSTEMCONFIGURATION_FRAMEWORKS="-framework SystemConfiguration"
COREFOUNDATION_FRAMEWORKS="-framework CoreFoundation"
#
- # OK, so we have the OS X frameworks; do they include
+ # OK, so we have the macOS frameworks; do they include
# CFPropertyListCreateWithStream, or do we have
# to fall back on CFPropertyListCreateFromStream?
# (They only differ in the error return, which we
AC_SUBST(APPLICATIONSERVICES_FRAMEWORKS)
AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS)
AC_SUBST(COREFOUNDATION_FRAMEWORKS)
-AM_CONDITIONAL(HAVE_OS_X_FRAMEWORKS, [test "x$have_os_x_frameworks" = "xyes"])
+AM_CONDITIONAL(HAVE_MACOS_FRAMEWORKS, [test "x$have_macos_frameworks" = "xyes"])
#
# If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a
AC_SUBST(LRELEASE)
#
- # On Darwin, find where the Qt frameworks are
- # located, and add that to the rpath, just in
- # case this is Qt 5.5 or later and the frameworks
- # have an install name that begins with @rpath
- # and aren't installed in a frameworks directory
- # that's searched by default.
+ # On Darwin, make sure we're using Qt5 or later.
+ # If so, find where the Qt frameworks are located
+ # and add that to the rpath, just in case this is
+ # Qt 5.5 or later and the frameworks have an
+ # install name that begins with @rpath and aren't
+ # installed in a frameworks directory that's
+ # searched by default.
#
case "$host_os" in
darwin*)
if test $qt_version -le 4
then
- Qt_LDFLAGS="-Wl,-rpath,"`$PKG_CONFIG --libs QtCore | sed -e 's/-F//' -e 's/ -framework.*//'`
+ AC_MSG_ERROR([macOS builds should use Qt5])
else
Qt_LDFLAGS="-Wl,-rpath,"`$PKG_CONFIG --libs Qt${qt_version}Core | sed -e 's/-F//' -e 's/ -framework.*//'`
fi
wireshark_bin="wireshark\$(EXEEXT) wireshark-gtk\$(EXEEXT)"
wireshark_man="wireshark.1"
- wireshark_SUBDIRS="codecs ui/qt ui/gtk"
-fi
-if test "$have_gtk" = "no" -a "$have_qt" = "yes" ; then
+ wireshark_SUBDIRS="ui/qt ui/gtk"
+elif test "$have_gtk" = "no" -a "$have_qt" = "yes" ; then
# We don't have GTK+ but we have Qt.
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_man="wireshark.1"
- wireshark_SUBDIRS="codecs ui/qt"
-fi
-if test "$have_gtk" = "yes" -a "$have_qt" = "no" ; then
+ wireshark_SUBDIRS="ui/qt"
+elif test "$have_gtk" = "yes" -a "$have_qt" = "no" ; then
# We have GTK+ but not Qt.
wireshark_bin="wireshark-gtk\$(EXEEXT)"
wireshark_man="wireshark.1"
- wireshark_SUBDIRS="codecs ui/gtk"
+ wireshark_SUBDIRS="ui/gtk"
OSX_APP_FLAGS="$OSX_APP_FLAGS -gtk"
OSX_DMG_FLAGS="-gtk"
-fi
-if test "$have_gtk" = "no" -a "$have_qt" = "no" ; then
+elif test "$have_gtk" = "no" -a "$have_qt" = "no" ; then
# We have neither GTK+ nor Qt.
#
# If they didn't explicitly say "--disable-wireshark",
# problem).
#
if test "x$enable_wireshark" = "xyes"; then
- AC_MSG_ERROR([Neither Qt nor GTK+ are available, so Wireshark can't be compiled])
+ if test "$with_qt" != "no" -a "$with_gtk" != "no" ; then
+ AC_MSG_ERROR([Neither Qt nor GTK+ are available, so Wireshark can't be compiled])
+ elif test "$with_qt" != "no" -a "$with_gtk" = "no" ; then
+ AC_MSG_ERROR([Qt is not available and GTK+ was not requested, so Wireshark can't be compiled])
+ elif test "$with_qt" = "no" -a "$with_gtk" != "no" ; then
+ AC_MSG_ERROR([Qt was not requested and GTK+ is not available, so Wireshark can't be compiled])
+ elif test "$with_qt" = "no" -a "$with_gtk" = "no" ; then
+ AC_MSG_ERROR([Neither Qt nor GTK+ were requested, so Wireshark can't be compiled])
+ fi
fi
wireshark_bin=""
wireshark_man=""
])
if test "$ac_cv_glib_supports_modules" = yes ; then
have_plugins=yes
- plugins_dir="plugins"
else
have_plugins=no
- plugins_dir=""
fi
-AC_SUBST(plugins_dir)
#
# If we have <dlfcn.h>, check whether we have dladdr.
if test "x$have_gtk" = "xyes"
then
#
- # We have GTK+; do we want the OS X integration functions and,
+ # We have GTK+; do we want the macOS integration functions and,
# if so, do we have them and, if so, which versions do we have,
# the old Carbon-based ones or the new Cocoa-based ones?
#
- AC_MSG_CHECKING(whether to use OS X integration functions)
+ AC_MSG_CHECKING(whether to use macOS integration functions)
AC_ARG_WITH(osx-integration,
AC_HELP_STRING( [--with-osx-integration],
- [use OS X integration functions @<:@default=yes, if available@:>@]),
+ [use macOS integration functions @<:@default=yes, if available@:>@]),
[
if test $withval = no
then
AC_SUBST(rawshark_bin)
AC_SUBST(rawshark_man)
-# Enable/disable echld
-AC_ARG_ENABLE(echld,
- AC_HELP_STRING( [--enable-echld],
- [support echld (Experimental) @<:@default=no@:>@]),
- have_echld=$enableval,have_echld=no)
+# Enable/disable sharkd
+AC_ARG_ENABLE(sharkd,
+ AC_HELP_STRING( [--enable-sharkd],
+ [build sharkd @<:@default=yes@:>@]),
+ sharkd=$enableval,enable_sharkd=yes)
-AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes")
-if test "x$have_echld" = "xyes"
-then
- AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled])
- echld_test_bin="echld_test\$(EXEEXT)"
- echld_dir="echld"
+if test "x$enable_sharkd" = "xyes" ; then
+ sharkd_bin="sharkd\$(EXEEXT)"
else
- have_echld="no"
- echld_test_bin=""
- echld_dir=""
+ sharkd_bin=""
fi
-AC_SUBST(echld_test_bin)
-AC_SUBST(echld_dir)
+AC_SUBST(sharkd_bin)
# Enable/disable tfshark
AC_ARG_ENABLE(tfshark,
AC_CHECK_MEMBERS([struct stat.st_flags])
+# We need to know whether "struct stat" has an "st_birthtime" member
+# or an "__st_birthtime" member for the file set dialog.
+
+AC_CHECK_MEMBERS([struct stat.st_birthtime])
+AC_CHECK_MEMBERS([struct stat.__st_birthtime])
+
# We need to know whether "struct sockaddr" has an "sa_len" member
# for get_interface_list().
fi
AM_CONDITIONAL(HAVE_SBC, test "x$have_sbc" = "xyes")
+#`
+# Check SpanDSP library for RTP Player
+# http://www.soft-switch.org/
+AC_ARG_WITH([spandsp],
+ AC_HELP_STRING( [--with-spandsp=@<:@yes/no@:>@],
+ [use SpanDSP to play G.722/G.726 codecs @<:@default=yes, if available@:>@]),
+ with_spandsp="$withval"; want_spandsp="yes", with_spandsp="yes")
+
+PKG_CHECK_MODULES(SPANDSP, spandsp, [have_spandsp=yes], [have_spandsp=no])
+if test "x$with_spandsp" != "xno"; then
+ if (test "${have_spandsp}" = "yes"); then
+ AC_DEFINE(HAVE_SPANDSP, 1, [Define if you have the SpanDSP library])
+ elif test "x$want_spandsp" = "xyes"; then
+ # Error out if the user explicitly requested the SpanDSP library
+ AC_MSG_ERROR([SpanDSP library was requested, but is not available])
+ fi
+else
+ have_spandsp=no
+fi
+AM_CONDITIONAL(HAVE_SPANDSP, test "x$have_spandsp" = "xyes")
+
+#`
+# Libxml2 check
+AC_ARG_WITH(libxml2,
+ AC_HELP_STRING([--with-libxml2=@<:@yes/no@:>@],
+ [Libxml2 is a XML C parser, which can be used for handling XML configuration in dissectors @<:@default=yes, if available@:>@]),
+ with_libxml2="$withval"; want_libxml2="yes", with_libxml2="yes")
+
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0, [have_libxml2=yes], [have_libxml2=no])
+if test "x$with_libxml2" != "xno"; then
+ if (test "${have_libxml2}" = "yes"); then
+ AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have libxml2])
+ elif test "x$want_libxml2" = "xyes"; then
+ # Error out if the user explicitly requested libxml2
+ AC_MSG_ERROR([Libxml2 was requested, but is not available])
+ fi
+else
+ have_libxml2=no
+fi
+AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
+
+
dnl
dnl check whether plugins should be enabled and, if they should be,
dnl check for plugins directory - stolen from Amanda's configure.ac
AM_CONDITIONAL(HAVE_PLUGINS, test "x$have_plugins" = "xyes")
if test x$have_plugins = xyes
then
+ plugins_dir="plugins"
AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled])
+else
+ plugins_dir=""
fi
+AC_SUBST(plugins_dir)
AC_SUBST(plugindir)
#
epan/dissectors/asn1/mms/Makefile
epan/dissectors/asn1/mpeg-audio/Makefile
epan/dissectors/asn1/mpeg-pes/Makefile
+ epan/dissectors/asn1/mudurl/Makefile
epan/dissectors/asn1/nbap/Makefile
epan/dissectors/asn1/ns_cert_exts/Makefile
epan/dissectors/asn1/novell_pkis/Makefile
plugins/opcua/Makefile
plugins/profinet/Makefile
plugins/stats_tree/Makefile
+ plugins/transum/Makefile
plugins/unistim/Makefile
plugins/wimax/Makefile
plugins/wimaxasncp/Makefile
writecap/Makefile
writecap/doxygen.cfg
wsutil/Makefile
- echld/Makefile
_CUSTOM_AC_OUTPUT_
)
if test "x$have_gtk" = "xyes"; then
gtk_lib_message=" (with GTK+ v$GTK_VERSION"
if test "x$have_ige_mac" = "xyes"; then
- gtk_lib_message="$gtk_lib_message and OS X integration)"
+ gtk_lib_message="$gtk_lib_message and macOS integration)"
else
gtk_lib_message="$gtk_lib_message)"
fi
echo " Build randpkt : $enable_randpkt"
echo " Build dftest : $enable_dftest"
echo " Build rawshark : $enable_rawshark"
+echo " Build sharkd : $enable_sharkd"
echo " Build androiddump : $enable_androiddump"
echo " Build sshdump : $enable_sshdump"
echo " Build ciscodump : $enable_ciscodump"
echo " Build randpktdump : $enable_randpktdump"
echo " Build udpdump : $enable_udpdump"
-echo " Build echld : $have_echld"
echo ""
echo " Save files as pcap-ng by default : $enable_pcap_ng_default"
echo " Install dumpcap with capabilities : $setcap_message"
echo " Use kerberos library : $krb5_message"
echo " Use c-ares library : $c_ares_message"
echo " Use SMI MIB library : $libsmi_message"
-echo " Use GNU gcrypt library : $gcrypt_message"
+echo " Use GNU gcrypt library : yes"
echo " Use SSL crypto library : $ssl_message"
echo " Use GnuTLS library : $tls_message"
echo " Use POSIX capabilities library : $libcap_message"
echo " Have ssh_userauth_agent : $ssh_userauth_agent_message"
echo " Use nl library : $libnl_message"
echo " Use SBC codec library : $have_sbc"
+echo " Use SpanDSP library : $have_spandsp"
+echo " Use libxml2 library : $have_libxml2"
echo " Use nghttp2 library : $nghttp2_message"
echo " Use LZ4 library : $have_lz4"
echo " Use Snappy library : $have_snappy"
git.samba.org / metze / wireshark / wip.git / blobdiff