=== modified file 'bootstrap.sh' --- bootstrap.sh 2012-08-11 06:06:34 +0000 +++ bootstrap.sh 2013-06-11 11:49:52 +0000 @@ -96,62 +96,61 @@ # On MAC OS X, GNU libtool is named 'glibtool': if [ `uname -s 2>/dev/null` = 'Darwin' ] then LIBTOOL_BIN="glibtool" else LIBTOOL_BIN="libtool" fi # Adjust paths of required autool packages amver=`find_variant automake ${amversions}` acver=`find_variant autoconf ${acversions}` ltver=`find_variant ${LIBTOOL_BIN} ${ltversions}` # Produce debug output about what version actually found. amversion=`show_version automake "${amver}"` acversion=`show_version autoconf "${acver}"` ltversion=`show_version ${LIBTOOL_BIN} "${ltver}"` # Find the libtool path to get the right aclocal includes ltpath=`find_path ${LIBTOOL_BIN}${ltver}` # Set environment variable to tell automake which autoconf to use. AUTOCONF="autoconf${acver}" ; export AUTOCONF echo "automake ($amversion) : automake$amver" echo "autoconf ($acversion) : autoconf$acver" echo "libtool ($ltversion) : ${LIBTOOL_BIN}${ltver}" echo "libtool path : $ltpath" for dir in \ - "" \ - lib/libTrie + "" do if [ -z "$dir" ] || [ -d $dir ]; then if ( echo "Bootstrapping $dir" cd ./$dir if [ -n "$dir" ] && [ -f bootstrap.sh ]; then ./bootstrap.sh elif [ ! -f $dir/configure ]; then # Make sure cfgaux exists mkdir -p cfgaux if test -n "$ltpath"; then acincludeflag="-I $ltpath/../share/aclocal" else acincludeflag="" fi # Bootstrap the autotool subsystems bootstrap aclocal$amver $acincludeflag bootstrap autoheader$acver bootstrap_libtoolize ${LIBTOOL_BIN}ize${ltver} bootstrap automake$amver --foreign --add-missing --copy -f bootstrap autoconf$acver --force fi ); then : # OK else exit 1 fi fi done === modified file 'configure.ac' --- configure.ac 2013-06-03 14:38:26 +0000 +++ configure.ac 2013-06-11 15:06:07 +0000 @@ -3346,60 +3346,62 @@ AC_SUBST(XTRA_OBJS) if test "x$XTRA_LIBS" = "x"; then XTRA_LIBS="$LIBS" dnl minor cleanup XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/ */ /g"` LIBS='' fi AC_SUBST(XTRA_LIBS) AC_SUBST(SQUID_CFLAGS) AC_SUBST(SQUID_CXXFLAGS) AC_MSG_NOTICE([BUILD LIBRARIES: $LIBS]) AC_MSG_NOTICE([BUILD EXTRA LIBRARIES: $XTRA_LIBS]) AC_MSG_NOTICE([BUILD OBJECTS: $OBJS]) AC_MSG_NOTICE([BUILD EXTRA OBJECTS: $XTRA_OBJS]) AC_MSG_NOTICE([BUILD C FLAGS: $CFLAGS]) AC_MSG_NOTICE([BUILD EXTRA C FLAGS: $SQUID_CFLAGS]) AC_MSG_NOTICE([BUILD C++ FLAGS: $CXXFLAGS]) AC_MSG_NOTICE([BUILD EXTRA C++ FLAGS: $SQUID_CXXFLAGS]) dnl Clean up after OSF/1 core dump bug rm -f core AC_CONFIG_FILES([\ Makefile \ compat/Makefile \ lib/Makefile \ lib/ntlmauth/Makefile \ + lib/libTrie/Makefile \ + lib/libTrie/test/Makefile \ lib/profiler/Makefile \ lib/rfcnb/Makefile \ lib/smblib/Makefile \ scripts/Makefile \ src/Makefile \ src/anyp/Makefile \ src/base/Makefile \ src/acl/Makefile \ src/fs/Makefile \ src/repl/Makefile \ src/auth/Makefile \ src/auth/basic/Makefile \ src/auth/digest/Makefile \ src/auth/negotiate/Makefile \ src/auth/ntlm/Makefile \ src/adaptation/Makefile \ src/adaptation/icap/Makefile \ src/adaptation/ecap/Makefile \ src/comm/Makefile \ src/esi/Makefile \ src/eui/Makefile \ src/format/Makefile \ src/http/Makefile \ src/icmp/Makefile \ src/ident/Makefile \ src/ip/Makefile \ src/log/Makefile \ src/ipc/Makefile \ src/ssl/Makefile \ src/mgr/Makefile \ @@ -3434,36 +3436,34 @@ helpers/ntlm_auth/Makefile \ helpers/ntlm_auth/fake/Makefile \ helpers/ntlm_auth/smb_lm/Makefile \ helpers/ntlm_auth/SSPI/Makefile \ helpers/negotiate_auth/Makefile \ helpers/negotiate_auth/kerberos/Makefile \ helpers/negotiate_auth/SSPI/Makefile \ helpers/negotiate_auth/wrapper/Makefile \ helpers/external_acl/Makefile \ helpers/external_acl/AD_group/Makefile \ helpers/external_acl/eDirectory_userip/Makefile \ helpers/external_acl/file_userip/Makefile \ helpers/external_acl/kerberos_ldap_group/Makefile \ helpers/external_acl/LDAP_group/Makefile \ helpers/external_acl/LM_group/Makefile \ helpers/external_acl/session/Makefile \ helpers/external_acl/SQL_session/Makefile \ helpers/external_acl/unix_group/Makefile \ helpers/external_acl/wbinfo_group/Makefile \ helpers/external_acl/time_quota/Makefile \ helpers/log_daemon/Makefile \ helpers/log_daemon/DB/Makefile \ helpers/log_daemon/file/Makefile \ helpers/url_rewrite/Makefile \ helpers/url_rewrite/fake/Makefile \ helpers/ssl/Makefile \ tools/Makefile tools/purge/Makefile ]) -AC_CONFIG_SUBDIRS(lib/libTrie) - # must configure libltdl subdir unconditionally for "make distcheck" to work #AC_CONFIG_SUBDIRS(libltdl) AC_OUTPUT === modified file 'lib/libTrie/Makefile.am' --- lib/libTrie/Makefile.am 2012-10-04 11:10:17 +0000 +++ lib/libTrie/Makefile.am 2013-06-11 11:57:09 +0000 @@ -1,5 +1,17 @@ -## Process this file with automake to produce Makefile.in +include $(top_srcdir)/src/Common.am +include $(top_srcdir)/src/TestHeaders.am -AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 -DIST_SUBDIRS = include src test -SUBDIRS = src test +DIST_SUBDIRS = test +SUBDIRS = test + +noinst_LIBRARIES = libTrie.a + +noinst_HEADERS = Trie.h TrieNode.h TrieCharTransform.h + +libTrie_a_SOURCES = Trie.cc \ + Trie.cci \ + Trie.h \ + TrieNode.cc \ + TrieNode.cci \ + TrieNode.h \ + TrieCharTransform.h === renamed file 'lib/libTrie/src/Trie.cc' => 'lib/libTrie/Trie.cc' --- lib/libTrie/src/Trie.cc 2010-12-14 14:01:14 +0000 +++ lib/libTrie/Trie.cc 2013-06-11 11:53:42 +0000 @@ -1,50 +1,50 @@ /* * Copyright (c) 2002,2003 Robert Collins * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "Trie.h" #if HAVE_UNISTD_H #include #endif #include "TrieNode.h" #include "TrieCharTransform.h" #if !_USE_INLINE_ #include "Trie.cci" #endif Trie::Trie(TrieCharTransform *aTransform) : head(0) , transform(aTransform) {} extern "C" void *TrieCreate() { return new Trie; } Trie::~Trie() { delete head; delete transform; } extern "C" void TrieDestroy(void *aTrie) { delete (Trie *)aTrie; } === renamed file 'lib/libTrie/include/Trie.cci' => 'lib/libTrie/Trie.cci' === renamed file 'lib/libTrie/include/Trie.h' => 'lib/libTrie/Trie.h' === renamed file 'lib/libTrie/include/TrieCharTransform.h' => 'lib/libTrie/TrieCharTransform.h' === renamed file 'lib/libTrie/src/TrieNode.cc' => 'lib/libTrie/TrieNode.cc' --- lib/libTrie/src/TrieNode.cc 2010-12-14 14:01:14 +0000 +++ lib/libTrie/TrieNode.cc 2013-06-11 11:53:54 +0000 @@ -1,50 +1,50 @@ /* * Copyright (c) 2002,2003 Robert Collins * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" +#include "squid.h" #include "TrieNode.h" #include "TrieCharTransform.h" #if HAVE_UNISTD_H #include #endif TrieNode::TrieNode() : _privateData(NULL) { for (int i = 0; i < 256; ++i) internal[i] = NULL; } TrieNode::~TrieNode() { for (int i = 0; i < 256; ++i) delete internal[i]; } /* as for find */ bool TrieNode::add(char const *aString, size_t theLength, void *privatedata, TrieCharTransform *transform) { /* We trust that privatedata and existant keys have already been checked */ if (theLength) { int index = transform ? (*transform)(*aString): *aString; if (!internal[index]) internal[index] = new TrieNode; === renamed file 'lib/libTrie/include/TrieNode.cci' => 'lib/libTrie/TrieNode.cci' === renamed file 'lib/libTrie/include/TrieNode.h' => 'lib/libTrie/TrieNode.h' === removed file 'lib/libTrie/acinclude.m4' --- lib/libTrie/acinclude.m4 2011-12-03 10:55:45 +0000 +++ lib/libTrie/acinclude.m4 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -dnl === removed file 'lib/libTrie/configure.ac' --- lib/libTrie/configure.ac 2013-05-06 04:18:38 +0000 +++ lib/libTrie/configure.ac 1970-01-01 00:00:00 +0000 @@ -1,114 +0,0 @@ -# Process this file with autoconf to produce a configure script. -AC_INIT(libTrie, 0.1, rbtcollins@squid-cache.org) -AC_CONFIG_SRCDIR([src/Trie.cc]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_AUX_DIR(cfgaux) - -enable_inline=${enable_inline:=yes} -AC_ARG_ENABLE(optimizations, - AC_HELP_STRING([--disable-optimizations], - [Do not compile Squid with compiler optimizations enabled. - Optimization is good for production builds, but not - good for debugging. During development, use - --disable-optimizations to reduce compilation times - and allow easier debugging. This option implicitly - also enabled --disable-inline]), [ - if test "x$enableval" = "xno" ; then - AC_MSG_NOTICE([Disabling compiler optimizations (-O flag)]) - CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" - CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9]]*//'`" - enable_inline="no" - fi -]) - -AC_ARG_ENABLE(inline, - AC_HELP_STRING([--disable-inline], - [Do not compile trivial methods as inline. Squid - is coded with much of the code able to be inlined. - Inlining is good for production builds, but not - good for development. During development, use - --disable-inline to reduce compilation times and - allow incremental builds to be quick. For - production builds, or load tests, use - --enable-inline to have squid make all trivial - methods inlinable by the compiler.]), [ - if test "x${enableval}" = "xno" ; then - enable_inline=no - fi -]) -if test "x$enable_inline" = "xyes" ; then - AC_DEFINE(_SQUID_INLINE_, inline, - [Keyword used by squid for inlining methods]) - AC_DEFINE(_USE_INLINE_, 1, [Include inline methods into header file]) -else - AC_MSG_NOTICE([Inlining optimization disabled]) - AC_DEFINE(_SQUID_INLINE_, [] , [Keyword used by squid for inlining methods]) - AC_DEFINE(_USE_INLINE_, 0, [Include inline methods into header file]) -fi - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AC_LANG_CPLUSPLUS -AC_PROG_MAKE_SET -# for old automakes - like squid-cache.orgs! -AM_INIT_AUTOMAKE(libTrie, 0.1) -AM_MAINTAINER_MODE -AC_PROG_RANLIB - -AC_LIBTOOL_DLOPEN -AC_LIBLTDL_CONVENIENCE -AC_PROG_LIBTOOL -AC_LTDL_DLLIB -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) - -dnl set useful flags -TRIE_CFLAGS= -TRIE_CXXFLAGS= -if test "$GCC" = "yes"; then - TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" - TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wcomments" - - AC_ARG_ENABLE(strict-error-checking, - AS_HELP_STRING([--disable-strict-error-checking],[By default compile - with all possible static compiler error-checks enabled. - This flag disables the behavior]), [ - case $enableval in - yes|1|true) - enable_strict_error_checking=yes - ;; - *) - enable_strict_error_checking=no - ;; - esac - ]) - AC_MSG_NOTICE([strict error checking enabled: ${enable_strict_error_checking:=yes}]) - if test "x${enable_strict_error_checking:=yes}" = "xyes"; then - TRIE_CFLAGS="-Werror $TRIE_CFLAGS" - TRIE_CXXFLAGS="-Werror $TRIE_CXXFLAGS" - fi - -fi - -AC_SUBST(TRIE_CFLAGS) -AC_SUBST(TRIE_CXXFLAGS) - -# Checks for libraries. - -# Checks for header files. -AC_CHECK_HEADERS( \ - iostream \ -) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T - -# Checks for library functions. - -AC_CONFIG_FILES([Makefile - include/Makefile - src/Makefile - test/Makefile]) -AC_OUTPUT === removed directory 'lib/libTrie/include' === removed file 'lib/libTrie/include/Makefile.am' --- lib/libTrie/include/Makefile.am 2003-07-14 20:15:53 +0000 +++ lib/libTrie/include/Makefile.am 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -noinst_HEADERS = Trie.h TrieNode.h TrieCharTransform.h === removed directory 'lib/libTrie/src' === removed file 'lib/libTrie/src/Makefile.am' --- lib/libTrie/src/Makefile.am 2009-11-12 01:12:50 +0000 +++ lib/libTrie/src/Makefile.am 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ - -INCLUDES = -I$(top_srcdir)/include - -AM_CFLAGS = $(TRIE_CFLAGS) -AM_CXXFLAGS = $(TRIE_CXXFLAGS) - -noinst_LIBRARIES = libTrie.a - -libTrie_a_SOURCES = Trie.cc \ - TrieNode.cc - -noinst_HEADERS = ../include/Trie.cci \ - ../include/TrieNode.cci === modified file 'lib/libTrie/test/Makefile.am' --- lib/libTrie/test/Makefile.am 2009-11-25 23:57:26 +0000 +++ lib/libTrie/test/Makefile.am 2013-06-11 12:32:14 +0000 @@ -1,16 +1,15 @@ -INCLUDES = -I$(top_srcdir)/include +include $(top_srcdir)/src/Common.am -AM_CFLAGS = $(TRIE_CFLAGS) -AM_CXXFLAGS = $(TRIE_CXXFLAGS) +INCLUDES += -I$(top_srcdir)/include # TESTS = trie trie-c -TESTS = trie +TESTS += trie # check_PROGRAMS = trie trie-c -check_PROGRAMS = trie +check_PROGRAMS += trie trie_SOURCES = trie.cc -trie_LDADD = $(top_builddir)/src/libTrie.a +trie_LDADD = $(top_builddir)/lib/libTrie/libTrie.a #trie_c_SOURCES = trie-c.c -#trie_c_LDADD = $(top_builddir)/src/libTrie.a -lm +#trie_c_LDADD = $(top_builddir)/lib/libTrie/libTrie.a -lm === modified file 'lib/libTrie/test/trie.cc' --- lib/libTrie/test/trie.cc 2010-11-20 11:31:38 +0000 +++ lib/libTrie/test/trie.cc 2013-06-11 12:29:24 +0000 @@ -1,52 +1,52 @@ /* * Copyright (c) 2002,2003 Robert Collins * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "config.h" -#include "Trie.h" -#include "TrieCharTransform.h" +#include "squid.h" +#include "libTrie/Trie.h" +#include "libTrie/TrieCharTransform.h" #if HAVE_IOSTREAM #include #endif bool CaseSensitiveCheck() { Trie aTrie; if (!aTrie.add ("User-Agent", 10, (void *)1)) { std::cerr << "Could not add User-Agent" << std::endl; return 1; } if (aTrie.add ("User-Agent", 10, (void *)2)) { std::cerr << "Could add duplicate User-Agent" << std::endl; return 1; } if (!aTrie.add ("Alphabet", 8, (void *)3)) { std::cerr << "Could not add Alphabet" << std::endl; return 1; } if (!aTrie.add ("Uprefix", 8, (void *)3)) { std::cerr << "Could not add Uprefix" << std::endl; return 1; } === modified file 'scripts/source-maintenance.sh' --- scripts/source-maintenance.sh 2013-06-07 04:35:25 +0000 +++ scripts/source-maintenance.sh 2013-06-11 11:40:36 +0000 @@ -93,61 +93,61 @@ if test "x${FI}" != "x" ; then echo "ERROR: ${PWD}/${FILENAME} contains reference to forward.h without path" fi # # DEBUG Section list maintenance # grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' >>${ROOT}/doc/debug-sections.tmp # # File permissions maintenance. # chmod 644 ${FILENAME} ;; *.pl|*.sh) # # File permissions maintenance. # chmod 755 ${FILENAME} ;; Makefile.am) perl -i -p -e 's/@([A-Z0-9_]+)@/\$($1)/g' <${FILENAME} >${FILENAME}.styled mv ${FILENAME}.styled ${FILENAME} ;; esac - if test "$FILENAME" = "libltdl" -o "$FILENAME" = "libTrie" ; then + if test "$FILENAME" = "libltdl" ; then : elif test -d $FILENAME ; then cd $FILENAME srcformat ${ROOT} || exit 1 cd .. fi done } # Build XPROF types file from current sources echo "#ifndef _PROFILER_XPROF_TYPE_H_" >${ROOT}/lib/profiler/list echo "#define _PROFILER_XPROF_TYPE_H_" >>${ROOT}/lib/profiler/list echo "/* AUTO-GENERATED FILE */" >>${ROOT}/lib/profiler/list echo "#if USE_XPROF_STATS" >>${ROOT}/lib/profiler/list echo "typedef enum {" >>${ROOT}/lib/profiler/list echo "XPROF_PROF_UNACCOUNTED," >>${ROOT}/lib/profiler/list grep -R -h "PROF_start.*" ./* | grep -v probename | sed -e 's/ //g; s/PROF_start(/XPROF_/; s/);/,/' | sort -u >>${ROOT}/lib/profiler/list echo " XPROF_LAST } xprof_type;" >>${ROOT}/lib/profiler/list echo "#endif" >>${ROOT}/lib/profiler/list echo "#endif" >>${ROOT}/lib/profiler/list mv ${ROOT}/lib/profiler/list ${ROOT}/lib/profiler/xprof_type.h # Build icons install include from current icons available ( echo -n "ICONS=" for f in `ls -1 ${ROOT}/icons/silk/*` do echo " \\" echo -n " ${f}" === modified file 'src/Makefile.am' --- src/Makefile.am 2013-06-07 04:35:25 +0000 +++ src/Makefile.am 2013-06-11 12:14:39 +0000 @@ -53,61 +53,61 @@ ssl/libsslutil.la else SSL_LOCAL_LIBS = endif DIST_SUBDIRS += ssl SNMP_ALL_SOURCE = \ SnmpRequest.h \ snmp_core.h \ snmp_core.cc \ snmp_agent.h \ snmp_agent.cc if ENABLE_SNMP SNMP_SOURCE = $(SNMP_ALL_SOURCE) SUBDIRS += snmp SNMP_LIBS = snmp/libsnmp.la $(SNMPLIB) else SNMP_SOURCE = endif DIST_SUBDIRS += snmp if USE_ADAPTATION SUBDIRS += adaptation endif DIST_SUBDIRS += adaptation if USE_ESI SUBDIRS += esi ESI_LOCAL_LIBS = \ esi/libesi.la \ - $(top_builddir)/lib/libTrie/src/libTrie.a + $(top_builddir)/lib/libTrie/libTrie.a ESI_LIBS = $(ESI_LOCAL_LIBS) \ $(XMLLIB) \ $(EXPATLIB) else ESI_LIBS = endif DIST_SUBDIRS += esi DELAY_POOL_ALL_SOURCE = \ CommonPool.h \ CompositePoolNode.h \ delay_pools.cc \ DelayId.cc \ DelayId.h \ DelayIdComposite.h \ DelayBucket.cc \ DelayBucket.h \ DelayConfig.cc \ DelayConfig.h \ DelayPool.cc \ DelayPool.h \ DelayPools.h \ DelaySpec.cc \ DelaySpec.h \ DelayTagged.cc \ DelayTagged.h \ DelayUser.cc \ DelayUser.h \ DelayVector.cc \ DelayVector.h \ === modified file 'src/esi/CustomParser.cc' --- src/esi/CustomParser.cc 2013-05-04 11:50:26 +0000 +++ src/esi/CustomParser.cc 2013-06-11 12:10:22 +0000 @@ -8,62 +8,62 @@ * * Squid is the result of efforts by numerous individuals from * the Internet community; see the CONTRIBUTORS file for full * details. Many organizations have provided support for Squid's * development; see the SPONSORS file for full details. Squid is * Copyrighted (C) 2001 by the Regents of the University of * California; see the COPYRIGHT file for full details. Squid * incorporates software developed and/or copyrighted by other * sources; see the CREDITS file for full details. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ #include "squid.h" #include "base/Vector.h" #include "esi/CustomParser.h" #include "Debug.h" -#include "Trie.h" -#include "TrieCharTransform.h" +#include "libTrie/Trie.h" +#include "libTrie/TrieCharTransform.h" Trie *ESICustomParser::SearchTrie=NULL; EsiParserDefinition(ESICustomParser); Trie * ESICustomParser::GetTrie() { if (SearchTrie) return SearchTrie; SearchTrie = new Trie(new TrieCaseless); static const ESITAG_t ESITAG_value = ESITAG; assert (SearchTrie->add ("add ("add ("