Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple
[obnox/wireshark/wip.git] / acinclude.m4
index 0a9197d5d8bfd1f8ddd4648f75dddf002bd3c316..05829bf382c8bce970095e5582c55d72b3a1654c 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*)
@@ -69,79 +69,70 @@ case "$host_os" in
 esac
 ])
 
+#
+# AC_WIRESHARK_TIMEZONE_ABBREV
+#
+
+AC_DEFUN([AC_WIRESHARK_TIMEZONE_ABBREV],
+[
+  AC_CACHE_CHECK([for tm_zone in struct tm],
+    ac_cv_wireshark_have_tm_zone,
+    [
+      AC_TRY_COMPILE(
+        [#include <time.h>],
+        [struct tm t; t.tm_zone;],
+        ac_cv_wireshark_have_tm_zone=yes,
+        ac_cv_wireshark_have_tm_zone=no)
+    ])
+  if test $ac_cv_wireshark_have_tm_zone = yes; then
+    AC_DEFINE(HAVE_TM_ZONE, 1, [Define if tm_zone field exists in struct tm])
+  else
+    AC_CACHE_CHECK([for tzname],
+      ac_cv_wireshark_have_tzname,
+      [
+        AC_TRY_LINK(
+[#include <time.h>
+#include <stdio.h>],
+          [printf("%s", tzname[0]);],
+          ac_cv_wireshark_have_tzname=yes,
+          ac_cv_wireshark_have_tzname=no)
+      ])
+    if test $ac_cv_wireshark_have_tzname = yes; then
+      AC_DEFINE(HAVE_TZNAME, 1, [Define if tzname array exists])
+    fi
+  fi
+])
+
 
 #
-# 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 <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
@@ -221,7 +212,7 @@ yes
                                v6lib=inet6
                                [CFLAGS="-DINET6 -DSOLARIS8_INET6 $CFLAGS"]
                        fi
-                       ;; 
+                       ;;
                esac
                if test "$v6type" != "unknown"; then
                        break
@@ -243,16 +234,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.
@@ -266,7 +257,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
@@ -275,11 +266,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
@@ -295,9 +286,37 @@ AC_DEFUN([AC_ETHEREAL_SOCKET_LIB_CHECK],
 ])
 
 #
-# AC_ETHEREAL_PCAP_CHECK
+# AC_WIRESHARK_BREAKLOOP_TRY_LINK
 #
-AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
+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_WIRESHARK_PCAP_CHECK],
 [
        if test -z "$pcap_dir"
        then
@@ -305,40 +324,82 @@ AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
          # 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" - and
-         # "$prefix/include/pcap", in case $prefix is set to
-         # "/usr/include" or "/usr/local/include".
+         # The user didn't specify a directory in which libpcap resides.
+         # First, look for a pcap-config script.
          #
-         # 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=""
-         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"
+         AC_PATH_PROG(PCAP_CONFIG, pcap-config)
+
+         if test -n "$PCAP_CONFIG" ; then
+           #
+           # Found it.
+           #
+           # Now check whether it's the libpcap 1.0 version, which
+           # put a space after "-L" - on some platforms, that doesn't
+           # work.
+           #
+           AC_MSG_CHECKING(for broken pcap-config)
+           case "`\"$PCAP_CONFIG\" --libs`" in
+
+           "-L "*)
+             #
+             # Space after -L.  Pretend pcap-config doesn't exist.
+             #
+             AC_MSG_RESULT(yes)
+             PCAP_CONFIG=""
+             ;;
+
+           *)
+             #
+             # No space after -L.
+             #
+             AC_MSG_RESULT(no)
+             ;;
+           esac
          fi
