We need to build libui even if we're only building TShark. Fixes bug

6855.

svn path=/trunk/; revision=41131
This commit is contained in:
Guy Harris 2012-02-22 02:15:23 +00:00
parent e52bc42404
commit 4a20fd003c
2 changed files with 3 additions and 3 deletions

View File

@ -945,9 +945,9 @@ endif
DIST_SUBDIRS = asn1 codecs doc epan ui ui/cli ui/gtk help packaging plugins tools wiretap wsutil docbook
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ ui/cli . doc
SUBDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
else
SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ ui/cli . doc
SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
endif
help/faq.txt: $(srcdir)/help/faq.py

View File

@ -860,7 +860,7 @@ else
#
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_man="wireshark.1"
wireshark_SUBDIRS="codecs ui ui/gtk"
wireshark_SUBDIRS="codecs ui/gtk"
# Don't use GLIB_CFLAGS
AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)