sensitivity of packet range options fine tuning:
[obnox/wireshark/wip.git] / configure.in
index 6e8e948172b320ce77c4c563ce1beebe5aede876..8d3ed407dcf195cdbc054b524e37706398bd1e3d 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.138 2001/08/30 19:25:37 oabad Exp $
+# $Id: configure.in,v 1.235 2003/12/10 21:50:04 gerald 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
@@ -13,18 +13,31 @@ AC_INIT(etypes.h)
 
 AC_PREREQ(2.13)
 
-AM_INIT_AUTOMAKE(ethereal, 0.8.19)
-
 dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE(ethereal, 0.10.0)
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AM_DISABLE_STATIC
+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)
 
@@ -38,7 +51,6 @@ AC_SUBST(PYTHON)
 AC_CHECK_PROG(HAVE_PKGPROTO, pkgproto, "yes", "no")
 AC_CHECK_PROG(HAVE_PKGMK, pkgmk, "yes", "no")
 AC_CHECK_PROG(HAVE_PKGTRANS, pkgtrans, "yes", "no")
-AC_CHECK_PROG(HAVE_RPM, rpm, "yes", "no")
 
 if test x$HAVE_PKGPROTO = xyes -a x$HAVE_PKGMK = xyes \
      -a x$HAVE_PKGTRANS = xyes ; then
@@ -48,45 +60,33 @@ else
 fi
 AC_SUBST(HAVE_SVR4_PACKAGING)
 
-# Grr.  Rpm 2.x has a nifty "--showrc" flag that lists all of the current
-# configuration values.  Version 3.x took the niftiness away by returning
-# the values in their raw, unexpanded, macro-embedded form.  We can either
-# try to expand the values we get from 3.x, or poke around for popular build
-# directories.
-HAVE_RPM_PACKAGING=no
-if test x$HAVE_RPM = xyes ; then
-  AC_MSG_CHECKING(for rpm build directories)
-  RPM_SOURCESDIR=`rpm --showrc | grep "^sourcedir" | \
-    sed -e 's/.*: //' 2> /dev/null`
-  if test x$RPM_SPECDIR = x ; then
-    # Red Hat  : /usr/src/redhat
-    # Mandrake : /usr/scr/rpm
-    # SuSE     : /usr/src/packages
-    for TEST_DIR in /usr/src/redhat /usr/src/rpm /usr/src/packages ; do
-      if test -d $TEST_DIR/SPECS -a -d $TEST_DIR/SOURCES -a \
-              -d $TEST_DIR/RPMS -a -d $TEST_DIR/SRPMS -a \
-              -d $TEST_DIR/BUILD ; then
-        RPM_SOURCESDIR=$TEST_DIR/SOURCES
-      fi
-    done
-  fi
-  if test x$RPM_SOURCESDIR = x ; then
-    AC_MSG_RESULT(not found)
-    RPM_SOURCESDIR=""
-  else
-    AC_MSG_RESULT(found)
-    HAVE_RPM_PACKAGING=yes
-  fi
-fi
-AC_SUBST(HAVE_RPM_PACKAGING)
+AC_ETHEREAL_RPM_CHECK
+AC_SUBST(HAVE_RPM)
 
-
-# If we're running gcc, add '-Wall' to CFLAGS.
-AC_MSG_CHECKING(to see if we can add '-Wall' to CFLAGS)
+#
+# If we're running gcc, add '-Wall -W' to CFLAGS, and add
+# '-D_U_="__attribute__((unused))"' as well, so we can use _U_ to
+# flag unused function arguments and not get warnings about them.
+# If "--with-extra-gcc-checks" was specified, add "-Wcast-qual
+# -Wcast-align" as well.  (Add more checks here in the future?)
+#
+# Otherwise, add '-D_U_=""', so that _U_ used to flag an unused function
+# 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]],
+[
+       if test $withval != no
+       then
+               ethereal_extra_gcc_flags=" -Wcast-qual -Wcast-align"
+       fi
+],)
+AC_MSG_CHECKING(to see if we can add '-Wall -W$ethereal_extra_gcc_flags' to CFLAGS)
 if test x$GCC != x ; then
-  CFLAGS="-Wall -W -Wno-unused $CFLAGS"
+  CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -W$ethereal_extra_gcc_flags $CFLAGS"
   AC_MSG_RESULT(yes)
 else
+  CFLAGS="-D_U_=\"\" $CFLAGS"
   AC_MSG_RESULT(no)
 fi
 
@@ -109,6 +109,17 @@ then
                CFLAGS="-Ae +O2 $CFLAGS"
                AC_MSG_RESULT(HP ANSI C compiler - added -Ae +O2)
                ;;