-         for pcap_dir in $pcap_dir_list
-         do
-           if test -d $pcap_dir ; then
+         if test -n "$PCAP_CONFIG" ; then
+           #
+           # Found it, and it's usable; use it to get the include flags
+           # for libpcap.
+           #
+           CFLAGS="$CFLAGS `\"$PCAP_CONFIG\" --cflags`"
+           CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
+         else  
+           #
+           # Didn't find it; we have to look for libpcap ourselves.
+           # We assume that the current library search path will work,
+           # but we may have to look for the header in a "pcap"
+           # subdirectory of "/usr/include" or "/usr/local/include",
+           # as some systems apparently put "pcap.h" in a "pcap"
+           # subdirectory, and we also check "$prefix/include" - and
+           # "$prefix/include/pcap", in case $prefix is set to
+           # "/usr/include" or "/usr/local/include".
+           #
+           # XXX - should we just add "$prefix/include" to the include
+           # search path and "$prefix/lib" to the library search path?
+           #
+           AC_MSG_CHECKING(for extraneous pcap header directories)
+           found_pcap_dir=""
+           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 -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
+             fi
+           done
 
-         if test "$found_pcap_dir" != "" ; then
-           AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
-         else
-           AC_MSG_RESULT(not found)
+           if test "$found_pcap_dir" != "" ; then
+             AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
+           else
+             AC_MSG_RESULT(not found)
+           fi
          fi
        else
          #
@@ -355,45 +416,76 @@ 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,
 and did you also install that package?]]))
 
-       #
-       # Check to see if we find "pcap_open_live" in "-lpcap".
-       #
-       AC_CHECK_LIB(pcap, pcap_open_live,
-         [
-           PCAP_LIBS=-lpcap
-           AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
-         ], [
-           AC_MSG_CHECKING([for pcap_open_live in -lpcap -lcfg -lodm])
-           ac_save_LIBS="$LIBS"
-           LIBS="-lpcap -lcfg -lodm"
-           AC_TRY_LINK(
-               [
+       if test -n "$PCAP_CONFIG" ; then
+         #
+         # We have pcap-config; we assume that means we have libpcap
+         # installed and that pcap-config will tell us whatever
+         # libraries libpcap needs.
+         #
+         if test x$enable_static = xyes; then
+           PCAP_LIBS="`\"$PCAP_CONFIG\" --libs --static`"
+         else
+           PCAP_LIBS="`\"$PCAP_CONFIG\" --libs`"
+         fi
+         AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+       else
+         #
+         # 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_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_MSG_RESULT([yes])
-               PCAP_LIBS="-lpcap -lcfg -lodm"
-               AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
-               ],
-               [
-               AC_MSG_RESULT([no])
-               AC_MSG_ERROR([Library libpcap not found.])
-               ])
-           LIBS=$ac_save_LIBS
-         ], $SOCKET_LIBS $NSL_LIBS)
+                   ],
+                   [
+                       ac_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)
+       fi
        AC_SUBST(PCAP_LIBS)
 
        #
@@ -421,6 +513,56 @@ and did you also install that package?]]))
                AC_MSG_RESULT(no)
        fi
        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,
@@ -469,16 +611,35 @@ and did you also install that package?]]))
          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)
+         AC_CHECK_FUNCS(pcap_get_selectable_fd pcap_free_datalinks)
+         AC_CHECK_FUNCS(pcap_create bpf_image)
        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
@@ -494,12 +655,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
 
        #
@@ -572,8 +733,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
@@ -588,9 +749,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
                ])
@@ -611,15 +772,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.)
@@ -630,9 +791,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
@@ -648,13 +809,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
 
@@ -709,7 +870,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
@@ -723,10 +884,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
@@ -736,9 +897,9 @@ AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
 ])
 
 #
-# AC_ETHEREAL_LIBLUA_CHECK
+# AC_WIRESHARK_LIBLUA_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
+AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
 
        if test "x$lua_dir" != "x"
        then
@@ -754,24 +915,24 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_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$lua_dir/include"
-               ethereal_save_CPPFLAGS="$CPPFLAGS"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
                CPPFLAGS="$CPPFLAGS -I$lua_dir/include"
-               ethereal_save_LIBS="$LIBS"
-               LIBS="$LIBS -L$lua_dir/lib -llua"
-               ethereal_save_LDFLAGS="$LDFLAGS"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -L$lua_dir/lib -llua -lm"
+               wireshark_save_LDFLAGS="$LDFLAGS"
                LDFLAGS="$LDFLAGS -L$lua_dir/lib"
