autofoo will fail on systems that lack libgcrypt.m4.
[obnox/wireshark/wip.git] / acinclude.m4
index 47bfce350fe399760d96fd375a4aedb4f55b1265..26c6672bdc43605f7788a9b0a78ef3f6a9c15f36 100644 (file)
@@ -1,8 +1,8 @@
 dnl Macros that test for specific features.
-dnl This file is part of the Autoconf packaging for Ethereal.
+dnl This file is part of the Autoconf packaging for Wireshark.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.47 2002/12/28 23:15:52 guy Exp $
+dnl $Id$
 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
@@ -51,7 +51,7 @@ dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
 dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
 
 #
-# AC_ETHEREAL_ADD_DASH_L
+# AC_WIRESHARK_ADD_DASH_L
 #
 # Add to the variable specified as the first argument a "-L" flag for the
 # directory specified as the second argument, and, on Solaris, add a
@@ -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_WIRESHARK_ADD_DASH_L],
 [$1="$$1 -L$2"
 case "$host_os" in
   solaris*)
@@ -71,33 +71,77 @@ esac
 
 
 #
-# AC_ETHEREAL_STRUCT_SA_LEN
+# AC_WIRESHARK_STRUCT_SA_LEN
 #
 dnl AC_STRUCT_ST_BLKSIZE extracted from the file in question,
 dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
-dnl AC_ETHEREAL_STRUCT_SA_LEN, which checks if "struct sockaddr"
+dnl AC_WIRESHARK_STRUCT_SA_LEN, which checks if "struct sockaddr"
 dnl has the 4.4BSD "sa_len" member, and defines HAVE_SA_LEN; that's
 dnl what's in this file.
 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_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len,
+AC_DEFUN([AC_WIRESHARK_STRUCT_SA_LEN],
+[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_wireshark_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_cv_wireshark_struct_sa_len=yes, ac_cv_wireshark_struct_sa_len=no)])
+if test $ac_cv_wireshark_struct_sa_len = yes; then
+  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_WIRESHARK_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 <glibconfig.h>
+         #include <stdio.h>
+         #include <sys/types.h>
+
+         main()
+         {
+           guint64 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 (lower-case)])
+      AC_DEFINE(PRIX64, "$1X", [Format for printing 64-bit unsigned hexadecimal numbers (upper-case)])
+      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
+# AC_WIRESHARK_IPV6_STACK
 #
 # By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
 #
-AC_DEFUN(AC_ETHEREAL_IPV6_STACK,
+AC_DEFUN([AC_WIRESHARK_IPV6_STACK],
 [
        v6type=unknown
        v6lib=none
@@ -199,7 +243,7 @@ yes
 ])
 
 #
-# AC_ETHEREAL_GETHOSTBY_LIB_CHECK
+# AC_WIRESHARK_GETHOSTBY_LIB_CHECK
 #
 # Checks whether we need "-lnsl" to get "gethostby*()", which we use
 # in "resolv.c".
@@ -208,7 +252,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_WIRESHARK_GETHOSTBY_LIB_CHECK],
 [
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.
@@ -222,7 +266,7 @@ AC_DEFUN(AC_ETHEREAL_GETHOSTBY_LIB_CHECK,
 ])
 
 #
-# AC_ETHEREAL_SOCKET_LIB_CHECK
+# AC_WIRESHARK_SOCKET_LIB_CHECK
 #
 # Checks whether we need "-lsocket" to get "socket()", which is used
 # by libpcap on some platforms - and, in effect, "gethostby*()" on
@@ -235,7 +279,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_WIRESHARK_SOCKET_LIB_CHECK],
 [
     # lieder@skyler.mavd.honeywell.com says without -lsocket,
     # socket/setsockopt and other routines are undefined under SCO ODT
@@ -251,33 +295,43 @@ AC_DEFUN(AC_ETHEREAL_SOCKET_LIB_CHECK,
 ])
 
 #
