Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple

[obnox/wireshark/wip.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index ecc28bd7d9abf2d99f6357710d977ad3c262daec..05829bf382c8bce970095e5582c55d72b3a1654c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -614,6 +614,7 @@ install a newer version of the header file.])
          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"
 ])
@@ -1416,8 +1417,10 @@ 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
@@ -1740,35 +1743,68 @@ fi
 ])
 
 #
-# 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
 #
-AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
+# 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"
-       AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar,
+
+       #
+       # 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 -lGtk"
+               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 inclues the Imendio IGE Mac OS X Integration functions.])
+                               [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"