+       darwin*)
+               #
+               # It may be called "cc", but it's really a GCC derivative
+               # with a problematic special precompiler and precompiled
+               # headers; turn off the special precompiler, as some
+               # apparently-legal code won't compile with its precompiled
+               # headers.
+               #
+               CFLAGS="-no-cpp-precomp $CFLAGS"
+               AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
+               ;;
        *)
                AC_MSG_RESULT(none needed)
                ;;
@@ -122,8 +133,11 @@ else
                AC_MSG_RESULT(GCC on Solaris - added -Wno-return-type -DFUNCPROTO=15)
                ;;
        darwin*)
-               CFLAGS="-traditional-cpp $CFLAGS"
-               AC_MSG_RESULT(Apple cc compiler - added -traditional-cpp)
+               #
+               # See comments above about Apple's lovely C compiler.
+               #
+               CFLAGS="-no-cpp-precomp $CFLAGS"
+               AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
                ;;
        *)
                AC_MSG_RESULT(none needed)
@@ -131,32 +145,37 @@ else
        esac
 fi
 
-#
-# 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", an SNMP library)
-# may have been installed under "/usr/local/include".
-#
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I\$(top_srcdir)/epan -I/usr/local/include"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I\$(top_srcdir)/epan -I/usr/local/include"
+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)
 
-#
-# Arrange that we search for libraries in "/usr/local/lib".
-#
-AC_ETHEREAL_ADD_DASH_L(LDFLAGS, /usr/local/lib)
+AC_MSG_CHECKING(whether to use /usr/local for headers and libraries)
+if test "x$enable_usr_local" = "xyes" ; then
+       AC_MSG_RESULT(yes)
+       #
+       # 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", an SNMP library)
+       # may have been installed under "/usr/local/include".
+       #
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 
-# Create DATAFILE_DIR #define for config.h
-DATAFILE_DIR=$sysconfdir
-DATAFILE_DIR=`(
-    test "x$prefix" = xNONE && prefix=$ac_default_prefix
-    test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
-    eval echo "$DATAFILE_DIR"
-)`
-AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR")
-AC_SUBST(DATAFILE_DIR)
+       #
+       # Arrange that we search for libraries in "/usr/local/lib".
+       #
+       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, /usr/local/lib)
+else
+       AC_MSG_RESULT(no)
+fi
 
+#
 # If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a
 # link directory.
+#
 case "$host_os" in
   solaris*)
     AC_MSG_CHECKING(for LD_LIBRARY_PATH, since you appear to be running Solaris)
@@ -169,20 +188,82 @@ case "$host_os" in
   ;;
 esac
 
+#
+# Check for versions of "sed" inadequate to handle, in libtool, a list
+# of object files as large as the list in Ethereal.
+#
+# 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.
+#
+# Add any checks here that are necessary for other OSes.
+#
+AC_ETHEREAL_GNU_SED_CHECK
+if test "$HAVE_GNU_SED" = no ; then
+       case "$host_os" in
+       solaris*)
+               AC_MSG_CHECKING(whether one of /usr/bin/sed or /bin/sed or /usr/ucb/sed will be used)
+               case `which sed` in
+                       /bin/sed|/usr/bin/sed|/usr/ucb/sed)
+                       AC_MSG_RESULT(yes)              
+                       AC_MSG_ERROR([change your path to search /usr/xpg4/bin or directory containing GNU sed before /usr/bin (and /bin and /usr/ucb)])
+                       ;;
+
+                       *)
+                       AC_MSG_RESULT(no)
+                       ;;
+               esac
+               ;;
 
-# Enable/disable tethereal
+       *)
+               :
+               ;;
+       esac
+fi
 
-GTK_OK=yes
+# 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=$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
+       
 # GTK checks
 # 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_ethereal" = "xyes" ; then
+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" != "xyes" -a "x$enable_ethereal" = "xyes" ; then
+       GTK_OK=one
        AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no )
+else
+       GTK_OK=no
 fi
 
 # GLib checks
@@ -195,19 +276,26 @@ fi
 # 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" = "yes" -a "x$enable_ethereal" = "xyes" ; then
-       ethereal_bin="ethereal"
-       ethereal_man="ethereal.1"
-       ethereal_SUBDIRS="gtk"
-
-       # Ignore GLIB_CFLAGS
-       AM_PATH_GLIB(1.2.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule)
-else
+if test "$GTK_OK" = "no" ; then
        enable_ethereal="no"
        ethereal_bin=""
        ethereal_man=""
        # Honor GLIB_CFLAGS
