The function pointer in a "per_choice_t" or a "per_sequence_t" is to a
[obnox/wireshark/wip.git] / configure.in
index aa6dc16e7b65f6b1fd42c8dc64ea83dea1e052fc..de71a4eda27eb3ba5f4610985799c9a006ca892e 100644 (file)
@@ -1,38 +1,42 @@
-# $Id: configure.in,v 1.192 2003/01/14 23:53:32 guy Exp $
-dnl
-dnl Process this file with autoconf 2.13 or later to produce a
-dnl configure script; 2.12 doesn't generate a "configure" script that
-dnl defines SHELL, and "Makefile.in" has
-dnl
-dnl    SHELL = @SHELL@
-dnl
-dnl which requires it to be defined - and there may be other problems
-dnl with pre-2.13 "autoconf" as well.
-dnl
+# $Id: configure.in,v 1.263 2004/05/23 22:34:44 jmayer Exp $
+#
 AC_INIT(etypes.h)
 
-AC_PREREQ(2.13)
+AC_PREREQ(2.52)
 
 dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(ethereal, 0.9.8)
+AM_INIT_AUTOMAKE(ethereal, 0.10.4)
+
+AM_DISABLE_STATIC
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
+dnl Work around libtool bug (fixed in the version 1.5a?)
+AC_DEFUN([AC_PROVIDE_AC_LIBTOOL_DLOPEN], )
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 AC_PROG_YACC
 AM_PROG_LEX
 AC_PATH_PROG(PERL, perl)
 AC_PATH_PROG(POD2MAN, pod2man)
+if test "x$POD2MAN" = x
+then
+       #
+       # The alternative is not to build the man pages....
+       #
+       AC_MSG_ERROR(I couldn't find pod2man; make sure it's installed and in your path)
+fi
 AC_PATH_PROG(LEX, flex)
 AC_PATH_PROG(PYTHON, python)
 
 AC_SUBST(PERL)
+AC_SUBST(POD2MAN)
 AC_SUBST(LEX)
+AC_SUBST(FLEX_PATH)
 AC_SUBST(PYTHON)
 
 # Check for packaging utilities
@@ -64,11 +68,11 @@ AC_SUBST(HAVE_RPM)
 # argument will compile with non-GCC compilers.
 #
 AC_ARG_WITH(extra-gcc-checks,
-[  --with-extra-gcc-checks do additional -W checks in GCC.  [default=no]],
+[  --with-extra-gcc-checks Do additional -W checks in GCC.  [default=no]],
 [
        if test $withval != no
        then
-               ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align"
+               ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes"
        fi
 ],)
 AC_MSG_CHECKING(to see if we can add '-Wall -W$ethereal_extra_gcc_flags' to CFLAGS)
@@ -129,21 +133,29 @@ else
                CFLAGS="-no-cpp-precomp $CFLAGS"
                AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
                ;;
+       cygwin*)
+               #
+               # Shared libraries in cygwin/Win32 must never contain
+               # undefined symbols.
+               #
+               LDFLAGS="$LDFLAGS -no-undefined"
+               AC_MSG_RESULT(CygWin GCC - added -no-undefined to LDFLAGS)
+               ;;
        *)
                AC_MSG_RESULT(none needed)
                ;;
        esac
 fi
 
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-
 dnl Look in /usr/local for header files and libraries ?
+dnl XXX FIXME don't include /usr/local if it is already in the system
+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,
-[  --enable-usr-local      look for headers and libs in /usr/local tree.  [default=yes]],enable_usr_local=$enableval,enable_usr_local=yes)
+[  --enable-usr-local      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)
-if test "x$enable_usr_local" = "xyes" ; then
+if test "x$ac_cv_enable_usr_local" = "xyes" ; then
        AC_MSG_RESULT(yes)
        #
        # Arrange that we search for header files in the source directory
@@ -162,15 +174,6 @@ else
        AC_MSG_RESULT(no)
 fi
 
-# Create DATAFILE_DIR #define for config.h
-datafiledir=$sysconfdir
-datafiledir=`(
-    test "x$prefix" = xNONE && prefix=$ac_default_prefix
-    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
-    eval echo "$datafiledir"
-)`
-AC_DEFINE_UNQUOTED(DATAFILE_DIR, "$datafiledir")
-
 #
 # If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a
 # link directory.