-# AC_ETHEREAL_PCAP_CHECK
+# AC_WIRESHARK_PCAP_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
+AC_DEFUN([AC_WIRESHARK_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
-               if test x$pcap_dir != x/usr/include; 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
 
@@ -301,65 +355,147 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
          #
          CFLAGS="$CFLAGS -I$pcap_dir/include"
          CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
-         AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
+         AC_WIRESHARK_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
+       # 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?]]))
-       AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
 
        #
        # Check to see if we find "pcap_open_live" in "-lpcap".
+       # Also check for various additional libraries that libpcap might
+       # require.
        #
        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_wireshark_extras_found=no
+           ac_save_LIBS="$LIBS"
+           for extras in "-lcfg -lodm" "-lpfring"
+           do
+               AC_MSG_CHECKING([for pcap_open_live in -lpcap with $extras])
+               LIBS="-lpcap $extras"
+               #
+               # XXX - can't we use AC_CHECK_LIB here?
+               #
+               AC_TRY_LINK(
+                   [
+#      include <pcap.h>
+                   ],
+                   [
+       pcap_open_live(NULL, 0, 0, 0, NULL);
+                   ],
+                   [
+                       ac_wireshark_extras_found=yes
+                       AC_MSG_RESULT([yes])
+                       PCAP_LIBS="-lpcap $extras"
+                       AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+                   ],
+                   [
+                       AC_MSG_RESULT([no])
+                   ])
+               if test x$ac_wireshark_extras_found = xyes
+               then
+                   break
+               fi
+           done
+           if test x$ac_wireshark_extras_found = xno
+           then
+               AC_MSG_ERROR([Can't link with library libpcap.])
+           fi
+           LIBS=$ac_save_LIBS
+         ], $SOCKET_LIBS $NSL_LIBS)
        AC_SUBST(PCAP_LIBS)
-])
 
