diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2008-12-23 03:25:56 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-12-23 03:25:56 +0000 |
| commit | 3a50c0063f9baf439841d0fd51279eee6eca50e8 (patch) | |
| tree | a74507a2c3d3df558a6768a8dbd950b3618e040c /acinclude.m4 | |
| parent | 880180dd6b15bfb0f16692d5ccf8f3c8c98ee463 (diff) | |
| download | wireshark-3a50c0063f9baf439841d0fd51279eee6eca50e8.tar.gz wireshark-3a50c0063f9baf439841d0fd51279eee6eca50e8.tar.bz2 wireshark-3a50c0063f9baf439841d0fd51279eee6eca50e8.zip | |
Fix bug #3152 for good.
svn path=/trunk/; revision=27092
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6b7cd9f41c..4d8d9136ca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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" ]) |