Use "fork_child" rather than "child_process" - on Win32, "child_process"
[obnox/wireshark/wip.git] / acinclude.m4
index 543cd79dfc6a72d8d676c54c1af98d9cea34b167..a3f11716756668453b73cee5da191a4e36cc375f 100644 (file)
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
 dnl This file is part of the Autoconf packaging for Ethereal.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.19 2000/01/15 21:01:04 guy Exp $
+dnl $Id: acinclude.m4,v 1.67 2003/12/19 01:36:01 guy Exp $
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN,
 #include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
 ac_cv_ethereal_struct_sa_len=yes, ac_cv_ethereal_struct_sa_len=no)])
 if test $ac_cv_ethereal_struct_sa_len = yes; then
-  AC_DEFINE(HAVE_SA_LEN)
+  AC_DEFINE(HAVE_SA_LEN, 1, [Define if sa_len field exists in struct sockaddr])
 fi
 ])
 
@@ -103,10 +103,10 @@ AC_DEFUN(AC_ETHEREAL_IPV6_STACK,
        v6lib=none
 
        AC_MSG_CHECKING([ipv6 stack type])
-       for i in v6d toshiba kame inria zeta linux; do
+       for i in v6d toshiba kame inria zeta linux linux-glibc solaris8; do
                case $i in
                v6d)
-                       AC_EGREP_CPP(yes, [dnl
+                       AC_EGREP_CPP(yes, [
 #include </usr/local/v6/include/sys/types.h>
 #ifdef __V6D__
 yes
@@ -116,7 +116,7 @@ yes
                                CFLAGS="-I/usr/local/v6/include $CFLAGS"])
                        ;;
                toshiba)
-                       AC_EGREP_CPP(yes, [dnl
+                       AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _TOSHIBA_INET6
 yes
@@ -126,7 +126,7 @@ yes
                                CFLAGS="-DINET6 $CFLAGS"])
                        ;;
                kame)
-                       AC_EGREP_CPP(yes, [dnl
+                       AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef __KAME__
 yes
@@ -136,7 +136,7 @@ yes
                                CFLAGS="-DINET6 $CFLAGS"])
                        ;;
                inria)
-                       AC_EGREP_CPP(yes, [dnl
+                       AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef IPV6_INRIA_VERSION
 yes
@@ -144,7 +144,7 @@ yes
                                [v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
                        ;;
                zeta)
-                       AC_EGREP_CPP(yes, [dnl
+                       AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _ZETA_MINAMI_INET6
 yes
@@ -161,6 +161,23 @@ yes
                                CFLAGS="-DINET6 $CFLAGS"
                        fi
                        ;;
+               linux-glibc)
+                       AC_EGREP_CPP(yes, [
+#include <features.h>
+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __GLIBC__ > 2
+yes
+#endif
+#endif],
+                       [v6type=$i; v6lib=inet6; CFLAGS="-DINET6 $CFLAGS"])
+                       ;;
+               solaris8)
+                       if test "`uname -s`" = "SunOS" && test "`uname -r`" = "5.8"; then
+                               v6type=$i
+                               v6lib=inet6
+                               [CFLAGS="-DINET6 -DSOLARIS8_INET6 $CFLAGS"]
+                       fi
+                       ;; 
                esac
                if test "$v6type" != "unknown"; then
                        break
@@ -199,10 +216,8 @@ AC_DEFUN(AC_ETHEREAL_GETHOSTBY_LIB_CHECK,
     # needs -lnsl.
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
-    AC_CHECK_FUNC(gethostbyname)
-    if test $ac_cv_func_gethostbyname = no; then
-      AC_CHECK_LIB(nsl, gethostbyname, NSL_LIBS="-lnsl")
-    fi
+    AC_CHECK_FUNC(gethostbyname, ,
+       AC_CHECK_LIB(nsl, gethostbyname, NSL_LIBS="-lnsl"))
     AC_SUBST(NSL_LIBS)
 ])
 
@@ -229,11 +244,9 @@ AC_DEFUN(AC_ETHEREAL_SOCKET_LIB_CHECK,
     # gethostby* variants that don't use the nameserver (or something).
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
-    AC_CHECK_FUNC(connect)
-    if test $ac_cv_func_connect = no; then
+    AC_CHECK_FUNC(connect, ,
       AC_CHECK_LIB(socket, connect, SOCKET_LIBS="-lsocket",
-               AC_MSG_ERROR(Function 'socket' not found.), $NSL_LIBS)
-    fi
+               AC_MSG_ERROR(Function 'socket' not found.), $NSL_LIBS))
     AC_SUBST(SOCKET_LIBS)
 ])
 