@@ -225,12 +228,41 @@ fi
 # Enable/disable tethereal
 
 AC_ARG_ENABLE(ethereal,
-[  --enable-ethereal       build GTK+-based ethereal.  [default=yes]],,enable_ethereal=yes)
+[  --enable-ethereal       build GTK+-based ethereal.  [default=yes]],enable_ethereal=$enableval,enable_ethereal=yes)
 
 AC_ARG_ENABLE(gtk2,
-[  --enable-gtk2           build Glib2/Gtk2+-based (t)ethereal.  [default=no]],enable_gtk2=yes,enable_gtk2=no)
+[  --enable-gtk2           build Glib2/Gtk2+-based (t)ethereal.  [default=no]],enable_gtk2=$enableval,enable_gtk2=no)
 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)
+AM_CONDITIONAL(USE_THREADS, test x$enable_threads = xyes)
+
+AC_ARG_ENABLE(profile-build,
+[  --enable-profile-build  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)
+if test "x$enable_profile_build" = "xyes" ; then
+       if test -n "$GCC" ; then
+               AC_MSG_RESULT(yes)
+               CFLAGS=" -pg $CFLAGS"
+       else
+               AC_MSG_RESULT(no)
+               echo "Building profile binaries currently only supported for GCC."
+       fi
+else
+       AC_MSG_RESULT(no)
+fi
+
+# Create DATAFILE_DIR #define for config.h
+datafiledir=$datadir/ethereal
+datafiledir=`(
+    test "x$prefix" = xNONE && prefix=$ac_default_prefix
+    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
+    eval echo "$datafiledir"
+)`
+AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data])
+
 # GTK checks
 # We don't add $GLIB_LIBS to LIBS, because we don't want to force all
 # programs to be built with GTK+.
@@ -238,7 +270,7 @@ AM_CONDITIONAL(USE_GTK2, test x$enable_gtk2 = xyes)
 if test "x$enable_gtk2" = "xyes" -a "x$enable_ethereal" = "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" = "xno" -a "x$enable_ethereal" = "xyes" ; then
+elif test "x$enable_gtk2" != "xyes" -a "x$enable_ethereal" = "xyes" ; then
        GTK_OK=one
        AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no )
 else
@@ -266,7 +298,7 @@ if test "$GTK_OK" = "no" ; then
                AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
        fi
 else
-       ethereal_bin="ethereal"
+       ethereal_bin="ethereal\$(EXEEXT)"
        ethereal_man="ethereal.1"
         ethereal_SUBDIRS="gtk"
        # Honor GLIB_CFLAGS
@@ -301,7 +333,8 @@ main ()
     return 1;  /* failure */
 }
 ], ac_cv_glib_supports_modules=yes, ac_cv_glib_supports_modules=no,
-   [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+   [echo $ac_n "cross compiling; assumed OK... $ac_c"
+    ac_cv_glib_supports_modules=yes])
 CFLAGS="$ac_save_CFLAGS"
 LIBS="$ac_save_LIBS"
 if test "$ac_cv_glib_supports_modules" = yes ; then
@@ -316,32 +349,36 @@ fi
 AC_SUBST(ethereal_bin)
 AC_SUBST(ethereal_man)
 
+rdps_bin="rdps\$(EXEEXT)"
+AC_SUBST(rdps_bin)
 
 
 # Enable/disable tethereal
 
 AC_ARG_ENABLE(tethereal,
-[  --enable-tethereal      build tethereal.  [default=yes]],,enable_tethereal=yes)
+[  --enable-tethereal      build tethereal.  [default=yes]],tethereal=$enableval,enable_tethereal=yes)
 
 if test "x$enable_tethereal" = "xyes" ; then
-       tethereal_bin="tethereal"
+       tethereal_bin="tethereal\$(EXEEXT)"
        tethereal_man="tethereal.1"
+       etherealfilter_man="ethereal-filter.4"
 else
        tethereal_bin=""
        tethereal_man=""
 fi
 AC_SUBST(tethereal_bin)
 AC_SUBST(tethereal_man)
+AC_SUBST(etherealfilter_man)
 
 
 
 # Enable/disable editcap
 
 AC_ARG_ENABLE(editcap,
-[  --enable-editcap        build editcap.  [default=yes]],,enable_editcap=yes)
+[  --enable-editcap        build editcap.  [default=yes]],enable_editcap=$enableval,enable_editcap=yes)
 
 if test "x$enable_editcap" = "xyes" ; then
-       editcap_bin="editcap"
+       editcap_bin="editcap\$(EXEEXT)"
        editcap_man="editcap.1"
 else
        editcap_bin=""
