osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2010-06-05 22:04:28 +00:00
parent f7ed15f39e
commit 22c9dd27f7
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
acinclude.m4
View File

@ -1764,18 +1764,36 @@ 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
# 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
#
@ -1785,23 +1803,7 @@ AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
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.])
# 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
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.])
[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)