diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-06-18 06:38:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-06-18 06:38:44 +0000 |
| commit | 5c423a4c514accc6432d1cbf70d977ea4310d33b (patch) | |
| tree | c322fbe5cd232d8b9cce36f1ab7c35e2e416bb12 | |
| parent | c92fced5b8e66810b6e92cf31f96412598d34442 (diff) | |
The toolkit-dependent UI library, well, depends on the toolkit. Make it
so.
svn path=/trunk/; revision=43329
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 46e620f4e7..8819195d3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -322,8 +322,7 @@ endif # @GTK_LIBS@ (as those are also needed for X applications, and GTK+ # applications are X applications). wireshark_LDADD = \ - ui/gtk/libgtkui.a \ - ui/gtk/libgtkui_dirty.a \ + @UI_LIBS@ \ ui/libui.a \ codecs/libcodec.a \ wiretap/libwiretap.la \ @@ -342,7 +341,7 @@ wireshark_LDADD = \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ \ @PORTAUDIO_LIBS@ \ - @GTK_LIBS@ -lm + -lm wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) diff --git a/configure.in b/configure.in index 8973326199..d508cb7290 100644 --- a/configure.in +++ b/configure.in @@ -889,6 +889,7 @@ if test "$have_gtk" = "no" ; then wireshark_bin="wireshark\$(EXEEXT)" wireshark_man="wireshark.1" wireshark_SUBDIRS="codecs ui/qt" + UI_LIBS="ui/qt/libqtui.a $Qt_LIBS" else # # We don't have Qt, either, which means we have no UI @@ -940,7 +941,9 @@ else # (Versions prior to 2.22 lacked some necessary accessors.) CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS" fi + UI_LIBS="ui/gtk/libgtkui.a ui/gtk/libgtkui_dirty.a $GTK_LIBS" fi +AC_SUBST(UI_LIBS) # Error out if a glib header other than a "top level" header # (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h) |