@@ -354,10 +391,10 @@ AC_SUBST(editcap_man)
 # Enable/disable mergecap
 
 AC_ARG_ENABLE(mergecap,
-[  --enable-mergecap       build mergecap.  [default=yes]],,enable_mergecap=yes)
+[  --enable-mergecap       build mergecap.  [default=yes]],enable_mergecap=$enableval,enable_mergecap=yes)
 
 if test "x$enable_mergecap" = "xyes" ; then
-       mergecap_bin="mergecap"
+       mergecap_bin="mergecap\$(EXEEXT)"
        mergecap_man="mergecap.1"
 else
        mergecap_bin=""
@@ -370,10 +407,10 @@ AC_SUBST(mergecap_man)
 # Enable/disable text2pcap
 
 AC_ARG_ENABLE(text2pcap,
-[  --enable-text2pcap      build text2pcap.  [default=yes]],,enable_text2pcap=yes)
+[  --enable-text2pcap      build text2pcap.  [default=yes]],text2pcap=$enableval,enable_text2pcap=yes)
 
 if test "x$enable_text2pcap" = "xyes" ; then
-       text2pcap_bin="text2pcap"
+       text2pcap_bin="text2pcap\$(EXEEXT)"
        text2pcap_man="text2pcap.1"
 else
        text2pcap_bin=""
@@ -385,7 +422,7 @@ AC_SUBST(text2pcap_man)
 # Enable/disable idl2eth
 
 AC_ARG_ENABLE(idl2eth,
-[  --enable-idl2eth        build idl2eth.  [default=yes]],,enable_idl2eth=yes)
+[  --enable-idl2eth        build idl2eth.  [default=yes]],enable_idl2eth=$enableval,enable_idl2eth=yes)
 
 if test "x$enable_idl2eth" = "xyes" ; then
        idl2eth_bin="idl2eth"
@@ -401,10 +438,10 @@ AC_SUBST(idl2eth_man)
 # Enable/disable dftest
 
 AC_ARG_ENABLE(dftest,
-[  --enable-dftest         build dftest.  [default=no]],,enable_dftest=no)
+[  --enable-dftest         build dftest.  [default=yes]],enable_dftest=$enableval,enable_dftest=yes)
 
 if test "x$enable_dftest" = "xyes" ; then
-       dftest_bin="dftest"
+       dftest_bin="dftest\$(EXEEXT)"
 else
        dftest_bin=""
 fi
@@ -414,10 +451,10 @@ AC_SUBST(dftest_bin)
 # Enable/disable randpkt
 
 AC_ARG_ENABLE(randpkt,
-[  --enable-randpkt        build randpkt.  [default=no]],,enable_randpkt=no)
+[  --enable-randpkt        build randpkt.  [default=no]],enable_randpkt=$enableval,enable_randpkt=no)
 
 if test "x$enable_randpkt" = "xyes" ; then
-       randpkt_bin="randpkt"
+       randpkt_bin="randpkt\$(EXEEXT)"
 else
        randpkt_bin=""
 fi
