From: hno <> Date: Tue, 17 Apr 2007 06:44:16 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE6~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=377792e42a25ae49fe73abaf331e7082b286d662;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/Makefile.in b/Makefile.in index 8d8d93e0d1..544c07b36b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.96 2007/04/17 00:10:40 hno Exp $ +# $Id: Makefile.in,v 1.97 2007/04/17 00:44:16 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -274,6 +274,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign diff --git a/configure b/configure index b609048caf..1f314f8d86 100755 --- a/configure +++ b/configure @@ -467,7 +467,8 @@ 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI USE_IPC_WIN32_TRUE USE_IPC_WIN32_FALSE MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE USE_AIO_WIN32_TRUE USE_AIO_WIN32_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPPUNITCONFIG SQUID_CPPUNIT_LIBS SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS' +ac_subdirs_all="$ac_subdirs_all lib/libTrie" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE WIN32_PSAPI USE_IPC_WIN32_TRUE USE_IPC_WIN32_FALSE MINGW_LIBS CACHE_HTTP_PORT CACHE_ICP_PORT SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_LINKOBJS STORE_TESTS DISK_LIBS DISK_PROGRAMS DISK_LINKOBJS USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE USE_AIO_WIN32_TRUE USE_AIO_WIN32_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_ICAP_CLIENT_TRUE USE_ICAP_CLIENT_FALSE ICAP_LIBS USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_LIBS AUTH_LINKOBJS AUTH_OBJS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPPUNITCONFIG SQUID_CPPUNIT_LIBS SQUID_CPPUNIT_LA SQUID_CPPUNIT_INC SH FALSE TRUE RM MV MKDIR LN PERL AR_R ALLOCA CRYPTLIB LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4571,7 +4572,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4574 "configure"' > conftest.$ac_ext + echo '#line 4575 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5706,7 +5707,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5709:" \ +echo "$as_me:5710:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6769,11 +6770,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6772: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6773: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6776: \$? = $ac_status" >&5 + echo "$as_me:6777: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7037,11 +7038,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7040: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7041: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7044: \$? = $ac_status" >&5 + echo "$as_me:7045: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7141,11 +7142,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7144: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7145: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7148: \$? = $ac_status" >&5 + echo "$as_me:7149: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9486,7 +9487,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11930: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11933: \$? = $ac_status" >&5 + echo "$as_me:11934: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12030,11 +12031,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12033: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12034: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12037: \$? = $ac_status" >&5 + echo "$as_me:12038: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13600,11 +13601,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13603: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13604: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13607: \$? = $ac_status" >&5 + echo "$as_me:13608: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13704,11 +13705,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13707: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13708: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13711: \$? = $ac_status" >&5 + echo "$as_me:13712: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15907,11 +15908,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15910: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15911: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15914: \$? = $ac_status" >&5 + echo "$as_me:15915: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16175,11 +16176,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16179: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16183: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16279,11 +16280,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16283: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16286: \$? = $ac_status" >&5 + echo "$as_me:16287: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -43896,6 +43897,11 @@ rm -f core ac_config_files="$ac_config_files Makefile lib/Makefile scripts/Makefile scripts/RunCache scripts/RunAccel src/Makefile src/fs/Makefile src/repl/Makefile src/auth/Makefile contrib/Makefile snmplib/Makefile icons/Makefile errors/Makefile test-suite/Makefile doc/Makefile helpers/Makefile helpers/basic_auth/Makefile helpers/basic_auth/LDAP/Makefile helpers/basic_auth/MSNT/Makefile helpers/basic_auth/NCSA/Makefile helpers/basic_auth/PAM/Makefile helpers/basic_auth/SMB/Makefile helpers/basic_auth/mswin_sspi/Makefile helpers/basic_auth/YP/Makefile helpers/basic_auth/getpwnam/Makefile helpers/basic_auth/multi-domain-NTLM/Makefile helpers/basic_auth/SASL/Makefile helpers/basic_auth/POP3/Makefile helpers/digest_auth/Makefile helpers/digest_auth/password/Makefile helpers/digest_auth/ldap/Makefile helpers/ntlm_auth/Makefile helpers/ntlm_auth/fakeauth/Makefile helpers/ntlm_auth/no_check/Makefile helpers/ntlm_auth/SMB/Makefile helpers/ntlm_auth/SMB/smbval/Makefile helpers/ntlm_auth/mswin_sspi/Makefile helpers/negotiate_auth/Makefile helpers/negotiate_auth/mswin_sspi/Makefile helpers/external_acl/Makefile helpers/external_acl/ip_user/Makefile helpers/external_acl/ldap_group/Makefile helpers/external_acl/session/Makefile helpers/external_acl/unix_group/Makefile helpers/external_acl/wbinfo_group/Makefile helpers/external_acl/mswin_lm_group/Makefile tools/Makefile" + + +subdirs="$subdirs lib/libTrie" + + 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 @@ -45028,6 +45034,7 @@ s,@LIBREGEX@,$LIBREGEX,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@XTRA_OBJS@,$XTRA_OBJS,;t t s,@XTRA_LIBS@,$XTRA_LIBS,;t t +s,@subdirs@,$subdirs,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -45744,3 +45751,183 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d $srcdir/$ac_dir || continue + + { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 +echo "$as_me: configuring in $ac_dir" >&6;} + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + cd $ac_dir + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" + elif test -f $ac_srcdir/configure; then + ac_sub_configure="$SHELL '$ac_srcdir/configure'" + elif test -f $ac_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file=$ac_top_builddir$cache_file ;; + esac + + { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval $ac_sub_configure $ac_sub_configure_args \ + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} + { (exit 1); exit 1; }; } + fi + + cd $ac_popdir + done +fi + diff --git a/configure.in b/configure.in index 3fdb54b0ad..2dbf967e6f 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.451 2007/04/16 14:12:06 hno Exp $ +dnl $Id: configure.in,v 1.452 2007/04/17 00:44:16 hno Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE([tar-ustar]) -AC_REVISION($Revision: 1.451 $)dnl +AC_REVISION($Revision: 1.452 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -3300,4 +3300,6 @@ AC_CONFIG_FILES([\ tools/Makefile ]) +AC_CONFIG_SUBDIRS(lib/libTrie) + AC_OUTPUT diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 99aa7934ba..7d19b24b5e 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -250,6 +250,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SQUID_RC = squid.rc diff --git a/doc/Makefile.in b/doc/Makefile.in index 744b39370a..ba565902b5 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.70 2007/04/17 00:10:43 hno Exp $ +# $Id: Makefile.in,v 1.71 2007/04/17 00:44:18 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf diff --git a/errors/Makefile.in b/errors/Makefile.in index 54c3bfc279..c5508aecf9 100644 --- a/errors/Makefile.in +++ b/errors/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.86 2007/04/17 00:10:45 hno Exp $ +# $Id: Makefile.in,v 1.87 2007/04/17 00:44:20 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -249,6 +249,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ errordir = $(datadir)/errors diff --git a/helpers/Makefile.in b/helpers/Makefile.in index 6660e19042..402a8ca668 100644 --- a/helpers/Makefile.in +++ b/helpers/Makefile.in @@ -254,6 +254,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = basic_auth ntlm_auth digest_auth negotiate_auth external_acl diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index d25bc08834..4d954bb1fa 100644 --- a/helpers/basic_auth/LDAP/Makefile.in +++ b/helpers/basic_auth/LDAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.76 2007/04/17 00:10:47 hno Exp $ +# $Id: Makefile.in,v 1.77 2007/04/17 00:44:23 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -280,6 +280,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = squid_ldap_auth.8 diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index d665781dff..f6601ffbd7 100644 --- a/helpers/basic_auth/MSNT/Makefile.in +++ b/helpers/basic_auth/MSNT/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.79 2007/04/17 00:10:48 hno Exp $ +# $Id: Makefile.in,v 1.80 2007/04/17 00:44:23 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -289,6 +289,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ msnt_auth_SOURCES = md4.c rfcnb-io.c rfcnb-util.c session.c msntauth.c \ diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 85dbda0810..29127b07f8 100644 --- a/helpers/basic_auth/Makefile.in +++ b/helpers/basic_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.75 2007/04/17 00:10:47 hno Exp $ +# $Id: Makefile.in,v 1.76 2007/04/17 00:44:22 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB YP SASL mswin_sspi POP3 diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index f55ebb4575..cd4abef720 100644 --- a/helpers/basic_auth/NCSA/Makefile.in +++ b/helpers/basic_auth/NCSA/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.76 2007/04/17 00:10:48 hno Exp $ +# $Id: Makefile.in,v 1.77 2007/04/17 00:44:23 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -277,6 +277,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ ncsa_auth_SOURCES = ncsa_auth.c crypt_md5.c crypt_md5.h diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index 28fdbca474..5c544e74a3 100644 --- a/helpers/basic_auth/PAM/Makefile.in +++ b/helpers/basic_auth/PAM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.77 2007/04/17 00:10:49 hno Exp $ +# $Id: Makefile.in,v 1.78 2007/04/17 00:44:24 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -279,6 +279,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir)/include diff --git a/helpers/basic_auth/POP3/Makefile.in b/helpers/basic_auth/POP3/Makefile.in index 54bd123ed6..3b96c351ef 100644 --- a/helpers/basic_auth/POP3/Makefile.in +++ b/helpers/basic_auth/POP3/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.4 2007/04/17 00:10:49 hno Exp $ +# $Id: Makefile.in,v 1.5 2007/04/17 00:44:24 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ libexec_SCRIPTS = \ diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index 20f482ec78..e514b91961 100644 --- a/helpers/basic_auth/SASL/Makefile.in +++ b/helpers/basic_auth/SASL/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.73 2007/04/17 00:10:50 hno Exp $ +# $Id: Makefile.in,v 1.74 2007/04/17 00:44:24 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -276,6 +276,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir)/include diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index e4d7bc44a9..8a7c785b6f 100644 --- a/helpers/basic_auth/SMB/Makefile.in +++ b/helpers/basic_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.75 2007/04/17 00:10:50 hno Exp $ +# $Id: Makefile.in,v 1.76 2007/04/17 00:44:24 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -285,6 +285,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SMB_AUTH_HELPER = smb_auth.sh diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index 2fb8df99f0..0bef9808dd 100644 --- a/helpers/basic_auth/YP/Makefile.in +++ b/helpers/basic_auth/YP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.76 2007/04/17 00:10:50 hno Exp $ +# $Id: Makefile.in,v 1.77 2007/04/17 00:44:25 hno Exp $ # # @@ -275,6 +275,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ yp_auth_SOURCES = yp_auth.c nis_support.h nis_support.c diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index f132e8eff1..5ece61a4e0 100644 --- a/helpers/basic_auth/getpwnam/Makefile.in +++ b/helpers/basic_auth/getpwnam/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.74 2007/04/17 00:10:50 hno Exp $ +# $Id: Makefile.in,v 1.75 2007/04/17 00:44:26 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -277,6 +277,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ getpwname_auth_SOURCES = getpwnam_auth.c diff --git a/helpers/basic_auth/mswin_sspi/Makefile.in b/helpers/basic_auth/mswin_sspi/Makefile.in index fd562524e4..5506eb5097 100755 --- a/helpers/basic_auth/mswin_sspi/Makefile.in +++ b/helpers/basic_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.18 2007/04/17 00:10:50 hno Exp $ +# $Id: Makefile.in,v 1.19 2007/04/17 00:44:26 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -276,6 +276,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ mswin_auth_SOURCES = mswin_auth.c valid.c valid.h diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index f1544a2029..445eb77642 100644 --- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in +++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.72 2007/04/17 00:10:52 hno Exp $ +# $Id: Makefile.in,v 1.73 2007/04/17 00:44:26 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ libexec_SCRIPTS = \ diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index 89f47028c2..471c67d15c 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.72 2007/04/17 00:10:52 hno Exp $ +# $Id: Makefile.in,v 1.73 2007/04/17 00:44:27 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = password ldap diff --git a/helpers/digest_auth/ldap/Makefile.in b/helpers/digest_auth/ldap/Makefile.in index 99de6baafa..68bdb247b3 100644 --- a/helpers/digest_auth/ldap/Makefile.in +++ b/helpers/digest_auth/ldap/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.18 2007/04/17 00:10:52 hno Exp $ +# $Id: Makefile.in,v 1.19 2007/04/17 00:44:27 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -279,6 +279,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ digest_ldap_auth_SOURCES = digest_pw_auth.c \ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index 881dd1c19c..49dfd19950 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.77 2007/04/17 00:10:53 hno Exp $ +# $Id: Makefile.in,v 1.78 2007/04/17 00:44:27 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -278,6 +278,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ digest_pw_auth_SOURCES = digest_pw_auth.c \ diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in index 25ca231041..ff72c8ab67 100644 --- a/helpers/external_acl/Makefile.in +++ b/helpers/external_acl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.63 2007/04/17 00:10:53 hno Exp $ +# $Id: Makefile.in,v 1.64 2007/04/17 00:44:28 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = ip_user ldap_group session unix_group wbinfo_group mswin_lm_group diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in index 50f69cffa4..bbf51ae559 100644 --- a/helpers/external_acl/ip_user/Makefile.in +++ b/helpers/external_acl/ip_user/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.62 2007/04/17 00:10:53 hno Exp $ +# $Id: Makefile.in,v 1.63 2007/04/17 00:44:28 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -276,6 +276,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ ip_user_check_SOURCES = \ diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in index be5fa4150b..c0578738e7 100644 --- a/helpers/external_acl/ldap_group/Makefile.in +++ b/helpers/external_acl/ldap_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.64 2007/04/17 00:10:53 hno Exp $ +# $Id: Makefile.in,v 1.65 2007/04/17 00:44:29 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -281,6 +281,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = squid_ldap_group.8 diff --git a/helpers/external_acl/mswin_lm_group/Makefile.in b/helpers/external_acl/mswin_lm_group/Makefile.in index 360bd5e8e7..f755cf19ab 100755 --- a/helpers/external_acl/mswin_lm_group/Makefile.in +++ b/helpers/external_acl/mswin_lm_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.18 2007/04/17 00:10:54 hno Exp $ +# $Id: Makefile.in,v 1.19 2007/04/17 00:44:29 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -276,6 +276,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ mswin_check_lm_group_SOURCES = win32_check_group.c win32_check_group.h diff --git a/helpers/external_acl/session/Makefile.in b/helpers/external_acl/session/Makefile.in index 95c0a0724c..abac2ecad0 100644 --- a/helpers/external_acl/session/Makefile.in +++ b/helpers/external_acl/session/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.15 2007/04/17 00:10:54 hno Exp $ +# $Id: Makefile.in,v 1.16 2007/04/17 00:44:30 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -279,6 +279,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = squid_session.8 diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in index 469b1568df..7a0728cbda 100644 --- a/helpers/external_acl/unix_group/Makefile.in +++ b/helpers/external_acl/unix_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.62 2007/04/17 00:10:54 hno Exp $ +# $Id: Makefile.in,v 1.63 2007/04/17 00:44:30 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -278,6 +278,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = squid_unix_group.8 diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in index 4dd38491fa..29abbf7fc5 100644 --- a/helpers/external_acl/wbinfo_group/Makefile.in +++ b/helpers/external_acl/wbinfo_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.60 2007/04/17 00:10:55 hno Exp $ +# $Id: Makefile.in,v 1.61 2007/04/17 00:44:31 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ libexec_SCRIPTS = wbinfo_group.pl diff --git a/helpers/negotiate_auth/Makefile.in b/helpers/negotiate_auth/Makefile.in index 92c1fcd85a..1a53cfcaa3 100755 --- a/helpers/negotiate_auth/Makefile.in +++ b/helpers/negotiate_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for negotiate authentication helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.17 2007/04/17 00:10:55 hno Exp $ +# $Id: Makefile.in,v 1.18 2007/04/17 00:44:31 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = mswin_sspi diff --git a/helpers/negotiate_auth/mswin_sspi/Makefile.in b/helpers/negotiate_auth/mswin_sspi/Makefile.in index 9520fe03b0..296c9cfb77 100755 --- a/helpers/negotiate_auth/mswin_sspi/Makefile.in +++ b/helpers/negotiate_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.17 2007/04/17 00:10:55 hno Exp $ +# $Id: Makefile.in,v 1.18 2007/04/17 00:44:31 hno Exp $ # srcdir = @srcdir@ @@ -275,6 +275,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ mswin_negotiate_auth_SOURCES = libnegotiatessp.c negotiate_auth.c negotiate.h diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index 55f33cbb0e..4d7a9356cd 100644 --- a/helpers/ntlm_auth/Makefile.in +++ b/helpers/ntlm_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.74 2007/04/17 00:10:55 hno Exp $ +# $Id: Makefile.in,v 1.75 2007/04/17 00:44:32 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = fakeauth no_check SMB mswin_sspi diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index 2d3e40c4e0..f16f5e5fd2 100644 --- a/helpers/ntlm_auth/SMB/Makefile.in +++ b/helpers/ntlm_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.74 2007/04/17 00:10:56 hno Exp $ +# $Id: Makefile.in,v 1.75 2007/04/17 00:44:32 hno Exp $ # srcdir = @srcdir@ @@ -282,6 +282,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = smbval diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index b4bb0bfa77..c5a565114c 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -270,6 +270,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index c66e30e071..4014ac2f19 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.in +++ b/helpers/ntlm_auth/fakeauth/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.71 2007/04/17 00:10:57 hno Exp $ +# $Id: Makefile.in,v 1.72 2007/04/17 00:44:33 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -277,6 +277,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ fakeauth_auth_SOURCES = fakeauth_auth.c ntlm.h diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.in b/helpers/ntlm_auth/mswin_sspi/Makefile.in index cb51759b14..1b54c681e0 100755 --- a/helpers/ntlm_auth/mswin_sspi/Makefile.in +++ b/helpers/ntlm_auth/mswin_sspi/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.17 2007/04/17 00:10:57 hno Exp $ +# $Id: Makefile.in,v 1.18 2007/04/17 00:44:33 hno Exp $ # srcdir = @srcdir@ @@ -274,6 +274,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ mswin_ntlm_auth_SOURCES = libntlmssp.c ntlm_auth.c ntlm.h diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index 7390fa23d7..772d226b96 100644 --- a/helpers/ntlm_auth/no_check/Makefile.in +++ b/helpers/ntlm_auth/no_check/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.73 2007/04/17 00:10:58 hno Exp $ +# $Id: Makefile.in,v 1.74 2007/04/17 00:44:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ libexec_SCRIPTS = no_check.pl diff --git a/icons/Makefile.in b/icons/Makefile.in index dbf70a054f..3a40b04afb 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.87 2007/04/17 00:10:58 hno Exp $ +# $Id: Makefile.in,v 1.88 2007/04/17 00:44:34 hno Exp $ # srcdir = @srcdir@ @@ -258,6 +258,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ ICON1 = anthony-binhex.gif diff --git a/lib/Makefile.in b/lib/Makefile.in index 6694713c4d..4bdba85c91 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.129 2007/04/17 00:10:58 hno Exp $ +# $Id: Makefile.in,v 1.130 2007/04/17 00:44:34 hno Exp $ # srcdir = @srcdir@ @@ -334,6 +334,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DIST_SUBDIRS = libTrie diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 604bf7cea6..27bdc932d4 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -255,6 +255,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ bin_SCRIPTS = RunCache RunAccel diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index 86d9ddd86f..b12b487b80 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -268,6 +268,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AM_CFLAGS = @SQUID_CFLAGS@ diff --git a/src/Makefile.in b/src/Makefile.in index bd9bbda4b3..59cf2d739e 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.417 2007/04/17 00:10:59 hno Exp $ +# $Id: Makefile.in,v 1.418 2007/04/17 00:44:35 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -1671,6 +1671,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = subdir-objects diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index b8db65d379..f11a2de03a 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -289,12 +289,13 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.75 2007/04/17 00:10:59 hno Exp $ +# $Id: Makefile.in,v 1.76 2007/04/17 00:44:36 hno Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 6c6b78c9c9..afb2275b56 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.80 2007/04/17 00:11:00 hno Exp $ +# $Id: Makefile.in,v 1.81 2007/04/17 00:44:36 hno Exp $ # srcdir = @srcdir@ @@ -291,6 +291,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = subdir-objects diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index e4cf34c5cc..ad91b125a6 100644 --- a/src/repl/Makefile.in +++ b/src/repl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.74 2007/04/17 00:11:00 hno Exp $ +# $Id: Makefile.in,v 1.75 2007/04/17 00:44:37 hno Exp $ # srcdir = @srcdir@ @@ -284,6 +284,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = subdir-objects diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index ba13f9ac9d..c8db6da983 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.71 2007/04/17 00:11:02 hno Exp $ +# $Id: Makefile.in,v 1.72 2007/04/17 00:44:37 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -355,6 +355,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = subdir-objects diff --git a/tools/Makefile.in b/tools/Makefile.in index 05561034ba..14c00619ef 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.10 2007/04/17 00:11:02 hno Exp $ +# $Id: Makefile.in,v 1.11 2007/04/17 00:44:37 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -290,6 +290,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = subdir-objects