If we don't have any of the pcap_datalink_XXX_to_YYY routines,
[obnox/wireshark/wip.git] / acinclude.m4
index 4355a4964ced4ccde948d1e8df5241793d610856..528936c49813132a627dc83181f5962d231829fd 100644 (file)
@@ -1,5 +1,5 @@
 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$
@@ -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,75 +71,34 @@ 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 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_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_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
+# 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
@@ -219,7 +178,7 @@ yes
                                v6lib=inet6
                                [CFLAGS="-DINET6 -DSOLARIS8_INET6 $CFLAGS"]
                        fi
-                       ;; 
+                       ;;
                esac
                if test "$v6type" != "unknown"; then
                        break
@@ -241,16 +200,16 @@ 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".
 #
 # Adapted from stuff in the AC_PATH_XTRA macro in "acspecific.m4" in
 # GNU Autoconf 2.13; the comment came from there.
-# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14. 
+# 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.
@@ -264,7 +223,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
@@ -273,11 +232,11 @@ AC_DEFUN([AC_ETHEREAL_GETHOSTBY_LIB_CHECK],
 #
 # Adapted from stuff in the AC_PATH_XTRA macro in "acspecific.m4" in
 # GNU Autoconf 2.13; the comment came from there.
-# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14. 
+# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14.
 #
 # 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
@@ -293,9 +252,37 @@ AC_DEFUN([AC_ETHEREAL_SOCKET_LIB_CHECK],
 ])
 
 #
-# AC_ETHEREAL_PCAP_CHECK
+# AC_WIRESHARK_BREAKLOOP_TRY_LINK
+#
+AC_DEFUN([AC_WIRESHARK_PCAP_BREAKLOOP_TRY_LINK],
+[
+  AC_LINK_IFELSE(
+  [
+      AC_LANG_SOURCE(
+      [[
+#      include <pcap.h>
+       int main(void)
+       {
+         pcap_t  *pct = NULL;
+         pcap_breakloop(pct);
+         return 0;
+       }
+      ]])
+  ],
+  [
+    ws_breakloop_compiled=yes
+  ],
+  [
+    ws_breakloop_compiled=no
+  ])
+])
+
+
+
+#
+# AC_WIRESHARK_PCAP_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
+AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
 [
        if test -z "$pcap_dir"
        then
@@ -353,11 +340,11 @@ 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 check
-       AC_CHECK_HEADER(pcap.h,, 
+       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,
@@ -365,31 +352,48 @@ and did you also install that package?]]))
 
        #
        # 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, 1, [Define to use libpcap library])
          ], [
-           AC_MSG_CHECKING([for pcap_open_live in -lpcap -lcfg -lodm])
+           ac_wireshark_extras_found=no
            ac_save_LIBS="$LIBS"
-           LIBS="-lpcap -lcfg -lodm"
-           AC_TRY_LINK(
-               [
+           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_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.])
-               ])
+                   ],
+                   [
+                       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)
@@ -418,16 +422,133 @@ and did you also install that package?]]))
        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)