-       AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
+       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)
+       else
+               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"
+       # 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)
+       else
+               AM_PATH_GLIB(1.2.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule)
+       fi
 fi
 
 #
@@ -254,27 +342,29 @@ AC_SUBST(ethereal_man)
 # 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=""
@@ -287,10 +377,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=""
@@ -303,10 +393,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=""
@@ -318,7 +408,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"
@@ -334,10 +424,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=no]],enable_dftest=$enableval,enable_dftest=no)
 
 if test "x$enable_dftest" = "xyes" ; then
-       dftest_bin="dftest"
+       dftest_bin="dftest\$(EXEEXT)"
 else
        dftest_bin=""
 fi
@@ -347,10 +437,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
@@ -369,7 +459,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
@@ -390,28 +482,83 @@ 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_ARG_ENABLE(zlib,
-[  --enable-zlib           use zlib to read compressed data.  [default=yes]],,enable_zlib=yes)
-
 AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
-if test "x$enable_zlib" = "xno" ; then
+
+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
+[
+       if test $withval = no
+       then
+               want_zlib=no
+       elif test $withval = yes
+       then
+               want_zlib=yes
+       else
+               want_zlib=yes
+               zlib_dir=$withval
+       fi
+],[
+       #
+       # Use zlib if it's present, otherwise don't.
+       #
+       want_zlib=ifpresent
+       zlib_dir=
+])
+if test "x$want_zlib" = "xno" ; then
         AC_MSG_RESULT(no)
 else
         AC_MSG_RESULT(yes)
         AC_ETHEREAL_ZLIB_CHECK
-       if test "x$enable_zlib" = "xno" ; then
+       if test "x$want_zlib" = "xno" ; then
                AC_MSG_RESULT(zlib not found - disabling compressed capture file support)
        fi
 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
@@ -424,7 +571,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
@@ -439,10 +586,11 @@ 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(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(iconv.h)
 
 dnl SSL Check
 SSL_LIBS=''
@@ -455,75 +603,104 @@ else
 fi
 AC_SUBST(SSL_LIBS)
 
-dnl SNMP Check
-AC_ARG_ENABLE(snmp,
-[  --enable-snmp           use SNMP library, if available.  [default=yes]],,enable_snmp=yes)
-
+dnl UCD SNMP/NET-SNMP Check
 SNMP_LIBS=''
-AC_MSG_CHECKING(whether to use SNMP library if available)
-if test "x$enable_snmp" = "xno" ; then
-       AC_MSG_RESULT(no)
-else
-       AC_MSG_RESULT(yes)
-       AC_ETHEREAL_UCDSNMP_CHECK
-       AC_CHECK_HEADERS(ucd-snmp/snmp.h ucd-snmp/version.h snmp/snmp.h snmp/version.h)
 
-       #
-       # If we found both UCD and CMU SNMP headers, die, as both
-       # packages install the SNMP library as "libsnmp", so either
-       # only one of them is present or they're in different
-       # directories, and we run the risk of picking up the headers
-       # from one and the library from another.
-       #
-       if test "$ac_cv_header_ucd_snmp_snmp_h" = yes -a \
-          "$ac_cv_header_snmp_snmp_h" = yes ; then
-           AC_MSG_ERROR([Both UCD and CMU SNMP libraries found - uninstall one of them.])
-       fi
+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]
+)
 
+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
+               want_ucdsnmp=no
+       elif test $withval = yes
+       then
+               want_ucdsnmp=yes
+       else
+               want_ucdsnmp=yes
+               ucdsnmp_dir=$withval
+       fi
+],[
        #
-       # This may require "-lkstat" on Solaris, sigh.
+       # Set "want_ucdsnmp" to "ifpresent" to make the default "use it
+       # if you find it, otherwise don't".
        #
-       AC_CHECK_LIB(snmp, sprint_objid,
-         SNMP_LIBS=-lsnmp,
-         [
-           #
-           # Throw away the cached "we didn't find it" answer.
-           #
-           unset ac_cv_lib_snmp_sprint_objid
-           AC_CHECK_LIB(snmp, sprint_objid,
-             [
-               #
-               # Throw away the cached "we found it" answer, so that if
-               # we rerun "configure", we don't just blow off this check
-               # and blithely assume that we don't need "-lkstat".
-               #
-               # XXX - autoconf really needs a way to test for a given
-               # routine in a given library *and* to test whether additional
-               # "-L"/"-R"/whatever flags are needed *before* the "-l"
-               # flag for the library and to test whether additional libraries
-               # are needed after the library *and* to cache all that
-               # information.
-               #
-               unset ac_cv_lib_snmp_sprint_objid
-               SNMP_LIBS="-lsnmp -lkstat"
-             ],,$SOCKET_LIBS $NSL_LIBS $SSL_LIBS -lkstat
-           )
-         ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS
-       )
+       want_ucdsnmp=ifpresent
+       ucdsnmp_dir=
+])
 