-       else 
+       else
                #
                # The user specified no directory in which liblua resides,
                # so just add "-llua -lliblua" to the used libs.
                #
-               ethereal_save_CFLAGS="$CFLAGS"
-               ethereal_save_CPPFLAGS="$CPPFLAGS"
-               ethereal_save_LDFLAGS="$LDFLAGS"
-               ethereal_save_LIBS="$LIBS"
-               LIBS="$LIBS -llua"
+               wireshark_save_CFLAGS="$CFLAGS"
+               wireshark_save_CPPFLAGS="$CPPFLAGS"
+               wireshark_save_LDFLAGS="$LDFLAGS"
+               wireshark_save_LIBS="$LIBS"
+               LIBS="$LIBS -llua -lm"
        fi
 
        #
@@ -780,32 +941,104 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
        #
        AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h,,
        [
-               if test "x$lua_dir" != "x"
-               then
+               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
+                               #
+                               # The user didn't specify a directory in which liblua resides;
+                               # we must look for the headers in a "lua5.1" subdirectory of
+                               # "/usr/include", "/usr/local/include", or "$prefix/include"
+                               # as some systems apparently put the headers in a "lua5.1"
+                               # subdirectory.
+                               AC_MSG_CHECKING(for extraneous lua header directories)
+                               found_lua_dir=""
+                               lua_dir_list="/usr/include/lua5.1 $prefix/include/lua5.1"
+                               if test "x$ac_cv_enable_usr_local" = "xyes"
+                               then
+                                       lua_dir_list="$lua_dir_list /usr/local/include/lua5.1"
+                               fi
+                               for lua_dir_ent in $lua_dir_list
+                               do
+                                       if test -d $lua_dir_ent
+                                       then
+                                               LUA_INCLUDES="-I$lua_dir_ent"
+                                               found_lua_dir="$lua_dir_ent"
+                                               break
+                                       fi
+                               done
+
+                               if test "x$found_lua_dir" != "x"
+                               then
+                                       AC_MSG_RESULT(found -- $found_lua_dir)
+                               else
+                                       AC_MSG_RESULT(not found)
+                                       #
+                                       # 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=""
+                                       if test "x$want_lua" = "xyes"
+                                       then
+                                               # 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 locate the include directory. Please set the DIR for the --with-lua configure parameter.)
+                                       else
+                                               #
+                                               # We couldn't find the header file; don't use the
+                                               # library, as it's probably not present.
+                                               #
+                                               want_lua=no
+                                       fi
+                               fi
+                       fi
+               ],
+               [
                        #
-                       # 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.
+                       # Restore the versions of CFLAGS, CPPFLAGS,
+                       # LDFLAGS, and LIBS before we added the
+                       # "--with-lua=" directory, as we didn't
+                       # actually find lua there.
                        #
-                       AC_MSG_ERROR([liblua header not found in directory specified in --with-lua])
-               else
-                       if test "x$want_lua" = "xyes"
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
+                       LDFLAGS="$wireshark_save_LDFLAGS"
+                       LIBS="$wireshark_save_LIBS"
+                       LUA_LIBS=""
+                       if test "x$lua_dir" != "x"
                        then
                                #
-                               # The user tried to force us to use the library, but we
-                               # couldn't find the header file; report an error.
+                               # 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(Header file lua.h not found.)
+                               AC_MSG_ERROR([liblua header not found in directory specified in --with-lua])
                        else
-                               #
-                               # We couldn't find the header file; don't use the
-                               # library, as it's probably not present.
-                               #
-                               want_lua=no
+                               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
-               fi
+               ])
        ])
 
        if test "x$want_lua" != "xno"
@@ -815,8 +1048,16 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
                #
                # let's check if the libs are there
                #
