From 85a5084140befff0e459a923db37064a08edabc4 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 22 Feb 2012 02:15:23 +0000 Subject: [PATCH] We need to build libui even if we're only building TShark. Fixes bug 6855. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41131 f5534014-38df-0310-8fa8-9805f1628bb7 --- Makefile.am | 4 ++-- configure.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 76a8cd8d4f..f79f5c47d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.in b/configure.in index 92ee0c9aea..85f49c3997 100644 --- a/configure.in +++ b/configure.in @@ -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) -- 2.34.1