AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(ethereal, 0.10.14)
+AM_INIT_AUTOMAKE(wireshark, 1.1.0)
AM_DISABLE_STATIC
AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no")
AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes)
+# gnu tls
+AM_PATH_LIBGNUTLS(1.0.0,
+ [
+ echo "gnuTLS found, enabling ssl decryption"
+ AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library])
+ tls_message="yes"
+ ]
+ , [
+ if test x$libgnutls_config_prefix != x ; then
+ AC_MSG_ERROR([[gnuTLS not found; install gnuTLS-devel package for your system]])
+ else
+ echo echo "gnuTLS not found, disabling ssl decryption"
+ tls_message="no"
+ fi
+ ]
+)
+
+# libgrypt
+AM_PATH_LIBGCRYPT(1.1.0,
+ [
+ echo "libgcrypt found, enabling ipsec decryption"
+ 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
+ echo echo "libgcrypt not found, disabling ipsec decryption"
+ gcrypt_message="no"
+ fi
+ ]
+)
+
# Check for xsltproc
AC_PATH_PROG(XSLTPROC, xsltproc)
AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, "yes", "no")
fi
AC_SUBST(HAVE_SVR4_PACKAGING)
-AC_ETHEREAL_RPM_CHECK
+AC_WIRESHARK_RPM_CHECK
AC_SUBST(HAVE_RPM)
#
[
if test $withval != no
then
- ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings"
+ wireshark_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings"
fi
],)
-AC_MSG_CHECKING(to see if we can add '-Wall -W $ethereal_extra_gcc_flags' to CFLAGS)
+AC_MSG_CHECKING(to see if we can add '-Wall -W $wireshark_extra_gcc_flags' to CFLAGS)
if test x$GCC != x ; then
- CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $ethereal_extra_gcc_flags $CFLAGS"
+ CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $wireshark_extra_gcc_flags $CFLAGS"
AC_MSG_RESULT(yes)
else
CFLAGS="-D_U_=\"\" $CFLAGS"
#
# Arrange that we search for libraries in "/usr/local/lib".
#
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, /usr/local/lib)
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
else
AC_MSG_RESULT(no)
fi
#
# Check for versions of "sed" inadequate to handle, in libtool, a list
-# of object files as large as the list in Ethereal.
+# of object files as large as the list in Wireshark.
#
# On Solaris, we check for "/bin/sed", "/usr/bin/sed", and "/usr/ucb/sed",
# as both "/usr/bin/sed" (which is also "/bin/sed", as "/bin" is just a
# symlink to "/usr/bin", but people may have "/bin" before "/usr/bin" in
# their search path) and "/usr/ucb/sed" are inadequate; "/usr/xpg4/bin/sed"
-# is the only "sed" that comes with Solaris that can handle Ethereal.
+# is the only "sed" that comes with Solaris that can handle Wireshark.
#
# Add any checks here that are necessary for other OSes.
#
-AC_ETHEREAL_GNU_SED_CHECK
+AC_WIRESHARK_GNU_SED_CHECK
if test "$HAVE_GNU_SED" = no ; then
case "$host_os" in
solaris*)
esac
fi
-# Enable/disable tethereal
+# Enable/disable tshark
-AC_ARG_ENABLE(ethereal,
-[ --enable-ethereal build GTK+-based ethereal. [default=yes]],enable_ethereal=$enableval,enable_ethereal=yes)
+AC_ARG_ENABLE(wireshark,
+[ --enable-wireshark build GTK+-based wireshark. [default=yes]],enable_wireshark=$enableval,enable_wireshark=yes)
AC_ARG_ENABLE(gtk2,
-[ --disable-gtk2 build Glib1/Gtk1+-based (t)ethereal. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes)
+[ --disable-gtk2 build Glib1/Gtk1+-based wireshark. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes)
AM_CONDITIONAL(USE_GTK2, test x$enable_gtk2 = xyes)
AC_ARG_ENABLE(threads,
-[ --enable-threads use threads in ethereal. [default=no]],enable_threads=$enableval,enable_threads=no)
+[ --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,
fi
# Create DATAFILE_DIR #define for config.h
-datafiledir=$datadir/ethereal
+datafiledir=$datadir/wireshark
datafiledir=`(
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
# 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_gtk2" = "xyes" -a "x$enable_ethereal" = "xyes" ; then
+if test "x$enable_gtk2" = "xyes" -a "x$enable_wireshark" = "xyes" ; then
GTK_OK=two
AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no, gthread)
-elif test "x$enable_gtk2" != "xyes" -a "x$enable_ethereal" = "xyes" ; then
+elif test "x$enable_gtk2" != "xyes" -a "x$enable_wireshark" = "xyes" ; then
GTK_OK=one
AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no )
else
# programs to be built with GLib.
#
if test "$GTK_OK" = "no" ; then
- enable_ethereal="no"
- ethereal_bin=""
- ethereal_man=""
+ enable_wireshark="no"
+ wireshark_bin=""
+ wireshark_man=""
# Honor GLIB_CFLAGS
if test "x$enable_gtk2" = "xyes" ; then
AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
fi
else
- ethereal_bin="ethereal\$(EXEEXT)"
- ethereal_man="ethereal.1"
- ethereal_SUBDIRS="gtk"
+ wireshark_bin="wireshark\$(EXEEXT)"
+ wireshark_man="wireshark.1"
+ wireshark_SUBDIRS="gtk"
# Honor GLIB_CFLAGS
if test "$GTK_OK" = "two" ; then
AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule)
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
if (g_module_supported())
],
[
AC_MSG_RESULT(yes)
- ac_ethereal_inttypes_h_defines_formats=yes
+ ac_wireshark_inttypes_h_defines_formats=yes
],
[
AC_MSG_RESULT(no)
- ac_ethereal_inttypes_h_defines_formats=no
+ ac_wireshark_inttypes_h_defines_formats=no
])
],
[
# We don't have inttypes.h, so it obviously can't define those
# macros.
#
- ac_ethereal_inttypes_h_defines_formats=no
+ ac_wireshark_inttypes_h_defines_formats=no
])
-if test "$ac_ethereal_inttypes_h_defines_formats" = yes; then
+if test "$ac_wireshark_inttypes_h_defines_formats" = yes; then
AC_DEFINE(INTTYPES_H_DEFINES_FORMATS,,[Define if <inttypes.h> defines PRI[doxu]64 macros])
else
- AC_ETHEREAL_CHECK_64BIT_FORMAT(ll,
+ AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
[
- AC_ETHEREAL_CHECK_64BIT_FORMAT(L,
+ AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
[
- AC_ETHEREAL_CHECK_64BIT_FORMAT(q,
+ AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
[
AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
])
])
fi
-AC_SUBST(ethereal_bin)
-AC_SUBST(ethereal_man)
+AC_SUBST(wireshark_bin)
+AC_SUBST(wireshark_man)
rdps_bin="rdps\$(EXEEXT)"
AC_SUBST(rdps_bin)
-# Enable/disable tethereal
+# Enable/disable tshark
-AC_ARG_ENABLE(tethereal,
-[ --enable-tethereal build tethereal. [default=yes]],tethereal=$enableval,enable_tethereal=yes)
+AC_ARG_ENABLE(tshark,
+[ --enable-tshark build tshark. [default=yes]],tshark=$enableval,enable_tshark=yes)
-if test "x$enable_tethereal" = "xyes" ; then
- tethereal_bin="tethereal\$(EXEEXT)"
- tethereal_man="tethereal.1"
- etherealfilter_man="ethereal-filter.4"
+if test "x$enable_tshark" = "xyes" ; then
+ tshark_bin="tshark\$(EXEEXT)"
+ tshark_man="tshark.1"
+ wiresharkfilter_man="wireshark-filter.4"
else
- tethereal_bin=""
- tethereal_man=""
+ tshark_bin=""
+ tshark_man=""
fi
-AC_SUBST(tethereal_bin)
-AC_SUBST(tethereal_man)
-AC_SUBST(etherealfilter_man)
+AC_SUBST(tshark_bin)
+AC_SUBST(tshark_man)
+AC_SUBST(wiresharkfilter_man)
# Enable/disable dumpcap
AC_ARG_ENABLE(dumpcap,
-[ --enable-dumpcap build dumpcap. [default=no]],enable_dumpcap=$enableval,enable_dumpcap=no)
+[ --enable-dumpcap build dumpcap. [default=yes]],enable_dumpcap=$enableval,enable_dumpcap=yes)
if test "x$enable_dumpcap" = "xyes" ; then
dumpcap_bin="dumpcap\$(EXEEXT)"
AC_SUBST(text2pcap_bin)
AC_SUBST(text2pcap_man)
-# Enable/disable idl2eth
+# Enable/disable idl2wrs
-AC_ARG_ENABLE(idl2eth,
-[ --enable-idl2eth build idl2eth. [default=yes]],enable_idl2eth=$enableval,enable_idl2eth=yes)
+AC_ARG_ENABLE(idl2wrs,
+[ --enable-idl2wrs build idl2wrs. [default=yes]],enable_idl2wrs=$enableval,enable_idl2wrs=yes)
-if test "x$enable_idl2eth" = "xyes" ; then
- idl2eth_bin="idl2eth"
- idl2eth_man="idl2eth.1"
+if test "x$enable_idl2wrs" = "xyes" ; then
+ idl2wrs_bin="idl2wrs"
+ idl2wrs_man="idl2wrs.1"
else
- idl2eth_bin=""
- idl2eth_man=""
+ idl2wrs_bin=""
+ idl2wrs_man=""
fi
-AC_SUBST(idl2eth_bin)
-AC_SUBST(idl2eth_man)
+AC_SUBST(idl2wrs_bin)
+AC_SUBST(idl2wrs_man)
# Enable/disable dftest
dnl Checks for "gethostbyname()" - and "-lnsl", if we need it to get
dnl "gethostbyname()".
-AC_ETHEREAL_GETHOSTBY_LIB_CHECK
+AC_WIRESHARK_GETHOSTBY_LIB_CHECK
dnl Checks for "connect()", used as a proxy for "socket()" - and
dnl "-lsocket", if we need it to get "connect()".
-AC_ETHEREAL_SOCKET_LIB_CHECK
+AC_WIRESHARK_SOCKET_LIB_CHECK
dnl pcap check
AC_MSG_CHECKING(whether to use libpcap for packet capture)
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_PCAP_CHECK
+ AC_WIRESHARK_PCAP_CHECK
fi
dnl zlib check
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_ZLIB_CHECK
+ AC_WIRESHARK_ZLIB_CHECK
if test "x$want_zlib" = "xno" ; then
AC_MSG_RESULT(zlib not found - disabling compressed capture file support)
fi
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_LIBPCRE_CHECK
+ 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
AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin)
AC_ARG_WITH(lua,
-[ --with-lua[[=DIR]] use liblua (located in directory DIR, if supplied) for the lua scripting plugin. [[default=no]]],
+[ --with-lua[[=DIR]] use liblua (located in directory DIR, if supplied) for the lua scripting plugin. [[default=no]]],
[
if test $withval = no
then
fi
],[
#
- # Use liblua if it's present, otherwise don't.
+ # Don't use liblua by default (it isn't ready yet)
#
want_lua=no
lua_dir=
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_LIBLUA_CHECK
+ AC_WIRESHARK_LIBLUA_CHECK
if test "x$want_lua" = "xno" ; then
AC_MSG_RESULT(liblua not found - disabling support for the lua scripting plugin)
fi
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_IPV6_STACK
+ AC_WIRESHARK_IPV6_STACK
fi
-dnl Check if ethereal should be installed setuid
+dnl Check if wireshark should be installed setuid
AC_ARG_ENABLE(setuid-install,
-[ --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
+[ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
-AC_MSG_CHECKING(whether to install ethereal setuid)
+AC_MSG_CHECKING(whether to install wireshark setuid)
if test "x$enable_setuid_install" = "xno" ; then
AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(yes)
+ if test "x$enable_dumpcap" = "xno" ; then
+ AC_MSG_ERROR(Setuid install works only with --enable-dumpcap, but dumpcap disabled)
+ else
+ AC_MSG_RESULT(yes)
+ fi
fi
AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes)
want_ssl=yes
elif test -d "$withval"; then
want_ssl=yes
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
fi
],[
want_ssl=no
else
AC_MSG_RESULT(yes)
fi
- AC_ETHEREAL_NETSNMP_CHECK
+ AC_WIRESHARK_NETSNMP_CHECK
fi
#
else
AC_MSG_RESULT(yes)
fi
- AC_ETHEREAL_UCDSNMP_CHECK
+ AC_WIRESHARK_UCDSNMP_CHECK
fi
fi
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_KRB5_CHECK
+ AC_WIRESHARK_KRB5_CHECK
fi
want_adns=yes
elif test -d "$withval"; then
want_adns=yes
- AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
fi
])
if test "x$with_adns" = "xno" ; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- AC_ETHEREAL_ADNS_CHECK
+ AC_WIRESHARK_ADNS_CHECK
fi
AC_SUBST(ADNS_LIBS)
# We need to know whether "struct sockaddr" has an "sa_len" member
# for get_interface_list().
-AC_ETHEREAL_STRUCT_SA_LEN
+AC_WIRESHARK_STRUCT_SA_LEN
# We must know our byte order
AC_C_BIGENDIAN
# XXX - do we need this?
AC_PROG_GCC_TRADITIONAL
+GETOPT_C=""
+GETOPT_O=""
+AC_CHECK_FUNC(getopt, GETOPT_O="",
+ [GETOPT_O="getopt.o"
+ AC_DEFINE(NEED_GETOPT_H, 1, [Define if getopt.h needs to be included])
+])
+if test "$ac_cv_func_getopt" = no ; then
+ GETOPT_C="getopt.c"
+ GETOPT_O="getopt.o"
+fi
+AC_SUBST(GETOPT_C)
+AC_SUBST(GETOPT_O)
+
# If there's a system out there that has snprintf and _doesn't_ have vsnprintf,
# then this won't work.
SNPRINTF_C=""
AC_SUBST(STRPTIME_O)
AC_CHECK_FUNCS(getprotobynumber gethostbyname2)
+AC_CHECK_FUNCS(issetugid)
+AC_CHECK_FUNCS(mmap mprotect sysconf)
dnl blank for now, but will be used in future
-AC_SUBST(ethereal_SUBDIRS)
+AC_SUBST(wireshark_SUBDIRS)
dnl
dnl check whether plugins should be enabled and, if they should be,
dnl check for plugins directory - stolen from Amanda's configure.in
dnl
-plugindir="$libdir/ethereal/plugins/$VERSION"
+plugindir="$libdir/wireshark/plugins/$VERSION"
AC_ARG_WITH(plugins,
[ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).],
[
#
# The plugin dissectors reside in ./plugins/PROTO/
#
-PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
+PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
AC_SUBST(PLUGIN_LIBS)
dnl libtool defs
AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
if test x$enable_static = xyes -a x$have_plugins = xyes
then
- AC_DEFINE(ENABLE_STATIC, 1, [Link plugins statically into Ethereal])
+ AC_DEFINE(ENABLE_STATIC, 1, [Link plugins statically into Wireshark])
fi
AC_SUBST(ENABLE_STATIC)
packaging/nsis/Makefile
packaging/rpm/Makefile
packaging/rpm/SPECS/Makefile
- packaging/rpm/SPECS/ethereal.spec
+ packaging/rpm/SPECS/wireshark.spec
packaging/svr4/Makefile
packaging/svr4/checkinstall
packaging/svr4/pkginfo
fi
echo ""
-echo "The Ethereal package has been configured with the following options."
-echo " Build ethereal : $enable_ethereal"
-echo " Build tethereal : $enable_tethereal"
-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 idl2eth : $enable_idl2eth"
-echo " Build randpkt : $enable_randpkt"
-echo " Build dftest : $enable_dftest"
+echo "The Wireshark package has been configured with the following options."
+echo " Build wireshark : $enable_wireshark"
+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 ""
-echo " Install setuid : $setuid_message"
-echo " Use plugins : $have_plugins"
-echo " Build lua plugin : $lua_message"
-echo " Use GTK+ v2 library : $enable_gtk2"
+echo " Install setuid : $setuid_message"
+echo " Use plugins : $have_plugins"
+echo " Build lua plugin : $lua_message"
+echo " Use GTK+ v2 library : $enable_gtk2"
if test "x$enable_gtk2" = "xyes" ; then
echo " Use threads : $enable_threads"
echo " Build profile binaries : $enable_profile_build"
echo " Use pcre library : $pcre_message"
echo " Use kerberos library : $krb5_message"
echo " Use GNU ADNS library : $adns_message"
+echo " Use GNU crypto library : $gcrypt_message"
echo " Use SSL crypto library : $ssl_message"
echo " Use IPv6 name resolution : $enable_ipv6"
echo " Use UCD SNMP/Net-SNMP library : $snmp_libs_message"
+echo " Use gnutls library : $tls_message"
git.samba.org / metze / wireshark / wip.git / blobdiff