diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-12-22 16:10:14 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-12-22 16:10:14 +0000 |
| commit | 6c81d84efce15407192d5b633eea6f57d15befeb (patch) | |
| tree | 21bbdfed8ab5f09dac5c03fa83c451e7ef267f25 /acinclude.m4 | |
| parent | 074c1469e0353f4648eadf7155ad099f8fc931c8 (diff) | |
| download | wireshark-6c81d84efce15407192d5b633eea6f57d15befeb.tar.gz wireshark-6c81d84efce15407192d5b633eea6f57d15befeb.tar.bz2 wireshark-6c81d84efce15407192d5b633eea6f57d15befeb.zip | |
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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 528936c498..6b7cd9f41c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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" |