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

Fix bug 3152: when searching for igemacintegration manually set GTK_LIBS to 

the found library (AC_SEARCH_LIBS sets the LIBS variable but we really don't
want that).

svn path=/trunk/; revision=27088
This commit is contained in:
Jeff Morriss 2008-12-22 16:10:14 +00:00
parent 074c1469e0
commit 6c81d84efc
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
acinclude.m4
View File

@ -1572,10 +1572,23 @@ 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 igemacintegration,
AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, Gtk,
[
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 -lGtk"
]
[
AC_SEARCH_LIBS(ige_mac_menu_set_menu_bar, igemacintegration,
[
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"
])
])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"