-#
-# AC_ETHEREAL_PCAP_VERSION_CHECK
-#
-# Check whether "pcap_version" is defined by libpcap.
-#
-AC_DEFUN(AC_ETHEREAL_PCAP_VERSION_CHECK,
-[
-       AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
+       #
+       # 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([],
+       AC_TRY_LINK(
           [
-char *
-return_pcap_version(void)
-{
-       extern char pcap_version[];
-
-       return pcap_version;
-}
+#      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"])
-       LIBS="$ac_save_LIBS"
        if test "$ac_cv_pcap_version_defined" = yes ; then
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_PCAP_VERSION)
+               AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known])
        else
                AC_MSG_RESULT(no)
        fi
+       AC_CHECK_FUNCS(pcap_open_dead pcap_freecode pcap_breakloop)
+       #
+       # Later versions of Mac OS X 10.3[.x] ship a pcap.h that
+       # doesn't define pcap_if_t but ship an 0.8[.x] libpcap,
+       # so the library has "pcap_findalldevs()", but pcap.h
+       # doesn't define "pcap_if_t" so you can't actually *use*
+       # "pcap_findalldevs()".
+       #
+       # That even appears to be true of systems shipped with
+       # 10.3.4, so it doesn't appear only to be a case of
+       # Software Update not updating header files.
+       #
+       # (You can work around this by installing the 0.8 header
+       # files.)
+       #
+       AC_CACHE_CHECK([whether pcap_findalldevs is present and usable],
+         [ac_cv_func_pcap_findalldevs],
+         [
+           AC_LINK_IFELSE(
+             [
+               AC_LANG_SOURCE(
+                 [[
+                   #include <pcap.h>
+                   main()
+                   {
+                     pcap_if_t *devpointer;
+                     char errbuf[1];
+
+                     pcap_findalldevs(&devpointer, errbuf);
+                   }
+                 ]])
+             ],
+             [
+               ac_cv_func_pcap_findalldevs=yes
+             ],
+             [
+               ac_cv_func_pcap_findalldevs=no
+             ])
+         ])
+       #
+       # Don't check for other new routines that showed up after
+       # "pcap_findalldevs()" if we don't have a usable
+       # "pcap_findalldevs()", so we don't end up using them if the
+       # "pcap.h" is crufty and old and doesn't declare them.
+       #
+       if test $ac_cv_func_pcap_findalldevs = "yes" ; then
+         AC_DEFINE(HAVE_PCAP_FINDALLDEVS, 1,
+          [Define to 1 if you have the `pcap_findalldevs' function and a pcap.h that declares pcap_if_t.])
+         AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
+         AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink pcap_lib_version)
+         AC_CHECK_FUNCS(pcap_get_selectable_fd)
+       fi
+       LIBS="$ac_save_LIBS"
 ])
 
 #
-# AC_ETHEREAL_ZLIB_CHECK
+# AC_WIRESHARK_ZLIB_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
+AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK],
 [
        if test "x$zlib_dir" != "x"
        then
@@ -375,12 +511,12 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
          # as the compiler and/or linker will search that other
          # directory before it searches the specified directory.
          #
-         ethereal_save_CFLAGS="$CFLAGS"
+         wireshark_save_CFLAGS="$CFLAGS"
          CFLAGS="$CFLAGS -I$zlib_dir/include"
-         ethereal_save_CPPLAGS="$CPPLAGS"
+         wireshark_save_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
-         ethereal_save_LIBS="$LIBS"
-         AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
+         wireshark_save_LIBS="$LIBS"
+         AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
        fi
 
        #
@@ -453,12 +589,12 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
                                # LIBS.
                                #
                                LIBS=""
-                               AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
-                               LIBS="$LIBS -lz $ethereal_save_LIBS"
+                               AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+                               LIBS="$LIBS -lz $wireshark_save_LIBS"
                        else
                                LIBS="-lz $LIBS"
                        fi
-                       AC_DEFINE(HAVE_LIBZ)
+                       AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
                ],[
                        if test "x$zlib_dir" != "x"
                        then
@@ -469,9 +605,9 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
                                # zlib there, or didn't find a zlib that
                                # contains gzgets there.
                                #
-                               CFLAGS="$ethereal_save_CFLAGS"
-                               CPPFLAGS="$ethereal_save_CPPLAGS"
-                               LIBS="$ethereal_save_LIBS"
+                               CFLAGS="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                               LIBS="$wireshark_save_LIBS"
                        fi
                        want_zlib=no
                ])
@@ -511,9 +647,371 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
 ])
 
 #
-# AC_ETHEREAL_UCDSNMP_CHECK
+# AC_WIRESHARK_LIBPCRE_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
+[
+       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.
+         #
+         wireshark_save_CFLAGS="$CFLAGS"
+         CFLAGS="$CFLAGS -I$pcre_dir/include"
+         wireshark_save_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
+         wireshark_save_LIBS="$LIBS"
+         LIBS="$LIBS -lpcre"
+         wireshark_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 $wireshark_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="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                               LDFLAGS="$wireshark_save_LDFLAGS"
+                               LIBS="$wireshark_save_LIBS"
+                               PCRE_LIBS=""
+                       fi
+                       want_pcre=no
+               ])
+               AC_SUBST(PCRE_LIBS)
+       fi
+])
+
+#
+# AC_WIRESHARK_LIBLUA_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
+
+       if test "x$lua_dir" != "x"
+       then
+               #
+               # The user specified a directory in which liblua 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 liblua 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.
+               #
+               wireshark_save_CFLAGS="$CFLAGS"
+               CFLAGS="$CFLAGS -I$lua_dir/include"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS -I$lua_dir/include"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -L$lua_dir/lib -llua"
+               wireshark_save_LDFLAGS="$LDFLAGS"
+               LDFLAGS="$LDFLAGS -L$lua_dir/lib"
+       else 
+               #
+               # The user specified no directory in which liblua resides,
+               # so just add "-llua -lliblua" to the used libs.
+               #
+               wireshark_save_CFLAGS="$CFLAGS"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               wireshark_save_LDFLAGS="$LDFLAGS"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -llua"
+       fi
+
+       #
+       # Make sure we have "lua.h", "lualib.h" and "lauxlib.h".  If we don't, it means we probably
+       # don't have liblua, so don't use it.
+       #
+       AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h,,
+       [
+               if test "x$lua_dir" != "x"
+               then
+                       #
+                       # The user used "--with-lua=" to specify a directory
+                       # containing liblua, but we didn't find the header file
+                       # there; that either means they didn't specify the
+                       # right directory or are confused about whether liblua
+                       # is, in fact, installed.  Report the error and give up.
+                       #
+                       AC_MSG_ERROR([liblua header not found in directory specified in --with-lua])
+               else
+                       if test "x$want_lua" = "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 lua.h not found.)
+                       else
+                               #
+                               # We couldn't find the header file; don't use the
+                               # library, as it's probably not present.
+                               #
+                               want_lua=no
+                       fi
+               fi
+       ])
+
+       if test "x$want_lua" != "xno"
+       then
+               #
+               # Well, we at least have the lua header file.
+               #
+               # let's check if the libs are there
+               #
+
+               # At least on Suse 9.3 systems, liblualib needs linking
+               # against libm.
+               LIBS="$LIBS $LUA_LIBS -lm"
+
+               AC_CHECK_LIB(lua, lua_call,
+               [
+                       if test "x$lua_dir" != "x"
+                       then
+                               #
+                               # Put the "-I" and "-L" flags for lua at
+                               # the beginning of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS.
+                               #
+                               LUA_LIBS="-L$lua_dir/lib -llua"
+                               LUA_INCLUDES="-I$lua_dir/include"
+                       else
+                               LUA_LIBS="-llua"
+                               LUA_INCLUDES=""
+                       fi
+
+                       #
+                       # we got lua, now look for lualib
+                       #
+                       AC_CHECK_LIB(lualib, luaL_openlib,
+                       [
+                               #
+                               # we have 5.0
+                               #
+                               LUA_LIBS="$LUA_LIBS -llualib"
+                       ],[
+                               #
+                               # no lualib, in 5.1 there's only liblua
+                               # do we have 5.1?
+                               #
+                               
+                               LIBS="$wireshark_save_LIBS $LUA_LIBS"
+
+                               AC_CHECK_LIB(lua, luaL_register,
+                               [
+                                   #
+                                   #  Lua 5.1 found
+                                   #
+                                   AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                               ],[
+                                   #
+                                   # No, it is not 5.1
+                                   #
+                                   if test "x$lua_dir" != "x"
+                                   then
+                                       #
+                                       # Restore the versions of CFLAGS, CPPFLAGS,
+                                       # LDFLAGS, and LIBS before we added the
+                                       # "--with-lua=" directory, as we didn't
+                                       # actually find lua there.
+                                       #
+                                       CFLAGS="$wireshark_save_CFLAGS"
+                                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                                       LDFLAGS="$wireshark_save_LDFLAGS"
+                                       LIBS="$wireshark_save_LIBS"
+                                       LUA_LIBS=""
+                                   fi
+                                   # User requested --with-lua but it isn't available
+                                   if test "x$want_lua" = "xyes"
+                                   then
+                                       AC_MSG_ERROR(Linking with liblualib failed.)
+                                   fi
+                                   want_lua=no
+                               ])
+                       ])
+               ],[  
+                       #
+                       # Restore the versions of CFLAGS, CPPFLAGS,
+                       # LDFLAGS, and LIBS before we added the
+                       # "--with-lua=" directory, as we didn't
+                       # actually find lua there.
+                       #
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       LDFLAGS="$wireshark_save_LDFLAGS"
+                       LIBS="$wireshark_save_LIBS"
+                       LUA_LIBS=""
+                       # User requested --with-lua but it isn't available
+                       if test "x$want_lua" = "xyes"
+                       then
+                               AC_MSG_ERROR(Linking with liblua failed.)
+                       fi
+                       want_lua=no
+               ])
+
+       CFLAGS="$wireshark_save_CFLAGS"
+       CPPFLAGS="$wireshark_save_CPPFLAGS"
+       LDFLAGS="$wireshark_save_LDFLAGS"
+       LIBS="$wireshark_save_LIBS"
+       AC_SUBST(LUA_LIBS)
+       AC_SUBST(LUA_INCLUDES)
+
+       fi
+])
+
+#
+# AC_WIRESHARK_NETSNMP_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_NETSNMP_CHECK],
+[
+       dnl get the net-snmp-config binary
+       if test "x$netsnmpconfig" = "x" ; then
+               #
+               # The user didn't specify where net-snmp-config is
+               # located; search for it.
+               #
+               AC_PATH_PROG(NETSNMPCONFIG, net-snmp-config)
+       else
+               NETSNMPCONFIG=$netsnmpconfig
+               if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
+                       NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
+                       if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
+                               AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
+                       fi
+               fi
+       fi
+
+       #
+       # XXX - check whether $NETSNMPCONFIG is executable?
+       # if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
+       # We already did that if it was set; presumably AC_PATH_PROG
+       # will fail if it doesn't find an executable version.
+       #
+       if test "x$NETSNMPCONFIG" != "x" ; then
+               dnl other choices for flags to use here: could also use
+               dnl --prefix or --exec-prefix if you don't want the full list.
+
+               #
+               # Save the current settings of CFLAGS and CPPFLAGS, and add
+               # the output of "$NETSNMPCONFIG --cflags" to it, so that when
+               # searching for the Net-SNMP headers, we look in whatever
+               # directory that output specifies.
+               #
+               wireshark_save_CFLAGS="$CFLAGS"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
+               CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
+
+               AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
+               if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
+                       SNMP_LIBS=`$NETSNMPCONFIG --libs`
+                       if echo "$SNMP_LIBS" | grep crypto >/dev/null  && test "x$SSL_LIBS" = "x"; then
+                               if test "x$want_netsnmp" = "xyes" ; then
+                                       AC_MSG_ERROR(Net-SNMP requires openssl but ssl not enabled)
+                               else
+                                       AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
+                               fi
+                               CFLAGS="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                               SNMP_LIBS=
+                       else
+                               AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for Net-SNMP])
+                               have_net_snmp="yes"
+                       fi
+               else
+                       if test "x$want_netsnmp" = "xyes" ; then
+                               AC_MSG_ERROR(Net-SNMP not found)
+                       else
+                               #
+                               # Restore the versions of CFLAGS and
+                               # CPPFLAGS before we added the output
+                               # of '$NETSNMPCONFIG --cflags", as we
+                               # didn't actually find Net-SNMP there.
+                               #
+                               CFLAGS="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       fi
+               fi
+       fi      
+])
+
+#
+# AC_WIRESHARK_UCDSNMP_CHECK
 #
-AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
+AC_DEFUN([AC_WIRESHARK_UCDSNMP_CHECK],
 [
        if test "x$ucdsnmp_dir" != "x"
        then
@@ -531,50 +1029,94 @@ AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
                #
                CFLAGS="$CFLAGS -I$ucdsnmp_dir/include"
                CPPFLAGS="$CPPFLAGS -I$ucdsnmp_dir/include"
-               AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $ucdsnmp_dir/lib)
+               AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $ucdsnmp_dir/lib)
        fi
 
        #
-       # Check for the UCD SNMP header file, to see whether we
-       # have UCD SNMP installed.
+       # Check for one of the UCD SNMP header files we include,
+       # to see whether we have UCD SNMP installed.
        #
-       AC_CHECK_HEADER(ucd-snmp/snmp.h,
+       AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
        [
                #
-               # UCD SNMP may require "-lkstat" on Solaris, sigh.
-               # 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.
+               # 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.
                #
-               AC_CHECK_LIB(snmp, sprint_realloc_objid,
-                 SNMP_LIBS=-lsnmp,
-                 [
-                   #
-                   # Throw away the cached "we didn't find it" answer.
-                   #
-                   unset ac_cv_lib_snmp_sprint_realloc_objid
-                   AC_CHECK_LIB(snmp, sprint_realloc_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_realloc_objid
-                       SNMP_LIBS="-lsnmp -lkstat"
-                     ],,$SOCKET_LIBS $NSL_LIBS $SSL_LIBS -lkstat
-                   )
-                 ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS
-               )
+               # It might also require "-lcrypto" on some platforms;
+               # if the user didn't specify --with-ssl, we check
+               # whether it would have made a difference and, if so,
+               # we tell the user that they needed to request it.
+               # (There are annoying licensing issues with it and
+               # GPL'ed code, so we don't include it by default.)
+               #
+               # 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.
+               #
+               wireshark_save_LIBS="$LIBS"
+               found_sprint_realloc_objid=no
+               for extras in "" "-L/usr/kerberos/lib -ldes425" "-lkstat"
+               do
+                       LIBS="-lsnmp $extras $SOCKET_LIBS $NSL_LIBS $SSL_LIBS"
+                       if test -z "$extras"
+                       then
+                               AC_MSG_CHECKING([whether UCD SNMP includes sprint_realloc_objid])
+                       else
+                               AC_MSG_CHECKING([whether UCD SNMP includes sprint_realloc_objid (linking with $extras)])
+                       fi
+                       AC_TRY_LINK(
+                           [
+                           ],
+                           [
+                               sprint_realloc_objid();
+                           ],
+                           [
+                               #
+                               # We found "sprint_realloc_objid()",
+                               # and required the libraries in
+                               # extras as well.
+                               #
+                               AC_MSG_RESULT(yes)
+                               SNMP_LIBS="-lsnmp $extras"; break;
+                               found_sprint_realloc_objid=yes
+                               break
+                           ],
+                           [
+                               #
+                               # The link failed.  If they didn't ask
+                               # for SSL, try linking with -lcrypto
+                               # as well, and if *that* succeeds,
+                               # tell them they'll need to specify
+                               # --want-ssl.
+                               #
+                               AC_MSG_RESULT(no)
+                               if test "x$want_ssl" = "xno"
+                               then
+                                       LIBS="$LIBS -lcrypto"
+                                       AC_TRY_LINK(
+                                           [
+                                           ],
+                                           [
+                                               sprint_realloc_objid();
+                                           ],
+                                           [
+                                               #
+                                               # It worked with -lcrypto; tell
+                                               # them they'll need to specify
+                                               # --with-ssl.
+                                               #
+                                               AC_MSG_ERROR([UCD SNMP requires -lcrypto but --with-ssl not specified])
+                                           ])
+                               fi
+                           ])
+               done
+               LIBS="$wireshark_save_LIBS"
 
                #
                # If we didn't find "sprint_realloc_objid()", fail.
@@ -582,14 +1124,15 @@ AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
                # with "sprint_realloc_objid()", or they may need to
                # specify "--with-ssl".
                #
-               if test "$ac_cv_lib_snmp_sprint_realloc_objid" = no; then
+               if test "$found_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)
+               AC_DEFINE(HAVE_UCD_SNMP, 1, [Define to enable support for UCD-SNMP])
+               have_ucd_snmp="yes"
        ],[
                #
                # No, we don't have it.
@@ -603,51 +1146,13 @@ AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
 ])
 
 #
-# 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.], [
-       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
+# AC_WIRESHARK_RPM_CHECK
 # Looks for the rpm program, and checks to see if we can redefine "_topdir".
 #
-AC_DEFUN(AC_ETHEREAL_RPM_CHECK,
+AC_DEFUN([AC_WIRESHARK_RPM_CHECK],
 [
-       AC_CHECK_PROG(ac_cv_ethereal_have_rpm, rpm, "yes", "no")
-       if test "x$ac_cv_ethereal_have_rpm" = "xyes"; then
+       AC_CHECK_PROG(ac_cv_wireshark_have_rpm, rpm, "yes", "no")
+       if test "x$ac_cv_wireshark_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
@@ -661,10 +1166,10 @@ AC_DEFUN(AC_ETHEREAL_RPM_CHECK,
 ])
 
 #
-# AC_ETHEREAL_GNU_SED_CHECK
+# AC_WIRESHARK_GNU_SED_CHECK
 # Checks if GNU sed is the first sed in PATH.
 #
-AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
+AC_DEFUN([AC_WIRESHARK_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
@@ -675,3 +1180,289 @@ AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
                HAVE_GNU_SED=no
        fi
 ])
+
+#
+# AC_WIRESHARK_ADNS_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_ADNS_CHECK],
+[
+       want_adns=defaultyes
+
+       if test "x$want_adns" = "xdefaultyes"; then
+               want_adns=yes
+               withval=/usr/local
+               if test -d "$withval"; then
+                       AC_WIRESHARK_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
+])
+
+
+#
+# AC_WIRESHARK_KRB5_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
+[
+       wireshark_save_CFLAGS="$CFLAGS"
+       wireshark_save_CPPFLAGS="$CPPFLAGS"
+       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.
+         #
+         CFLAGS="$CFLAGS -I$krb5_dir/include"
+         CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+         ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+         ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+         ac_krb5_version="$ac_heimdal_version$ac_mit_version"
+         if test "x$ac_krb5_version" = "xHEIMDAL"
+             KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
+         then
+             KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lk5crypto -lcom_err"
+         fi
+         if test "x$ac_krb5_version" = "xMIT"
+         then
+           AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+         fi
+       else
+         AC_PATH_PROG(KRB5_CONFIG, krb5-config) 
+         if test -x "$KRB5_CONFIG"
+         then
+           KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+           KRB5_LIBS=`"$KRB5_CONFIG" --libs`
+           CFLAGS="$CFLAGS $KRB5_FLAGS"
+           CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
+           #
+           # If -lcrypto is in KRB5_FLAGS, we require it to build
+           # with Heimdal/MIT.  We don't want to built with it by
+           # default, due to annoying license incompatibilities
+           # between the OpenSSL license and the GPL, so:
+           #
+           #   if SSL_LIBS is set to a non-empty string, we
+           #   remove -lcrypto from KRB5_LIBS and replace
+           #   it with SSL_LIBS;
+           #
+           #   if SSL_LIBS is not set to a non-empty string
+           #   we fail with an appropriate error message.
+           #
+           case "$KRB5_LIBS" in
+           *-lcrypto*)
+               if test ! -z "$SSL_LIBS"
+               then
+                   KRB5_LIBS=`echo $KRB5_LIBS | sed 's/-lcrypto//'`
+                   KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
+               else
+                   AC_MSG_ERROR([Kerberos library requires -lcrypto but --with-ssl not specified])
+               fi
+               ;;
+           esac
+           ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/'`
+         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
+               AC_MSG_RESULT(No Heimdal or MIT header found - disabling dissection for some kerberos data in packet decoding)
+             fi
+           fi
+         ])
+
+       if test "x$want_krb5" != "xno"
+       then
+           #
+           # Well, we at least have the krb5 header file.
+           # Check whether this is Heimdal or MIT.
+           #
+           AC_MSG_CHECKING(whether the Kerberos library is Heimdal or MIT)
+           if test "x$ac_krb5_version" = "xHEIMDAL" -o "x$ac_krb5_version" = "xMIT"
+           then
+               #
+               # Yes.
+               # Check whether we have krb5_kt_resolve - and whether
+               # we need to link with -lresolv when linking with
+               # the Kerberos library.
+               #
+               AC_MSG_RESULT($ac_krb5_version)
+               wireshark_save_LIBS="$LIBS"
+               found_krb5_kt_resolve=no
+               for extras in "" "-lresolv"
+               do
+                   LIBS="$KRB5_LIBS $extras"
+                   if test -z "$extras"
+                   then
+                       AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve])
+                   else
+                       AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve (linking with $extras)])
+                   fi
+                   AC_TRY_LINK(
+                       [
+                       ],
+                       [
+                           krb5_kt_resolve();
+                       ],
+                       [
+                           #
+                           # We found "krb5_kt_resolve()", and required
+                           # the libraries in extras as well.
+                           #
+                           AC_MSG_RESULT(yes)
+                           KRB5_LIBS="$LIBS"
+                           AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
+                           if test "x$ac_krb5_version" = "xHEIMDAL"
+                           then
+                               AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+                           elif test "x$ac_krb5_version" = "xMIT"
+                           then
+                               AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+                           fi
+                           found_krb5_kt_resolve=yes
+                           break
+                       ],
+                       [
+                           AC_MSG_RESULT(no)
+                       ])
+               done
+               if test "$found_krb5_kt_resolve" = no
+               then
+                   #
+                   # We didn't find "krb5_kt_resolve()" in the
+                   # Kerberos library, even when we tried linking
+                   # with -lresolv; we can't link with kerberos.
+                   #
+                   if test "x$want_krb5" = "xyes"
+                   then
+                       #
+                       # The user tried to force us to use the library,
+                       # but we can't do so; report an error.
+                       #
+                       AC_MSG_ERROR(Usable $ac_krb5_version not found)
+                   else
+                       #
+                       # Restore the versions of CFLAGS and CPPFLAGS
+                       # from before we added the flags for Kerberos.
+                       #
+                       AC_MSG_RESULT(Usable $ac_krb5_version not found - disabling dissection for some kerberos data in packet decoding)
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       KRB5_LIBS=""
+                       want_krb5=no
+                   fi
+               else
+                   #
+                   # We can link with Kerberos; see whether krb5.h
+                   # defines KEYTYPE_ARCFOUR_56 (where "defines" means
+                   # "as a #define or as an enum member).
+                   #
+                   AC_MSG_CHECKING([whether krb5.h defines KEYTYPE_ARCFOUR_56])
+                   AC_COMPILE_IFELSE(
+                     [
+                       AC_LANG_SOURCE(
+                         [[
+                           #include <krb5.h>
+                           #include <stdio.h>
+
+                           main()
+                           {
+                             printf("%u\n", KEYTYPE_ARCFOUR_56);
+                           }
+                         ]])
+                     ],
+                     [
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_KEYTYPE_ARCFOUR_56, 1, [Define if krb5.h defines KEYTYPE_ARCFOUR_56])
+                     ],
+                     [
+                       AC_MSG_RESULT(no)
+                     ])
+               fi
+               LIBS="$wireshark_save_LIBS"
+           else
+               #
+               # It's not Heimdal or MIT.
+               #
+               AC_MSG_RESULT(no)
+               if test "x$want_krb5" = "xyes"
+               then
+                   #
+                   # The user tried to force us to use the library,
+                   # but we can't do so; report an error.
+                   #
+                   AC_MSG_ERROR(Kerberos not found)
+               else
+                   #
+                   # Restore the versions of CFLAGS and CPPFLAGS
+                   # from before we added the flags for Kerberos.
+                   #
+                   AC_MSG_RESULT(Kerberos not found - disabling dissection for some kerberos data in packet decoding)
+                   CFLAGS="$wireshark_save_CFLAGS"
+                   CPPFLAGS="$wireshark_save_CPPFLAGS"
+                   KRB5_LIBS=""
+                   want_krb5=no
+               fi
+           fi
+       else
+           #
+           # The user asked us not to use Kerberos, or they didn't
+           # say whether they wanted us to use it but we found
+           # that we couldn't.
+           #
+           # Restore the versions of CFLAGS and CPPFLAGS
+           # from before we added the flags for Kerberos.
+           #
+           CFLAGS="$wireshark_save_CFLAGS"
+           CPPFLAGS="$wireshark_save_CPPFLAGS"
+           KRB5_LIBS=""
+           want_krb5=no
+       fi
+       AC_SUBST(KRB5_LIBS)
+])
+