From 7256f900691f6f629dd0e45bdba91c7a22fa375c Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 31 Dec 2012 06:09:19 +0000
Subject: Make sure we link Wireshark with the right UI library.

svn path=/trunk/; revision=46869
---
 Makefile.am  | 2 +-
 configure.ac | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index cdac8e7dd3..2676f7826d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -338,7 +338,7 @@ endif
 # GLIB_LIBS (that's the case on my machine right now, for example).
 #
 wireshark_LDADD = \
-	ui/gtk/libgtkui.a		\
+	@wireshark_ui_lib@		\
 	ui/libui.a			\
 	ui/libui_dirty.a		\
 	codecs/libcodec.a		\
diff --git a/configure.ac b/configure.ac
index 45257c3a60..42a4987a13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1006,6 +1006,7 @@ if test "$have_gtk" = "no" ; then
 		# wouldn't think we had it, and thus wouldn't be here).
 		#
 		wireshark_bin="wireshark\$(EXEEXT)"
+		wireshark_ui_lib="ui/qt/libqtui.a"
 		wireshark_man="wireshark.1"
 	        wireshark_SUBDIRS="codecs ui/qt"
 	else
@@ -1027,6 +1028,7 @@ if test "$have_gtk" = "no" ; then
 			fi
 		fi
 		wireshark_bin=""
+		wireshark_ui_lib=""
 		wireshark_man=""
 	fi
 	# Use GLIB_CFLAGS
@@ -1042,6 +1044,7 @@ else
 	# GTK+, so we wouldn't think we had it, and thus wouldn't be here).
 	#
 	wireshark_bin="wireshark\$(EXEEXT)"
+	wireshark_ui_lib="ui/gtk/libgtkui.a"
 	wireshark_man="wireshark.1"
         wireshark_SUBDIRS="codecs ui/gtk"
 	# Don't use GLIB_CFLAGS
@@ -1173,6 +1176,7 @@ then
 fi
 
 AC_SUBST(wireshark_bin)
+AC_SUBST(wireshark_ui_lib)
 AC_SUBST(wireshark_man)
 
 
-- 
cgit v1.2.3