# $Id$
#
-AC_INIT(etypes.h)
+AC_INIT(cfile.h)
AC_PREREQ(2.52)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(ethereal, 0.10.6)
+AM_INIT_AUTOMAKE(ethereal, 0.10.14)
AM_DISABLE_STATIC
#
AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
fi
+AC_PATH_PROG(HTML_VIEWER, htmlview)
+if test "x$HTML_VIEWER" = x
+then
+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
+else
+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
+fi
+
AC_PATH_PROG(LEX, flex)
AC_PATH_PROG(PYTHON, python)
AC_SUBST(LEX)
AC_SUBST(FLEX_PATH)
AC_SUBST(PYTHON)
+AC_SUBST(XSLTPROC)
+AC_SUBST(XMLLINT)
# Check for doxygen
AC_PATH_PROG(DOXYGEN, doxygen)
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
+ ]
+)
+
+
+# Check for xsltproc
+AC_PATH_PROG(XSLTPROC, xsltproc)
+AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, "yes", "no")
+AM_CONDITIONAL(HAVE_XSLTPROC, test x$HAVE_XSLTPROC = xyes)
+
+# Check for xmllint
+AC_PATH_PROG(XMLLINT, xmllint)
+AC_CHECK_PROG(HAVE_XMLLINT, xmllint, "yes", "no")
+AM_CONDITIONAL(HAVE_XMLLINT, test x$HAVE_XMLLINT = xyes)
+
+# Check for fop (translate .fo to e.g. pdf)
+AC_PATH_PROG(FOP, fop)
+AC_CHECK_PROG(HAVE_FOP, fop, "yes", "no")
+AM_CONDITIONAL(HAVE_FOP, test x$HAVE_FOP = xyes)
+
+# Check for hhc (html help compiler)
+AC_PATH_PROG(HHC, hhc.exe)
+AC_CHECK_PROG(HAVE_HHC, hhc.exe, "yes", "no")
+AM_CONDITIONAL(HAVE_HHC, test x$HAVE_HHC = xyes)
+
# Check for packaging utilities
# For now, we check to see if the various packaging utilites are in our
# path. I'm too lazy to write code to go hunt for them. - Gerald
[
if test $withval != no
then
- ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes"
+ ethereal_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 $ethereal_extra_gcc_flags' to CFLAGS)
if test x$GCC != x ; then
- CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W$ethereal_extra_gcc_flags $CFLAGS"
+ CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $ethereal_extra_gcc_flags $CFLAGS"
AC_MSG_RESULT(yes)
else
CFLAGS="-D_U_=\"\" $CFLAGS"
ethereal_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(GLib distribution not found.), gmodule)
+ AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
else
AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
fi
printf("%" PRId64 "\n", (gint64)1);
printf("%" PRIo64 "\n", (guint64)1);
printf("%" PRIx64 "\n", (guint64)1);
+ printf("%" PRIX64 "\n", (guint64)1);
printf("%" PRIu64 "\n", (guint64)1);
}
]])
AC_SUBST(editcap_man)
-# Enable/disable capinfo
+# Enable/disable dumpcap
+
+AC_ARG_ENABLE(dumpcap,
+[ --enable-dumpcap build dumpcap. [default=yes]],enable_dumpcap=$enableval,enable_dumpcap=yes)
+
+if test "x$enable_dumpcap" = "xyes" ; then
+ dumpcap_bin="dumpcap\$(EXEEXT)"
+ dumpcap_man="dumpcap.1"
+else
+ dumpcap_bin=""
+ dumpcap_man=""
+fi
+AC_SUBST(dumpcap_bin)
+AC_SUBST(dumpcap_man)
+
+
+# Enable/disable capinfos
-AC_ARG_ENABLE(capinfo,
-[ --enable-capinfo build capinfo. [default=yes]],enable_capinfo=$enableval,enable_capinfo=yes)
+AC_ARG_ENABLE(capinfos,
+[ --enable-capinfos build capinfos. [default=yes]],enable_capinfos=$enableval,enable_capinfos=yes)
-if test "x$enable_capinfo" = "xyes" ; then
- capinfo_bin="capinfo\$(EXEEXT)"
- capinfo_man="capinfo.1"
+if test "x$enable_capinfos" = "xyes" ; then
+ capinfos_bin="capinfos\$(EXEEXT)"
+ capinfos_man="capinfos.1"
else
- capinfo_bin=""
- capinfo_man=""
+ capinfos_bin=""
+ capinfos_man=""
fi
-AC_SUBST(capinfo_bin)
-AC_SUBST(capinfo_man)
+AC_SUBST(capinfos_bin)
+AC_SUBST(capinfos_man)
# Enable/disable mergecap
# Enable/disable randpkt
AC_ARG_ENABLE(randpkt,
-[ --enable-randpkt build randpkt. [default=no]],enable_randpkt=$enableval,enable_randpkt=no)
+[ --enable-randpkt build randpkt. [default=yes]],enable_randpkt=$enableval,enable_randpkt=yes)
if test "x$enable_randpkt" = "xyes" ; then
randpkt_bin="randpkt\$(EXEEXT)"
AC_MSG_CHECKING(whether to use libpcap for packet capture)
AC_ARG_WITH(pcap,
-changequote(<<, >>)dnl
-<< --with-pcap[=DIR] use libpcap for packet capturing. [default=yes]>>,
-changequote([, ])dnl
+[ --with-pcap[[=DIR]] use libpcap for packet capturing. [[default=yes]]],
[
if test $withval = no
then
AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
AC_ARG_WITH(zlib,
-changequote(<<, >>)dnl
-<< --with-zlib[=DIR] use zlib (located in directory DIR, if supplied) to read compressed data. [default=yes, if present]>>,
-changequote([, ])dnl
+[ --with-zlib[[=DIR]] use zlib (located in directory DIR, if supplied) to read compressed data. [[default=yes, if available]]],
[
if test $withval = no
then
#
# Use zlib if it's present, otherwise don't.
#
- want_zlib=ifpresent
+ want_zlib=ifavailable
zlib_dir=
])
if test "x$want_zlib" = "xno" ; then
AC_MSG_CHECKING(whether to use libpcre for regular expressions in dfilters)
AC_ARG_WITH(pcre,
-changequote(<<, >>)dnl
-<< --with-pcre[=DIR] use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. [default=yes, if present]>>,
-changequote([, ])dnl
+[ --with-pcre[[=DIR]] use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. [[default=yes, if available]]],
[
if test $withval = no
then
#
# Use libpcre if it's present, otherwise don't.
#
- want_pcre=ifpresent
+ want_pcre=ifavailable
pcre_dir=
])
if test "x$want_pcre" = "xno" ; then
fi
+dnl lua check
+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]]],
+[
+ if test $withval = no
+ then
+ want_lua=no
+ elif test $withval = yes
+ then
+ want_lua=yes
+ else
+ want_lua=yes
+ lua_dir=$withval
+ fi
+],[
+ #
+ # Don't use liblua by default (it isn't ready yet)
+ #
+ want_lua=no
+ lua_dir=
+])
+if test "x$want_lua" = "xno" ; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+ AC_ETHEREAL_LIBLUA_CHECK
+ if test "x$want_lua" = "xno" ; then
+ AC_MSG_RESULT(liblua not found - disabling support for the lua scripting plugin)
+ fi
+fi
+AM_CONDITIONAL(HAVE_LIBLUA, test x$want_lua = xyes)
+
+
dnl ipv6 check
AC_ARG_ENABLE(ipv6,
[ --enable-ipv6 use ipv6 name resolution, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes)
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)
AC_MSG_CHECKING(whether to use SSL library)
AC_ARG_WITH(ssl,
-changequote(<<, >>)dnl
-<< --with-ssl[=DIR] use SSL crypto library (located in directory DIR, if supplied). [default=no]>>,
-changequote([, ])dnl
+[ --with-ssl[[=DIR]] use SSL crypto library (located in directory DIR, if supplied). [[default=no]]],
[
if test "x$withval" = "xno"; then
want_ssl=no
fi
AC_SUBST(SSL_LIBS)
-dnl UCD SNMP/NET-SNMP Check
+dnl UCD SNMP/Net-SNMP Check
SNMP_LIBS=''
AC_ARG_WITH(net-snmp,
-changequote(<<, >>)dnl
-<< --with-net-snmp=PATH use NET-SNMP library, with PATH as the location of the net-snmp-config shell script that comes with the net-snmp package.>>,
-changequote([, ])dnl
-[netsnmpconfig=$withval]
-)
+[ --with-net-snmp[[=PATH]] use Net-SNMP library (with PATH as the location of the net-snmp-config shell script that comes with the net-snmp package, if supplied) [[default=yes, if available]]],
+[
+ if test $withval = no
+ then
+ want_netsnmp=no
+ elif test $withval = yes
+ then
+ want_netsnmp=yes
+ else
+ want_netsnmp=yes
+ netsnmpconfig="$withval"
+ fi
+],[
+ #
+ # Set "want_netsnmp" to "ifavailable" to make the default "use it
+ # if you find it, otherwise don't".
+ #
+ want_netsnmp=ifavailable
+])
AC_ARG_WITH(ucd-snmp,
-changequote(<<, >>)dnl
-<< --with-ucd-snmp[=DIR] use UCD SNMP client library (located in directory DIR, if supplied). [default=yes, if present]>>,
-changequote([, ])dnl
+[ --with-ucd-snmp[[=DIR]] use UCD SNMP client library (located in directory DIR, if supplied). [[default=yes, if available]]],
[
if test $withval = no
then
fi
],[
#
- # Set "want_ucdsnmp" to "ifpresent" to make the default "use it
+ # Set "want_ucdsnmp" to "ifavailable" to make the default "use it
# if you find it, otherwise don't".
#
- want_ucdsnmp=ifpresent
+ want_ucdsnmp=ifavailable
ucdsnmp_dir=
])
-dnl try net-snmp first
-AC_MSG_CHECKING(whether to use NET-SNMP library if available)
-if test "x$netsnmpconfig" != "xno" ; then
- AC_MSG_RESULT(yes)
- dnl get the net-snmp-config binary
- if test "x$netsnmpconfig" = "xyes" -o "x$netsnmpconfig" = "x" ; then
- dnl search for it
- AC_PATH_PROG(NETSNMPCONFIG,net-snmp-config)
+#
+# Try Net-SNMP first.
+#
+AC_MSG_CHECKING(whether to use Net-SNMP library)
+if test "x$want_netsnmp" = "xno" ; then
+ AC_MSG_RESULT(no)
+else
+ if test "x$want_netsnmp" = "xifavailable" ; then
+ AC_MSG_RESULT([yes, if available])
else
- NETSNMPCONFIG=$netsnmpconfig
- if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
- NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
- if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
- AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
- fi
- fi
+ AC_MSG_RESULT(yes)
fi
-else
- AC_MSG_RESULT(no)
+ AC_ETHEREAL_NETSNMP_CHECK
fi
-if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
- dnl other choices for flags to use here: could also use
- dnl --prefix or --exec-prefix if you don't want the full list.
-
- #
- # Save the current settings of CFLAGS and CPPFLAGS, and add
- # the output of "$NETSNMPCONFIG --cflags" to it, so that when
- # searching for the Net-SNMP headers, we look in whatever
- # directory that output specifies.
- #
- ethereal_save_CFLAGS="$CFLAGS"
- ethereal_save_CPPFLAGS="$CPPFLAGS"
- CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
- CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
-
- AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
- if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
- SNMP_LIBS=`$NETSNMPCONFIG --libs`
- if echo "$SNMP_LIBS" | grep crypto >/dev/null && test "x$SSL_LIBS" = "x"; then
- AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- SNMP_LIBS=
- NETSNMPCONFIG="no"
- else
- AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP])
- have_net_snmp="yes"
- fi
- else
- # technically, we should retry ucd-snmp but it's
- # unlikely they have installed net-snmp-config and not
- # the net-snmp headers but do have the ucd-snmp
- # headers. This would likely be a broken system to
- # try and use anyway.
- NETSNMPCONFIG="no"
-
- #
- # Restore the versions of CFLAGS and CPPFLAGS before
- # we added the output of '$NETSNMPCONFIG --cflags",
- # as we didn't actually find Net-SNMP there.
- #
- CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPFLAGS"
- fi
-else
- AC_MSG_CHECKING(whether to use UCD SNMP library if available)
+#
+# If that didn't find Net-SNMP, try UCD SNMP.
+#
+if test "x$have_net_snmp" != "xyes" ; then
+ AC_MSG_CHECKING(whether to use UCD SNMP library)
if test "x$want_ucdsnmp" = "xno" ; then
AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(yes)
+ if test "x$want_ucdsnmp" = "xifavailable" ; then
+ AC_MSG_RESULT([yes, if available])
+ else
+ AC_MSG_RESULT(yes)
+ fi
AC_ETHEREAL_UCDSNMP_CHECK
fi
fi
if test "x$have_net_snmp" = "xyes" || test "x$have_ucd_snmp" = "xyes"; then
- AC_DEFINE(HAVE_SOME_SNMP, 1, [Define to if some SNMP support is to be used])
+ AC_DEFINE(HAVE_SOME_SNMP, 1, [Define to 1 if some SNMP support is to be used])
fi
AC_SUBST(SNMP_LIBS)
-dnl kerberos/heimdal check
-AC_MSG_CHECKING(whether to use kerberos/heimdal)
+dnl kerberos check
+AC_MSG_CHECKING(whether to use kerberos)
AC_ARG_WITH(krb5,
-changequote(<<, >>)dnl
-<< --with-krb5[=DIR] use kerberos/heimdal (located in directory DIR, if supplied) to use in kerberos dissection [default=yes]>>,
-changequote([, ])dnl
+[ --with-krb5[[=DIR]] use kerberos (located in directory DIR, if supplied) to use in kerberos dissection [[default=yes]]],
[
if test $withval = no
then
fi
],[
#
- # Use kerberos/heimdal if specified, otherwise don't.
+ # Use kerberos if specified, otherwise don't.
#
- want_krb5=ifpresent
+ want_krb5=ifavailable
krb5_dir=
])
if test "x$want_krb5" = "xno" ; then
else
AC_MSG_RESULT(yes)
AC_ETHEREAL_KRB5_CHECK
- if test "x$want_krb5" = "xno" ; then
- AC_MSG_RESULT(heimdal not found - disabling dissection for some kerberos data in packet decoding)
- fi
fi
dnl ADNS Check
ADNS_LIBS=''
AC_MSG_CHECKING(whether to use the GNU ADNS library if available)
+
+AC_ARG_WITH(adns,
+[ --with-adns[[=DIR]] use GNU ADNS (located in directory DIR, if supplied). [[default=yes, if present]]],
+[
+if test "x$withval" = "xno"; then
+ want_adns=no
+elif test "x$withval" = "xyes"; then
+ want_adns=yes
+elif test -d "$withval"; then
+ want_adns=yes
+ AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+fi
+])
if test "x$with_adns" = "xno" ; then
AC_MSG_RESULT(no)
else
# 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)
dnl blank for now, but will be used in future
AC_SUBST(ethereal_SUBDIRS)
dnl
plugindir="$libdir/ethereal/plugins/$VERSION"
AC_ARG_WITH(plugins,
-changequote(<<, >>)dnl
-<< --with-plugins[=DIR] support plugins (installed in DIR, if supplied).>>,
-changequote([, ])dnl
+[ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).],
[
case "$withval" in
"" | y | ye | yes )
packaging/svr4/pkginfo
plugins/Makefile
plugins/acn/Makefile
+ plugins/agentx/Makefile
plugins/artnet/Makefile
plugins/asn1/Makefile
plugins/ciscosm/Makefile
plugins/enttec/Makefile
plugins/giop/Makefile
plugins/gryphon/Makefile
+ plugins/h223/Makefile
plugins/irda/Makefile
+ plugins/lua/Makefile
plugins/lwres/Makefile
+ plugins/mate/Makefile
plugins/megaco/Makefile
plugins/mgcp/Makefile
plugins/opsi/Makefile
plugins/pcli/Makefile
+ plugins/profinet/Makefile
plugins/rdm/Makefile
plugins/rlm/Makefile
plugins/rtnet/Makefile
plugins/rudp/Makefile
+ plugins/stats_tree/Makefile
plugins/v5ua/Makefile
tools/Makefile
tools/lemon/Makefile
pcre_message="yes"
fi
+if test "x$want_lua" = "xyes" -a "x$have_plugins" = "xyes" ; then
+ lua_message="yes"
+else
+ lua_message="no"
+fi
+
if test "x$want_ssl" = "xno" ; then
ssl_message="no"
else
if test "x$want_krb5" = "xno" ; then
krb5_message="no"
else
- krb5_message="yes (heimdal)"
+ krb5_message="yes ($ac_krb5_version)"
fi
if test "x$have_good_adns" = "xyes" ; then
adns_message="no"
fi
-if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
+if test "x$have_net_snmp" = "xyes" ; then
snmp_libs_message="yes (net-snmp)"
-elif test "x$SNMP_LIBS" = "x" ; then
- snmp_libs_message="no"
-else
+elif test "x$have_ucdsnmp" = "xyes" ; then
snmp_libs_message="yes (ucd-snmp)"
+else
+ snmp_libs_message="no"
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 capinfo : $enable_capinfo"
+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 ""
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 " Use GNU ADNS library : $adns_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 UCD SNMP/Net-SNMP library : $snmp_libs_message"
+echo " Use gnutls library : $tls_message"