diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-31 06:09:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-31 06:09:19 +0000 |
| commit | 7256f900691f6f629dd0e45bdba91c7a22fa375c (patch) | |
| tree | 6f3786c49203c88e622c7a228123e37fc4be573b | |
| parent | 1a5ac2e68dc6042c924c9117824524b599206259 (diff) | |
Make sure we link Wireshark with the right UI library.
svn path=/trunk/; revision=46869
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 1 deletions
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) |