From 3a50c0063f9baf439841d0fd51279eee6eca50e8 Mon Sep 17 00:00:00 2001
From: Stephen Fisher <steve@stephen-fisher.com>
Date: Tue, 23 Dec 2008 03:25:56 +0000
Subject: Fix bug #3152 for good.

svn path=/trunk/; revision=27092
---
 acinclude.m4 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'acinclude.m4')

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"
 ])
-- 
cgit v1.2.1