@@ -436,7 +473,9 @@ dnl pcap check
 AC_MSG_CHECKING(whether to use libpcap for packet capture)
 
 AC_ARG_WITH(pcap,
-[  --with-pcap[=DIR]       use libpcap for packet capturing.  [default=yes]],
+changequote(<<, >>)dnl
+<<  --with-pcap[=DIR]       use libpcap for packet capturing.  [default=yes]>>,
+changequote([, ])dnl
 [
        if test $withval = no
        then
@@ -457,14 +496,15 @@ if test "x$want_pcap" = "xno" ; then
 else
        AC_MSG_RESULT(yes)
        AC_ETHEREAL_PCAP_CHECK
-       AC_ETHEREAL_PCAP_VERSION_CHECK
 fi
 
 dnl zlib check
 AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
 
 AC_ARG_WITH(zlib,
-[  --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 present]>>,
+changequote([, ])dnl
 [
        if test $withval = no
        then
@@ -494,9 +534,45 @@ else
 fi
 
 
+dnl pcre check
+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
+[
+       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, otherwise don't.
+       #
+       want_pcre=ifpresent
+       pcre_dir=
+])
+if test "x$want_pcre" = "xno" ; then
+        AC_MSG_RESULT(no)
+else
+        AC_MSG_RESULT(yes)
+        AC_ETHEREAL_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
+
+
 dnl ipv6 check
 AC_ARG_ENABLE(ipv6,
-[  --enable-ipv6           use ipv6 name resolution, if available.  [default=yes]],,enable_ipv6=yes)
+[  --enable-ipv6           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)
 if test "x$enable_ipv6" = "xno" ; then
@@ -509,7 +585,7 @@ fi
 
 dnl Check if ethereal should be installed setuid
 AC_ARG_ENABLE(setuid-install,
-[  --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],,enable_setuid_install=no)
+[  --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
 
 AC_MSG_CHECKING(whether to install ethereal setuid)
 if test "x$enable_setuid_install" = "xno" ; then
@@ -522,12 +598,10 @@ AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdarg.h netdb.h)
-AC_CHECK_HEADERS(sys/stat.h sys/sockio.h sys/types.h sys/socket.h)
-AC_CHECK_HEADERS(sys/wait.h)
+AC_CHECK_HEADERS(direct.h dirent.h fcntl.h netdb.h stdarg.h stddef.h unistd.h)
+AC_CHECK_HEADERS(sys/ioctl.h sys/param.h sys/socket.h sys/sockio.h sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h)
 AC_CHECK_HEADERS(netinet/in.h)
-AC_CHECK_HEADERS(stddef.h)
-AC_CHECK_HEADERS(arpa/inet.h)
+AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h)
 AC_CHECK_HEADERS(iconv.h)
 
 dnl SSL Check
@@ -541,17 +615,20 @@ else
 fi
 AC_SUBST(SSL_LIBS)
 
-dnl UCD SNMP Check
+dnl UCD SNMP/NET-SNMP Check
 SNMP_LIBS=''
-AC_MSG_CHECKING(whether to use UCD SNMP/NET-SNMP library if available)
 
 AC_ARG_WITH(net-snmp,
-[  --with-net-snmp=PATH    use PATH as the location of the net-snmp-config shell script that comes with the net-snmp package.],
+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]
 )
 
-AC_ARG_WITH(ucdsnmp,
-[  --with-ucdsnmp[=DIR]    use UCD SNMP/NET-SNMP client library (located in directory DIR, if supplied).  [default=yes, if present]],
+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
 [
        if test $withval = no
        then
@@ -573,30 +650,46 @@ AC_ARG_WITH(ucdsnmp,
 ])
 
 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)
        else
                NETSNMPCONFIG=$netsnmpconfig
-               if test ! -x $NETSNMPCONFIG ; then
-                       AC_MSG_ERROR(Invalid net-snmp-config: $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
        fi
+else
+       AC_MSG_RESULT(no)
 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
-               CFLAGS="$CFLAGS `net-snmp-config --cflags`"
-               CPPFLAGS="$CPPLAGS `net-snmp-config --cflags`"
-               SNMP_LIBS=`net-snmp-config --libs`
-               AC_DEFINE(HAVE_NET_SNMP)
-               AC_MSG_RESULT(yes (net-snmp))
+               SNMP_LIBS=`$NETSNMPCONFIG --libs`
+               AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP])
+               have_net_snmp="yes"
        else
                # technically, we should retry ucd-snmp but it's
                # unlikely they have installed net-snmp-config and not
@@ -604,19 +697,85 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO
                # headers.  This would likely be a broken system to
                # try and use anyway.
                NETSNMPCONFIG="no"
-               AC_MSG_RESULT(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 test "x$want_ucdsnmp" = "xno" ; then
                AC_MSG_RESULT(no)
        else
-               AC_MSG_RESULT(yes (ucd-snmp))
+               AC_MSG_RESULT(yes)
                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])
+fi
+
 AC_SUBST(SNMP_LIBS)
 
+
+dnl kerberos/heimdal check
+AC_MSG_CHECKING(whether to use kerberos/heimdal)
+
+AC_ARG_WITH(krb5,
+changequote(<<, >>)dnl
+<<  --with-krb5[=DIR]       use kerberos/heimdal (located in directory DIR, if supplied) to use in kerberos dissection  [default=no]>>,
+changequote([, ])dnl
+[
+       if test $withval = no
+       then
+               want_krb5=no
+       elif test $withval = yes
+       then
+               want_krb5=yes
+       else
+               want_krb5=yes
+               krb5_dir=$withval
+       fi
+],[
+       #
+       # Use kerberos/heimdal if specified, otherwise don't.
+       #
+       want_krb5=no
+       krb5_dir=
+])
+if test "x$want_krb5" = "xno" ; then
+        AC_MSG_RESULT(no)
+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)
+if test "x$with_adns" = "xno" ; then
+       AC_MSG_RESULT(no)
+else
+       AC_MSG_RESULT(yes)
+       AC_ETHEREAL_ADNS_CHECK
+fi
+AC_SUBST(ADNS_LIBS)
+
+#
+# Define ETH_VAR_IMPORT appropriately for declarations of external
+# variables exported from dynamically-linked libraries.
+#
+AC_DEFINE(ETH_VAR_IMPORT, extern, [Define as the string to precede external variable declarations in dynamically-linked libraries])
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 # AC_C_CONST
 
