From Harald Welte:
[obnox/wireshark/wip.git] / acinclude.m4
index 43c1761197d1c2e51e6eb759dcadd417d3f797f9..7409bd7067057dc1e4a5b6535a85c3029f368dc3 100644 (file)
@@ -69,6 +69,40 @@ 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_WIRESHARK_STRUCT_SA_LEN
@@ -290,40 +324,82 @@ AC_DEFUN([AC_WIRESHARK_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".
-         #
-         # XXX - should we just add "$prefix/include" to the include
-         # search path and "$prefix/lib" to the library search path?
+         # The user didn't specify a directory in which libpcap resides.
+         # First, look for a pcap-config script.
          #
-         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
          #
@@ -350,20 +426,33 @@ 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".
-       # 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
+       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"
                #
@@ -389,13 +478,14 @@ and did you also install that package?]]))
                then
                    break
                fi
-           done
-           if test x$ac_wireshark_extras_found = xno
-           then
+             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
+             LIBS=$ac_save_LIBS
+           ], $SOCKET_LIBS $NSL_LIBS)
+       fi
        AC_SUBST(PCAP_LIBS)
 
        #
@@ -403,25 +493,7 @@ and did you also install that package?]]))
        # libpcap.
        #
        ac_save_LIBS="$LIBS"
-       AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
        LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
-       AC_TRY_LINK(
-          [
-#      include <stdio.h>
-       extern char *pcap_version;
-          ],
-          [
-       printf ("%s\n", pcap_version);
-          ],
-          ac_cv_pcap_version_defined=yes,
-          ac_cv_pcap_version_defined=no,
-          [echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       if test "$ac_cv_pcap_version_defined" = yes ; then
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known])
-       else
-               AC_MSG_RESULT(no)
-       fi
        AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
        #
        # pcap_breakloop may be present in the library but not declared
@@ -521,8 +593,10 @@ install a newer version of the header file.])
          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)
+         AC_CHECK_FUNCS(pcap_create bpf_image)
        fi
        LIBS="$ac_save_LIBS"
 ])
@@ -609,198 +683,66 @@ AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK],
        then
                #
                # Well, we at least have the zlib header file.
+               # We link with zlib to support uncompression of
+               # gzipped network traffic, e.g. in an HTTP request
+               # or response body.
                #
-               # Check for "gzgets()" in zlib, because we need it, but
-               # some older versions of zlib don't have it.  It appears
-               # from the zlib ChangeLog that any released version of zlib
-               # with "gzgets()" should have the other routines we
-               # depend on, such as "gzseek()", "gztell()", and "zError()".
-               #
-               # Another reason why we require "gzgets()" is that
-               # some versions of zlib that didn't have it, such
-               # as 1.0.8, had a bug in "gzseek()" that meant that it
-               # doesn't work correctly on uncompressed files; this
-               # means we cannot use version 1.0.8.  (Unfortunately,
-               # that's the version that comes with recent X11 source,
-               # and many people who install XFree86 on their Slackware
-               # boxes don't realize that they should configure it to
-               # use the native zlib rather than building and installing
-               # the crappy old version that comes with XFree86.)
-               #
-               # I.e., we can't just avoid using "gzgets()", as
-               # versions of zlib without "gzgets()" are likely to have
-               # a broken "gzseek()".
-               #
-               AC_CHECK_LIB(z, gzgets,
-               [
-                       if test "x$zlib_dir" != "x"
-                       then
-                               #
-                               # Put the "-I" and "-L" flags for zlib at
-                               # the beginning of CFLAGS, CPPFLAGS, and
-                               # LIBS.
-                               #
-                               LIBS=""
-                               AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
-                               LIBS="$LIBS -lz $wireshark_save_LIBS"
-                       else
-                               LIBS="-lz $LIBS"
-                       fi
-                       AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
-               ],[
-                       if test "x$zlib_dir" != "x"
-                       then
-                               #
-                               # Restore the versions of CFLAGS, CPPFLAGS,
-                               # and LIBS before we added the "-with-zlib="
-                               # directory, as we didn't actually find
-                               # zlib there, or didn't find a zlib that
-                               # contains gzgets there.
-                               #
-                               CFLAGS="$wireshark_save_CFLAGS"
-                               CPPFLAGS="$wireshark_save_CPPFLAGS"
-                               LIBS="$wireshark_save_LIBS"
-                       fi
-                       want_zlib=no
-               ])
-       fi
-
-       if test "x$want_zlib" != "xno"
-       then
-               #
-               # Well, we at least have the zlib header file and a zlib
-               # with "gzgets()".
-               #
-               # Now check for "gzgets()" in zlib when linking with the
-               # linker flags for GTK+ applications; people often grab
-               # XFree86 source and build and install it on their systems,
-               # and they appear sometimes to misconfigure XFree86 so that,
-               # even on systems with zlib, it assumes there is no zlib,
-               # so the XFree86 build process builds and installs its
-               # own zlib in the X11 library directory.
-               #
-               # The XFree86 zlib is an older version that lacks
-               # "gzgets()", and that's the zlib with which 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_MSG_RESULT(yes)
-                   AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
-                 ])
-               CFLAGS="$ac_save_CFLAGS"
-               LIBS="$ac_save_LIBS"
-       fi
-])
-
-#
-# AC_WIRESHARK_LIBPCRE_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
-[
-       if test "x$pcre_dir" != "x"
-       then
-         #
-         # The user specified a directory in which libpcre resides,
-         # so add the "include" subdirectory of that directory to
-         # the include file search path and the "lib" subdirectory
-         # of that directory to the library search path.
-         #
-         # XXX - if there's also a libpcre in a directory that's
-         # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
-         # make us find the version in the specified directory,
-         # as the compiler and/or linker will search that other
-         # directory before it searches the specified directory.
-         #
-         wireshark_save_CFLAGS="$CFLAGS"
-         CFLAGS="$CFLAGS -I$pcre_dir/include"
-         wireshark_save_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
-         wireshark_save_LIBS="$LIBS"
-         LIBS="$LIBS -lpcre"
-         wireshark_save_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
-       fi
+               if test "x$zlib_dir" != "x"
+               then
+                       #
+                       # Put the "-I" and "-L" flags for zlib at
+                       # the beginning of CFLAGS, CPPFLAGS, and
+                       # LIBS.
+                       #
+                       LIBS=""
+                       AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+                       LIBS="$LIBS -lz $wireshark_save_LIBS"
+               else
+                       LIBS="-lz $LIBS"
+               fi
+               AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
 
-       #
-       # Make sure we have "pcre.h".  If we don't, it means we probably
-       # don't have libpcre, so don't use it.
-       #
-       AC_CHECK_HEADER(pcre.h,,
-         [
-           if test "x$pcre_dir" != "x"
-           then
-             #
-             # The user used "--with-pcre=" to specify a directory
-             # containing libpcre, but we didn't find the header file
-             # there; that either means they didn't specify the
-             # right directory or are confused about whether libpcre
-             # is, in fact, installed.  Report the error and give up.
-             #
-             AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre])
-           else
-             if test "x$want_pcre" = "xyes"
-             then
                #
-               # The user tried to force us to use the library, but we
-               # couldn't find the header file; report an error.
+               # Check for "inflatePrime()" in zlib, which we need
+               # in order to read compressed capture files.
                #
-               AC_MSG_ERROR(Header file pcre.h not found.)
-             else
-               #
-               # We couldn't find the header file; don't use the
-               # library, as it's probably not present.
-               #
-               want_pcre=no
-             fi
-           fi
-         ])
+               AC_CHECK_FUNCS(inflatePrime)
 