+       AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
+       #
+       # pcap_breakloop may be present in the library but not declared
+       # in the pcap.h header file.  If it's not declared in the header
+       # file, attempts to use it will get warnings, and, if we're
+       # building with warnings treated as errors, that warning will
+       # cause compilation to fail.
+       #
+       # We are therefore first testing whether the function is present
+       # and then, if we're compiling with warnings as errors, testing
+       # whether it is usable.  It is usable if it compiles without
+       # a -Wimplicit warning (the "compile with warnings as errors"
+       # option requires GCC). If it is not usable, we fail and tell
+       # the user that the pcap.h header needs to be updated.
+       #
+       # Ceteris paribus, this should only happen with Mac OS X 10.3[.x] which
+       # can have an up-to-date pcap library without the corresponding pcap
+       # header.
+       #
+       # However, it might also happen on some others OSes with some erroneous
+       # system manipulations where multiple versions of libcap might co-exist
+       # e.g. hand made symbolic link from libpcap.so -> libpcap.so.0.8 but
+       # having the pcap header version 0.7.
+       #
+       AC_MSG_CHECKING([whether pcap_breakloop is present])
+       ac_CFLAGS_saved="$CFLAGS"
+       AC_WIRESHARK_PCAP_BREAKLOOP_TRY_LINK
+       if test "x$ws_breakloop_compiled" = "xyes"; then
+         AC_MSG_RESULT(yes)
+         AC_DEFINE(HAVE_PCAP_BREAKLOOP, 1, [Define if pcap_breakloop is known])
+         if test "x$with_warnings_as_errors" = "xyes"; then
+           AC_MSG_CHECKING([whether pcap_breakloop is usable])
+           CFLAGS="$CFLAGS -Werror -Wimplicit"
+           AC_WIRESHARK_PCAP_BREAKLOOP_TRY_LINK
+           if test "x$ws_breakloop_compiled" = "xyes"; then
+             AC_MSG_RESULT(yes)
+           else
+             AC_MSG_RESULT(no)
+             AC_MSG_ERROR(
+[Your pcap library is more recent than your pcap header.
+As you are building with compiler warnings treated as errors, Wireshark
+won't be able to use functions not declared in that header.
+If you wish to build with compiler warnings treated as errors, You should
+install a newer version of the header file.])
+           fi
+           CFLAGS="$ac_CFLAGS_saved"
+         fi
+       else
+         AC_MSG_RESULT(no)
+       fi
+
+       #
+       # 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_datalink_val_to_description)
+         AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink pcap_lib_version)
+         AC_CHECK_FUNCS(pcap_get_selectable_fd pcap_free_datalinks)
+       fi
        LIBS="$ac_save_LIBS"
 ])
 
+AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK],
+[
+    ac_save_LIBS="$LIBS"
+    LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
+    AC_DEFINE(HAVE_REMOTE, 1, [Define to 1 to enable remote
+              capturing feature in WinPcap library])
+    AC_CHECK_FUNCS(pcap_open pcap_findalldevs_ex pcap_createsrcstr)
+    if test $ac_cv_func_pcap_open = "yes" -a \
+            $ac_cv_func_pcap_findalldevs_ex = "yes" -a \
+            $ac_cv_func_pcap_createsrcstr = "yes" ; then
+        AC_DEFINE(HAVE_PCAP_REMOTE, 1,
+            [Define to 1 if you have WinPcap remote capturing support and prefer to use these new API features.])
+    fi
+    AC_CHECK_FUNCS(pcap_setsampling)
+    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
@@ -443,12 +564,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_CPPFLAGS="$CPPFLAGS"
+         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
 
        #
@@ -521,8 +642,8 @@ 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
@@ -537,9 +658,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_CPPFLAGS"
-                               LIBS="$ethereal_save_LIBS"
+                               CFLAGS="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                               LIBS="$wireshark_save_LIBS"
                        fi
                        want_zlib=no
                ])
@@ -560,15 +681,15 @@ AC_DEFUN([AC_ETHEREAL_ZLIB_CHECK],
                # 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.
+               # "gzgets()", and that's the zlib with which Wireshark
+               # gets linked, so the build of Wireshark 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_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.)
@@ -579,9 +700,9 @@ AC_DEFUN([AC_ETHEREAL_ZLIB_CHECK],
 ])
 
 #
