Make sure we link Wireshark with the right UI library.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46869 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index cdac8e7dd3612ef7058992056b8cf954254cb207..2676f7826d484d4ce250485eaf52faccde105ca6 100644 (file)
--- 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 45257c3a608036678f33ab1d99c14c585f4ad2da..42a4987a1348b1544b85ca499e9c18e957c0df34 100644 (file)
--- 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)