@@ -242,109 +255,367 @@ AC_DEFUN(AC_ETHEREAL_SOCKET_LIB_CHECK,
 #
 AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
 [
-       # Evidently, some systems have pcap.h, etc. in */include/pcap
-       AC_MSG_CHECKING(for extraneous pcap header directories)
-       found_pcap_dir=""
-       for pcap_dir in /usr/include/pcap /usr/local/include/pcap $prefix/include
-       do
-         if test -d $pcap_dir ; then
-           CFLAGS="$CFLAGS -I$pcap_dir"
-           CPPFLAGS="$CPPFLAGS -I$pcap_dir"
-           found_pcap_dir=" $found_pcap_dir -I$pcap_dir"
-         fi
-       done
+       if test -z "$pcap_dir"
+       then
+         # Pcap header checks
+         # XXX need to set a var AC_CHECK_HEADER(pcap.h,,)
 
-       if test "$found_pcap_dir" != "" ; then
-         AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
+         #
+         # The user didn't specify a directory in which libpcap resides;
+         # we assume that the current library search path will work,
+         # but we may have to look for the header in a "pcap"
+         # subdirectory of "/usr/include" or "/usr/local/include",
+         # as some systems apparently put "pcap.h" in a "pcap"
+         # subdirectory, and we also check "$prefix/include" - and
+         # "$prefix/include/pcap", in case $prefix is set to
+         # "/usr/include" or "/usr/local/include".
+         #
+         # XXX - should we just add "$prefix/include" to the include
+         # search path and "$prefix/lib" to the library search path?
+         #
+         AC_MSG_CHECKING(for extraneous pcap header directories)
+         found_pcap_dir=""
+         for pcap_dir in /usr/include/pcap $prefix/include/pcap $prefix/include /usr/local/include/pcap
+         do
+           if test -d $pcap_dir ; then
+               if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then
+                   CFLAGS="$CFLAGS -I$pcap_dir"
+                   CPPFLAGS="$CPPFLAGS -I$pcap_dir"
+               fi
+               found_pcap_dir=" $found_pcap_dir -I$pcap_dir"
+               break
+           fi
+         done
+
+         if test "$found_pcap_dir" != "" ; then
+           AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
+         else
+           AC_MSG_RESULT(not found)
+         fi
        else
-         AC_MSG_RESULT(not found)
+         #
+         # The user specified a directory in which libpcap resides,
+         # so add the "include" subdirectory of that directory to
+         # the include file search path and the "lib" subdirectory
+         # of that directory to the library search path.
+         #
+         # XXX - if there's also a libpcap in a directory that's
+         # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
+         # make us find the version in the specified directory,
+         # as the compiler and/or linker will search that other
+         # directory before it searches the specified directory.
+         #
+         CFLAGS="$CFLAGS -I$pcap_dir/include"
+         CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
+         AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
        fi
 
-       # Pcap header checks
-       AC_CHECK_HEADER(net/bpf.h,,
-           AC_MSG_ERROR([[Header file net/bpf.h not found; if you installed libpcap from source, did you also do \"make install-incl\"?]]))
-       AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
+       # Pcap header check
+       AC_CHECK_HEADER(pcap.h,, 
+           AC_MSG_ERROR([[Header file pcap.h not found; if you installed libpcap
+from source, did you also do \"make install-incl\", and if you installed a
+binary package of libpcap, is there also a developer's package of libpcap,
+and did you also install that package?]]))
 
        #
-       # Try various directories to find libpcap
+       # Check to see if we find "pcap_open_live" in "-lpcap".
        #
        AC_CHECK_LIB(pcap, pcap_open_live,
          [
            PCAP_LIBS=-lpcap
-           AC_DEFINE(HAVE_LIBPCAP)
-         ],
+           AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+         ], [AC_MSG_ERROR(Library libpcap not found.)],
+         $SOCKET_LIBS $NSL_LIBS)
+       AC_SUBST(PCAP_LIBS)
+
+       #
+       # Check whether various variables and functions are defined by
+       # libpcap.
+       #
+       ac_save_LIBS="$LIBS"
+       AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
+       LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
+       AC_TRY_LINK(
+          [
+#      include <stdio.h>
+       extern char *pcap_version;
+          ],
+          [
+       printf ("%s\n", pcap_version);
+          ],
+          ac_cv_pcap_version_defined=yes,
+          ac_cv_pcap_version_defined=no,
+          [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       if test "$ac_cv_pcap_version_defined" = yes ; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known])
+       else
+               AC_MSG_RESULT(no)
+       fi
+       AC_CHECK_FUNCS(pcap_findalldevs pcap_lib_version pcap_open_dead)
+       AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
+       AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink)
+       LIBS="$ac_save_LIBS"
+])
+
+#
+# AC_ETHEREAL_ZLIB_CHECK
+#
+AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
+[
+       if test "x$zlib_dir" != "x"
+       then
+         #
+         # The user specified a directory in which zlib resides,
+         # so add the "include" subdirectory of that directory to
+         # the include file search path and the "lib" subdirectory
+         # of that directory to the library search path.
+         #
+         # XXX - if there's also a zlib in a directory that's
+         # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
+         # make us find the version in the specified directory,
+         # as the compiler and/or linker will search that other
+         # directory before it searches the specified directory.
+         #
+         ethereal_save_CFLAGS="$CFLAGS"
+         CFLAGS="$CFLAGS -I$zlib_dir/include"
+         ethereal_save_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
+         ethereal_save_LIBS="$LIBS"
+         AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
+       fi
+
+       #
+       # Make sure we have "zlib.h".  If we don't, it means we probably
+       # don't have zlib, so don't use it.
+       #
+       AC_CHECK_HEADER(zlib.h,,
          [
-           #
-           # Throw away the cached "we didn't find it"
-           # answer, and see if it's in "/usr/local/lib".
-           #
-           unset ac_cv_lib_pcap_pcap_open_live
-           ethereal_save_LIBS="$LIBS"
-           AC_ETHEREAL_ADD_DASH_L(LIBS, /usr/local/lib)
-           AC_CHECK_LIB(pcap, pcap_open_live,
-             [
-               #
-               # Throw away the cached "we found it" answer, so that if
-               # we rerun "configure", we don't just blow off the above
-               # checks and blithely assume that we don't need to search
-               # "/usr/local/lib".
-               #
-               # 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.
+           if test "x$zlib_dir" != "x"
+           then
+             #
+             # The user used "--with-zlib=" to specify a directory
+             # containing zlib, but we didn't find the header file
+             # there; that either means they didn't specify the
+             # right directory or are confused about whether zlib
+             # is, in fact, installed.  Report the error and give up.
+             #
+             AC_MSG_ERROR([zlib header not found in directory specified in --with-zlib])
+           else
+             if test "x$want_zlib" = "xyes"
+             then
+               #
+               # The user tried to force us to use the library, but we
+               # couldn't find the header file; report an error.
                #
-               unset ac_cv_lib_pcap_pcap_open_live
-               AC_ETHEREAL_ADD_DASH_L(PCAP_LIBS, /usr/local/lib)
-               PCAP_LIBS="$PCAP_LIBS -lpcap"
-               AC_DEFINE(HAVE_LIBPCAP)
-               LIBS="$ethereal_save_LIBS"
-             ],
-             [
+               AC_MSG_ERROR(Header file zlib.h not found.)
+             else
+               #
+               # We couldn't find the header file; don't use the
+               # library, as it's probably not present.
+               #
+               want_zlib=no
+             fi
+           fi
+         ])
+
+       if test "x$want_zlib" != "xno"
+       then
                #
-               # Throw away the cached "we didn't find it"
-               # answer, and see if it's in "$prefix/lib".
+               # Well, we at least have the zlib header file.
                #
-               unset ac_cv_lib_pcap_pcap_open_live
-               LIBS="$ethereal_save_LIBS -L$prefix/lib"
-               AC_CHECK_LIB(pcap, pcap_open_live,
+               # Check for "gzgets()" in zlib, because we need it, but
+               # some older versions of zlib don't have it.  It appears
+               # from the zlib ChangeLog that any released version of zlib
+               # with "gzgets()" should have the other routines we
+               # depend on, such as "gzseek()", "gztell()", and "zError()".
+               #
+               # Another reason why we require "gzgets()" is that
+               # some versions of zlib that didn't have it, such
+               # as 1.0.8, had a bug in "gzseek()" that meant that it
+               # doesn't work correctly on uncompressed files; this
+               # means we cannot use version 1.0.8.  (Unfortunately,
+               # that's the version that comes with recent X11 source,
+               # and many people who install XFree86 on their Slackware
+               # boxes don't realize that they should configure it to
+               # use the native zlib rather than building and installing
+               # the crappy old version that comes with XFree86.)
+               #
+               # I.e., we can't just avoid using "gzgets()", as
+               # versions of zlib without "gzgets()" are likely to have
+               # a broken "gzseek()".
+               #
+               AC_CHECK_LIB(z, gzgets,
+               [
+                       if test "x$zlib_dir" != "x"
+                       then
+                               #
+                               # Put the "-I" and "-L" flags for zlib at
+                               # the beginning of CFLAGS, CPPFLAGS, and
+                               # LIBS.
+                               #
+                               LIBS=""
+                               AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
+                               LIBS="$LIBS -lz $ethereal_save_LIBS"
+                       else
+                               LIBS="-lz $LIBS"
+                       fi
+                       AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
+               ],[
+                       if test "x$zlib_dir" != "x"
+                       then
+                               #
+                               # Restore the versions of CFLAGS, CPPFLAGS,
+                               # and LIBS before we added the "-with-zlib="
+                               # directory, as we didn't actually find
+                               # zlib there, or didn't find a zlib that
+                               # contains gzgets there.
+                               #
+                               CFLAGS="$ethereal_save_CFLAGS"
+                               CPPFLAGS="$ethereal_save_CPPFLAGS"
+                               LIBS="$ethereal_save_LIBS"
+                       fi
+                       want_zlib=no
+               ])
+       fi
+
+       if test "x$want_zlib" != "xno"
+       then
+               #
+               # Well, we at least have the zlib header file and a zlib
+               # with "gzgets()".
+               #
+               # Now check for "gzgets()" in zlib when linking with the
+               # linker flags for GTK+ applications; people often grab
+               # XFree86 source and build and install it on their systems,
+               # and they appear sometimes to misconfigure XFree86 so that,
+               # even on systems with zlib, it assumes there is no zlib,
+               # so the XFree86 build process builds and installs its
+               # own zlib in the X11 library directory.
+               #
+               # The XFree86 zlib is an older version that lacks
+               # "gzgets()", and that's the zlib with which Ethereal
+               # gets linked, so the build of Ethereal fails.
+               #
+               ac_save_CFLAGS="$CFLAGS"
+               ac_save_LIBS="$LIBS"
+               CFLAGS="$CFLAGS $GTK_CFLAGS"
+               LIBS="$GTK_LIBS -lz $LIBS"
+               AC_MSG_CHECKING([for gzgets missing when linking with X11])
+               AC_TRY_LINK_FUNC(gzgets, AC_MSG_RESULT(no),
                  [
-                   #
-                   # Throw away the cached "we found it" answer, so that if
-                   # we rerun "configure", we don't just blow off the above
-                   # checks and blithely assume that we don't need to search
-                   # "$prefix/lib".
-                   #
-                   unset ac_cv_lib_pcap_pcap_open_live
-                   AC_ETHEREAL_ADD_DASH_L(PCAP_LIBS, $prefix/lib)
-                   PCAP_LIBS="$PCAP_LIBS -lpcap"
-                   AC_DEFINE(HAVE_LIBPCAP)
-                   LIBS="$ethereal_save_LIBS"
-                 ],
-                 AC_MSG_ERROR(Library libpcap not found.),
-                 $SOCKET_LIBS $NSL_LIBS)
-             ], $SOCKET_LIBS $NSL_LIBS)
-         ], $SOCKET_LIBS $NSL_LIBS)
-       AC_SUBST(PCAP_LIBS)
+                   AC_MSG_RESULT(yes)
+                   AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
+                 ])
+               CFLAGS="$ac_save_CFLAGS"
+               LIBS="$ac_save_LIBS"
+       fi
 ])
 
 #
