diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2008-10-26 20:09:54 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-10-26 20:09:54 +0000 |
| commit | 812ecb21c3eb5c2c6af4257af5a2d3e81022cbdf (patch) | |
| tree | d0d0f7524c558586feb29a986a9fcb58cfda07f5 /acinclude.m4 | |
| parent | f47b6450082a41264811a52db4405f78df08f17c (diff) | |
| download | wireshark-812ecb21c3eb5c2c6af4257af5a2d3e81022cbdf.tar.gz wireshark-812ecb21c3eb5c2c6af4257af5a2d3e81022cbdf.tar.bz2 wireshark-812ecb21c3eb5c2c6af4257af5a2d3e81022cbdf.zip | |
Tweak Mac IGE integration detection so that it can find the functions not
only in the Gtk+ OS X framework, but also in the separate igemacintegration
library. Also add call to ite_mac_menu_set_menu_bar() to synchronize the
OS X menu bar with the Gtk menu bar in Wireshark. The Gtk menu bar in
Wireshark will remain there.
svn path=/trunk/; revision=26560
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a38d0d97dc..d2ef5a59e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1575,7 +1575,9 @@ fi # # AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK # -# Checks for the presence of OS X integration functions in GTK+ +# Checks for the presence of OS X integration functions in the GTK+ framework +# or as a separate library. +# # http://developer.imendio.com/projects/gtk-macosx/integration # AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK], @@ -1584,11 +1586,10 @@ AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK], ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$GTK_LIBS $LIBS" - AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar, + AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, Gtk igemacintegration, [ AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1, - [Define to 1 if the GTK+ library inclues the Imendio IGE Mac OS X Integration library.]) - AC_CHECK_FUNCS(ige_mac_menu_install_key_handler) + [Define to 1 if the the Gtk+ framework or a separate library inclues the Imendio IGE Mac OS X Integration functions.]) ]) ]) |