bugfix to a bug reported by Ian Schorr:
[obnox/wireshark/wip.git] / acinclude.m4
index ec88486e55c85b119d244857a71839542b8963b4..69b2b8ce3f7afb017936e37e9e7e4194b90e5d77 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.27 2001/06/27 07:47:48 guy Exp $
+dnl $Id: acinclude.m4,v 1.79 2004/06/29 07:59:12 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
@@ -60,7 +60,7 @@ dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
 # XXX - IRIX, and other OSes, may require some flag equivalent to
 # "-R" here.
 #
-AC_DEFUN(AC_ETHEREAL_ADD_DASH_L,
+AC_DEFUN([AC_ETHEREAL_ADD_DASH_L],
 [$1="$$1 -L$2"
 case "$host_os" in
   solaris*)
@@ -82,28 +82,70 @@ dnl Done by Guy Harris <guy@alum.mit.edu> on 1998-11-14.
 
 dnl ### Checks for structure members
 
-AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN,
+AC_DEFUN([AC_ETHEREAL_STRUCT_SA_LEN],
 [AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #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
 ])
 
+
+dnl
+dnl Check whether a given format can be used to print 64-bit integers
+dnl
+AC_DEFUN([AC_ETHEREAL_CHECK_64BIT_FORMAT],
+[
+  AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
+  AC_RUN_IFELSE(
+    [
+      AC_LANG_SOURCE(
+       [[
+#        ifdef HAVE_INTTYPES_H
+         #include <inttypes.h>
+#        endif
+         #include <stdio.h>
+         #include <sys/types.h>
+
+         main()
+         {
+           u_int64_t t = 1;
+           char strbuf[16+1];
+           sprintf(strbuf, "%016$1x", t << 32);
+           if (strcmp(strbuf, "0000000100000000") == 0)
+             exit(0);
+           else
+             exit(1);
+         }
+       ]])
+    ],
+    [
+      AC_DEFINE(PRId64, "$1d", [Format for printing 64-bit signed decimal numbers])
+      AC_DEFINE(PRIo64, "$1o", [Format for printing 64-bit unsigned octal numbers])
+      AC_DEFINE(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers])
+      AC_DEFINE(PRIu64, "$1u", [Format for printing 64-bit unsigned decimal numbers])
+      AC_MSG_RESULT(yes)
+    ],
+    [
+      AC_MSG_RESULT(no)
+      $2
+    ])
+])
+
 #
 # AC_ETHEREAL_IPV6_STACK
 #
 # By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
 #
-AC_DEFUN(AC_ETHEREAL_IPV6_STACK,
+AC_DEFUN([AC_ETHEREAL_IPV6_STACK],
 [
        v6type=unknown
        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, [
@@ -161,6 +203,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
@@ -191,7 +250,7 @@ yes
 # GNU Autoconf 2.13; the comment came from there.
 # Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14. 
 #
-AC_DEFUN(AC_ETHEREAL_GETHOSTBY_LIB_CHECK,
+AC_DEFUN([AC_ETHEREAL_GETHOSTBY_LIB_CHECK],
 [
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.
@@ -199,10 +258,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)
 ])
 
@@ -220,7 +277,7 @@ AC_DEFUN(AC_ETHEREAL_GETHOSTBY_LIB_CHECK,
 #
 # We use "connect" because that's what AC_PATH_XTRA did.
 #
-AC_DEFUN(AC_ETHEREAL_SOCKET_LIB_CHECK,
+AC_DEFUN([AC_ETHEREAL_SOCKET_LIB_CHECK],
 [
     # lieder@skyler.mavd.honeywell.com says without -lsocket,
     # socket/setsockopt and other routines are undefined under SCO ODT
@@ -229,40 +286,50 @@ 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)
 ])
 
 #
 # AC_ETHEREAL_PCAP_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
+AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
 [
        if test -z "$pcap_dir"
        then
+         # Pcap header checks
+         # XXX need to set a var AC_CHECK_HEADER(pcap.h,,)
+
          #
          # 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".
+         # 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 /usr/local/include/pcap $prefix/include
+         pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include"
+         if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+           pcap_dir_list="$pcap_dir_list /usr/local/include/pcap"
+         fi
+         for pcap_dir in $pcap_dir_list
          do
            if test -d $pcap_dir ; then
-               CFLAGS="$CFLAGS -I$pcap_dir"
-               CPPFLAGS="$CPPFLAGS -I$pcap_dir"
+               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
 
@@ -274,8 +341,9 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
        else
          #
          # The user specified a directory in which libpcap resides,
-         # so add that directory to the include file and library
-         # search path.
+         # 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
@@ -283,15 +351,17 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
          # as the compiler and/or linker will search that other
          # directory before it searches the specified directory.
          #
-         CFLAGS="$CFLAGS -I$pcap_dir"
-         CPPFLAGS="$CPPFLAGS -I$pcap_dir"
+         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?]]))
 
        #
        # Check to see if we find "pcap_open_live" in "-lpcap".
@@ -299,87 +369,425 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
        AC_CHECK_LIB(pcap, pcap_open_live,
          [
            PCAP_LIBS=-lpcap
-           AC_DEFINE(HAVE_LIBPCAP)
-         ], AC_MSG_ERROR(Library libpcap not found.),
-         $SOCKET_LIBS $NSL_LIBS)
+           AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+         ], [
+           AC_MSG_CHECKING([for pcap_open_live in -lpcap -lcfg -lodm])
+           ac_save_LIBS="$LIBS"
+           LIBS="-lpcap -lcfg -lodm"
+           AC_TRY_LINK(
+               [
+#      include <pcap.h>
+               ],
+               [
+       pcap_open_live(NULL, 0, 0, 0, NULL);
+               ],
+               [
+               AC_MSG_RESULT([yes])
+               PCAP_LIBS="-lpcap -lcfg -lodm"
+               AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+               ],
+               [
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([Library libpcap not found.])
+               ])
+           LIBS=$ac_save_LIBS
+         ], $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,
+AC_DEFUN([AC_ETHEREAL_ZLIB_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$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,,
+         [
+           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.
+               #
+               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
+               #
+               # Well, we at least have the zlib header file.
+               #
+               # 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),
+                 [
+                   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_UCDSNMP_CHECK
+# AC_ETHEREAL_LIBPCRE_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
+AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
 [
-       want_ucdsnmp=yes
+       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
 
-       AC_ARG_WITH(ucdsnmp,
-       [  --with-ucdsnmp=DIR      use UCD SNMP client library, located in directory DIR.], [
-       if test $withval = no
+       #
+       # 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
-               want_ucdsnmp=no
-       else
-               want_ucdsnmp=yes
-               ucdsnmp_user_dir=$withval
+               #
+               # 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
-       ])
+])
 
-       if test $want_ucdsnmp = yes
+#
+# AC_ETHEREAL_UCDSNMP_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
+[
+       if test "x$ucdsnmp_dir" != "x"
        then
-               ucdsnmpdir=""
+               #
+               # 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
 
-               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"
-                       AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${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
-       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,
+AC_DEFUN([AC_ETHEREAL_SSL_CHECK],
 [
        want_ssl=defaultyes
 
        AC_ARG_WITH(ssl,
-       [  --with-ssl=DIR          use SSL crypto library, located in directory DIR.], [
+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
@@ -404,10 +812,216 @@ AC_DEFUN(AC_ETHEREAL_SSL_CHECK,
                    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
-                 -lcrypto
                AC_MSG_RESULT(not required)
        fi
+])
+
 
+#
+# AC_ETHEREAL_KRB5_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
+[
+       if test "x$krb5_dir" != "x"
+       then
+         #
+         # The user specified a directory in which kerberos 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 kerberos 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$krb5_dir/include"
+         ethereal_save_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+         #ethereal_save_LIBS="$LIBS"
+         #LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
+         KRB5_LIBS="-lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
+         ethereal_save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
+         ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'` 
+       else
+         AC_PATH_PROG(KRB5_CONFIG, krb5-config) 
+         if test -x "$KRB5_CONFIG"
+         then
+           KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+           CFLAGS="$CFLAGS $KRB5_FLAGS"
+            CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
+           KRB5_LIBS=`"$KRB5_CONFIG" --libs`
+           # Looks like krb5-config is lacking -lresolv on some systems
+           AC_MSG_CHECKING(whether library list looks OK)
+           if echo "$KRB5_LIBS" | grep resolv >/dev/null
+           then
+               AC_MSG_RESULT(yes)
+           else
+               KRB5_LIBS="$KRB5_LIBS -lresolv"
+               AC_MSG_RESULT(Adding -lresolv to libs)
+           fi
+
+           #LIBS="$LIBS $KRB5_LIBS"
+           ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
+         fi
+       fi
+
+       #
+       # Make sure we have "krb5.h".  If we don't, it means we probably
+       # don't have kerberos, so don't use it.
+       #
+       AC_CHECK_HEADER(krb5.h,,
+         [
+           if test "x$krb5_dir" != "x"
+           then
+             #
+             # The user used "--with-krb5=" to specify a directory
+             # containing kerberos, but we didn't find the header file
+             # there; that either means they didn't specify the
+             # right directory or are confused about whether kerberos
+             # is, in fact, installed.  Report the error and give up.
+             #
+             AC_MSG_ERROR([kerberos header not found in directory specified in --with-krb5])
+           else
+             if test "x$want_krb5" = "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 krb5.h not found.)
+             else
+               #
+               # We couldn't find the header file; don't use the
+               # library, as it's probably not present.
+               #
+               want_krb5=no
+             fi
+           fi
+         ])
+
+       if test "x$want_krb5" != "xno" -a "x$ac_krb5_version" = "xHEIMDAL"
+       then
+               #
+               # Well, we at least have the krb5 header file.
+               #
+               AC_CHECK_LIB(krb5, krb5_kt_resolve,
+               [
+                       if test "x$krb5_dir" != "x"
+                       then
+                               #
+                               # Put the "-I" and "-L" flags for krb5 at
+                               # the beginning of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS.
+                               #
+                               KRB5_LIBS="-L$krb5_dir/lib $KRB5_LIBS"
+                       fi
+                       AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
+                       AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+               ],[
+                       if test "x$krb5_dir" != "x"
+                       then
+                               #
+                               # Restore the versions of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS before we added the
+                               # "--with-krb5=" directory, as we didn't
+                               # actually find kerberos there.
+                               #
+                               CFLAGS="$ethereal_save_CFLAGS"
+                               CPPFLAGS="$ethereal_save_CPPFLAGS"
+                               LDFLAGS="$ethereal_save_LDFLAGS"
+                               #LIBS="$ethereal_save_LIBS"
+                               KRB5_LIBS=""
+                       fi
+                       want_krb5=no
+               ], $KRB5_LIBS)
+       else
+               KRB5_LIBS=""
+               want_krb5=no
+       fi
+       AC_SUBST(KRB5_LIBS)
 ])
+