-       #
-       # If we have SNMP header files but didn't find "sprint_objid()",
-       # fail, as there's something wrong (perhaps the user needs to
-       # specify "--with-ssl").
-       #
-       if test '(' "$ac_cv_header_ucd_snmp_snmp_h" = yes -o \
-          "$ac_cv_header_snmp_snmp_h" = yes ')' -a \
-          "$ac_cv_lib_snmp_sprint_objid" = no; then
-           AC_MSG_ERROR([SNMP header files found, but sprint_objid not found in SNMP library.])
+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)
+               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.
+
+       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, 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
+               # 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"
+       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)
+               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 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)
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 # AC_C_CONST
 
@@ -544,7 +721,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"
@@ -553,7 +732,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"
@@ -589,7 +770,9 @@ AC_SUBST(MKSTEMP_C)
 AC_SUBST(MKSTEMP_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"
@@ -606,10 +789,12 @@ 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
-PLUGIN_DIR="$libdir/ethereal/plugins/$VERSION"
+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
@@ -625,32 +810,45 @@ AC_ARG_WITH(plugins,
     then
       AC_MSG_ERROR([GLib on this platform doesn't support loadable modules, so you can't enable plugins.])
     fi
-    PLUGIN_DIR="$withval"
+    plugindir="$withval"
     ;;
   esac
-  ]
-)
+])
 
 AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes)
 if test x$have_plugins = xyes
 then
-  AC_DEFINE(HAVE_PLUGINS)
-  PLUGIN_DIR=`(
+  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}
-    eval echo "$PLUGIN_DIR"
+    eval echo "$plugindir"
   )`
-  AC_DEFINE_UNQUOTED(PLUGIN_DIR,"$PLUGIN_DIR", [Plugin installation directory])
+  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(PLUGIN_DIR)
+AC_SUBST(plugindir)
 
 dnl libtool defs
-AC_LIBTOOL_DLOPEN
+#
+# 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)
+
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SUBDIRS(epan wiretap)
 AC_OUTPUT(
@@ -660,14 +858,25 @@ AC_OUTPUT(
   packaging/Makefile
   packaging/nsis/Makefile
   packaging/rpm/Makefile
-  packaging/rpm/ethereal.spec
+  packaging/rpm/SPECS/Makefile
+  packaging/rpm/SPECS/ethereal.spec
   packaging/svr4/Makefile
   packaging/svr4/checkinstall
   packaging/svr4/pkginfo
   plugins/Makefile
+  plugins/acn/Makefile
+  plugins/artnet/Makefile
+  plugins/asn1/Makefile
+  plugins/docsis/Makefile
+  plugins/enttec/Makefile
+  plugins/giop/Makefile
   plugins/gryphon/Makefile
+  plugins/lwres/Makefile
+  plugins/megaco/Makefile
   plugins/mgcp/Makefile
-  plugins/giop/Makefile
+  plugins/pcli/Makefile
+  plugins/rdm/Makefile
+  plugins/rtnet/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)
@@ -681,13 +890,31 @@ else
        setuid_message="no"
 fi
 
-if test "x$SNMP_LIBS" = "x" ; then
-       snmp_libs_message="no"
+if test "x$want_zlib" = "xno" ; then
+       zlib_message="no"
 else
-       snmp_libs_message="yes"
+       zlib_message="yes"
 fi
 
+if test "x$want_pcre" = "xno" ; then
+       pcre_message="no"
+else
+       pcre_message="yes"
+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
+       snmp_libs_message="no"
+else
+       snmp_libs_message="yes (ucd-snmp)"
+fi
 
 echo ""
 echo "The Ethereal package has been configured with the following options."
@@ -702,7 +929,14 @@ echo "                      Build dftest : $enable_dftest"
 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 : $enable_zlib"
+echo "                  Use zlib library : $zlib_message"
+echo "                  Use pcre library : $pcre_message"
+echo "              Use GNU ADNS library : $adns_message"
 echo "          Use IPv6 name resolution : $enable_ipv6"
-echo "                  Use SNMP library : $snmp_libs_message"
+echo "     Use UCD SNMP/NET-SNMP library : $snmp_libs_message"