-# AC_ETHEREAL_ZLIB_CHECK
+# AC_ETHEREAL_LIBPCRE_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
+AC_DEFUN(AC_ETHEREAL_LIBPCRE_CHECK,
 [
-        AC_CHECK_HEADER(zlib.h,,enable_zlib=no)
-
-        dnl
-        dnl Check for "gzgets()" in zlib, because we need it, but
-        dnl some older versions of zlib don't have it.  It appears
-        dnl from the ChangeLog that any released version of zlib
-        dnl with "gzgets()" should have the other routines we
-        dnl depend on, such as "gzseek()", "gztell()", and "zError()".
-        dnl
-        AC_CHECK_LIB(z, gzgets,,enable_zlib=no)
+       if test "x$pcre_dir" != "x"
+       then
+         #
+         # The user specified a directory in which libpcre resides,
+         # so add the "include" subdirectory of that directory to
+         # the include file search path and the "lib" subdirectory
+         # of that directory to the library search path.
+         #
+         # XXX - if there's also a libpcre in a directory that's
+         # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
+         # make us find the version in the specified directory,
+         # as the compiler and/or linker will search that other
+         # directory before it searches the specified directory.
+         #
+         ethereal_save_CFLAGS="$CFLAGS"
+         CFLAGS="$CFLAGS -I$pcre_dir/include"
+         ethereal_save_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
+         ethereal_save_LIBS="$LIBS"
+         LIBS="$LIBS -lpcre"
+         ethereal_save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
+       fi
+
+       #
+       # Make sure we have "pcre.h".  If we don't, it means we probably
+       # don't have libpcre, so don't use it.
+       #
+       AC_CHECK_HEADER(pcre.h,,
+         [
+           if test "x$pcre_dir" != "x"
+           then
+             #
+             # The user used "--with-pcre=" to specify a directory
+             # containing libpcre, but we didn't find the header file
+             # there; that either means they didn't specify the
+             # right directory or are confused about whether libpcre
+             # is, in fact, installed.  Report the error and give up.
+             #
+             AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre])
+           else
+             if test "x$want_pcre" = "xyes"
+             then
+               #
+               # The user tried to force us to use the library, but we
+               # couldn't find the header file; report an error.
+               #
+               AC_MSG_ERROR(Header file pcre.h not found.)
+             else
+               #
+               # We couldn't find the header file; don't use the
+               # library, as it's probably not present.
+               #
+               want_pcre=no
+             fi
+           fi
+         ])
+
+       if test "x$want_pcre" != "xno"
+       then
+               #
+               # Well, we at least have the pcre header file.
+               #
+               # We're only using standard functions from libpcre,
+               # so we don't need to perform extra checks.
+               #
+               AC_CHECK_LIB(pcre, pcre_compile,
+               [
+                       if test "x$pcre_dir" != "x"
+                       then
+                               #
+                               # Put the "-I" and "-L" flags for pcre at
+                               # the beginning of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS.
+                               #
+                               PCRE_LIBS="-L$pcre_dir/lib -lpcre $ethereal_save_LIBS"
+                       else
+                               PCRE_LIBS="-lpcre"
+                       fi
+                       AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library])
+               ],[
+                       if test "x$pcre_dir" != "x"
+                       then
+                               #
+                               # Restore the versions of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS before we added the
+                               # "--with-pcre=" directory, as we didn't
+                               # actually find pcre there.
+                               #
+                               CFLAGS="$ethereal_save_CFLAGS"
+                               CPPFLAGS="$ethereal_save_CPPFLAGS"
+                               LDFLAGS="$ethereal_save_LDFLAGS"
+                               LIBS="$ethereal_save_LIBS"
+                               PCRE_LIBS=""
+                       fi
+                       want_pcre=no
+               ])
+               AC_SUBST(PCRE_LIBS)
+       fi
 ])
 
 #