-# AC_ETHEREAL_LIBPCRE_CHECK
+# AC_WIRESHARK_LIBPCRE_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
+AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
 [
        if test "x$pcre_dir" != "x"
        then
@@ -597,13 +718,13 @@ AC_DEFUN([AC_ETHEREAL_LIBPCRE_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$pcre_dir/include"
-         ethereal_save_CPPFLAGS="$CPPFLAGS"
+         wireshark_save_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
-         ethereal_save_LIBS="$LIBS"
+         wireshark_save_LIBS="$LIBS"
          LIBS="$LIBS -lpcre"
-         ethereal_save_LDFLAGS="$LDFLAGS"
+         wireshark_save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
        fi
 
@@ -658,7 +779,7 @@ AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
                                # the beginning of CFLAGS, CPPFLAGS,
                                # LDFLAGS, and LIBS.
                                #
-                               PCRE_LIBS="-L$pcre_dir/lib -lpcre $ethereal_save_LIBS"
+                               PCRE_LIBS="-L$pcre_dir/lib -lpcre $wireshark_save_LIBS"
                        else
                                PCRE_LIBS="-lpcre"
                        fi
@@ -672,10 +793,10 @@ AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
                                # "--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"
+                               CFLAGS="$wireshark_save_CFLAGS"
+                               CPPFLAGS="$wireshark_save_CPPFLAGS"
+                               LDFLAGS="$wireshark_save_LDFLAGS"
+                               LIBS="$wireshark_save_LIBS"
                                PCRE_LIBS=""
                        fi
                        want_pcre=no
@@ -685,173 +806,320 @@ AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
 ])
 
 #
-# AC_ETHEREAL_UCDSNMP_CHECK
+# AC_WIRESHARK_LIBLUA_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
-[
-       if test "x$ucdsnmp_dir" != "x"
+AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
+
+       if test "x$lua_dir" != "x"
        then
                #
-               # The user specified a directory in which UCD SNMP resides,
+               # 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 libpcap in a directory that's
+               # 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.
                #
-               CFLAGS="$CFLAGS -I$ucdsnmp_dir/include"
-               CPPFLAGS="$CPPFLAGS -I$ucdsnmp_dir/include"
-               AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $ucdsnmp_dir/lib)
+               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 -lm"
+               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 -lm"
        fi
 
        #
-       # Check for one of the UCD SNMP header files we include,
-       # to see whether we have UCD SNMP installed.
+       # 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_HEADER(ucd-snmp/ucd-snmp-config.h,
+       AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h,,
        [
+               AC_CHECK_HEADERS(lua5.1/lua.h lua5.1/lualib.h lua5.1/lauxlib.h,
+               [
+                       if test "x$lua_dir" != "x"
+                       then
+                               LUA_INCLUDES="-I$lua_dir/include/lua5.1"
+                       else
+                               # we found lua5.1/lua.h, but we don't know which include dir contains it
+                               AC_MSG_ERROR(Header file lua.h was found as lua5.1/lua.h but we can't use it. Please set the PATH for the --with-lua configure parameter. \n probably it is /usr.)
+                       fi
+
+               ],
+               [
+                       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
                #
-               # 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.
+               # Well, we at least have the lua header file.
                #
-               # 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.
+               # let's check if the libs are there
                #
-               for extras in "" "-L/usr/kerberos/lib -ldes425" "-lkstat"
-               do
-                       LIBS="$SOCKET_LIBS $NSL_LIBS $SSL_LIBS $extras"
-                       AC_TRY_LINK(
-                       [
-                       ],
-                       [
-                       sprint_realloc_objid();
-                       ],
-                       [
-                       SNMP_LIBS="-lsnmp $extras"; break;
-                       ],
+
+               # At least on Suse 9.3 systems, liblualib needs linking
+               # against libm.
+               LIBS="$LIBS $LUA_LIBS -lm"
+
+               AC_CHECK_LIB(lua, luaL_register,
+               [
+                   #
+                   #  Lua 5.1 found
+                   #
+                       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 -lm"
+                               LUA_INCLUDES="-I$lua_dir/include"
+                       else
+                               LUA_LIBS="-llua -lm"
+                               LUA_INCLUDES=""
+                       fi
+                       AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+
+               ],[
+                       #
+                       # We could not find the libs, maybe we have version number in the lib name
+                       #
+
+                       LIBS="$wireshark_save_LIBS -llua5.1 -lm"
+
+                       AC_CHECK_LIB(lua5.1, luaL_register,
                        [
+                           #
+                           #  Lua 5.1 found
+                           #
+                           AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                           LUA_LIBS=" -llua5.1 -lm"
+                       ],[
+                               #
+                               # 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
                        ])
-                       
-#        int sprint_realloc_objid(u_char **buf, size_t *buf_len, size_t *out_len, int allow_realloc, const oid *objid, size_t objidlen);
-#        AC_TRY_LINK(includes, body, [if-found], [if-not-found])
-#                      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 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
+       CFLAGS="$wireshark_save_CFLAGS"
+       CPPFLAGS="$wireshark_save_CPPFLAGS"
+       LDFLAGS="$wireshark_save_LDFLAGS"
+       LIBS="$wireshark_save_LIBS"
+       AC_SUBST(LUA_LIBS)
+       AC_SUBST(LUA_INCLUDES)
 
-               #
-               # 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
-       ])
+       fi
 ])
 
 #
-# AC_ETHEREAL_SSL_CHECK
+# AC_WIRESHARK_LIBPORTAUDIO_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_SSL_CHECK],
-[
-       want_ssl=defaultno
+AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
 
-       AC_ARG_WITH(ssl,
-changequote(<<, >>)dnl
-<<  --with-ssl[=DIR]        use SSL crypto library (located in directory DIR, if supplied).   [default=no]>>,
-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)
+       if test "x$portaudio_dir" != "x"
+       then
+               #
+               # The user specified a directory in which libportaudio
+               # 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 libportaudio 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$portaudio_dir/include"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS -I$portaudio_dir/include"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -L$portaudio_dir/lib -lportaudio"
+               wireshark_save_LDFLAGS="$LDFLAGS"
+               LDFLAGS="$LDFLAGS -L$portaudio_dir/lib"
+       else
+               #
+               # The user specified no directory in which libportaudio resides,
+               # so just add "-lportaudio" to the used libs.
+               #
+               wireshark_save_CFLAGS="$CFLAGS"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               wireshark_save_LDFLAGS="$LDFLAGS"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -lportaudio"
        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)
+       #
+       # Make sure we have "portaudio.h".  If we don't, it means we probably
+       # don't have libportaudio, so don't use it.
+       #
+       AC_CHECK_HEADERS(portaudio.h,,
+       [
+               if test "x$portaudio_dir" != "x"
+               then
+                       #
+                       # The user used "--with-portaudio=" to specify a directory
+                       # containing libportaudio, but we didn't find the header file
+                       # there; that either means they didn't specify the
+                       # right directory or are confused about whether libportaudio
+                       # is, in fact, installed.  Report the error and give up.
+                       #
+                       AC_MSG_ERROR([libportaudio header not found in directory specified in --with-portaudio])
+               else
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       LDFLAGS="$wireshark_save_LDFLAGS"
+                       LIBS="$wireshark_save_LIBS"
+                       PORTAUDIO_LIBS=""
+                       if test "x$want_portaudio" = "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 portaudio.h not found.)
+                       else
+                               #
+                               # We couldn't find the header file; don't use the
+                               # library, as it's probably not present.
+                               #
+                               want_portaudio=no
+                       fi
                fi
+       ])
+
+       #
+       # Check whether we have the right version of portaudio
+       #
+       if test "x$want_portaudio" != "xno"
+       then
+               AC_CHECK_TYPE(PortAudioStream,
+               AC_DEFINE(PORTAUDIO_API_1, 1, [Define if we are using version of of the Portaudio library API]),
+               ,
+               [#include <portaudio.h>])
        fi
 
-       if test "x$want_ssl" = "xyes"; then
-           LIBS="-lcrypto"
-            AC_TRY_LINK(
-                [
-               void EVP_md5();
-                ],
-                [
-               EVP_md5();
-                ],
-                [
-               AC_MSG_RESULT([yes])
-               SSL_LIBS=-lcrypto
-                ],
-                [
-                AC_MSG_RESULT([no])
-                AC_MSG_ERROR([libcrypto failed link test.])
-                ])
+       if test "x$want_portaudio" != "xno"
+       then
+               #
+               # Well, we at least have the portaudio header file.
+               #
+               # let's check if the libs are there
+               #
+
+               AC_CHECK_LIB(portaudio, Pa_Initialize,
+               [
+                       if test "x$portaudio_dir" != "x"
+                       then
+                               #
+                               # Put the "-I" and "-L" flags for portaudio at
+                               # the beginning of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS.
+                               #
+                               PORTAUDIO_LIBS="-L$portaudio_dir/lib -lportaudio"
+                               PORTAUDIO_INCLUDES="-I$portaudio_dir/include"
+                       else
+                               PORTAUDIO_LIBS="-lportaudio"
+                               PORTAUDIO_INCLUDES=""
+                       fi
+                       AC_DEFINE(HAVE_LIBPORTAUDIO, 1, [Define to use libportaudio library])
+                       want_portaudio=yes
+               ],[
+                       #
+                       # Restore the versions of CFLAGS, CPPFLAGS,
+                       # LDFLAGS, and LIBS before we added the
+                       # "--with-portaudio=" directory, as we didn't
+                       # actually find portaudio there.
+                       #
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       LDFLAGS="$wireshark_save_LDFLAGS"
+                       LIBS="$wireshark_save_LIBS"
+                       PORTAUDIO_LIBS=""
+                       # User requested --with-portaudio but it isn't available
+                       if test "x$want_portaudio" = "xyes"
+                       then
+                               AC_MSG_ERROR(Linking with libportaudio failed.)
+                       fi
+                       want_portaudio=no
+               ])
+
+       CFLAGS="$wireshark_save_CFLAGS"
+       CPPFLAGS="$wireshark_save_CPPFLAGS"
+       LDFLAGS="$wireshark_save_LDFLAGS"
+       LIBS="$wireshark_save_LIBS"
+       AC_SUBST(PORTAUDIO_LIBS)
+       AC_SUBST(PORTAUDIO_INCLUDES)
 
-       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
@@ -865,10 +1133,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
@@ -881,32 +1149,50 @@ AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
 ])
 
 #
-# AC_ETHEREAL_ADNS_CHECK
+# AC_WIRESHARK_C_ARES_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_ADNS_CHECK],
+AC_DEFUN([AC_WIRESHARK_C_ARES_CHECK],
 [
-       want_adns=defaultyes
+       want_c_ares=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)
+       if test "x$want_c_ares" = "xdefaultyes"; then
+               want_c_ares=yes
+               if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+                       withval=/usr/local
+                       if test -d "$withval"; then
+                               AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+                       fi
+               fi
        fi
-       ])
+
+       if test "x$want_c_ares" = "xyes"; then
+               AC_CHECK_LIB(cares, ares_init,
+                 [
+                   C_ARES_LIBS=-lcares
+               AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
+               have_good_c_ares=yes
+                 ],, $SOCKET_LIBS $NSL_LIBS
+               )
+       else
+               AC_MSG_RESULT(not required)
+       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_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+               if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+                       withval=/usr/local
+                       if test -d "$withval"; then
+                               AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+                       fi
                fi
        fi
 
@@ -925,10 +1211,43 @@ changequote([, ])dnl
 
 
 #
-# AC_ETHEREAL_KRB5_CHECK
+# AC_WIRESHARK_LIBCAP_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LIBCAP_CHECK],
+[
+       want_libcap=defaultyes
+
+       if test "x$want_libcap" = "xdefaultyes"; then
+               want_libcap=yes
+               if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+                       withval=/usr/local
+                       if test -d "$withval"; then
+                               AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+                       fi
+               fi
+       fi
+
+       if test "x$want_libcap" = "xyes"; then
+               AC_CHECK_LIB(cap, cap_set_flag,
+                 [
+                   LIBCAP_LIBS=-lcap
+               AC_DEFINE(HAVE_LIBCAP, 1, [Define to use the libcap library])
+               have_good_libcap=yes
+                 ],,
+               )
+       else
+               AC_MSG_RESULT(not required)
+       fi
+])
+
+
+#
+# AC_WIRESHARK_KRB5_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
+AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
 [
+       wireshark_save_CFLAGS="$CFLAGS"
+       wireshark_save_CPPFLAGS="$CPPFLAGS"
        if test "x$krb5_dir" != "x"
        then
          #
@@ -943,34 +1262,53 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
          # 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"
-         KRB5_LIBS="-lkrb5 -lasn1 $SSL_LIBS -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'` 
+         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) 
+         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'`
+           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
 
@@ -1004,49 +1342,243 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                # 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" -a "x$ac_krb5_version" = "xHEIMDAL"
+       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
                #
-               # Well, we at least have the krb5 header file.
+               # Yes.
+               # Check whether we have krb5_kt_resolve - and whether
+               # we need to link with -lresolv when linking with
+               # the Kerberos library.
                #
-               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
+               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
-               ], $KRB5_LIBS)
+                   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
-               KRB5_LIBS=""
-               want_krb5=no
+           #
+           # 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)
 ])
 