-       if test "x$want_pcre" != "xno"
-       then
-               #
-               # Well, we at least have the pcre header file.
+               if test "x$ac_cv_func_inflatePrime" = "xyes" ; then
+                       #
+                       # Now check for "inflatePrime()" in zlib when
+                       # linking with the linker flags for GTK+
+                       # applications; people often grab XFree86 source
+                       # and build and install it on their systems,
+                       # and they appear sometimes to misconfigure
+                       # XFree86 so that, even on systems with zlib,
+                       # it assumes there is no zlib, so the XFree86
+                       # build process builds and installs its
+                       # own zlib in the X11 library directory.
+                       #
+                       # The zlib in at least some versions of XFree86
+                       # is an older version that may lack "inflatePrime()",
+                       # and that's the zlib with which Wireshark gets
+                       # linked, so the build of Wireshark fails.
+                       #
+                       AC_MSG_CHECKING([for inflatePrime missing when linking with X11])
+                       AC_TRY_LINK_FUNC(inflatePrime, AC_MSG_RESULT(no),
+                         [
+                           AC_MSG_RESULT(yes)
+                           AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
+                         ])
+               fi
+       else
                #
-               # We're only using standard functions from libpcre,
-               # so we don't need to perform extra checks.
+               # Restore the versions of CFLAGS, CPPFLAGS,
+               # and LIBS before we added the "-with-zlib="
+               # directory, as we didn't actually find
+               # zlib there.
                #
-               AC_CHECK_LIB(pcre, pcre_compile,
-               [
-                       if test "x$pcre_dir" != "x"
-                       then
-                               #
-                               # Put the "-I" and "-L" flags for pcre at
-                               # the beginning of CFLAGS, CPPFLAGS,
-                               # LDFLAGS, and LIBS.
-                               #
-                               PCRE_LIBS="-L$pcre_dir/lib -lpcre $wireshark_save_LIBS"
-                       else
-                               PCRE_LIBS="-lpcre"
-                       fi
-                       AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library])
-               ],[
-                       if test "x$pcre_dir" != "x"
-                       then
-                               #
-                               # Restore the versions of CFLAGS, CPPFLAGS,
-                               # LDFLAGS, and LIBS before we added the
-                               # "--with-pcre=" directory, as we didn't
-                               # actually find pcre there.
-                               #
-                               CFLAGS="$wireshark_save_CFLAGS"
-                               CPPFLAGS="$wireshark_save_CPPFLAGS"
-                               LDFLAGS="$wireshark_save_LDFLAGS"
-                               LIBS="$wireshark_save_LIBS"
-                               PCRE_LIBS=""
-                       fi
-                       want_pcre=no
-               ])
-               AC_SUBST(PCRE_LIBS)
+               CFLAGS="$wireshark_save_CFLAGS"
+               CPPFLAGS="$wireshark_save_CPPFLAGS"
+               LIBS="$wireshark_save_LIBS"
+               want_zlib=no
        fi
 ])
 
