diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-05-25 00:35:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-05-25 00:35:44 +0000 |
| commit | 36623bcb712ad6553c7c33ff92d69130e62aec1d (patch) | |
| tree | 23818f5c9d00bffc5d4317f7f0d5fd36508dd58d /acinclude.m4 | |
| parent | 9bafe2064358245a0d85d3e1a3da0ec0cbe31598 (diff) | |
| download | wireshark-36623bcb712ad6553c7c33ff92d69130e62aec1d.tar.gz wireshark-36623bcb712ad6553c7c33ff92d69130e62aec1d.tar.bz2 wireshark-36623bcb712ad6553c7c33ff92d69130e62aec1d.zip | |
From H.sivank: GtkOSXApplication support.
Call the various flavors of OS X integration just "OS X integration",
not anything with "IGE" in it - it appears that, in some places,
"ige-mac-integration" refers only to the older Carbon-based functions,
although the library still appears to be called -ligemacintegration.
Update the URLs for the information about the OS X integration
libraries.
Clean up help message for --with-pcap-remote.
Clean up white space a bit.
Speaking of white space, it's "Mac OS X", not "MacOS X".
svn path=/trunk/; revision=32941
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 896564ab12..ff46e26c32 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1743,19 +1743,29 @@ 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" + + # + # 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, @@ -1768,6 +1778,10 @@ AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK], 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, @@ -1777,6 +1791,23 @@ AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK], GTK_LIBS="$GTK_LIBS -ligemacintegration" ]) fi + + if test x$have_ige_mac == x + then + # + # Not found - 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 the the Gtk+ framework or a separate library inclues 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" + ]) + fi CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" ]) |