+#
+# AC_WIRESHARK_GEOIP_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK],
+[
+       want_geoip=defaultyes
+
+       if test "x$want_geoip" = "xdefaultyes"; then
+               want_geoip=yes
+               if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+                       withval=/usr/local
+                       if test -d "$withval"; then
+                               AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+                       fi
+               fi
+       fi
+
+       if test "x$want_geoip" = "xyes"; then
+               AC_CHECK_LIB(GeoIP, GeoIP_new,
+                 [
+                   GEOIP_LIBS=-lGeoIP
+               AC_DEFINE(HAVE_GEOIP, 1, [Define to use GeoIP library])
+               have_good_geoip=yes
+                 ],,
+               )
+       else
+               AC_MSG_RESULT(not required)
+       fi
+])
+
+#
+# AC_WIRESHARK_GCC_CFLAGS_CHECK
+#
+# $1 : cflags to test
+#
+# The macro first determines if the compiler is GCC. Then compile with the
+# defined cflags. The defined flags are added to CFLAGS only if the compilation
+# succeeds.
+#
+AC_DEFUN([AC_WIRESHARK_GCC_CFLAGS_CHECK],
+[GCC_OPTION="$1"
+AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS)
+if test "x$GCC" != "x"; then
+  CFLAGS_saved="$CFLAGS"
+  CFLAGS="$CFLAGS $GCC_OPTION"
+  AC_COMPILE_IFELSE([
+    AC_LANG_SOURCE([[
+                      int foo;
+                  ]])],
+                  [
+                    AC_MSG_RESULT(yes)
+                  ],
+                  [
+                    AC_MSG_RESULT(no)
+                    CFLAGS="$CFLAGS_saved"
+                  ])
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
+#
+# AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK
+#
+# Checks for the presence of OS X integration functions in the GTK+ framework
+# or as a separate library.
+#
+# http://developer.imendio.com/projects/gtk-macosx/integration
+#
+AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
+[
+       ac_save_CFLAGS="$CFLAGS"
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GTK_CFLAGS"
+       LIBS="$GTK_LIBS $LIBS"
+       AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, Gtk igemacintegration,
+       [
+               AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
+                       [Define to 1 if the the Gtk+ framework or a separate library inclues the Imendio IGE Mac OS X Integration functions.])
+       ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+])
+
+