@@ -352,46 +623,209 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
 #
 AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
 [
-       want_ucdsnmp=yes
-
-       AC_ARG_WITH(ucdsnmp,
-       [  --with-ucdsnmp=DIR      use UCD SNMP client library, located in directory DIR.], [
-       if test $withval = no
+       if test "x$ucdsnmp_dir" != "x"
        then
-               want_ucdsnmp=no
-       else
-               want_ucdsnmp=yes
-               ucdsnmp_user_dir=$withval
+               #
+               # The user specified a directory in which UCD SNMP resides,
+               # so add the "include" subdirectory of that directory to
+               # the include file search path and the "lib" subdirectory
+               # of that directory to the library search path.
+               #
+               # XXX - if there's also a libpcap in a directory that's
+               # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
+               # make us find the version in the specified directory,
+               # as the compiler and/or linker will search that other
+               # directory before it searches the specified directory.
+               #
+               CFLAGS="$CFLAGS -I$ucdsnmp_dir/include"
+               CPPFLAGS="$CPPFLAGS -I$ucdsnmp_dir/include"
+               AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $ucdsnmp_dir/lib)
        fi
-       ])
 
-       if test $want_ucdsnmp = yes
-       then
-               ucdsnmpdir=""
-
-               for d in $ucdsnmp_user_dir $prefix
+       #
+       # Check for one of the UCD SNMP header files we include,
+       # to see whether we have UCD SNMP installed.
+       #
+       AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
+       [
+               #
+               # UCD SNMP or Net-SNMP might require various helper
+               # libraries on various platforms, such as "-ldes425"
+               # in "/usr/kerberos/lib" on some versions of Red
+               # Hat Linux, or "-lkstat" on Solaris.
+               # XXX - it may also require "-lcrypto" on some platforms;
+               # we should check for that as well, rather than requiring
+               # users to explicitly indicate whether it's required.
+               #
+               # 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.
+               #
+               for extras in "" "-L/usr/kerberos/lib -ldes425" "-lkstat"
                do
-                       if test x$d != xNONE 
-                       then
-                               AC_MSG_CHECKING($d for ucd-snmp)
-
-                               if test x$d != x/usr/local && test -f $d/include/ucd-snmp/snmp.h
-                               then
-                                       AC_MSG_RESULT(found)
-                                       ucdsnmpdir=$d
-                                       break
-                               else
-                                       AC_MSG_RESULT(not found)
-                               fi
-                       fi
+                       AC_CHECK_LIB(snmp, sprint_realloc_objid,
+                         [
+                               SNMP_LIBS="-lsnmp $extras"; break
+                         ],
+                         [
+                               #
+                               # Throw away the cached "we didn't find it"
+                               # answer, so that if we rerun "configure",
+                               # we still do all these checks and don't
+                               # just blithely assume we don't need
+                               # the extra libraries.
+                               #
+                               unset ac_cv_lib_snmp_sprint_realloc_objid
+                         ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS $extras)
                done
 
-               if test x$ucdsnmpdir != x
-               then
-                       AC_MSG_RESULT(added $d to paths)
-                       CFLAGS="$CFLAGS -I${ucdsnmpdir}/include"
-                       CPPFLAGS="$CPPFLAGS -I${ucdsnmpdir}/include"
-                       LIBS="$LIBS -L${ucdsnmpdir}/lib"
+               #
+               # If we didn't find "sprint_realloc_objid()", fail.
+               # Either the user needs a newer version of UCD SNMP
+               # with "sprint_realloc_objid()", or they may need to
+               # specify "--with-ssl".
+               #
+               if test "$ac_cv_lib_snmp_sprint_realloc_objid" = no; then
+                   AC_MSG_ERROR([UCD SNMP header files found, but sprint_realloc_objid not found in SNMP library.])
+               fi
+
+               #
+               # We found it, so we have UCD SNMP.
+               #
+               AC_DEFINE(HAVE_UCD_SNMP, 1, [Define to enable support for UCD-SNMP])
+               have_ucd_snmp="yes"
+       ],[
+               #
+               # No, we don't have it.
+               # If the user explicitly asked for UCD SNMP, fail,
+               # otherwise just don't use the UCD SNMP library.
+               #
+               if test "x$want_ucdsnmp" = "xyes" ; then
+                       AC_MSG_ERROR(Header file ucd-snmp/snmp.h not found.)
                fi
+       ])
+])
+
+#
+# AC_ETHEREAL_SSL_CHECK
+#
+AC_DEFUN(AC_ETHEREAL_SSL_CHECK,
+[
+       want_ssl=defaultyes
+
+       AC_ARG_WITH(ssl,
+changequote(<<, >>)dnl
+<<  --with-ssl[=DIR]        use SSL crypto library (located in directory DIR, if supplied).   [default=yes, if present]>>,
+changequote([, ])dnl
+       [
+       if   test "x$withval" = "xno";  then
+               want_ssl=no
+       elif test "x$withval" = "xyes"; then
+               want_ssl=yes
+       elif test -d "$withval"; then
+               want_ssl=yes
+               AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+       fi
+       ])
+
+       if test "x$want_ssl" = "xdefaultyes"; then
+               want_ssl=yes
+               withval=/usr/local/ssl
+               if test -d "$withval"; then
+                       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+               fi
+       fi
+
+       if test "x$want_ssl" = "xyes"; then
+               AC_CHECK_LIB(crypto, EVP_md5,
+                 [
+                   SSL_LIBS=-lcrypto
+                 ],,
+               )
+       else
+               AC_MSG_RESULT(not required)
+       fi
+])
+
+#
+# AC_ETHEREAL_RPM_CHECK
+# Looks for the rpm program, and checks to see if we can redefine "_topdir".
+#
+AC_DEFUN(AC_ETHEREAL_RPM_CHECK,
+[
+       AC_CHECK_PROG(ac_cv_ethereal_have_rpm, rpm, "yes", "no")
+       if test "x$ac_cv_ethereal_have_rpm" = "xyes"; then
+               rpm --define '_topdir /tmp' > /dev/null 2>&1
+               AC_MSG_CHECKING(to see if we can redefine _topdir)
+               if test $? -eq 0 ; then
+                       AC_MSG_RESULT(yes)
+                       HAVE_RPM=yes
+               else
+                       AC_MSG_RESULT(no.  You'll have to build packages manually.)
+                       HAVE_RPM=no
+               fi
+       fi
+])
+
+#
+# AC_ETHEREAL_GNU_SED_CHECK
+# Checks if GNU sed is the first sed in PATH.
+#
+AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
+[
+       AC_MSG_CHECKING(for GNU sed as first sed in PATH)
+       if  ( sh -c "sed --version" </dev/null 2> /dev/null | grep "GNU sed" 2>&1 > /dev/null ) ;  then
+               AC_MSG_RESULT(yes)
+               HAVE_GNU_SED=yes
+       else
+               AC_MSG_RESULT(no)
+               HAVE_GNU_SED=no
+       fi
+])
+
+#
+# AC_ETHEREAL_ADNS_CHECK
+#
+AC_DEFUN(AC_ETHEREAL_ADNS_CHECK,
+[
+       want_adns=defaultyes
+
+       AC_ARG_WITH(adns,
+changequote(<<, >>)dnl
+<<  --with-adns[=DIR]       use GNU ADNS (located in directory DIR, if supplied).   [default=yes, if present]>>,
+changequote([, ])dnl
+       [
+       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$want_adns" = "xdefaultyes"; then
+               want_adns=yes
+               withval=/usr/local
+               if test -d "$withval"; then
+                       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+               fi
+       fi
+
+       if test "x$want_adns" = "xyes"; then
+               AC_CHECK_LIB(adns, adns_init,
+                 [
+                   ADNS_LIBS=-ladns
+               AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library])
+               have_good_adns=yes
+                 ],, $SOCKET_LIBS $NSL_LIBS
+               )
+       else
+               AC_MSG_RESULT(not required)
        fi
 ])