-               AC_CHECK_LIB(lua, lua_call,
+
+               # 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
                                #
@@ -824,86 +1065,55 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
                                # the beginning of CFLAGS, CPPFLAGS,
                                # LDFLAGS, and LIBS.
                                #
-                               LUA_LIBS="-L$lua_dir/lib -llua"
+                               LUA_LIBS="-L$lua_dir/lib -llua -lm"
                                LUA_INCLUDES="-I$lua_dir/include"
                        else
-                               LUA_LIBS="-llua"
+                               LUA_LIBS="-llua -lm"
                                LUA_INCLUDES=""
                        fi
+                       AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                       want_lua=yes
 
+               ],[
                        #
-                       # we got lua, now look for lualib
+                       # We could not find the libs, maybe we have version number in the lib name
                        #
-                       AC_CHECK_LIB(lualib, luaL_openlib,
+
+                       LIBS="$wireshark_save_LIBS -llua5.1 -lm"
+
+                       AC_CHECK_LIB(lua5.1, luaL_register,
                        [
-                               #
-                               # we have 5.0
-                               #
-                               LUA_LIBS="$LUA_LIBS -llualib"
+                           #
+                           #  Lua 5.1 found
+                           #
+                           LUA_LIBS=" -llua5.1 -lm"
+                           AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                           want_lua=yes
                        ],[
                                #
-                               # no lualib, in 5.1 there's only liblua
-                               # do we have 5.1?
+                               # Restore the versions of CFLAGS, CPPFLAGS,
+                               # LDFLAGS, and LIBS before we added the
+                               # "--with-lua=" directory, as we didn't
+                               # actually find lua there.
                                #
-                               
-                               LIBS="$ethereal_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="$ethereal_save_CFLAGS"
-                                       CPPFLAGS="$ethereal_save_CPPFLAGS"
-                                       LDFLAGS="$ethereal_save_LDFLAGS"
-                                       LIBS="$ethereal_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
-                               ])
+                               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
                        ])
-               ],[  
-                       #
-                       # 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="$ethereal_save_CFLAGS"
-                       CPPFLAGS="$ethereal_save_CPPFLAGS"
-                       LDFLAGS="$ethereal_save_LDFLAGS"
-                       LIBS="$ethereal_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="$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"
        AC_SUBST(LUA_LIBS)
        AC_SUBST(LUA_INCLUDES)
 
@@ -911,226 +1121,157 @@ AC_DEFUN([AC_ETHEREAL_LIBLUA_CHECK],[
 ])
 
 #
-# AC_ETHEREAL_NETSNMP_CHECK
+# AC_WIRESHARK_LIBPORTAUDIO_CHECK
 #
-AC_DEFUN([AC_ETHEREAL_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.
-               #
-               ethereal_save_CFLAGS="$CFLAGS"
-               ethereal_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="$ethereal_save_CFLAGS"
-                               CPPFLAGS="$ethereal_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="$ethereal_save_CFLAGS"
-                               CPPFLAGS="$ethereal_save_CPPFLAGS"
-                       fi
-               fi
-       fi      
-])
+AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
 
-#
-# AC_ETHEREAL_UCDSNMP_CHECK
-#
-AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
-[
-       if test "x$ucdsnmp_dir" != "x"
+       if test "x$portaudio_dir" != "x"
        then
                #
-               # The user specified a directory in which UCD SNMP resides,
-               # so add the "include" subdirectory of that directory to
+               # 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 libpcap in a directory that's
+               # 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.
                #
-               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$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
 
        #
-       # Check for one of the UCD SNMP header files we include,
-       # to see whether we have UCD SNMP installed.
+       # 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_HEADER(ucd-snmp/ucd-snmp-config.h,
+       AC_CHECK_HEADERS(portaudio.h,,
        [
-               #
-               # UCD SNMP or Net-SNMP might require various helper
-               # libraries on various platforms, such as "-ldes425"
-               # in "/usr/kerberos/lib" on some versions of Red
-               # Hat Linux, or "-lkstat" on Solaris.
-               #
-               # 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.
-               #
-               ethereal_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"
+               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
-                               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.
+                               # The user tried to force us to use the library, but we
+                               # couldn't find the header file; report an error.
                                #
-                               AC_MSG_RESULT(yes)
-                               SNMP_LIBS="-lsnmp $extras"; break;
-                               found_sprint_realloc_objid=yes
-                               break
-                           ],
-                           [
+                               AC_MSG_ERROR(Header file portaudio.h not found.)
+                       else
                                #
-                               # 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.
+                               # We couldn't find the header file; don't use the
+                               # library, as it's probably not present.
                                #
-                               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="$ethereal_save_LIBS"
-
-               #
-               # 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 "$found_snmp_sprint_realloc_objid" = no; then
-                   AC_MSG_ERROR([UCD SNMP header files found, but sprint_realloc_objid not found in SNMP library.])
+                               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_portaudio" != "xno"
+       then
                #
-               # 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"
-       ],[
+               # Well, we at least have the portaudio header file.
                #
-               # No, we don't have it.
-               # If the user explicitly asked for UCD SNMP, fail,
-               # otherwise just don't use the UCD SNMP library.
+               # let's check if the libs are there
                #
-               if test "x$want_ucdsnmp" = "xyes" ; then
-                       AC_MSG_ERROR(Header file ucd-snmp/snmp.h not found.)
-               fi
-       ])
+
+               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)
+
+       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
@@ -1144,10 +1285,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
@@ -1160,17 +1301,50 @@ AC_DEFUN([AC_ETHEREAL_GNU_SED_CHECK],
 ])
 
 #
