From: robertc <> Date: Mon, 14 Jul 2003 21:14:40 +0000 (+0000) Subject: bootstrapped X-Git-Tag: SQUID_3_0_PRE1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=029d84da8e1faf0316635566f0c21ccec351abf2;p=thirdparty%2Fsquid.git bootstrapped --- diff --git a/configure b/configure index d24400841a..f28aed89d3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.336 . +# From configure.in Revision: 1.337 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -4888,6 +4888,12 @@ else fi XTRA_LIBS="$XTRA_LIBS -lexpat" +else + +cat >>confdefs.h <<\_ACEOF +#define ESI 0 +_ACEOF + fi diff --git a/lib/libTrie/Makefile.in b/lib/libTrie/Makefile.in index f9efb5fa36..3daa7f68a8 100644 --- a/lib/libTrie/Makefile.in +++ b/lib/libTrie/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.6 2003/05/29 00:13:12 hno Exp $ +# $Id: Makefile.in,v 1.7 2003/07/14 15:14:42 robertc Exp $ # srcdir = @srcdir@ @@ -87,6 +87,8 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TRIE_CFLAGS = @TRIE_CFLAGS@ +TRIE_CXXFLAGS = @TRIE_CXXFLAGS@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libTrie/configure b/lib/libTrie/configure index 42e8fdd032..10b344c198 100755 --- a/lib/libTrie/configure +++ b/lib/libTrie/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK am__leading_dot DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT RANLIB ac_ct_RANLIB CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK am__leading_dot DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT RANLIB ac_ct_RANLIB TRIE_CFLAGS TRIE_CXXFLAGS CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -857,13 +857,13 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-inline Don't 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. + 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. --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful @@ -1302,16 +1302,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SquidInline="yes" -# Check whether --enable-inline or --disable-inline was given. + # Check whether --enable-inline or --disable-inline was given. if test "${enable_inline+set}" = set; then enableval="$enable_inline" if test "$enableval" = "no" ; then - SquidInline="no" - fi + SquidInline="no" + fi fi; -if test "$SquidInline" = "yes" ; then + if test "$SquidInline" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define _SQUID_INLINE_ inline @@ -1322,16 +1322,16 @@ cat >>confdefs.h <<\_ACEOF #define _USE_INLINE_ _ACEOF -else + else cat >>confdefs.h <<\_ACEOF #define _SQUID_INLINE_ _ACEOF -fi + fi # Checks for programs. -ac_ext=cc + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -1854,7 +1854,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -2519,7 +2519,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2549,7 +2549,7 @@ echo "${ECHO_T}no" >&6 fi # for old automakes - like squid-cache.orgs! -am__api_version="1.7" + am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -3157,7 +3157,7 @@ fi -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then @@ -3181,7 +3181,7 @@ fi MAINT=$MAINTAINER_MODE_TRUE -if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3262,6 +3262,16 @@ else fi + if test "$GCC" = "yes"; then + TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" + TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wcomments" + else + TRIE_CFLAGS= + TRIE_CXXFLAGS= + fi + + + # Checks for libraries. # Checks for header files. @@ -3366,7 +3376,7 @@ _ACEOF fi -ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -3899,9 +3909,9 @@ fi # Checks for library functions. - ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile test/Makefile" + ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile test/Makefile" -cat >confcache <<\_ACEOF + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs, see configure's option --config-cache. @@ -4600,6 +4610,8 @@ s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@TRIE_CFLAGS@,$TRIE_CFLAGS,;t t +s,@TRIE_CXXFLAGS@,$TRIE_CXXFLAGS,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/lib/libTrie/include/Makefile.in b/lib/libTrie/include/Makefile.in index 7179333c3c..9628fbb521 100644 --- a/lib/libTrie/include/Makefile.in +++ b/lib/libTrie/include/Makefile.in @@ -83,6 +83,8 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TRIE_CFLAGS = @TRIE_CFLAGS@ +TRIE_CXXFLAGS = @TRIE_CXXFLAGS@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -114,7 +116,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -noinst_HEADERS = Trie.h TrieNode.h +noinst_HEADERS = Trie.h TrieNode.h TrieCharTransform.h subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/lib/libTrie/src/Makefile.in b/lib/libTrie/src/Makefile.in index 26fbf3e5a4..72d9eff90b 100644 --- a/lib/libTrie/src/Makefile.in +++ b/lib/libTrie/src/Makefile.in @@ -83,6 +83,8 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TRIE_CFLAGS = @TRIE_CFLAGS@ +TRIE_CXXFLAGS = @TRIE_CXXFLAGS@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -117,6 +119,9 @@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir)/include +AM_CFLAGS = @TRIE_CFLAGS@ +AM_CXXFLAGS = @TRIE_CXXFLAGS@ + noinst_LIBRARIES = libTrie.a libTrie_a_SOURCES = Trie.cc \ diff --git a/lib/libTrie/test/Makefile.in b/lib/libTrie/test/Makefile.in index e6cd442955..7ffd99db2a 100644 --- a/lib/libTrie/test/Makefile.in +++ b/lib/libTrie/test/Makefile.in @@ -83,6 +83,8 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TRIE_CFLAGS = @TRIE_CFLAGS@ +TRIE_CXXFLAGS = @TRIE_CXXFLAGS@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -116,6 +118,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir)/include +AM_CFLAGS = @TRIE_CFLAGS@ +AM_CXXFLAGS = @TRIE_CXXFLAGS@ + TESTS = trie trie-c check_PROGRAMS = trie trie-c diff --git a/src/Makefile.in b/src/Makefile.in index 43dfc95db4..353531ac4f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.312 2003/07/08 00:12:52 hno Exp $ +# $Id: Makefile.in,v 1.313 2003/07/14 15:14:48 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -251,6 +251,8 @@ ESI_ALL_SOURCE = \ ElementList.h \ ESI.cc \ ESI.h \ + ESIAssign.cc \ + ESIAssign.h \ ESIAttempt.h \ ESIContext.cc \ ESIContext.h \ @@ -261,13 +263,19 @@ ESI_ALL_SOURCE = \ ESIExpatParser.cc \ ESIExpatParser.h \ ESIExpression.cc \ + ESIExpression.h \ + ESIInclude.cc \ + ESIInclude.h \ ESILiteral.h \ ESIParser.cc \ ESIParser.h \ ESISegment.cc \ ESISegment.h \ ESISequence.cc \ - ESISequence.h + ESISequence.h \ + ESIVar.h \ + ESIVarState.cc \ + ESIVarState.h @USE_ESI_TRUE@ESI_SOURCE = $(ESI_ALL_SOURCE) @USE_ESI_FALSE@ESI_SOURCE = @@ -275,7 +283,7 @@ ESI_ALL_SOURCE = \ @ENABLE_XPROF_STATS_TRUE@XPROF_STATS_SOURCE = ProfStats.cc @ENABLE_XPROF_STATS_FALSE@XPROF_STATS_SOURCE = -@ENABLE_HTCP_TRUE@HTCPSOURCE = htcp.cc +@ENABLE_HTCP_TRUE@HTCPSOURCE = htcp.cc htcp.h @MAKE_LEAKFINDER_TRUE@LEAKFINDERSOURCE = leakfinder.cc @MAKE_LEAKFINDER_FALSE@LEAKFINDERSOURCE = @@ -990,15 +998,17 @@ am__squid_SOURCES_DIST = access_log.cc acl.cc ACL.h ACLChecklist.cc \ DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \ DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \ disk.cc dns_internal.cc dns.cc enums.h errorpage.cc \ - ElementList.h ESI.cc ESI.h ESIAttempt.h ESIContext.cc \ - ESIContext.h ESICustomParser.cc ESICustomParser.h ESIElement.h \ - ESIExcept.h ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \ - ESILiteral.h ESIParser.cc ESIParser.h ESISegment.cc \ - ESISegment.h ESISequence.cc ESISequence.h ETag.cc event.cc \ + ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \ + ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \ + ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \ + ESIExpatParser.h ESIExpression.cc ESIExpression.h ESIInclude.cc \ + ESIInclude.h ESILiteral.h ESIParser.cc ESIParser.h \ + ESISegment.cc ESISegment.h ESISequence.cc ESISequence.h \ + ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc event.cc \ external_acl.cc ExternalACL.h ExternalACLEntry.cc \ ExternalACLEntry.h fd.cc fde.cc fde.h filemap.cc forward.cc \ fqdncache.cc ftp.cc Generic.h globals.h gopher.cc helper.cc \ - htcp.cc http.cc http.h HttpStatusLine.cc HttpHdrCc.cc \ + htcp.cc htcp.h http.cc http.h HttpStatusLine.cc HttpHdrCc.cc \ HttpHdrRange.cc HttpHdrSc.cc HttpHdrScTarget.cc \ HttpHdrContRange.cc HttpHdrContRange.h HttpHeader.cc \ HttpHeader.h HttpHeaderRange.h HttpHeaderTools.cc HttpBody.cc \ @@ -1049,10 +1059,11 @@ am__objects_4 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \ @USE_DELAY_POOLS_FALSE@am__objects_5 = @USE_DNSSERVER_TRUE@am__objects_6 = dns.$(OBJEXT) @USE_DNSSERVER_FALSE@am__objects_6 = dns_internal.$(OBJEXT) -am__objects_7 = ESI.$(OBJEXT) ESIContext.$(OBJEXT) \ +am__objects_7 = ESI.$(OBJEXT) ESIAssign.$(OBJEXT) ESIContext.$(OBJEXT) \ ESICustomParser.$(OBJEXT) ESIExpatParser.$(OBJEXT) \ - ESIExpression.$(OBJEXT) ESIParser.$(OBJEXT) \ - ESISegment.$(OBJEXT) ESISequence.$(OBJEXT) + ESIExpression.$(OBJEXT) ESIInclude.$(OBJEXT) \ + ESIParser.$(OBJEXT) ESISegment.$(OBJEXT) ESISequence.$(OBJEXT) \ + ESIVarState.$(OBJEXT) @USE_ESI_TRUE@am__objects_8 = $(am__objects_7) @USE_ESI_FALSE@am__objects_8 = @ENABLE_HTCP_TRUE@am__objects_9 = htcp.$(OBJEXT) @@ -1163,13 +1174,15 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc ufsdump.cc store.cc \ DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \ DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \ disk.cc dns_internal.cc dns.cc enums.h errorpage.cc \ - ElementList.h ESI.cc ESI.h ESIAttempt.h ESIContext.cc \ - ESIContext.h ESICustomParser.cc ESICustomParser.h ESIElement.h \ - ESIExcept.h ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \ - ESILiteral.h ESIParser.cc ESIParser.h ESISegment.cc \ - ESISegment.h ESISequence.cc ESISequence.h ETag.cc event.cc \ + ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \ + ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \ + ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \ + ESIExpatParser.h ESIExpression.cc ESIExpression.h ESIInclude.cc \ + ESIInclude.h ESILiteral.h ESIParser.cc ESIParser.h \ + ESISegment.cc ESISegment.h ESISequence.cc ESISequence.h \ + ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc event.cc \ external_acl.cc fd.cc fde.cc fde.h filemap.cc forward.cc \ - fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc http.cc \ + fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc \ HttpStatusLine.cc HttpHdrCc.cc HttpHdrRange.cc HttpHdrSc.cc \ HttpHdrScTarget.cc HttpHdrContRange.cc HttpHeader.cc \ HttpHeaderTools.cc HttpBody.cc HttpMsg.cc HttpReply.cc \ @@ -1283,12 +1296,14 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/DelayPool.Po ./$(DEPDIR)/DelaySpec.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/DelayTagged.Po ./$(DEPDIR)/DelayUser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/DelayVector.Po ./$(DEPDIR)/ESI.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ESIContext.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ESIAssign.Po ./$(DEPDIR)/ESIContext.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ESICustomParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ESIExpatParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ESIExpression.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ESIParser.Po ./$(DEPDIR)/ESISegment.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ESISequence.Po ./$(DEPDIR)/ETag.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ESIInclude.Po ./$(DEPDIR)/ESIParser.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ESISegment.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ESISequence.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ESIVarState.Po ./$(DEPDIR)/ETag.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ExternalACLEntry.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/HttpBody.Po ./$(DEPDIR)/HttpHdrCc.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/HttpHdrContRange.Po \ @@ -1564,13 +1579,16 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelayUser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelayVector.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESI.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIAssign.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIContext.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESICustomParser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIExpatParser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIExpression.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIInclude.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIParser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESISegment.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESISequence.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIVarState.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ETag.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExternalACLEntry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpBody.Po@am__quote@ diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index 3b65a3b3c9..7ef378a045 100644 --- a/test-suite/Makefile.in +++ b/test-suite/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.36 2003/07/11 00:13:05 hno Exp $ +# $Id: Makefile.in,v 1.37 2003/07/14 15:14:51 robertc Exp $ # srcdir = @srcdir@ @@ -217,18 +217,28 @@ INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$ EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2 rfc1738 +ESI_ALL_TESTS = \ + ESIExpressions + + +@USE_ESI_TRUE@ESI_TESTS = $(ESI_ALL_TESTS) +@USE_ESI_FALSE@ESI_TESTS = + TESTS = debug \ syntheticoperators \ + StackTest \ rfc1738 \ refcount\ splay\ MemPoolTest\ mem_node_test\ mem_hdr_test\ - http_range_test + http_range_test \ + $(ESI_TESTS) check_PROGRAMS = debug \ + $(ESI_TESTS) \ http_range_test \ MemPoolTest\ mem_node_test\ @@ -236,38 +246,44 @@ check_PROGRAMS = debug \ refcount\ rfc1738\ splay \ + StackTest \ syntheticoperators LDADD = -L$(top_builddir)/lib -lmiscutil -debug_SOURCES = debug.cc test_tools.cc -debug_LDADD = $(top_builddir)/src/globals.o \ - $(LDADD) +DEBUG_SOURCE = test_tools.cc +DEBUG_OBJECTS = $(top_builddir)/src/globals.o +debug_SOURCES = debug.cc $(DEBUG_SOURCE) +debug_LDADD = $(DEBUG_OBJECTS) $(LDADD) +ESIExpressions_SOURCES = ESIExpressions.cc $(DEBUG_SOURCE) +ESIExpressions_LDADD = $(top_builddir)/src/ESIExpression.o \ + $(DEBUG_OBJECTS) $(LDADD) mem_node_test_SOURCES = mem_node_test.cc mem_node_test_LDADD = $(top_builddir)/src/mem_node.o $(LDADD) -mem_hdr_test_SOURCES = mem_hdr_test.cc test_tools.cc +mem_hdr_test_SOURCES = mem_hdr_test.cc $(DEBUG_SOURCE) mem_hdr_test_LDADD = $(top_builddir)/src/stmem.o \ - $(top_builddir)/src/globals.o \ + $(DEBUG_OBJECTS) \ $(top_builddir)/src/mem_node.o $(LDADD) MemPoolTest_SOURCES = MemPoolTest.cc refcount_SOURCES = refcount.cc -http_range_test_SOURCES = http_range_test.cc test_tools.cc +http_range_test_SOURCES = http_range_test.cc $(DEBUG_SOURCE) http_range_test_LDADD = $(top_builddir)/src/HttpHdrRange.o \ $(top_builddir)/src/HttpHeaderTools.o \ $(top_builddir)/src/MemBuf.o \ $(top_builddir)/src/Packer.o \ $(top_builddir)/src/String.o \ $(top_builddir)/src/mem.o \ - $(top_builddir)/src/globals.o \ - $(LDADD) + $(DEBUG_OBJECTS) $(LDADD) splay_SOURCES = splay.cc -syntheticoperators_SOURCES = syntheticoperators.cc test_tools.cc +StackTest_SOURCES = StackTest.cc $(DEBUG_SOURCE) + +syntheticoperators_SOURCES = syntheticoperators.cc $(DEBUG_SOURCE) rfc1738_SOURCES = rfc1738.cc subdir = test-suite @@ -277,21 +293,37 @@ CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = EXTRA_PROGRAMS = mem_node_test$(EXEEXT) membanger$(EXEEXT) \ splay$(EXEEXT) tcp-banger2$(EXEEXT) rfc1738$(EXEEXT) -check_PROGRAMS = debug$(EXEEXT) http_range_test$(EXEEXT) \ - MemPoolTest$(EXEEXT) mem_node_test$(EXEEXT) \ - mem_hdr_test$(EXEEXT) refcount$(EXEEXT) rfc1738$(EXEEXT) \ - splay$(EXEEXT) syntheticoperators$(EXEEXT) +@USE_ESI_TRUE@check_PROGRAMS = debug$(EXEEXT) ESIExpressions$(EXEEXT) \ +@USE_ESI_TRUE@ http_range_test$(EXEEXT) MemPoolTest$(EXEEXT) \ +@USE_ESI_TRUE@ mem_node_test$(EXEEXT) mem_hdr_test$(EXEEXT) \ +@USE_ESI_TRUE@ refcount$(EXEEXT) rfc1738$(EXEEXT) splay$(EXEEXT) \ +@USE_ESI_TRUE@ StackTest$(EXEEXT) syntheticoperators$(EXEEXT) +@USE_ESI_FALSE@check_PROGRAMS = debug$(EXEEXT) http_range_test$(EXEEXT) \ +@USE_ESI_FALSE@ MemPoolTest$(EXEEXT) mem_node_test$(EXEEXT) \ +@USE_ESI_FALSE@ mem_hdr_test$(EXEEXT) refcount$(EXEEXT) \ +@USE_ESI_FALSE@ rfc1738$(EXEEXT) splay$(EXEEXT) \ +@USE_ESI_FALSE@ StackTest$(EXEEXT) syntheticoperators$(EXEEXT) +am__objects_1 = test_tools.$(OBJEXT) +am_ESIExpressions_OBJECTS = ESIExpressions.$(OBJEXT) $(am__objects_1) +ESIExpressions_OBJECTS = $(am_ESIExpressions_OBJECTS) +ESIExpressions_DEPENDENCIES = $(top_builddir)/src/ESIExpression.o \ + $(top_builddir)/src/globals.o +ESIExpressions_LDFLAGS = am_MemPoolTest_OBJECTS = MemPoolTest.$(OBJEXT) MemPoolTest_OBJECTS = $(am_MemPoolTest_OBJECTS) MemPoolTest_LDADD = $(LDADD) MemPoolTest_DEPENDENCIES = MemPoolTest_LDFLAGS = -am_debug_OBJECTS = debug.$(OBJEXT) test_tools.$(OBJEXT) +am_StackTest_OBJECTS = StackTest.$(OBJEXT) $(am__objects_1) +StackTest_OBJECTS = $(am_StackTest_OBJECTS) +StackTest_LDADD = $(LDADD) +StackTest_DEPENDENCIES = +StackTest_LDFLAGS = +am_debug_OBJECTS = debug.$(OBJEXT) $(am__objects_1) debug_OBJECTS = $(am_debug_OBJECTS) debug_DEPENDENCIES = $(top_builddir)/src/globals.o debug_LDFLAGS = -am_http_range_test_OBJECTS = http_range_test.$(OBJEXT) \ - test_tools.$(OBJEXT) +am_http_range_test_OBJECTS = http_range_test.$(OBJEXT) $(am__objects_1) http_range_test_OBJECTS = $(am_http_range_test_OBJECTS) http_range_test_DEPENDENCIES = $(top_builddir)/src/HttpHdrRange.o \ $(top_builddir)/src/HttpHeaderTools.o \ @@ -299,7 +331,7 @@ http_range_test_DEPENDENCIES = $(top_builddir)/src/HttpHdrRange.o \ $(top_builddir)/src/String.o $(top_builddir)/src/mem.o \ $(top_builddir)/src/globals.o http_range_test_LDFLAGS = -am_mem_hdr_test_OBJECTS = mem_hdr_test.$(OBJEXT) test_tools.$(OBJEXT) +am_mem_hdr_test_OBJECTS = mem_hdr_test.$(OBJEXT) $(am__objects_1) mem_hdr_test_OBJECTS = $(am_mem_hdr_test_OBJECTS) mem_hdr_test_DEPENDENCIES = $(top_builddir)/src/stmem.o \ $(top_builddir)/src/globals.o $(top_builddir)/src/mem_node.o @@ -329,7 +361,7 @@ splay_LDADD = $(LDADD) splay_DEPENDENCIES = splay_LDFLAGS = am_syntheticoperators_OBJECTS = syntheticoperators.$(OBJEXT) \ - test_tools.$(OBJEXT) + $(am__objects_1) syntheticoperators_OBJECTS = $(am_syntheticoperators_OBJECTS) syntheticoperators_LDADD = $(LDADD) syntheticoperators_DEPENDENCIES = @@ -343,8 +375,9 @@ tcp_banger2_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/MemPoolTest.Po ./$(DEPDIR)/debug.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/http_range_test.Po \ +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ESIExpressions.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/MemPoolTest.Po ./$(DEPDIR)/StackTest.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/debug.Po ./$(DEPDIR)/http_range_test.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mem_hdr_test.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mem_node_test.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/membanger.Po ./$(DEPDIR)/refcount.Po \ @@ -361,13 +394,14 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ -DIST_SOURCES = $(MemPoolTest_SOURCES) $(debug_SOURCES) \ +DIST_SOURCES = $(ESIExpressions_SOURCES) $(MemPoolTest_SOURCES) \ + $(StackTest_SOURCES) $(debug_SOURCES) \ $(http_range_test_SOURCES) $(mem_hdr_test_SOURCES) \ $(mem_node_test_SOURCES) membanger.c $(refcount_SOURCES) \ $(rfc1738_SOURCES) $(splay_SOURCES) \ $(syntheticoperators_SOURCES) tcp-banger2.c DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(MemPoolTest_SOURCES) $(debug_SOURCES) $(http_range_test_SOURCES) $(mem_hdr_test_SOURCES) $(mem_node_test_SOURCES) membanger.c $(refcount_SOURCES) $(rfc1738_SOURCES) $(splay_SOURCES) $(syntheticoperators_SOURCES) tcp-banger2.c +SOURCES = $(ESIExpressions_SOURCES) $(MemPoolTest_SOURCES) $(StackTest_SOURCES) $(debug_SOURCES) $(http_range_test_SOURCES) $(mem_hdr_test_SOURCES) $(mem_node_test_SOURCES) membanger.c $(refcount_SOURCES) $(rfc1738_SOURCES) $(splay_SOURCES) $(syntheticoperators_SOURCES) tcp-banger2.c all: all-am @@ -381,9 +415,15 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) +ESIExpressions$(EXEEXT): $(ESIExpressions_OBJECTS) $(ESIExpressions_DEPENDENCIES) + @rm -f ESIExpressions$(EXEEXT) + $(CXXLINK) $(ESIExpressions_LDFLAGS) $(ESIExpressions_OBJECTS) $(ESIExpressions_LDADD) $(LIBS) MemPoolTest$(EXEEXT): $(MemPoolTest_OBJECTS) $(MemPoolTest_DEPENDENCIES) @rm -f MemPoolTest$(EXEEXT) $(CXXLINK) $(MemPoolTest_LDFLAGS) $(MemPoolTest_OBJECTS) $(MemPoolTest_LDADD) $(LIBS) +StackTest$(EXEEXT): $(StackTest_OBJECTS) $(StackTest_DEPENDENCIES) + @rm -f StackTest$(EXEEXT) + $(CXXLINK) $(StackTest_LDFLAGS) $(StackTest_OBJECTS) $(StackTest_LDADD) $(LIBS) debug$(EXEEXT): $(debug_OBJECTS) $(debug_DEPENDENCIES) @rm -f debug$(EXEEXT) $(CXXLINK) $(debug_LDFLAGS) $(debug_OBJECTS) $(debug_LDADD) $(LIBS) @@ -421,7 +461,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ESIExpressions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MemPoolTest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StackTest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_range_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem_hdr_test.Po@am__quote@