diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-06-05 22:04:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-06-05 22:04:28 +0000 |
| commit | 22c9dd27f71332027bbb3b865241b57355caa6dd (patch) | |
| tree | 3be3ebc4813934e4e3c1d88f53efb8d803d931da /acinclude.m4 | |
| parent | f7ed15f39ee45c773762c479ed16589e3f279f35 (diff) | |
First check for the new GTK+/OS X integration functions, then the old
ones; it appears that at least one user's -ligemacintegration has both
(see bug 4823), and we should choose the new ones in that case.
Also, always set have_ige_mac if we have the functions.
Fix tpyoes while we're at it.
svn path=/trunk/; revision=33106
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ff46e26c32..ca9703f603 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1764,44 +1764,46 @@ AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK], LIBS="$GTK_LIBS $LIBS" # - # Check for the old integration functions in the Gtk framework. + # Check for the new integration functions in a -ligemacintegration + # library. # - AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar, + 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 - # a -ligemacintegration library. + # the Gtk framework. # - AC_CHECK_LIB(igemacintegration, ige_mac_menu_set_menu_bar, + 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 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" + GTK_LIBS="$GTK_LIBS -lGtk" ]) fi - + if test x$have_ige_mac == x then # - # Not found - check for the new integration functions in + # Not found - check for the old integration functions in # a -ligemacintegration library. # - AC_CHECK_LIB(igemacintegration, gtk_osxapplication_set_menu_bar, + AC_CHECK_LIB(igemacintegration, ige_mac_menu_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.]) + 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) |