-# AC_ETHEREAL_ADNS_CHECK
+# AC_WIRESHARK_C_ARES_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_C_ARES_CHECK],
+[
+       want_c_ares=defaultyes
+
+       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_ETHEREAL_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
 
@@ -1189,12 +1363,43 @@ AC_DEFUN([AC_ETHEREAL_ADNS_CHECK],
 
 
 #
-# 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],
 [
-       ethereal_save_CFLAGS="$CFLAGS"
-       ethereal_save_CPPFLAGS="$CPPFLAGS"
+       wireshark_save_CFLAGS="$CFLAGS"
+       wireshark_save_CPPFLAGS="$CPPFLAGS"
        if test "x$krb5_dir" != "x"
        then
          #
@@ -1212,8 +1417,10 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
          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"
+         # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
+         ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+         ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+         ac_krb5_version="$ac_heimdal_version$ac_mit_version_olddir$ac_mit_version_newdir"
          if test "x$ac_krb5_version" = "xHEIMDAL"
              KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
          then
@@ -1224,7 +1431,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
            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`
@@ -1255,7 +1462,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                fi
                ;;
            esac
-           ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/'`
+           ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/' -e 's/^Solaris Kerberos .*$/MIT/'`
          fi
        fi
 
@@ -1310,7 +1517,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                # the Kerberos library.
                #
                AC_MSG_RESULT($ac_krb5_version)
-               ethereal_save_LIBS="$LIBS"
+               wireshark_save_LIBS="$LIBS"
                found_krb5_kt_resolve=no
                for extras in "" "-lresolv"
                do
@@ -1369,8 +1576,8 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                        # 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="$ethereal_save_CFLAGS"
-                       CPPFLAGS="$ethereal_save_CPPFLAGS"
+                       CFLAGS="$wireshark_save_CFLAGS"
+                       CPPFLAGS="$wireshark_save_CPPFLAGS"
                        KRB5_LIBS=""
                        want_krb5=no
                    fi
@@ -1402,7 +1609,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                        AC_MSG_RESULT(no)
                      ])
                fi
-               LIBS="$ethereal_save_LIBS"
+               LIBS="$wireshark_save_LIBS"
            else
                #
                # It's not Heimdal or MIT.
@@ -1421,8 +1628,8 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
                    # from before we added the flags for Kerberos.
                    #
                    AC_MSG_RESULT(Kerberos not found - disabling dissection for some kerberos data in packet decoding)
-                   CFLAGS="$ethereal_save_CFLAGS"
-                   CPPFLAGS="$ethereal_save_CPPFLAGS"
+                   CFLAGS="$wireshark_save_CFLAGS"
+                   CPPFLAGS="$wireshark_save_CPPFLAGS"
                    KRB5_LIBS=""
                    want_krb5=no
                fi
@@ -1436,167 +1643,228 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
            # Restore the versions of CFLAGS and CPPFLAGS
            # from before we added the flags for Kerberos.
            #
-           CFLAGS="$ethereal_save_CFLAGS"
-           CPPFLAGS="$ethereal_save_CPPFLAGS"
+           CFLAGS="$wireshark_save_CFLAGS"
+           CPPFLAGS="$wireshark_save_CPPFLAGS"
            KRB5_LIBS=""
            want_krb5=no
        fi
        AC_SUBST(KRB5_LIBS)
 ])
 
