From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 13 Mar 2009 21:47:14 +0000 (-0600)
Subject: Build libTrie only if ESI is enabled. Nothing else appears to use that library.
X-Git-Tag: SQUID_3_2_0_1~1111^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c41d7e69c78c25bca66a79c80345c5a9858f7d68;p=thirdparty%2Fsquid.git

Build libTrie only if ESI is enabled. Nothing else appears to use that library.
Do not include libTrie/src/Trie*.o in libmiscutil. Code needing ESI should
include libTrie (which was previously unused except for libTrie/test?).

TODO: Is it OK to covert libTrie to a convinience library? If yes, we should
LIBADD libTrie to libesi so that we do not have to remember to add libTrie
when we use libesi.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8cd9e72ced..ab4274d77e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,12 +3,16 @@
 #  $Id$
 #
 
-SUBDIRS = libTrie
+SUBDIRS =
 
 if USE_LOADABLE_MODULES
 SUBDIRS += libLtdl
 endif
 
+if USE_ESI
+SUBDIRS += libTrie
+endif
+
 CLEANFILES =
 
 
@@ -89,10 +93,8 @@ libmiscutil_a_SOURCES = \
 	xusleep.c \
 	$(XPROF_STATS_SOURCE) \
 	$(WIN32SRC)
-libmiscutil_a_LIBADD = \
-	libTrie/src/Trie.o \
-	libTrie/src/TrieNode.o \
-	@LIBOBJS@
+libmiscutil_a_LIBADD = @LIBOBJS@
+
 # $(top_srcdir)/include/version.h should be a dependency
 libntlmauth_a_SOURCES = \
 	ntlmauth.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 637378e442..e0444043b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,9 @@ ADAPTATION_LIBS = @ADAPTATION_LIBS@
 
 if USE_ESI
 SUBDIRS += esi
-ESI_LIBS = esi/libesi.la
+ESI_LIBS = \
+	esi/libesi.la \
+	$(top_builddir)/lib/libTrie/src/libTrie.a
 else
 ESI_LIBS = 
 endif
@@ -173,7 +175,6 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/lib/libTrie/include \
 	-I$(top_builddir)/lib \
 	-I$(top_srcdir)/lib \
 	@SQUID_CPPUNIT_INC@