@@ -855,12 +797,71 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
                        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.)
+                               #
+                               # 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
-
                ],
                [
+                       #
+                       # 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$lua_dir" != "x"
                        then
                                #
@@ -921,6 +922,7 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
                                LUA_INCLUDES=""
                        fi
                        AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                       want_lua=yes
 
                ],[
                        #
@@ -934,8 +936,9 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
                            #
                            #  Lua 5.1 found
                            #
-                           AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
                            LUA_LIBS=" -llua5.1 -lm"
+                           AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+                           want_lua=yes
                        ],[
                                #
                                # Restore the versions of CFLAGS, CPPFLAGS,
@@ -1264,11 +1267,14 @@ AC_DEFUN([AC_WIRESHARK_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
+             KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
+         else
              KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lk5crypto -lcom_err"
          fi
          if test "x$ac_krb5_version" = "xMIT"
@@ -1307,7 +1313,7 @@ AC_DEFUN([AC_WIRESHARK_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
 
@@ -1521,26 +1527,76 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK],
                have_good_geoip=yes
                  ],,
                )
+               if test "x$have_good_geoip" = "xyes"; then
+                       AC_CHECK_LIB(GeoIP, GeoIP_country_name_by_ipnum_v6,
+                         [
+                               AC_DEFINE(HAVE_GEOIP_V6, 1, [Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later)])
+                         ],,
+                       )
+               fi
        else
                AC_MSG_RESULT(not required)
        fi
 ])
 
+#AC_WIRESHARK_LDFLAGS_CHECK
+#
+# $1 : ldflag(s) to test
+#
+# The macro first determines if the compiler supports "-Wl,{option}" to
+# pass options through to the linker. Then it attempts to compile with
+# the defined ldflags. The defined flags are added to LDFLAGS only if
+# the compilation succeeds.
+#
+AC_DEFUN([AC_WIRESHARK_LDFLAGS_CHECK],
+[GCC_OPTION="$1"
+AC_MSG_CHECKING(whether we can add $GCC_OPTION to LDFLAGS)
+if test "x$ac_supports_W_linker_passthrough" = "xyes"; then
+  LDFLAGS_saved="$LDFLAGS"
+  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
+])
+
 #
 # 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.
+# The macro first determines if the compiler supports GCC-style flags.
+# Then it attempts to compile with the defined cflags.  The defined
+# flags are added to CFLAGS only if the compilation succeeds.
+#
+# We do this because not all such options are necessarily supported by
+# the version of the particular compiler we're using.
+#
+# NOTE: clang, by default, only warns about unknown -W options.
+# If we're using clang, we turn on -Werror=unknown-warning-option
+# so that it fails if we pass it a -W option it doesn't know about
+# but doesn't fail for any other warning that the test program might
+# produce.
 #
 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
+if test "x$ac_supports_gcc_flags" = "xyes" ; then
   CFLAGS_saved="$CFLAGS"
   CFLAGS="$CFLAGS $GCC_OPTION"
+  if test "x$CC" = "xclang" ; then
+    CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+  fi
   AC_COMPILE_IFELSE([
     AC_LANG_SOURCE([[
                       int foo;
 ])
 
 #
-# AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK
+# AC_WIRESHARK_OSX_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
+# http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate
+#
+# http://live.gnome.org/GTK%2B/OSX/Integration
+#    for the old Carbon-based integration functions
 #
-AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
+# 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"
-       AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, Gtk igemacintegration,
+
+       #
+       # Check for the new integration functions in a -ligemacintegration
+       # library.
+       #
+       AC_CHECK_LIB(igemacintegration, gtk_osxapplication_set_menu_bar,
        [
-               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.])
+               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 "x$ac_ws_python_config" = "xno"; then
+      ac_cv_wireshark_python_devel=no
+        if test "x$want_python" = "xyes"
+        then
+            #
+            # The user tried to force us to use Python, but we
+            # couldn't find the python-config tool; report an error.
+            #
+            AC_MSG_ERROR("python-config not found")
+        fi
+        #
+        # Set want_python to no, so we report that we aren't using
+        # the Python interpreter.
+        #
+        want_python=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
+          if test "x$want_python" = "xyes"
+          then
+            #
+            # The user tried to force us to use Python, but we
+            # couldn't compile the test program; report an error.
+            #
+            AC_MSG_ERROR("Python test program failed compilation")
+          fi
+          AC_MSG_RESULT([no])
+          #
+          # Set want_python to no, so we report that we aren't using
+          # the Python interpreter.
+          #
+          want_python=no
+        ])
+    fi
+#    ])
+])