@@ -637,7 +796,9 @@ AC_PROG_GCC_TRADITIONAL
 SNPRINTF_C=""
 SNPRINTF_O=""
 AC_CHECK_FUNC(snprintf, SNPRINTF_O="",
-  SNPRINTF_O="snprintf.o" [AC_DEFINE(NEED_SNPRINTF_H)])
+  [SNPRINTF_O="snprintf.o"
+   AC_DEFINE(NEED_SNPRINTF_H, 1, [Define if sprintf.h needs to be included])
+])
 if test "$ac_cv_func_snprintf" = no ; then
   SNPRINTF_C="snprintf.c"
   SNPRINTF_O="snprintf.o"
@@ -646,7 +807,9 @@ AC_SUBST(SNPRINTF_C)
 AC_SUBST(SNPRINTF_O)
 
 AC_CHECK_FUNC(strerror, STRERROR_O="",
-  STRERROR_O="strerror.o" [AC_DEFINE(NEED_STRERROR_H)])
+  [STRERROR_O="strerror.o"
+   AC_DEFINE(NEED_STRERROR_H, 1, [Define if strerror.h needs to be included])
+])
 if test "$ac_cv_func_strerror" = no ; then
   STRERROR_C="strerror.c"
   STRERROR_O="strerror.o"
@@ -681,8 +844,82 @@ fi
 AC_SUBST(MKSTEMP_C)
 AC_SUBST(MKSTEMP_O)
 
+AC_CHECK_FUNC(inet_aton, INET_ATON_O="",
+  INET_ATON_O="inet_aton.lo")
+if test "$ac_cv_func_inet_aton" = no ; then
+  INET_ATON_C="inet_aton.c"
+  INET_ATON_O="inet_aton.lo"
+  AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included])
+fi
+AC_SUBST(INET_ATON_C)
+AC_SUBST(INET_ATON_O)
+
+AC_SEARCH_LIBS(inet_pton, [socket nsl], [
+  dnl check for pre-BIND82 inet_pton() bug.
+  AC_MSG_CHECKING(for broken inet_pton)
+  AC_TRY_RUN([#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+int main()
+{
+#ifdef AF_INET6
+  char buf[16];
+  /* this should return 0 (error) */
+  return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf);
+#else
+  return 1;
+#endif
+}], [AC_MSG_RESULT(ok);
+have_inet_pton=yes], [AC_MSG_RESULT(broken);
+have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken);
+have_inet_pton=no])],
+have_inet_pton=no)
+if test "$have_inet_pton" = no; then
+  INET_PTON_C="inet_pton.c"
+  INET_PTON_O="inet_pton.lo"
+else
+  INET_PTON_C=""
+  INET_PTON_O=""
+fi
+AC_SUBST(INET_PTON_C)
+AC_SUBST(INET_PTON_O)
+
+AC_SEARCH_LIBS(inet_ntop, [socket nsl], [
+  AC_MSG_CHECKING([for inet_ntop prototype])
+  AC_TRY_COMPILE([#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+extern const char *inet_ntop(int, const void *, char *, size_t);],, [
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_INET_NTOP_PROTO, 1,
+    [Define if inet_ntop() prototype exists])], [
+    AC_TRY_COMPILE([#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_INET_NTOP_PROTO, 1,
+      [Define if inet_ntop() prototype exists])], [
+      AC_MSG_RESULT(no)])])
+  INET_NTOP_O=""], [
+  INET_NTOP_C="inet_ntop.c"
+  INET_NTOP_O="inet_ntop.lo"
+  AC_DEFINE(NEED_INET_V6DEFS_H, 1,
+  [Define if inet/v6defs.h needs to be included])])
+AC_SUBST(INET_NTOP_C)
+AC_SUBST(INET_NTOP_O)
+
 AC_CHECK_FUNC(strptime, STRPTIME_O="",
-  STRPTIME_O="strptime.o" [AC_DEFINE(NEED_STRPTIME_H)])
+  [STRPTIME_O="strptime.o"
+   AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included])
+])
 if test "$ac_cv_func_strptime" = no ; then
   STRPTIME_C="strptime.c"
   STRPTIME_O="strptime.o"