-dnl Autoconf macros for libgnutls
+#
+# AC_WIRESHARK_GEOIP_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK],
+[
+       want_geoip=defaultyes
 
-# Modified for LIBGNUTLS -- nmav
-# Configure paths for LIBGCRYPT
-# Shamelessly stolen from the one of XDELTA by Owen Taylor
-# Werner Koch   99-12-09
+       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
 
-dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBGNUTLS],
-[dnl
-dnl Get the cflags and libraries from the libgnutls-config script
-dnl
-AC_ARG_WITH(libgnutls-prefix,
-          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
-          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-
-  if test x$libgnutls_config_prefix != x ; then
-     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-     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_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
-  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
-  no_libgnutls=""
-  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-    no_libgnutls=yes
-  else
-    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-      LIBS="$LIBS $LIBGNUTLS_LIBS"
-dnl
-dnl Now check if the installed libgnutls is sufficiently new. Also sanity
-dnl checks the results of libgnutls-config to some extent
-dnl
-      rm -f conf.libgnutlstest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-
-int
-main ()
-{
-    system ("touch conf.libgnutlstest");
-
-    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-    {
-      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-             "$libgnutls_config_version", gnutls_check_version(NULL) );
-      printf("*** was found! If libgnutls-config was correct, then it is best\n");
-      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-    {
-      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-    }
-    else
-    {
-      if ( gnutls_check_version( "$min_libgnutls_version" ) )
-      {
-        return 0;
-      }
-     else
-      {
-        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-                gnutls_check_version(NULL) );
-        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-               "$min_libgnutls_version" );
-        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-        printf("*** \n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
+#AC_WIRESHARK_GCC_LDFLAGS_CHECK
+#
+# $1 : ldflag(s) to test
+#
+# The macro first determines if the compiler is GCC. Then compile with the
+# defined ldflags. The defined flags are added to LDFLAGS only if the
+# compilation succeeds.
+#
+AC_DEFUN([AC_WIRESHARK_GCC_LDFLAGS_CHECK],
+[GCC_OPTION="$1"
+AC_MSG_CHECKING(whether we can add $GCC_OPTION to LDFLAGS)
+if test "x$GCC" != "x"; then
+  LDFLAGS_saved="$CFLAGS"
+  LDFLAGS="$LDFLAGS $GCC_OPTION"
+  AC_LINK_IFELSE([
+    AC_LANG_SOURCE([[
+               main() { return; }
+                  ]])],
+                  [
+                    AC_MSG_RESULT(yes)
+                  ],
+                  [
+                    AC_MSG_RESULT(no)
+                    LDFLAGS="$LDFLAGS_saved"
+                  ])
+else
+  AC_MSG_RESULT(no)
+fi
+])
 
-  if test "x$no_libgnutls" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     if test -f conf.libgnutlstest ; then
-        :
-     else
-        AC_MSG_RESULT(no)
-     fi
-     if test "$LIBGNUTLS_CONFIG" = "no" ; then
-       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-       echo "*** full path to libgnutls-config."
-     else
-       if test -f conf.libgnutlstest ; then
-        :
-       else
-          echo "*** Could not run libgnutls test program, checking why..."
-          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-          LIBS="$LIBS $LIBGNUTLS_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-],      [ return !!gnutls_check_version(NULL); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     LIBGNUTLS_CFLAGS=""
-     LIBGNUTLS_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  rm -f conf.libgnutlstest
-  AC_SUBST(LIBGNUTLS_CFLAGS)
-  AC_SUBST(LIBGNUTLS_LIBS)
+#
+# 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_OSX_INTEGRATION_CHECK
+#
+# Checks for the presence of OS X integration functions in the GTK+ framework
+# or as a separate library.
+#
+# http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate
+#
+# http://live.gnome.org/GTK%2B/OSX/Integration
+#    for the old Carbon-based integration functions
+#
+# http://gtk-osx.sourceforge.net/ige-mac-integration/
+#    for the new Cocoa-based integration functions
+#
+AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
+[
+       ac_save_CFLAGS="$CFLAGS"
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GTK_CFLAGS"
+       LIBS="$GTK_LIBS $LIBS"
+
+       #
+       # Check for the new integration functions in a -ligemacintegration
+       # library.
+       #
+       AC_CHECK_LIB(igemacintegration, gtk_osxapplication_set_menu_bar,
+       [
+               AC_DEFINE(HAVE_GTKOSXAPPLICATION, 1,
+                       [Define to 1 if -ligemacintegration includes the GtkOSXApplication Integration functions.])
+               have_ige_mac=yes
+               # We don't want gtk stuff in LIBS (which is reset below) so
+               # manually set GTK_LIBS (which is more appropriate)
+               GTK_LIBS="$GTK_LIBS -ligemacintegration"
+       ])
+
+       if test x$have_ige_mac == x
+       then
+               #
+               # Not found - check for the old integration functions in
+               # the Gtk framework.
+               #
+               AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar,
+               [
+                       AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
+                               [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
+                       have_ige_mac=yes
+                       # We don't want gtk stuff in LIBS (which is reset below) so
+                       # manually set GTK_LIBS (which is more appropriate)
+                       GTK_LIBS="$GTK_LIBS -lGtk"
+               ])
+       fi
+
+       if test x$have_ige_mac == x
+       then
+               #
+               # Not found - check for the old integration functions in
+               # a -ligemacintegration library.
+               #
+               AC_CHECK_LIB(igemacintegration, ige_mac_menu_set_menu_bar,
+               [
+                       AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
+                               [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
+                       have_ige_mac=yes
+                       # We don't want gtk stuff in LIBS (which is reset below) so
+                       # manually set GTK_LIBS (which is more appropriate)
+                       GTK_LIBS="$GTK_LIBS -ligemacintegration"
+               ])
+       fi
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+])
+
+#
+# AC_WIRESHARK_PYTHON_CHECK
+#
+# Check whether python devel package is present
+#
+AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
+  [
+    #
+    # Checking whether we have a python devel environment available
+    #
+#  AC_CACHE_CHECK([checking python devel package], ac_cv_wireshark_python_devel,
+#    [
+    AC_CHECK_PROG([ac_ws_python_config], [python-config], "yes", "no")
+    if test ac_ws_python_config = "no"; then
+      ac_cv_wireshark_python_devel = "no"
+    else
+      AC_MSG_CHECKING([python devel])
+      ac_save_ws_cflags=$CFLAGS
+      ac_save_ws_libs=$LIBS
+      CFLAGS=$(python-config --includes)
+      LIBS=$(python-config --ldflags)
+      AC_COMPILE_IFELSE(
+        [
+          AC_LANG_PROGRAM(
+            [[#include <Python.h>]],
+            [[Py_Initialiaze();]]
+          )
+        ],
+        [
+          #
+          # Compilation successful, we have python devel available
+          #
+          ac_cv_wireshark_python_devel=yes
+          PY_LIBS=$LIBS
+          PY_CFLAGS=$CFLAGS
+          AC_SUBST(PY_LIBS)
+          AC_SUBST(PY_CFLAGS)
+          CFLAGS="$ac_save_ws_cflags"
+          LIBS="$ac_save_ws_libs"
+          AC_DEFINE(HAVE_PYTHON, 1, [Define if python devel package available])
+          AC_MSG_RESULT([yes])
+        ],
+        [
+          #
+          # Compilation unsuccessful, python devel not available
+          #
+          ac_cv_wireshark_python_devel=no
+          CFLAGS=$ac_save_ws_cflags
+          LIBS=$ac_save_ws_libs
+          AC_MSG_RESULT([no])
+        ])
+    fi
+#    ])
 ])