From: hno <> Date: Sun, 9 Feb 2003 00:08:38 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE1~372 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e825dd59cc6906108ef08389b1b70c132ff939de;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index 1cb4b971f1..5bb86d2bd5 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.318 . +# From configure.in Revision: 1.320 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -870,9 +870,6 @@ Optional Features: See src/fs for a list of available modules, or Programmers Guide section for details on how to build your custom store module - --enable-heap-replacement - Backwards compability option. Please use the - new --enable-removal-policies directive instead. --enable-removal-policies=\"list of policies\" Build support for the list of removal policies. The default is only to build the "lru" module. @@ -958,9 +955,6 @@ Optional Features: Programmers Guide section authentication schemes for details on how to build your custom auth scheme module - --enable-auth-modules=\"list of helpers\" - Backwards compability alias for - --enable-basic-auth-helpers --enable-basic-auth-helpers=\"list of helpers\" This option selects which basic scheme proxy_auth helpers to build and install as part of the normal @@ -4153,7 +4147,16 @@ fi; # Check whether --with-aufs-threads or --without-aufs-threads was given. if test "${with_aufs_threads+set}" = set; then withval="$with_aufs_threads" - aufs_io_threads=$withval + case $withval in + [0-9]*) + aufs_io_threads=$withval + ;; + *) + echo "ERROR: Invalid --with-aufs-threads argument" + exit 1 + ;; + esac + fi; if test "$aufs_io_threads"; then echo "With $aufs_io_threads aufs threads" @@ -4199,15 +4202,17 @@ if test "${enable_storeio+set}" = set; then enableval="$enable_storeio" case $enableval in yes) - for module in $srcdir/src/fs/*; do - if test -f $module/Makefile.in; then - STORE_MODULES="$STORE_MODULES `basename $module`" + for dir in $srcdir/src/fs/*; do + module="`basename $dir`" + if test -d "$dir" && test "$module" != CVS; then + STORE_MODULES="$STORE_MODULES $module" fi done ;; no) ;; - *) STORE_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + *) + STORE_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" ;; esac @@ -4217,24 +4222,35 @@ else fi fi; -echo "Store modules built: $STORE_MODULES" -STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" - -STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" - +if test -n "$STORE_MODULES"; then + for module in $STORE_MODULES; do + if test -d $srcdir/src/fs/$module; then + : + else + echo "ERROR: storeio $module does not exists" + exit 1 + fi + done + echo "Store modules built: $STORE_MODULES" + STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" + STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" +fi STORE_MODULE_SUBDIRS= UFS_FOUND= +NEED_UFS= for fs in $STORE_MODULES none; do case "$fs" in diskd) STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs" STORE_PROGRAMS="$STORE_PROGRAMS diskd/diskd" + NEED_UFS="true" ;; aufs) if test -z "$with_pthreads"; then echo "aufs store used, pthreads support automatically enabled" with_pthreads=yes fi + NEED_UFS="true" ;; coss) if test -z "$with_aio"; then @@ -4247,12 +4263,10 @@ for fs in $STORE_MODULES none; do esac done -if test -z "$UFS_FOUND"; then +if test -z "$UFS_FOUND" && test -n "$NEED_UFS"; then echo "adding UFS, as it contains core logic for diskd and aufs" STORE_OBJS="$STORE_OBJS fs/libufs.a" - STORE_LIBS="$STORE_LIBS libufs.a" - STORE_MODULES="$STORE_MODULES ufs" fi @@ -4260,33 +4274,24 @@ fi -# Check whether --enable-heap-replacement or --disable-heap-replacement was given. -if test "${enable_heap_replacement+set}" = set; then - enableval="$enable_heap_replacement" - if test "$enableval" = "yes" ; then - echo "--enable-heap-replacement is obsolete. please use the new" - echo "--enable-removal-policies directive instead" - sleep 5 - REPL_POLICIES="heap" - fi -fi; # Check whether --enable-removal-policies or --disable-removal-policies was given. if test "${enable_removal_policies+set}" = set; then enableval="$enable_removal_policies" case $enableval in yes) - for module in $srcdir/src/repl/*; do - if test -d $module; then - REPL_POLICIES="$REPL_POLICIES `basename $module`" + for dir in $srcdir/src/repl/*; do + module="`basename $dir`" + if test -d "$dir" && test "$module" != CVS; then + REPL_POLICIES="$REPL_POLICIES $module" fi - REPL_POLICIES="`echo $REPL_POLICIES|sed -e 's/CVS//g'`" done ;; no) ;; - *) REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + *) + REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" ;; esac @@ -4296,11 +4301,21 @@ else fi fi; -echo "Removal policies built: $REPL_POLICIES" +if test -n "$REPL_POLICIES"; then + for module in $REPL_POLICIES; do + if test -d $srcdir/src/repl/$module; then + : + else + echo "ERROR: Removal policy $module does not exists" + exit 1 + fi + done + echo "Removal policies built: $REPL_POLICIES" + REPL_OBJS="repl/lib`echo $REPL_POLICIES|sed -e 's% %.a repl/lib%g'`.a" + REPL_LIBS="`echo $REPL_OBJS|sed -e 's%repl/%%g'`" +fi -REPL_OBJS="repl/lib`echo $REPL_POLICIES|sed -e 's% %.a repl/lib%g'`.a" -REPL_LIBS="`echo $REPL_OBJS|sed -e 's%repl/%%g'`" @@ -5022,15 +5037,16 @@ if test "${enable_auth+set}" = set; then yes) for dir in $srcdir/src/auth/*; do module="`basename $dir`" - if test -f $dir/auth_${module}.cc; then + if test -d "$dir" && test "$module" != CVS; then AUTH_MODULES="$AUTH_MODULES $module" fi done ;; no) ;; - *) AUTH_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" - ;; + *) + AUTH_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + ;; esac else @@ -5039,61 +5055,51 @@ else fi fi; -echo "Auth scheme modules built: $AUTH_MODULES" +if test -n "$AUTH_MODULES"; then + for module in $AUTH_MODULES; do + if test -d $srcdir/src/auth/$module; then + : + else + echo "ERROR: Auth scheme $module does not exists" + exit 1 + fi + done + echo "Auth scheme modules built: $AUTH_MODULES" + AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" + AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" +fi -AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" -AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" BASIC_AUTH_HELPERS="" -# Check whether --enable-auth-modules or --disable-auth-modules was given. -if test "${enable_auth_modules+set}" = set; then - enableval="$enable_auth_modules" - echo "--enable-auth-modules is obsolete. Please use the new" - echo "option --enable-basic-auth-helpers" - sleep 5 - case "$enableval" in - yes) - for helper in $srcdir/helpers/basic_auth/*; do - if test -f $helper/Makefile.in; then - BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" - fi - done - ;; - no) - ;; - *) - BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" - esac - -fi; # Check whether --enable-basic-auth-helpers or --disable-basic-auth-helpers was given. if test "${enable_basic_auth_helpers+set}" = set; then enableval="$enable_basic_auth_helpers" case "$enableval" in yes) - BASIC_AUTH_HELPERS="" - for helper in $srcdir/helpers/basic_auth/*; do - if test -f $helper/Makefile.in; then - BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" - fi - done - ;; + for dir in $srcdir/helpers/basic_auth/*; do + helper="`basename $dir`" + if test -d "$dir" && test "$helper" != CVS; then + BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $helper" + fi + done + ;; no) - ;; + ;; *) - BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + ;; esac fi; if test -n "$BASIC_AUTH_HELPERS"; then for helper in $BASIC_AUTH_HELPERS; do - if test -f $srcdir/helpers/basic_auth/$helper/Makefile.in; then - : + if test -d $srcdir/helpers/basic_auth/$helper; then + : else - echo "ERROR: Basic auth helper $helper does not exists" - exit 1 + echo "ERROR: Basic auth helper $helper does not exists" + exit 1 fi done echo "Basic auth helpers built: $BASIC_AUTH_HELPERS" @@ -5106,26 +5112,28 @@ if test "${enable_ntlm_auth_helpers+set}" = set; then enableval="$enable_ntlm_auth_helpers" case "$enableval" in yes) - for helper in $srcdir/helpers/ntlm_auth/*; do - if test -f $helper/Makefile.in; then - NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS `basename $helper`" - fi - done - ;; + for dir in $srcdir/helpers/ntlm_auth/*; do + helper="`basename $dir`" + if test -d "$dir" && test "$helper" != CVS; then + NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS $helper" + fi + done + ;; no) - ;; + ;; *) - NTLM_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + NTLM_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + ;; esac fi; if test -n "$NTLM_AUTH_HELPERS"; then for helper in $NTLM_AUTH_HELPERS; do - if test -f $srcdir/helpers/ntlm_auth/$helper/Makefile.in; then - : + if test -d $srcdir/helpers/ntlm_auth/$helper; then + : else - echo "ERROR: NTLM auth helper $helper does not exists" - exit 1 + echo "ERROR: NTLM Auth helper $helper does not exists" + exit 1 fi done echo "NTLM auth helpers built: $NTLM_AUTH_HELPERS" @@ -5138,16 +5146,18 @@ if test "${enable_digest_auth_helpers+set}" = set; then enableval="$enable_digest_auth_helpers" case "$enableval" in yes) - for helper in $srcdir/helpers/digest_auth/*; do - if test -f $helper/Makefile.in; then - DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS `basename $helper`" - fi - done - ;; + for dir in $srcdir/helpers/digest_auth/*; do + helper="`basename $dir`" + if test -d "$dir" && test "$helper" != CVS; then + DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS $helper" + fi + done + ;; no) - ;; + ;; *) - DIGEST_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + DIGEST_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + ;; esac fi; @@ -5183,16 +5193,18 @@ if test "${enable_external_acl_helpers+set}" = set; then enableval="$enable_external_acl_helpers" case "$enableval" in yes) - for helper in $srcdir/helpers/external_acl/*; do - if test -f $helper/Makefile.in; then - EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS `basename $helper`" - fi - done - ;; + for dir in $srcdir/helpers/external_acl/*; do + helper="`basename $dir`" + if test -d "$dir" && test "$helper" != CVS; then + EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper" + fi + done + ;; no) - ;; + ;; *) - EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + ;; esac fi; diff --git a/src/Makefile.in b/src/Makefile.in index b305fd4793..05f430bed6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.280 2003/02/08 16:16:14 hno Exp $ +# $Id: Makefile.in,v 1.281 2003/02/08 17:08:39 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -771,11 +771,12 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \ Packer.$(OBJEXT) $(am__objects_3) pconn.$(OBJEXT) \ peer_digest.$(OBJEXT) peer_select.$(OBJEXT) redirect.$(OBJEXT) \ referer.$(OBJEXT) refresh.$(OBJEXT) send-announce.$(OBJEXT) \ - $(am__objects_8) ssl.$(OBJEXT) $(am__objects_9) stat.$(OBJEXT) \ - StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \ - store.$(OBJEXT) store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \ - store_client.$(OBJEXT) store_digest.$(OBJEXT) \ - store_dir.$(OBJEXT) store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ + $(am__objects_8) tunnel.$(OBJEXT) $(am__objects_9) \ + stat.$(OBJEXT) StatHist.$(OBJEXT) String.$(OBJEXT) \ + stmem.$(OBJEXT) store.$(OBJEXT) store_io.$(OBJEXT) \ + StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \ + store_digest.$(OBJEXT) store_dir.$(OBJEXT) \ + store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \ @@ -918,12 +919,12 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp @AMDEP_TRUE@ $(DEPDIR)/store_swapmeta.Po \ @AMDEP_TRUE@ $(DEPDIR)/store_swapout.Po \ @AMDEP_TRUE@ $(DEPDIR)/string_arrays.Po $(DEPDIR)/tools.Po \ -@AMDEP_TRUE@ $(DEPDIR)/ufscommon.Po $(DEPDIR)/ufsdump.Po \ -@AMDEP_TRUE@ $(DEPDIR)/unlinkd-unlinkd.Po $(DEPDIR)/unlinkd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/url.Po $(DEPDIR)/urn.Po \ -@AMDEP_TRUE@ $(DEPDIR)/useragent.Po $(DEPDIR)/wais.Po \ -@AMDEP_TRUE@ $(DEPDIR)/wccp.Po $(DEPDIR)/whois.Po \ -@AMDEP_TRUE@ $(DEPDIR)/win32.Po +@AMDEP_TRUE@ $(DEPDIR)/tunnel.Po $(DEPDIR)/ufscommon.Po \ +@AMDEP_TRUE@ $(DEPDIR)/ufsdump.Po $(DEPDIR)/unlinkd-unlinkd.Po \ +@AMDEP_TRUE@ $(DEPDIR)/unlinkd.Po $(DEPDIR)/url.Po \ +@AMDEP_TRUE@ $(DEPDIR)/urn.Po $(DEPDIR)/useragent.Po \ +@AMDEP_TRUE@ $(DEPDIR)/wais.Po $(DEPDIR)/wccp.Po \ +@AMDEP_TRUE@ $(DEPDIR)/whois.Po $(DEPDIR)/win32.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -1194,6 +1195,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/store_swapout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/string_arrays.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tunnel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ufscommon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ufsdump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/unlinkd-unlinkd.Po@am__quote@