@@ -701,8 +938,10 @@ dnl check for plugins directory - stolen from Amanda's configure.in
 dnl
 plugindir="$libdir/ethereal/plugins/$VERSION"
 AC_ARG_WITH(plugins,
-  [  --with-plugins[=DIR]    support plugins (installed in DIR, if supplied).],
-  [
+changequote(<<, >>)dnl
+<<  --with-plugins[=DIR]    support plugins (installed in DIR, if supplied).>>,
+changequote([, ])dnl
+[
   case "$withval" in
   "" | y | ye | yes )
     if test x$have_plugins = xno
@@ -721,13 +960,12 @@ AC_ARG_WITH(plugins,
     plugindir="$withval"
     ;;
   esac
-  ]
-)
+])
 
 AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes)
 if test x$have_plugins = xyes
 then
-  AC_DEFINE(HAVE_PLUGINS)
+  AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled])
   plugindir=`(
     test "x$prefix" = xNONE && prefix=$ac_default_prefix
     test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
@@ -735,20 +973,48 @@ then
   )`
   AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$plugindir", [Plugin installation directory])
 else
-  AC_DEFINE(PLUGIN_DIR, NULL)
+  AC_DEFINE(PLUGIN_DIR, NULL, [Plugin installation directory])
 fi
 AC_SUBST(plugindir)
 
+#
+# The plugin dissectors reside in ./plugins/PROTO/
+#
+PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
+AC_SUBST(PLUGIN_LIBS)
+
 dnl libtool defs
+#
+# Yes, AM_PROG_LIBTOOL is redundant with newer version(s) of some tool(s)
+# (autoconf?  automake?  libtool?) - with the newer version(s), it's
+# just an alias for AC_PROG_LIBTOOL, which is called earlier.
+#
+# With older version(s) of those tool(s), however, it's not just an
+# alias, and the configure scripts don't work without it.
+#
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
+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])
+fi
+AC_SUBST(ENABLE_STATIC)
+
+dnl Save the cacheable configure results to config.cache before recursing
+AC_CACHE_SAVE
+
 AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SUBDIRS(epan wiretap)
+AC_CONFIG_SUBDIRS(wiretap)
 AC_OUTPUT(
   Makefile
   doc/Makefile
+  epan/Makefile
+  epan/dfilter/Makefile
+  epan/ftypes/Makefile
   gtk/Makefile
+  help/Makefile
   packaging/Makefile
   packaging/nsis/Makefile
   packaging/rpm/Makefile
@@ -758,12 +1024,24 @@ AC_OUTPUT(
   packaging/svr4/checkinstall
   packaging/svr4/pkginfo
   plugins/Makefile
+  plugins/acn/Makefile
+  plugins/artnet/Makefile
+  plugins/asn1/Makefile
+  plugins/ciscosm/Makefile
   plugins/docsis/Makefile
+  plugins/enttec/Makefile
   plugins/giop/Makefile
   plugins/gryphon/Makefile
+  plugins/irda/Makefile
+  plugins/lwres/Makefile
   plugins/megaco/Makefile
   plugins/mgcp/Makefile
   plugins/pcli/Makefile
+  plugins/rdm/Makefile
+  plugins/rlm/Makefile
+  plugins/rtnet/Makefile
+  plugins/rudp/Makefile
+  plugins/v5ua/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)
@@ -783,6 +1061,24 @@ else
        zlib_message="yes"
 fi
 
+if test "x$want_pcre" = "xno" ; then
+       pcre_message="no"
+else
+       pcre_message="yes"
+fi
+
+if test "x$want_krb5" = "xno" ; then
+       krb5_message="no"
+else
+       krb5_message="yes (heimdal)"
+fi
+
+if test "x$have_good_adns" = "xyes" ; then
+       adns_message="yes"
+else
+       adns_message="no"
+fi
+
 if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
        snmp_libs_message="yes (net-snmp)"
 elif test "x$SNMP_LIBS" = "x" ; then
@@ -805,7 +1101,14 @@ echo ""
 echo "                    Install setuid : $setuid_message"
 echo "                       Use plugins : $have_plugins"
 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"
+fi
 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 GNU ADNS library : $adns_message"
 echo "          Use IPv6 name resolution : $enable_ipv6"
 echo "     Use UCD SNMP/NET-SNMP library : $snmp_libs_message"