diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index b2e538280b..ff39135052 100644 --- a/Makefile.am +++ b/Makefile.am @@ -337,8 +337,14 @@ endif # although it's also possible that -lgmodule is in GTK_LIBS but not # GLIB_LIBS (that's the case on my machine right now, for example). # +if HAVE_Qt +wireshark_ui_ldadd = ui/qt/libqtui.a +else +wireshark_ui_ldadd = ui/gtk/libgtkui.a +endif + wireshark_LDADD = \ - @wireshark_ui_lib@ \ + $(wireshark_ui_ldadd) \ ui/libui.a \ ui/libui_dirty.a \ codecs/libcodec.a \ diff --git a/configure.ac b/configure.ac index a0f7f4f295..33c8eca434 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,9 +1007,8 @@ 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" # Give automake a hint that it needs to use c++ linking. - have_wireshark_cxx="true" + have_wireshark_cxx="yes" wireshark_man="wireshark.1" wireshark_SUBDIRS="codecs ui/qt" else @@ -1031,7 +1030,6 @@ if test "$have_gtk" = "no" ; then fi fi wireshark_bin="" - wireshark_ui_lib="" wireshark_man="" fi # Use GLIB_CFLAGS @@ -1047,7 +1045,6 @@ 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 @@ -1179,9 +1176,9 @@ then fi AC_SUBST(wireshark_bin) -AC_SUBST(wireshark_ui_lib) AC_SUBST(wireshark_man) -AM_CONDITIONAL(HAVE_WIRESHARK_CXX, test "$have_wireshark_cxx" = "true") +AM_CONDITIONAL(HAVE_Qt, test "$have_qt" = "yes") +AM_CONDITIONAL(HAVE_WIRESHARK_CXX, test "$have_wireshark_cxx" = "yes") # Enable/disable tshark |