Fix bug #3152 for good.

svn path=/trunk/; revision=27092
This commit is contained in:
Stephen Fisher 2008-12-23 03:25:56 +00:00
parent 880180dd6b
commit 3a50c0063f
1 changed files with 8 additions and 5 deletions

View File

@ -1572,16 +1572,19 @@ AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, Gtk,
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.])
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"
]
[
AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, igemacintegration,
])
if test x$have_ige_mac == x
then
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.])
@ -1589,7 +1592,7 @@ AC_DEFUN([AC_WIRESHARK_IGE_MAC_INTEGRATION_CHECK],
# manually set GTK_LIBS (which is more appropriate)
GTK_LIBS="$GTK_LIBS -ligemacintegration"
])
])
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
])