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 8cd9e72ced2b6b61b2eadc3b6295a153da8179f4..ab4274d77e2db73dd0a7b4fb336ad1f04c4fef0c 100644 (file)
--- 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 637378e442df763f9c7dda50c427e3a1cb66bea2..e0444043b1fdf0d726aba00cfabcffc7a6d761b9 100644 (file)
--- 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@