--------------------- PatchSet 318 Date: 2000/05/22 11:15:06 Author: hno Branch: hno-2_3 Tag: (none) Log: Syncronized with Squid-2.3 from cvs.squid-cache.org Members: ChangeLog:1.1.1.3.4.1->1.1.1.3.4.1.4.1 configure:1.1.1.3.4.1.4.2->1.1.1.3.4.1.4.3(DEAD) configure.in:1.1.1.3.4.1.4.2->1.1.1.3.4.1.4.3 auth_modules/MSNT/Makefile:1.1.1.1.4.1->1.1.1.1.4.1.4.1 auth_modules/MSNT/README:1.1.1.1.4.1->1.1.1.1.4.1.4.1 auth_modules/MSNT/msntauth-v1.0.lsm:1.1.1.1.4.1->1.1.1.1.4.1.4.1 auth_modules/MSNT/smbauth.c:1.1.1.1.4.1->1.1.1.1.4.1.4.1 errors/Estonian/ERR_ACCESS_DENIED:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_CACHE_ACCESS_DENIED:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_CANNOT_FORWARD:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_CONNECT_FAIL:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_DNS_FAIL:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FORWARDING_DENIED:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_DISABLED:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_FAILURE:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_FORBIDDEN:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_NOT_FOUND:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_PUT_ERROR:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_FTP_UNAVAILABLE:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_INVALID_REQ:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_INVALID_URL:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_LIFETIME_EXP:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_NO_RELAY:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_ONLY_IF_CACHED_MISS:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_READ_ERROR:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_READ_TIMEOUT:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_SHUTTING_DOWN:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_SOCKET_FAILURE:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_TOO_BIG:1.1.1.1->1.1.1.1.16.1 errors/Estonian/ERR_UNSUP_REQ:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_URN_RESOLVE:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_WRITE_ERROR:1.1.1.1->1.1.1.1.20.1 errors/Estonian/ERR_ZERO_SIZE_OBJECT:1.1.1.2->1.1.1.2.20.1 errors/Simplify_Chinese/ERR_ACCESS_DENIED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_CANNOT_FORWARD:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_CONNECT_FAIL:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_DNS_FAIL:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FORWARDING_DENIED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_DISABLED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_FAILURE:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_FORBIDDEN:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_NOT_FOUND:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_PUT_CREATED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_PUT_ERROR:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_INVALID_REQ:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_INVALID_URL:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_LIFETIME_EXP:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_NO_RELAY:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_READ_ERROR:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_READ_TIMEOUT:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_SHUTTING_DOWN:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_SOCKET_FAILURE:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_TOO_BIG:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_UNSUP_REQ:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_URN_RESOLVE:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_WRITE_ERROR:1.1->1.1.10.1 errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT:1.1->1.1.10.1 errors/Simplify_Chinese/README:1.1->1.1.10.1 errors/Simplify_Chinese/generic:1.1->1.1.10.1 include/autoconf.h.in:1.1.1.3.4.1.4.1->1.1.1.3.4.1.4.2(DEAD) include/version.h:1.1.1.3.4.2.4.1->1.1.1.3.4.2.4.2 src/asn.c:1.1.1.3.4.1->1.1.1.3.4.1.4.1 src/cache_cf.c:1.1.1.3.4.2.4.1->1.1.1.3.4.2.4.2 src/carp.c:1.1.1.1.4.1->1.1.1.1.4.1.4.1 src/client_side.c:1.1.1.3.4.2.4.1->1.1.1.3.4.2.4.2 src/comm_select.c:1.1.1.3.4.1->1.1.1.3.4.1.4.1 src/delay_pools.c:1.1.1.3.4.1.4.1->1.1.1.3.4.1.4.2 src/icmp.c:1.1.1.2.4.1->1.1.1.2.4.1.4.1 src/store.c:1.1.1.3.4.1.4.1->1.1.1.3.4.1.4.2 src/store_dir.c:1.1.1.3.4.1->1.1.1.3.4.1.4.1 src/store_io_asyncufs.c:1.1.1.1.4.2->1.1.1.1.4.2.4.1 src/url.c:1.1.1.3.4.1.4.1->1.1.1.3.4.1.4.2 src/whois.c:1.1.1.2.4.1->1.1.1.2.4.1.4.1 Index: squid/ChangeLog =================================================================== RCS file: /cvsroot/squid-sf//squid/ChangeLog,v retrieving revision 1.1.1.3.4.1 retrieving revision 1.1.1.3.4.1.4.1 diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.4.1 --- squid/ChangeLog 17 Apr 2000 00:56:51 -0000 1.1.1.3.4.1 +++ squid/ChangeLog 22 May 2000 11:15:06 -0000 1.1.1.3.4.1.4.1 @@ -1,3 +1,52 @@ +Changes to Squid-2.3.STABLE3 (May 15, 2000): + + - Fixed malloc linking problems on Solaris. The configure + script incorrectly set options for dlmalloc. + - Added a configure check to remove compiler optimization + for GCC 2.95.x. + - Updated MSNT authenticator module. + - Updated Estonian error pages. + - Updated Japanese error pages. + - Fixed expires bug in httpReplyHdrCacheInit. It was + incorrectly setting expires based on max-age. It was using + the current time as a basis, instead of the response date. + - Fixed "USE_DNSSERVER" typos. + - Added a workaround for getpwnam() problems on Solaris. + getpwnam() could fail if there are fewer than 256 FDs + available. This causes root to own some disk files. + - Added an 'offline_toggle' option via the cache manager. + - Added a 'minimum_object_size' option. Files smaller than + this size are not stored. + - Added 'passive_ftp' option to disable passive FTP transfers. + - Added 'wccp_version' option because some Cisco IOS versions + require WCCP version 3. + - The 'client' program in ping mode (-g) now prints transfer + throughput. + - Fixed logging of proxy auth username for redirected + requests. + - Fixed bogus Age values for IMS requests. + - Fixed persistent connection timeout for client-side + connections. It was hard-coded to 15 seconds, now uses + the 'pconn_timeout' value. + - Fixed up httpAcceptDefer. It wasn't being used properly + and caused high CPU usage when Squid gets close to the FD + limit. + - Numerous delay_pools fixes and checks. + - Fixed SNMP coredumps from running snmpwalk. + - Added a check for errno == EPIPE in icmp.c when pinger uses + a Unix socket instead of a UDP socket. + - Fixed ACL checklist memory initialization bugs. + - Cleaned up the MIB file. Replaced contact information and + checked description fields. + - Removed LRU reference_age hard-coded upper limit. + - Fixed async I/O FD leak. + - Made getMyHostname() more robust. + - Fixed domain list matching bug. "x-foo.com" wasn't properly + compared to ".foo.com" and confused splay tree ordering. + - Added a check for whitespace in hostnames and optionally + strip whitespace if 'uri_whitespace' setting allows. + - Added status code and checking to ASN/whois queries. + Changes to Squid-2.3.STABLE2 (Mar 2, 2000): - Changed Copyright text. --- squid/configure Wed Feb 14 00:44:20 2007 +++ /dev/null Wed Feb 14 00:44:00 2007 @@ -1,5616 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_default_prefix=/usr/local/squid -ac_help="$ac_help - --enable-dlmalloc[=LIB] Compile & use the malloc package by Doug Lea" -ac_help="$ac_help - --enable-gnuregex Compile GNUregex" -ac_help="$ac_help - --enable-xmalloc-debug Do some simple malloc debugging" -ac_help="$ac_help - --enable-xmalloc-debug-trace - Detailed trace of memory allocations" -ac_help="$ac_help - --enable-xmalloc-statistics - Show malloc statistics in status page" -ac_help="$ac_help - --enable-carp Enable CARP support" -ac_help="$ac_help - --enable-async-io[=N_THREADS] - Do ASYNC disk I/O using threads. - N_THREADS is the number of worker threads - defaults to 16. See also src/squid.h for - some additional platform tuning" -ac_help="$ac_help - --enable-icmp Enable ICMP pinging" -ac_help="$ac_help - --enable-delay-pools Enable delay pools to limit bandwith usage" -ac_help="$ac_help - --enable-mem-gen-trace Do trace of memory stuff" -ac_help="$ac_help - --enable-useragent-log Enable logging of User-Agent header" -ac_help="$ac_help - --disable-wccp Disable Web Cache Coordination Protocol" -ac_help="$ac_help - --enable-kill-parent-hack - Kill parent on shutdown" -ac_help="$ac_help - --enable-snmp Enable SNMP monitoring" -ac_help="$ac_help - --enable-time-hack Update internal timestamp only once per second" -ac_help="$ac_help - --enable-cachemgr-hostname[=hostname] - Make cachemgr.cgi default to this host" -ac_help="$ac_help - --enable-arp-acl Enable use of ARP ACL lists (ether address)" -ac_help="$ac_help - --enable-htcp Enable HTCP protocol" -ac_help="$ac_help - --enable-forw-via-db Enable Forw/Via database" -ac_help="$ac_help - --enable-cache-digests Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html" -ac_help="$ac_help - --enable-err-language=lang - Select language for Error pages (see errors dir) " -ac_help="$ac_help - --enable-poll Enable poll() instead of select(). Normally poll - is preferred over select, but configure knows poll - is broken on some platforms. If you think you are - smarter than the configure script, you may enable - poll with this option. - --disable-poll Disable the use of poll()." -ac_help="$ac_help - --disable-http-violations - This allows you to remove code which is known to - violate the HTTP protocol specification." -ac_help="$ac_help - --enable-ipf-transparent - Enable Transparent Proxy support for systems - using IP-Filter network address redirection." -ac_help="$ac_help - --enable-leakfinder - Enable Leak Finding code. Enabling this alone - does nothing; you also have to modify the source - code to use the leak finding functions. Probably - Useful for hackers only." -ac_help="$ac_help - --disable-ident-lookups - This allows you to remove code that performs - Ident (RFC 931) lookups." -ac_help="$ac_help - --disable-internal-dns This prevents Squid from directly sending and - receiving DNS messages, and instead enables the - old external 'dnsserver' processes." -ac_help="$ac_help - --enable-truncate This uses truncate() instead of unlink() when - removing cache files. Truncate gives a little - performance improvement, but may cause problems - when used with async I/O. Truncate uses more - filesystem inodes than unlink.." -ac_help="$ac_help - --enable-underscores Squid by default rejects any host names with _ - in their name to conform with internet standars. - If you disagree with this you may allow _ in - hostnames by using this switch, provided that - the resolver library on the host where Squid runs - does not reject _ in hostnames..." -ac_help="$ac_help - --enable-heap-replacement - This option allows you to use various cache - replacement algorithms, instead of the standard - LRU algorithm. - " - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -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=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=src/main.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -# From configure.in Revision: 1.1.1.3.4.1.4.1 -ac_aux_dir= -for ac_dir in cfgaux $srcdir/cfgaux; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in cfgaux $srcdir/cfgaux" 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:655: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - - -CRYPTLIB='' -REGEXLIB='' # -lregex -LIBREGEX='' # libregex.a - -if test "$libexecdir" = '${exec_prefix}/libexec'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - -case "$host_os" in -cygwin32|os2) - exec_suffix=".exe" - cgi_suffix=".exe" - ;; -*) - exec_suffix="" - cgi_suffix=".cgi" - ;; -esac - - - -if test -z "$CACHE_HTTP_PORT"; then - CACHE_HTTP_PORT="3128" -fi -if test -z "$CACHE_ICP_PORT"; then - CACHE_ICP_PORT="3130" -fi - - - - -cat >> confdefs.h <&6 -echo "configure:723: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:753: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:804: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:836: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 847 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:883: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:911: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - - -case "$host" in - mab-next-nextstep3) - CC="$CC -arch m68k -arch i486 -arch hppa -arch sparc" - ;; -esac - -if test -z "$PRESET_CFLAGS"; then - if test "$GCC" = "yes"; then - case "$host" in - *-sun-sunos*) - # sunos has too many warnings for this to be useful - # motorola too - ;; - *m88k*) - # Motorola cc/ld does not like -02 but is ok on -O - CFLAGS=`echo $CFLAGS | sed -e 's/-O0-9/-O/'` - ;; - *) - CFLAGS="$CFLAGS -Wall" - ;; - esac - else - case "$host" in - *mips-sgi-irix6.*) - # suggested by Rafael Seidl - CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \ - -woff 1009,1014,1048,1110,1116,1185,1188,1204,1230,1233 \ - -Wl,-woff,85,-woff,84,-woff,134 \ - -nostdinc -I/usr/include -D_BSD_SIGNALS" - ;; - alpha-dec-osf4.*) - # Mogul says DEC compilers take both -g and -O2 - CFLAGS=`echo $CFLAGS | sed -e 's/-g/-g3/'` - CFLAGS="$CFLAGS -O2" - ;; - *) - ;; - esac - fi -fi - -if test -z "$PRESET_LDFLAGS"; then - if test "$GCC" = "yes"; then - case "$host" in - *) - # nothing - ;; - esac - else - case "$host" in - *mips-sgi-irix6.*) - # suggested by Rafael Seidl - LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32" - ;; - esac - fi -fi - -# Check whether --enable-dlmalloc or --disable-dlmalloc was given. -if test "${enable_dlmalloc+set}" = set; then - enableval="$enable_dlmalloc" - - case "$enableval" in - 'yes') - use_dlmalloc="yes" - LIBDLMALLOC="libdlmalloc.a" - LIB_MALLOC="-L../lib -ldlmalloc" - echo "dlmalloc enabled" - ;; - 'no') - use_dlmalloc="no" - echo "dlmalloc disabled" - ;; - *) use_dlmalloc="yes" - LIB_MALLOC="$enableval" - echo "dlmalloc enabled with $LIB_MALLOC" - esac - -fi - -if test "${use_dlmalloc-unset}" = unset; then - case "$host" in - i386-*-solaris2.*) - echo "Enabling dlmalloc for $host" - use_dlmalloc="yes" - LIBDLMALLOC="libdlmalloc.a" - LIB_MALLOC="-L../lib -ldlmalloc" - ;; - esac -fi -if test "x$ac_cv_enabled_dlmalloc" = "xyes"; then - # Ok. dlmalloc was enabled before, but state may be changed. - # we have to test these again - unset ac_cv_func_mallinfo - unset ac_cv_func_mallocblksize - unset ac_cv_func_free - unset ac_cv_func_realloc - unset ac_cv_func_memalign - unset ac_cv_func_valloc - unset ac_cv_func_pvalloc - unset ac_cv_func_calloc - unset ac_cv_func_cfree - unset ac_cv_func_malloc_trim - unset ac_cv_func_malloc_usable_size - unset ac_cv_func_malloc_stats - unset ac_cv_func_mallinfo - unset ac_cv_func_mallopt - unset ac_cv_lib_gnumalloc - unset ac_cv_header_gnumalloc_h - unset ac_cv_lib_malloc - unset ac_cv_enabled_dlmalloc -fi -if test "$use_dlmalloc" = yes; then - ac_cv_func_mallinfo="yes" - ac_cv_func_mallocblksize="no" - ac_cv_func_free="yes" - ac_cv_func_realloc="yes" - ac_cv_func_memalign="yes" - ac_cv_func_valloc="yes" - ac_cv_func_pvalloc="yes" - ac_cv_func_calloc="yes" - ac_cv_func_cfree="yes" - ac_cv_func_malloc_trim="yes" - ac_cv_func_malloc_usable_size="yes" - ac_cv_func_malloc_stats="yes" - ac_cv_func_mallopt="yes" - ac_cv_lib_gnumalloc="no" - ac_cv_header_gnumalloc_h="no" - ac_cv_lib_malloc="no" - ac_cv_enabled_dlmalloc="yes" -fi - - - - -# Check whether --enable-gnuregex or --disable-gnuregex was given. -if test "${enable_gnuregex+set}" = set; then - enableval="$enable_gnuregex" - USE_GNUREGEX=$enableval -fi - - -# Check whether --enable-xmalloc_debug or --disable-xmalloc_debug was given. -if test "${enable_xmalloc_debug+set}" = set; then - enableval="$enable_xmalloc_debug" - if test "$enableval" = "yes" ; then - echo "Malloc debugging enabled" - cat >> confdefs.h <<\EOF -#define XMALLOC_DEBUG 1 -EOF - - fi - -fi - - -# Check whether --enable-xmalloc_debug_trace or --disable-xmalloc_debug_trace was given. -if test "${enable_xmalloc_debug_trace+set}" = set; then - enableval="$enable_xmalloc_debug_trace" - if test "$enableval" = "yes" ; then - echo "Malloc debug trace enabled" - cat >> confdefs.h <<\EOF -#define XMALLOC_TRACE 1 -EOF - - cat >> confdefs.h <<\EOF -#define XMALLOC_DEBUG 1 -EOF - - fi - -fi - - -# Check whether --enable-xmalloc_statistics or --disable-xmalloc_statistics was given. -if test "${enable_xmalloc_statistics+set}" = set; then - enableval="$enable_xmalloc_statistics" - if test "$enableval" = "yes" ; then - echo "Malloc statistics enabled" - cat >> confdefs.h <<\EOF -#define XMALLOC_STATISTICS 1 -EOF - - fi - -fi - - -# Check whether --enable-carp or --disable-carp was given. -if test "${enable_carp+set}" = set; then - enableval="$enable_carp" - if test "$enableval" = "yes" ; then - echo "CARP support enabled" - cat >> confdefs.h <<\EOF -#define USE_CARP 1 -EOF - - fi - -fi - - -# Check whether --enable-async_io or --disable-async_io was given. -if test "${enable_async_io+set}" = set; then - enableval="$enable_async_io" - case "$enableval" in - yes) - async_io=yes - ;; - no) - async_io='' - ;; - *) - async_io=yes - cat >> confdefs.h <> confdefs.h <<\EOF -#define USE_ASYNC_IO 1 -EOF - - ASYNC_OBJS='$(ASYNC_OBJS)' - SQUID_PTHREAD_LIB='$(PTHREADLIB)' - CFLAGS="$CFLAGS -D_REENTRANT" - case "$host" in - i386-unknown-freebsd*) - if test "$GCC" = "yes" ; then - if test -z "$PRESET_LDFLAGS"; then - LDFLAGS="$LDFLAGS -pthread" - fi - fi - ;; - esac -fi - - - -# Check whether --enable-icmp or --disable-icmp was given. -if test "${enable_icmp+set}" = set; then - enableval="$enable_icmp" - if test "$enableval" = "yes" ; then - echo "ICMP enabled" - cat >> confdefs.h <<\EOF -#define USE_ICMP 1 -EOF - - fi - -fi - - -# Check whether --enable-delay_pools or --disable-delay_pools was given. -if test "${enable_delay_pools+set}" = set; then - enableval="$enable_delay_pools" - if test "$enableval" = "yes" ; then - echo "Delay pools enabled" - DELAY_OBJS='$(DELAY_OBJS)' - cat >> confdefs.h <<\EOF -#define DELAY_POOLS 1 -EOF - - fi - -fi - - - -# Check whether --enable-mem-gen-trace or --disable-mem-gen-trace was given. -if test "${enable_mem_gen_trace+set}" = set; then - enableval="$enable_mem_gen_trace" - if test "$enableval" = "yes" ; then - echo "Memory trace (to file) enabled" - cat >> confdefs.h <<\EOF -#define MEM_GEN_TRACE 1 -EOF - - fi - -fi - - -# Check whether --enable-useragent_log or --disable-useragent_log was given. -if test "${enable_useragent_log+set}" = set; then - enableval="$enable_useragent_log" - if test "$enableval" = "yes" ; then - echo "User-Agent logging enabled" - cat >> confdefs.h <<\EOF -#define USE_USERAGENT_LOG 1 -EOF - - fi - -fi - - -# Check whether --enable-wccp or --disable-wccp was given. -if test "${enable_wccp+set}" = set; then - enableval="$enable_wccp" - if test "$enableval" = "no" ; then - echo "Web Cache Coordination Protocol disabled" - cat >> confdefs.h <<\EOF -#define USE_WCCP 0 -EOF - - else - cat >> confdefs.h <<\EOF -#define USE_WCCP 1 -EOF - - fi - -fi - - -# Check whether --enable-kill_parent_hack or --disable-kill_parent_hack was given. -if test "${enable_kill_parent_hack+set}" = set; then - enableval="$enable_kill_parent_hack" - if test "$enableval" = "yes" ; then - echo "Kill parent on shutdown" - cat >> confdefs.h <<\EOF -#define KILL_PARENT_OPT 1 -EOF - - fi - -fi - - -# Check whether --enable-snmp or --disable-snmp was given. -if test "${enable_snmp+set}" = set; then - enableval="$enable_snmp" - if test "$enableval" = "yes" ; then - echo "SNMP monitoring enabled" - cat >> confdefs.h <<\EOF -#define SQUID_SNMP 1 -EOF - - SNMPLIB='-L../snmplib -lsnmp' - SNMP_OBJS='$(SNMP_OBJS)' - SNMP_MAKEFILE=./snmplib/Makefile - makesnmplib=snmplib - fi - -fi - - - - - -# Check whether --enable-time_hack or --disable-time_hack was given. -if test "${enable_time_hack+set}" = set; then - enableval="$enable_time_hack" - if test "$enableval" = "yes" ; then - echo "Update internal timestamp only once per second" - cat >> confdefs.h <<\EOF -#define ALARM_UPDATES_TIME 1 -EOF - - fi - -fi - - -# Check whether --enable-cachemgr_hostname or --disable-cachemgr_hostname was given. -if test "${enable_cachemgr_hostname+set}" = set; then - enableval="$enable_cachemgr_hostname" - case $enableval in - yes) - cat >> confdefs.h <<\EOF -#define CACHEMGR_HOSTNAME getfullhostname() -EOF - - echo "Cachemgr default hostname == host where cachemgr runs" - ;; - no) - : # Nothing to do.. - ;; - *) - cat >> confdefs.h <> confdefs.h <<\EOF -#define USE_ARP_ACL 1 -EOF - - fi - -fi - - -# Check whether --enable-htcp or --disable-htcp was given. -if test "${enable_htcp+set}" = set; then - enableval="$enable_htcp" - if test "$enableval" = "yes" ; then - echo "HTCP enabled" - HTCP_OBJS='$(HTCP_OBJS)' - cat >> confdefs.h <<\EOF -#define USE_HTCP 1 -EOF - - fi - -fi - - - -# Check whether --enable-forw-via-db or --disable-forw-via-db was given. -if test "${enable_forw_via_db+set}" = set; then - enableval="$enable_forw_via_db" - if test "$enableval" = "yes" ; then - echo "FORW-VIA enabled" - cat >> confdefs.h <<\EOF -#define FORW_VIA_DB 1 -EOF - - fi - -fi - - -# Check whether --enable-cache-digests or --disable-cache-digests was given. -if test "${enable_cache_digests+set}" = set; then - enableval="$enable_cache_digests" - if test "$enableval" = "yes" ; then - echo "USE_CACHE_DIGESTS enabled" - cat >> confdefs.h <<\EOF -#define USE_CACHE_DIGESTS 1 -EOF - - fi - -fi - - -# Check whether --enable-err-language or --disable-err-language was given. -if test "${enable_err_language+set}" = set; then - enableval="$enable_err_language" - - if test -d errors/$enableval; then - ERR_LANGUAGE=$enableval - else - echo "ERROR! Unknown language $enableval, see errors/" - exit 1 - fi - -else - ERR_LANGUAGE="English" -fi - - - -# Check whether --enable-poll or --disable-poll was given. -if test "${enable_poll+set}" = set; then - enableval="$enable_poll" - - case "$enableval" in - yes) - echo "Forcing poll() to be enabled" - ac_cv_func_poll='yes' - ;; - no) - echo "Forcing poll() to be disabled" - ac_cv_func_poll='no' - ;; - esac - -fi - - -# Check whether --enable-http-violations or --disable-http-violations was given. -if test "${enable_http_violations+set}" = set; then - enableval="$enable_http_violations" - if test "$enableval" = "no" ; then - echo "Disabling HTTP Violations" - cat >> confdefs.h <<\EOF -#define HTTP_VIOLATIONS 0 -EOF - - else - cat >> confdefs.h <<\EOF -#define HTTP_VIOLATIONS 1 -EOF - - fi - -fi - - -# Check whether --enable-ipf-transparent or --disable-ipf-transparent was given. -if test "${enable_ipf_transparent+set}" = set; then - enableval="$enable_ipf_transparent" - if test "$enableval" = "yes" ; then - echo "IP-Filter Transparent Proxy enabled" - cat >> confdefs.h <<\EOF -#define IPF_TRANSPARENT 1 -EOF - - IPF_TRANSPARENT="yes" - fi - -fi - - -# Check whether --enable-leakfinder or --disable-leakfinder was given. -if test "${enable_leakfinder+set}" = set; then - enableval="$enable_leakfinder" - if test "$enableval" = "yes" ; then - echo "Leak-Finding enabled" - cat >> confdefs.h <<\EOF -#define USE_LEAKFINDER 1 -EOF - - LEAKFINDER_OBJS='$(LEAKFINDER_OBJS)' - USE_LEAKFINDER="yes" - fi - -fi - - - -# Check whether --enable-ident-lookups or --disable-ident-lookups was given. -if test "${enable_ident_lookups+set}" = set; then - enableval="$enable_ident_lookups" - if test "$enableval" = "no" ; then - echo "Disabling Ident Lookups" - cat >> confdefs.h <<\EOF -#define USE_IDENT 0 -EOF - - else - cat >> confdefs.h <<\EOF -#define USE_IDENT 1 -EOF - - fi - -fi - - -# Check whether --enable-internal-dns or --disable-internal-dns was given. -if test "${enable_internal_dns+set}" = set; then - enableval="$enable_internal_dns" - if test "$enableval" = "no" ; then - echo "Disabling Internal DNS queries" - cat >> confdefs.h <<\EOF -#define USE_DNSSERVERS 1 -EOF - - else - cat >> confdefs.h <<\EOF -#define USE_DNSSERVERS 0 -EOF - - fi - -fi - - -# Check whether --enable-truncate or --disable-truncate was given. -if test "${enable_truncate+set}" = set; then - enableval="$enable_truncate" - if test "$enableval" = "yes" ; then - echo "Enabling truncate instead of unlink" - cat >> confdefs.h <<\EOF -#define USE_TRUNCATE 1 -EOF - - fi - -fi - - -# Check whether --enable-underscores or --disable-underscores was given. -if test "${enable_underscores+set}" = set; then - enableval="$enable_underscores" - if test "$enableval" = "yes" ; then - echo "Enabling the use of underscores in host names" - cat >> confdefs.h <<\EOF -#define ALLOW_HOSTNAME_UNDERSCORES 1 -EOF - - fi - -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 "Enabling HEAP_REPLACEMENT" - cat >> confdefs.h <<\EOF -#define HEAP_REPLACEMENT 1 -EOF - - fi - -fi - - -# Force some compilers to use ANSI features -# -case "$host" in - alpha-dec-osf*) - if test "$ac_cv_prog_CC" = "cc" ; then - echo "adding '-std1' to cc args for $host" - CC="cc -std1"; - ac_cv_prog_CC="$CC" - fi - ;; - *-hp-hpux*) - if test "$ac_cv_prog_CC" = "cc" ; then - echo "adding '-Ae' to cc args for $host" - CC="cc -Ae"; - ac_cv_prog_CC="$CC" - fi - ;; -esac - -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1595: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1686: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1741: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1769: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "sh", so it can be a program name with args. -set dummy sh; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1792: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_SH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$SH" in - /*) - ac_cv_path_SH="$SH" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_SH="$SH" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_SH="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_SH" && ac_cv_path_SH="/bin/sh" - ;; -esac -fi -SH="$ac_cv_path_SH" -if test -n "$SH"; then - echo "$ac_t""$SH" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "false", so it can be a program name with args. -set dummy false; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1828: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_FALSE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$FALSE" in - /*) - ac_cv_path_FALSE="$FALSE" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_FALSE="$FALSE" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_FALSE="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_FALSE" && ac_cv_path_FALSE="/usr/bin/false" - ;; -esac -fi -FALSE="$ac_cv_path_FALSE" -if test -n "$FALSE"; then - echo "$ac_t""$FALSE" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "true", so it can be a program name with args. -set dummy true; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1864: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_TRUE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$TRUE" in - /*) - ac_cv_path_TRUE="$TRUE" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_TRUE="$TRUE" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_TRUE="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_TRUE" && ac_cv_path_TRUE="/usr/bin/true" - ;; -esac -fi -TRUE="$ac_cv_path_TRUE" -if test -n "$TRUE"; then - echo "$ac_t""$TRUE" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1900: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$RM" in - /*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_RM="$RM" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_RM="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_RM" && ac_cv_path_RM="$FALSE" - ;; -esac -fi -RM="$ac_cv_path_RM" -if test -n "$RM"; then - echo "$ac_t""$RM" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "mv", so it can be a program name with args. -set dummy mv; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1936: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$MV" in - /*) - ac_cv_path_MV="$MV" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_MV="$MV" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_MV="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MV" && ac_cv_path_MV="$FALSE" - ;; -esac -fi -MV="$ac_cv_path_MV" -if test -n "$MV"; then - echo "$ac_t""$MV" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "mkdir", so it can be a program name with args. -set dummy mkdir; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1972: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$MKDIR" in - /*) - ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_MKDIR="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MKDIR" && ac_cv_path_MKDIR="$FALSE" - ;; -esac -fi -MKDIR="$ac_cv_path_MKDIR" -if test -n "$MKDIR"; then - echo "$ac_t""$MKDIR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "ln", so it can be a program name with args. -set dummy ln; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2008: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$LN" in - /*) - ac_cv_path_LN="$LN" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_LN="$LN" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LN="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_LN" && ac_cv_path_LN="cp" - ;; -esac -fi -LN="$ac_cv_path_LN" -if test -n "$LN"; then - echo "$ac_t""$LN" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2044: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$PERL" in - /*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PERL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/local/bin/perl" - ;; -esac -fi -PERL="$ac_cv_path_PERL" -if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "makedepend", so it can be a program name with args. -set dummy makedepend; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2080: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MAKEDEPEND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$MAKEDEPEND" in - /*) - ac_cv_path_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_MAKEDEPEND="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MAKEDEPEND" && ac_cv_path_MAKEDEPEND="$TRUE" - ;; -esac -fi -MAKEDEPEND="$ac_cv_path_MAKEDEPEND" -if test -n "$MAKEDEPEND"; then - echo "$ac_t""$MAKEDEPEND" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2116: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$AR" in - /*) - ac_cv_path_AR="$AR" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_AR="$AR" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AR="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_AR" && ac_cv_path_AR="$FALSE" - ;; -esac -fi -AR="$ac_cv_path_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -case "$host" in - *-hp-hpux*) - echo "Disabling 'ranlib' for HP-UX..." - RANLIB=":" - ;; -esac - -AR_R="$AR r" -case "$host" in - *-next-nextstep3) - AR="libtool -o" - ;; -esac - - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2170: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include <$ac_hdr> -int main() { -DIR *dirp = 0; -; return 0; } -EOF -if { (eval echo configure:2183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then -echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2208: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldir $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -ldir" -else - echo "$ac_t""no" 1>&6 -fi - -else -echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2249: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lx $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lx" -else - echo "$ac_t""no" 1>&6 -fi - -fi - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2291: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#include -#include -#include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then - : -else - cat > conftest.$ac_ext < -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - -EOF -if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no -fi -rm -fr conftest* -fi - -fi -fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - - -for ac_hdr in \ - arpa/inet.h \ - arpa/nameser.h \ - assert.h \ - bstring.h \ - config.h \ - crypt.h \ - ctype.h \ - errno.h \ - fcntl.h \ - getopt.h \ - gnumalloc.h \ - grp.h \ - ip_compat.h \ - ip_fil.h \ - ip_nat.h \ - libc.h \ - limits.h \ - malloc.h \ - math.h \ - memory.h \ - mount.h \ - net/if.h \ - netdb.h \ - netinet/if_ether.h \ - netinet/in.h \ - netinet/tcp.h \ - netinet/ip_compat.h \ - netinet/ip_fil.h \ - netinet/ip_nat.h \ - poll.h \ - pwd.h \ - regex.h \ - resolv.h \ - sched.h \ - signal.h \ - stdarg.h \ - stddef.h \ - stdio.h \ - stdlib.h \ - string.h \ - strings.h \ - sys/file.h \ - sys/ioctl.h \ - sys/mount.h \ - sys/param.h \ - sys/resource.h \ - sys/select.h\ - sys/socket.h \ - sys/stat.h \ - sys/statvfs.h \ - sys/syscall.h \ - sys/time.h \ - sys/types.h \ - sys/un.h \ - sys/vfs.h \ - sys/wait.h \ - syslog.h \ - time.h \ - unistd.h \ - varargs.h \ - -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2460: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2498: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <j = 5; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} - -; return 0; } -EOF -if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 -if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF - -fi - -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2573: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_cv_c_bigendian=unknown -# See if sys/param.h defines the BYTE_ORDER macro. -cat > conftest.$ac_ext < -#include -int main() { - -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros -#endif -; return 0; } -EOF -if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. -cat > conftest.$ac_ext < -#include -int main() { - -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif -; return 0; } -EOF -if { (eval echo configure:2606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_bigendian=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_bigendian=no -fi -rm -f conftest* -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -if test $ac_cv_c_bigendian = unknown; then -if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_c_bigendian=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_bigendian=yes -fi -rm -fr conftest* -fi - -fi -fi - -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -if test $ac_cv_c_bigendian = yes; then - cat >> confdefs.h <<\EOF -#define WORDS_BIGENDIAN 1 -EOF - -fi - - -echo $ac_n "checking if ANSI prototypes work""... $ac_c" 1>&6 -echo "configure:2664: checking if ANSI prototypes work" >&5 -if eval "test \"`echo '$''{'ac_cv_have_ansi_prototypes'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_ansi_prototypes="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_ansi_prototypes="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_ansi_prototypes" 1>&6 -if test $ac_cv_have_ansi_prototypes = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_ANSI_PROTOTYPES 1 -EOF - -fi - -echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6 -echo "configure:2699: checking for tm->tm_gmtoff" >&5 -if eval "test \"`echo '$''{'ac_cv_have_tm_gmoff'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#include -int main() { -struct tm foo; - foo.tm_gmtoff = 0; -; return 0; } -EOF -if { (eval echo configure:2714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_tm_gmoff="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_tm_gmoff="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_tm_gmoff" 1>&6 -if test $ac_cv_have_tm_gmoff = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_TM_GMTOFF 1 -EOF - -fi - -echo $ac_n "checking for struct mallinfo""... $ac_c" 1>&6 -echo "configure:2736: checking for struct mallinfo" >&5 -if eval "test \"`echo '$''{'ac_cv_have_struct_mallinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#if HAVE_MALLOC_H -#include -#endif -int main() { -struct mallinfo foo; - foo.arena = 0; - foo.ordblks = 0; - foo.smblks = 0; - foo.hblks = 0; - foo.hblkhd = 0; - foo.uordblks = 0; - foo.fordblks = 0; - foo.keepcost = 0; -; return 0; } -EOF -if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_struct_mallinfo="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_struct_mallinfo="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_struct_mallinfo" 1>&6 -if test $ac_cv_have_struct_mallinfo = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_STRUCT_MALLINFO 1 -EOF - -fi - -echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6 -echo "configure:2782: checking for extended mallinfo" >&5 -if eval "test \"`echo '$''{'ac_cv_have_ext_mallinfo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#include -int main() { -struct mallinfo foo; - foo.mxfast = 0; -; return 0; } -EOF -if { (eval echo configure:2797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_ext_mallinfo="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_ext_mallinfo="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_ext_mallinfo" 1>&6 -if test $ac_cv_have_ext_mallinfo = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_EXT_MALLINFO 1 -EOF - -fi - -echo $ac_n "checking for struct rusage""... $ac_c" 1>&6 -echo "configure:2819: checking for struct rusage" >&5 -if eval "test \"`echo '$''{'ac_cv_have_struct_rusage'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#endif -#if HAVE_SYS_RESOURCE_H -#include -#endif -int main() { -struct rusage R; -; return 0; } -EOF -if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_struct_rusage="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_struct_rusage="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_struct_rusage" 1>&6 -if test $ac_cv_have_struct_rusage = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_STRUCT_RUSAGE 1 -EOF - -fi - -echo $ac_n "checking for ip->ip_hl""... $ac_c" 1>&6 -echo "configure:2860: checking for ip->ip_hl" >&5 -if eval "test \"`echo '$''{'ac_cv_have_ip_hl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#include -#include -#include -#ifdef __linux__ -#define ip_hl ihl -#endif -#ifndef __linux__ -#define iphdr ip -#endif -int main() { -struct iphdr ip; - ip.ip_hl= 0; -; return 0; } -EOF -if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_ip_hl="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_ip_hl="no" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_have_ip_hl" 1>&6 -if test $ac_cv_have_ip_hl = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_IP_HL 1 -EOF - -fi - -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2905: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int)); - exit(0); -} -EOF -if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&6 -echo "configure:2944: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); - exit(0); -} -EOF -if { (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&6 -echo "configure:2983: checking size of void *" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(void *)); - exit(0); -} -EOF -if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_void_p=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_void_p=0 -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$ac_cv_sizeof_void_p" 1>&6 -cat >> confdefs.h <&6 -echo "configure:3025: checking for working alloca.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF - -fi - -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3058: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_alloca_works=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 -if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF - -fi - -if test $ac_cv_func_alloca_works = no; then - # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF - - -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3123: checking whether alloca needs Cray hooks" >&5 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_os_cray=yes -else - rm -rf conftest* - ac_cv_os_cray=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 -if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3153: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <&6 -fi - -done -fi - -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3208: checking stack direction for C alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat > conftest.$ac_ext < addr) ? 1 : -1; -} -main () -{ - exit (find_stack_direction() < 0); -} -EOF -if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_c_stack_direction=1 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 -fi -rm -fr conftest* -fi - -fi - -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <&6 -echo "configure:3258: checking for pid_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_pid_t=yes -else - rm -rf conftest* - ac_cv_type_pid_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF -#define pid_t int -EOF - -fi - -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3291: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes -else - rm -rf conftest* - ac_cv_type_size_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned int -EOF - -fi - -echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3324: checking for ssize_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_ssize_t=yes -else - rm -rf conftest* - ac_cv_type_ssize_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_ssize_t" 1>&6 -if test $ac_cv_type_ssize_t = no; then - cat >> confdefs.h <<\EOF -#define ssize_t int -EOF - -fi - -echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3357: checking for off_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_off_t=yes -else - rm -rf conftest* - ac_cv_type_off_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF -#define off_t int -EOF - -fi - -echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3390: checking for mode_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_mode_t=yes -else - rm -rf conftest* - ac_cv_type_mode_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -if test $ac_cv_type_mode_t = no; then - cat >> confdefs.h <<\EOF -#define mode_t u_short -EOF - -fi - -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 -echo "configure:3423: checking for fd_mask" >&5 -if eval "test \"`echo '$''{'ac_cv_type_fd_mask'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])fd_mask[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_fd_mask=yes -else - rm -rf conftest* - ac_cv_type_fd_mask=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_fd_mask" 1>&6 -if test $ac_cv_type_fd_mask = no; then - cat >> confdefs.h <<\EOF -#define fd_mask int -EOF - -fi - - -echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:3457: checking for socklen_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#include -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "socklen_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_socklen_t=yes -else - rm -rf conftest* - ac_cv_type_socklen_t=no -fi -rm -f conftest* - - -fi - -echo "$ac_t""$ac_cv_type_socklen_t" 1>&6 -if test $ac_cv_type_socklen_t = no; then - cat >> confdefs.h <<\EOF -#define socklen_t int -EOF - -fi - -echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3494: checking for main in -lnsl" >&5 -ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3537: checking for main in -lsocket" >&5 -ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - -if test "x$ac_cv_enabled_dlmalloc" = "xyes" ; then - echo "skipping libmalloc check (--enable-dlmalloc specified)" -else - echo $ac_n "checking for main in -lgnumalloc""... $ac_c" 1>&6 -echo "configure:3584: checking for main in -lgnumalloc" >&5 -ac_lib_var=`echo gnumalloc'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lgnumalloc $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo gnumalloc | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - if test "$ac_cv_lib_gnumalloc_main" = "yes"; then - echo "Disabling extended malloc functions when using gnumalloc" - ac_cv_func_mallinfo=no - ac_cv_func_mallocblksize=no - ac_cv_func_mallopt=no - else - case "$host" in - *-sun-solaris*) - echo "skipping libmalloc check for $host" - ;; - i386-*-freebsd*) - echo "skipping libmalloc check for $host" - ;; - *) - - echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6 -echo "configure:3642: checking for main in -lmalloc" >&5 -ac_lib_var=`echo malloc'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmalloc $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo malloc | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - ;; - esac - fi -fi - -echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3690: checking for main in -lbsd" >&5 -ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lbsd $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -echo $ac_n "checking for main in -lregex""... $ac_c" 1>&6 -echo "configure:3733: checking for main in -lregex" >&5 -ac_lib_var=`echo regex'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lregex $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - REGEXLIB="-lregex" -else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:3769: checking for gethostbyname in -lbind" >&5 -ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -if test $ac_cv_lib_bind_gethostbyname = "no" ; then - case "$host" in - i386-*-freebsd*) - echo "skipping libresolv checks for $host" - ;; - *) - echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:3822: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6 -echo "configure:3857: checking for inet_aton in -l44bsd" >&5 -ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l44bsd $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo 44bsd | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -else - echo "$ac_t""no" 1>&6 -fi - - echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:3908: checking for main in -lresolv" >&5 -ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - ;; - esac -fi -echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3954: checking for main in -lm" >&5 -ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - -echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:3998: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcrypt $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -if test $ac_cv_lib_crypt_crypt = "yes"; then - CRYPTLIB="-lcrypt" -fi - - -echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:4050: checking for main in -lpthread" >&5 -ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lpthread $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -if test $ac_cv_lib_pthread_main = "yes"; then - PTHREADLIB="-lpthread" -fi - - -case "$host" in - *-pc-sco3.2*) - echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:4100: checking for strftime in -lintl" >&5 -ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lintl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - ;; -esac - -case "$host" in - i386-*-solaris2.*) - if test "$GCC" = "yes"; then - echo "Removing -O for gcc on $host" - CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`" - fi - ;; - *-sgi-irix*) - echo "Removing -lsocket for IRIX..." - LIBS=`echo $LIBS | sed -e s/-lsocket//` - echo "Removing -lnsl for IRIX..." - LIBS=`echo $LIBS | sed -e s/-lnsl//` - ac_cv_lib_nsl_main=no - echo "Removing -lbsd for IRIX..." - LIBS=`echo $LIBS | sed -e s/-lbsd//` - ;; - *-ibm-aix*) - echo "Removing -lbsd for AIX..." - LIBS=`echo $LIBS | sed -e s/-lbsd//` - echo "disabling snprintf/vsnprintf for $host" - ac_cv_func_snprintf=no - ac_cv_func_vsnprintf=no - ;; - *m88k*) - CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_" - cat >> confdefs.h <<\EOF -#define GETTIMEOFDAY_NO_TZP 1 -EOF - - ;; - *-*-solaris2.[0-4]) - cat >> confdefs.h <<\EOF -#define GETTIMEOFDAY_NO_TZP 1 -EOF - - ;; - *-sony-newsos[56]*) - cat >> confdefs.h <<\EOF -#define GETTIMEOFDAY_NO_TZP 1 -EOF - - ;; -esac - -# Recommended by Balint Nagy Endre -case "$host" in - *-univel-sysv4.2MP) - if test `uname -v` = "2.03"; then - echo "disabling mallinfo for $host" - ac_cv_func_mallinfo=no - fi - ;; -esac - -# Disable poll() on certain platforms. Override by setting ac_cv_func_poll -# when running configure. -if test -z "$ac_cv_func_poll"; then - case "$host" in - alpha-dec-osf3.*) - # John Kay (jkay@nlanr.net) 19970818 - echo "disabling poll for $host..." - ac_cv_func_poll='no' - ;; - *-hp-hpux*.*) - # Duane Wessels - echo "disabling poll for $host..." - ac_cv_func_poll='no' - ;; - *-linux-*) - # Henrik Nordstrom (hno@hem.passagen.se) 19980817 - # poll is problematic on Linux. We disable it - # by default until Linux gets it right. - rev=`uname -r | awk -F. '{printf "%03d%03d",$1,$2}'` - if test $rev -lt 002002; then - echo "disabling poll for $host < 2.2..." - ac_cv_func_poll='no' - fi - ;; - powerpc-ibm-aix4.1.*) - # Mike Laster (mlaster@metavillage.com) 19981021 - echo "disabling poll for $host..." - ac_cv_func_poll='no' - ;; - *-pc-sco3.2*) - # Robert Side - # Mon, 18 Jan 1999 17:48:00 GMT - echo "disabling poll for $host..." - ac_cv_func_poll='no' - ;; - esac -fi - -for ac_func in \ - bcopy \ - crypt \ - fchmod \ - getdtablesize \ - getpagesize \ - getrusage \ - getspnam \ - lrand48 \ - mallinfo \ - mallocblksize \ - mallopt \ - memcpy \ - memmove \ - memset \ - mktime \ - mstats \ - poll \ - putenv \ - random \ - regcomp \ - regexec \ - regfree \ - res_init \ - rint \ - seteuid \ - setgroups \ - setpgrp \ - setrlimit \ - getrlimit \ - setsid \ - sigaction \ - snprintf \ - srand48 \ - srandom \ - sysconf \ - syslog \ - timegm \ - vsnprintf \ - -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4283: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - - -if test "$async_io" = "yes" ; then - for ac_func in \ - pthread_attr_setscope \ - pthread_setschedparam \ - pthread_attr_setschedparam \ - -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4344: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - -fi - -echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6 -echo "configure:4399: checking if setresuid is implemented" >&5 -if eval "test \"`echo '$''{'ac_cv_func_setresuid'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < - int main() { - if(setresuid(-1,-1,-1)) { - perror("setresuid:"); - exit(1); - } - exit(0); - } - -EOF -if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_setresuid="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_setresuid="no" -fi -rm -fr conftest* -fi - - -fi - -echo "$ac_t""$ac_cv_func_setresuid" 1>&6 -if test "$ac_cv_func_setresuid" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_SETRESUID 1 -EOF - -fi - -if test "$IPF_TRANSPARENT" ; then - echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6 -echo "configure:4445: checking if IP-Filter header files are installed" >&5 - if test "$ac_cv_header_ip_compat_h" = "yes" && - test "$ac_cv_header_ip_fil_h" = "yes" && - test "$ac_cv_header_ip_nat_h" = "yes" ; then - IPF_TRANSPARENT="yes" - cat >> confdefs.h <<\EOF -#define IPF_TRANSPARENT 1 -EOF - - elif test "$ac_cv_header_netinet_ip_compat_h" = "yes" && - test "$ac_cv_header_netinet_ip_fil_h" = "yes" && - test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then - IPF_TRANSPARENT="yes" - cat >> confdefs.h <<\EOF -#define IPF_TRANSPARENT 1 -EOF - - else - IPF_TRANSPARENT="no" - cat >> confdefs.h <<\EOF -#define IPF_TRANSPARENT 0 -EOF - - fi - echo "$ac_t""$IPF_TRANSPARENT" 1>&6 -fi -if test "$IPF_TRANSPARENT" = "no" ; then - echo "WARNING: Cannot find necessary IP-Filter header files" - echo " Transparent Proxy support WILL NOT be enabled" - sleep 10 -fi - -if test -z "$USE_GNUREGEX" ; then - case "$host" in - *-sun-solaris2.[0-4]) - USE_GNUREGEX="yes" - ;; - *-next-nextstep*) - USE_GNUREGEX="yes" - ;; - esac -fi -echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6 -echo "configure:4488: checking if GNUregex needs to be compiled" >&5 -if test -z "$USE_GNUREGEX"; then -if test "$ac_cv_func_regcomp" = "no" || test "$USE_GNUREGEX" = "yes" ; then - USE_GNUREGEX="yes" -else - cat > conftest.$ac_ext < -#include -int main() { -regex_t t; regcomp(&t,"",0); -; return 0; } -EOF -if { (eval echo configure:4502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - USE_GNUREGEX="no" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - USE_GNUREGEX="yes" -fi -rm -f conftest* -fi -fi -echo "$ac_t""$USE_GNUREGEX" 1>&6 -if test "$USE_GNUREGEX" = "yes"; then - REGEXLIB="-lregex" - LIBREGEX="libregex.a" - cat >> confdefs.h <<\EOF -#define USE_GNUREGEX 1 -EOF - -fi - - - -for ac_func in \ - drand48 \ - tempnam \ - strerror \ - -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4533: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" -fi -done - - - -echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6 -echo "configure:4589: checking Default FD_SETSIZE value" >&5 -if test "$cross_compiling" = yes; then - DEFAULT_FD_SETSIZE=256 -else - cat > conftest.$ac_ext < -#endif -#if HAVE_UNISTD_H -#include -#endif -#if HAVE_SYS_TIME_H -#include -#endif -#if HAVE_SYS_SELECT_H -#include -#endif -#if HAVE_SYS_TYPES_H -#include -#endif -main() { - FILE *fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", FD_SETSIZE); - exit(0); -} - -EOF -if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - DEFAULT_FD_SETSIZE=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - DEFAULT_FD_SETSIZE=256 -fi -rm -fr conftest* -fi - -echo "$ac_t""$DEFAULT_FD_SETSIZE" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4638: checking Maximum number of filedescriptors we can open" >&5 -TLDFLAGS="$LDFLAGS" -case $host in -i386-unknown-freebsd*) - if echo "$LDFLAGS" | grep -q pthread; then - LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"` - fi -esac -if test "$cross_compiling" = yes; then - SQUID_MAXFD=256 -else - cat > conftest.$ac_ext < -#include -#include /* needed on FreeBSD */ -#include -#include -main() { - FILE *fp; - int i,j; -#if __CYGWIN32__ - /* getrlimit and sysconf returns bogous values on cygwin32. - * Number of fds is virtually unlimited in cygwin (sys/param.h) - */ - i = NOFILE; -#elif HAVE_SETRLIMIT - struct rlimit rl; -#if defined(RLIMIT_NOFILE) - if (getrlimit(RLIMIT_NOFILE, &rl) < 0) { - perror("getrlimit: RLIMIT_NOFILE"); - } else { - rl.rlim_cur = rl.rlim_max; /* set it to the max */ - if (setrlimit(RLIMIT_NOFILE, &rl) < 0) { - perror("setrlimit: RLIMIT_NOFILE"); - } - } -#elif defined(RLIMIT_OFILE) - if (getrlimit(RLIMIT_OFILE, &rl) < 0) { - perror("getrlimit: RLIMIT_OFILE"); - } else { - rl.rlim_cur = rl.rlim_max; /* set it to the max */ - if (setrlimit(RLIMIT_OFILE, &rl) < 0) { - perror("setrlimit: RLIMIT_OFILE"); - } - } -#endif /* RLIMIT_NOFILE */ -#endif /* HAVE_SETRLIMIT */ - /* by starting at 2^14, we will never get higher - than 2^15 for SQUID_MAXFD */ - i = j = 1<<14; - while (j) { - j >>= 1; - if (dup2(0, i) < 0) { - i -= j; - } else { - close(i); - i += j; - } - } - i++; - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", i); - exit(0); -} - -EOF -if { (eval echo configure:4707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - SQUID_MAXFD=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - SQUID_MAXFD=256 -fi -rm -fr conftest* -fi - -echo "$ac_t""$SQUID_MAXFD" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4734: checking Default UDP send buffer size" >&5 -if test "$cross_compiling" = yes; then - SQUID_UDP_SO_SNDBUF=16384 -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -main () -{ - FILE *fp; - int fd,val=0,len=sizeof(int); - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); - if (val<=0) exit(1); - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", val); - exit(0); -} - -EOF -if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - SQUID_UDP_SO_SNDBUF=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - SQUID_UDP_SO_SNDBUF=16384 -fi -rm -fr conftest* -fi - -echo "$ac_t""$SQUID_UDP_SO_SNDBUF" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4779: checking Default UDP receive buffer size" >&5 -if test "$cross_compiling" = yes; then - SQUID_UDP_SO_RCVBUF=16384 -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -main () -{ - FILE *fp; - int fd,val=0,len=sizeof(int); - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); - if (val <= 0) exit(1); - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", val); - exit(0); -} - -EOF -if { (eval echo configure:4805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - SQUID_UDP_SO_RCVBUF=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - SQUID_UDP_SO_RCVBUF=16384 -fi -rm -fr conftest* -fi - -echo "$ac_t""$SQUID_UDP_SO_RCVBUF" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4824: checking Default TCP send buffer size" >&5 -if test "$cross_compiling" = yes; then - SQUID_TCP_SO_SNDBUF=16384 -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -main () -{ - FILE *fp; - int fd,val=0,len=sizeof(int); - if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); - if (val <= 0) exit(1); - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", val); - exit(0); -} - -EOF -if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - SQUID_TCP_SO_SNDBUF=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - SQUID_TCP_SO_SNDBUF=16384 -fi -rm -fr conftest* -fi - -echo "$ac_t""$SQUID_TCP_SO_SNDBUF" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4869: checking Default TCP receive buffer size" >&5 -if test "$cross_compiling" = yes; then - SQUID_TCP_SO_RCVBUF=16384 -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -main () -{ - FILE *fp; - int fd,val=0,len=sizeof(int); - if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); - if (val <= 0) exit(1); - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", val); - exit(0); -} - -EOF -if { (eval echo configure:4895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - SQUID_TCP_SO_RCVBUF=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - SQUID_TCP_SO_RCVBUF=16384 -fi -rm -fr conftest* -fi - -echo "$ac_t""$SQUID_TCP_SO_RCVBUF" 1>&6 -cat >> confdefs.h <&6 -echo "configure:4914: checking if sys_errlist is already defined" >&5 -if eval "test \"`echo '$''{'ac_cv_needs_sys_errlist'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -int main() { -char *s = sys_errlist; -; return 0; } -EOF -if { (eval echo configure:4926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_needs_sys_errlist="no" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_needs_sys_errlist="yes" -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_needs_sys_errlist" 1>&6 -if test "$ac_cv_needs_sys_errlist" = "yes" ; then - cat >> confdefs.h <<\EOF -#define NEED_SYS_ERRLIST 1 -EOF - -fi - -echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6 -echo "configure:4948: checking for libresolv _dns_ttl_ hack" >&5 -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -cat >> confdefs.h <<\EOF -#define LIBRESOLV_DNS_TTL_HACK 1 -EOF - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 -fi -rm -f conftest* - -echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6 -echo "configure:4973: checking if inet_ntoa() actually works" >&5 -if test "$cross_compiling" = yes; then - INET_NTOA_RESULT="broken" -else - cat > conftest.$ac_ext < -#include -#include -#include -#include -main () -{ - FILE *fp; - struct in_addr in; - in.s_addr = inet_addr("1.2.3.4"); - fp = fopen("conftestval", "w"); - fprintf (fp, "%s\n", inet_ntoa(in)); - exit(0); -} - -EOF -if { (eval echo configure:4997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - INET_NTOA_RESULT=`cat conftestval` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - INET_NTOA_RESULT="broken" -fi -rm -fr conftest* -fi - -if test "$INET_NTOA_RESULT" = "1.2.3.4" ; then - echo "$ac_t"""yes"" 1>&6 -else - echo "$ac_t"""no"" 1>&6 - echo "Will use our own inet_ntoa()." - LIBOBJS="$LIBOBJS inet_ntoa.o" -# echo "WARNING: This looks bad, and probably prevents Squid from working." -# echo " If you're on IRIX and using GCC 2.8, you probably need" -# echo " to use the IRIX C compiler instead." -# sleep 10 -fi - -if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then -echo $ac_n "checking for working statvfs() interface""... $ac_c" 1>&6 -echo "configure:5023: checking for working statvfs() interface" >&5 -cat > conftest.$ac_ext < -#include -#include -#include - -int main() { - -struct statvfs sfs; -sfs.f_blocks = sfs.f_bfree = sfs.f_frsize = -sfs.f_files = sfs.f_ffree = 0; -statvfs("/tmp", &sfs); - -; return 0; } -EOF -if { (eval echo configure:5042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_statvfs=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_statvfs=no -fi -rm -f conftest* -echo "$ac_t""$ac_cv_func_statvfs" 1>&6 -if test "$ac_cv_func_statvfs" = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_STATVFS 1 -EOF - -fi -fi - -echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6 -echo "configure:5062: checking for _res.nsaddr_list" >&5 -if eval "test \"`echo '$''{'ac_cv_have_res_nsaddr_list'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif -#if HAVE_RESOLV_H -#include -#endif - -int main() { -_res.nsaddr_list[0]; -; return 0; } -EOF -if { (eval echo configure:5090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_res_nsaddr_list="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_res_nsaddr_list="no" -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_have_res_nsaddr_list" 1>&6 -if test $ac_cv_have_res_nsaddr_list = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSADDR_LIST 1 -EOF - -fi - -if test $ac_cv_have_res_nsaddr_list = "no" ; then -echo $ac_n "checking for _res.ns_list""... $ac_c" 1>&6 -echo "configure:5112: checking for _res.ns_list" >&5 -if eval "test \"`echo '$''{'ac_cv_have_res_ns_list'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif -#if HAVE_RESOLV_H -#include -#endif - -int main() { -_res.ns_list[0].addr; -; return 0; } -EOF -if { (eval echo configure:5140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_have_res_ns_list="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_have_res_ns_list="no" -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_have_res_ns_list" 1>&6 -if test $ac_cv_have_res_ns_list = "yes" ; then - cat >> confdefs.h <<\EOF -#define HAVE_RES_NS_LIST 1 -EOF - -fi -fi - -XTRA_OBJS='' -if test "$ac_cv_lib_malloc_main" = "yes" ; then - if test -r /usr/lib/debug/malloc.o ; then - XTRA_OBJS="$XTRA_OBJS /usr/lib/debug/malloc.o" - fi - if test -r /usr/lib/debug/mallocmap.o ; then - XTRA_OBJS="$XTRA_OBJS /usr/lib/debug/mallocmap.o" - fi -fi - - - -if test -z "$XTRA_LIBS"; then - XTRA_LIBS="$LIBS" - XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/-lcrypt//"` - XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/-lpthread//"` - XTRA_LIBS=`echo $XTRA_LIBS | sed -e "s/ */ /g"` - LIBS='' -fi - - -rm -f core - -trap '' 1 2 15 -cat > confcache <<\EOF -# 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. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -DEFS=-DHAVE_CONFIG_H - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "\ - ./makefile \ - ./lib/Makefile \ - ./include/config.h \ - ./scripts/Makefile \ - ./scripts/RunCache \ - ./scripts/RunAccel \ - ./src/Makefile \ - ./contrib/Makefile \ - $SNMP_MAKEFILE \ - ./icons/Makefile \ - ./errors/Makefile \ - ./auth_modules/dummy \ - ./auth_modules/NCSA/Makefile \ - ./auth_modules/PAM/Makefile \ - ./auth_modules/SMB/Makefile - ./auth_modules/getpwnam/Makefile \ - ./auth_modules/LDAP/Makefile \ - include/autoconf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@exec_suffix@%$exec_suffix%g -s%@cgi_suffix@%$cgi_suffix%g -s%@CACHE_HTTP_PORT@%$CACHE_HTTP_PORT%g -s%@CACHE_ICP_PORT@%$CACHE_ICP_PORT%g -s%@CC@%$CC%g -s%@LIBDLMALLOC@%$LIBDLMALLOC%g -s%@LIB_MALLOC@%$LIB_MALLOC%g -s%@ASYNC_OBJS@%$ASYNC_OBJS%g -s%@SQUID_PTHREAD_LIB@%$SQUID_PTHREAD_LIB%g -s%@DELAY_OBJS@%$DELAY_OBJS%g -s%@SNMPLIB@%$SNMPLIB%g -s%@SNMP_OBJS@%$SNMP_OBJS%g -s%@makesnmplib@%$makesnmplib%g -s%@HTCP_OBJS@%$HTCP_OBJS%g -s%@ERR_LANGUAGE@%$ERR_LANGUAGE%g -s%@LEAKFINDER_OBJS@%$LEAKFINDER_OBJS%g -s%@CPP@%$CPP%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@RANLIB@%$RANLIB%g -s%@LN_S@%$LN_S%g -s%@SH@%$SH%g -s%@FALSE@%$FALSE%g -s%@TRUE@%$TRUE%g -s%@RM@%$RM%g -s%@MV@%$MV%g -s%@MKDIR@%$MKDIR%g -s%@LN@%$LN%g -s%@PERL@%$PERL%g -s%@MAKEDEPEND@%$MAKEDEPEND%g -s%@AR@%$AR%g -s%@AR_R@%$AR_R%g -s%@ALLOCA@%$ALLOCA%g -s%@CRYPTLIB@%$CRYPTLIB%g -s%@PTHREADLIB@%$PTHREADLIB%g -s%@REGEXLIB@%$REGEXLIB%g -s%@LIBREGEX@%$LIBREGEX%g -s%@LIBOBJS@%$LIBOBJS%g -s%@XTRA_OBJS@%$XTRA_OBJS%g -s%@XTRA_LIBS@%$XTRA_LIBS%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - -rm -f conftest.tail -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.1.1.3.4.1.4.2 retrieving revision 1.1.1.3.4.1.4.3 diff -u -r1.1.1.3.4.1.4.2 -r1.1.1.3.4.1.4.3 --- squid/configure.in 20 Apr 2000 20:31:13 -0000 1.1.1.3.4.1.4.2 +++ squid/configure.in 22 May 2000 11:15:07 -0000 1.1.1.3.4.1.4.3 @@ -3,13 +3,13 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.1.1.3.4.1.4.2 2000/04/20 20:31:13 hno Exp $ +dnl $Id: configure.in,v 1.1.1.3.4.1.4.3 2000/05/22 11:15:07 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.1.1.3.4.1.4.2 $)dnl +AC_REVISION($Revision: 1.1.1.3.4.1.4.3 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -912,6 +912,18 @@ ;; esac +# Remove optimization for GCC 2.95.[12] +# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL +if test "$GCC" = "yes"; then + GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` + case "$GCCVER" in + [2.95.[12]]) + echo "Removing -O for gcc on $host with GCC $GCCVER" + CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" + ;; + esac +fi + # Recommended by Balint Nagy Endre case "$host" in *-univel-sysv4.2MP) Index: squid/auth_modules/MSNT/Makefile =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/MSNT/Attic/Makefile,v retrieving revision 1.1.1.1.4.1 retrieving revision 1.1.1.1.4.1.4.1 diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.4.1 --- squid/auth_modules/MSNT/Makefile 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1 +++ squid/auth_modules/MSNT/Makefile 22 May 2000 11:15:07 -0000 1.1.1.1.4.1.4.1 @@ -3,7 +3,7 @@ INSTALLBIN = /usr/local/squid/bin OBJECTS = md4.o rfcnb-io.o rfcnb-util.o session.o smbauth.o smbdes.o \ -smbencrypt.o smblib-util.o smblib.o valid.o +smbencrypt.o smblib-util.o smblib.o valid.o denyusers.o CC = gcc CFLAGS = -s -O2 Index: squid/auth_modules/MSNT/README =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/MSNT/Attic/README,v retrieving revision 1.1.1.1.4.1 retrieving revision 1.1.1.1.4.1.4.1 diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.4.1 --- squid/auth_modules/MSNT/README 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1 +++ squid/auth_modules/MSNT/README 22 May 2000 11:15:07 -0000 1.1.1.1.4.1.4.1 @@ -1,8 +1,8 @@ -MSNT Auth v1.0 +MSNT Auth v1.1 Squid web proxy Authentication module Antonino Iannella, Stellar-X Pty Ltd -Sun Mar 12 15:36:58 CST 2000 +Mon Apr 10 22:47:33 CST 2000 _____________________________________ This is a simple authentication module for the Squid proxy server @@ -12,24 +12,22 @@ and Richard Sharpe. This version is sourced from the Pike authentication module by William Welliver (hwellive@intersil.com). -Its use is simple. It accepts a username and password on standard input +Usage is simple. It accepts a username and password on standard input and will return OK if the username/password is valid for the domain, or ERR if there was some problem. You will need to modify the NT server definitions for your site; -this is the NT server and domain to authenticate to. -This is done in smbauth.c. +this is the NT server and NT domain to authenticate to. +This is done in sitedef.h. -This release serves as a documentation update. -There have been no source code changes since the October 1999 release. -Note the change in contact details. +Usernames can now be explicitly denied. See below for details. This is released under the GNU General Public License and is available from http://stellarx.tripod.com. Site customisation - -Change the following lines in smbauth.c. +Change the following lines in sitedef.h. Set the Primary Domain Controller, the backup (if different from the PDC), and the NT domain. @@ -37,6 +35,19 @@ #define BACKUP_DC "my_bdc" #define NTDOMAIN "my_domain" +Denying Users - + +Users who are not allowed to access the web proxy can be added to +the denied user list. This list is read every minute, or when +msntauth receives a SIGHUP signal. + +The denied user file is /usr/local/squid/etc/denyusers. This may be +changed in the DENYUSERS line in denyusers.c. The denied user file +contains a list of usernames in no particular structure or form. +If the file does not exist, no users are denied. +The file must be readable by the web proxy user. +Msntauth will send syslog messages at LOG_USER priority. + Installation - Type 'make', then 'make install', then 'make clean'. Index: squid/auth_modules/MSNT/msntauth-v1.0.lsm =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/MSNT/Attic/msntauth-v1.0.lsm,v retrieving revision 1.1.1.1.4.1 retrieving revision 1.1.1.1.4.1.4.1 diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.4.1 --- squid/auth_modules/MSNT/msntauth-v1.0.lsm 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1 +++ squid/auth_modules/MSNT/msntauth-v1.0.lsm 22 May 2000 11:15:07 -0000 1.1.1.1.4.1.4.1 @@ -1,13 +1,13 @@ Begin3 Title: msntauth -Version: 1.0 -Entered-date: 10MAR00 +Version: 1.1 +Entered-date: 12APR00 Description: Squid web proxy NT domain authentication module Keywords: Squid WWW proxy SMB NT domain authentication module source Author: antonino.iannella@usa.net (Antonino Iannella) Maintained-by: antonino.iannella@usa.net (Antonino Iannella) Primary-site: sunsite.unc.edu /pub/Linux/system/network/misc - msntauth-v1.0.tgz + msntauth-v1.1.tgz Original-site: http://stellarx.tripod.com Copying-policy: GPL End Index: squid/auth_modules/MSNT/smbauth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/MSNT/Attic/smbauth.c,v retrieving revision 1.1.1.1.4.1 retrieving revision 1.1.1.1.4.1.4.1 diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.4.1 --- squid/auth_modules/MSNT/smbauth.c 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1 +++ squid/auth_modules/MSNT/smbauth.c 22 May 2000 11:15:07 -0000 1.1.1.1.4.1.4.1 @@ -2,12 +2,12 @@ /* msntauth - Modified to act as a Squid authenticator + Modified to act as a Squid authenticator module. Removed all Pike stuff. Returns OK for a successful authentication, or ERR upon error. Antonino Iannella, Camtech SA Pty Ltd - Thu Sep 16 15:25:28 CST 1999 + Mon Apr 10 22:24:26 CST 2000 Uses code from - Andrew Tridgell 1997 @@ -32,31 +32,82 @@ */ #include +#include +#include +#include "sitedef.h" -/* You must specifiy these for your site! */ - -#define PRIMARY_DC "my_pdc" -#define BACKUP_DC "my_bdc" -#define NTDOMAIN "my_domain" +extern void Checkforchange(); /* For signal() to find the function */ /* Main program for simple authentication. - This code could probably be better, might be - susceptible to buffer overflows. */ + Reads the denied user file. Sets alarm timer. + Scans and checks for Squid input, and attempts to validate the user. +*/ int main() { char username[256]; char password[256]; + char wstr[256]; + struct itimerval TimeOut; + + /* Read denied user file. If it fails there is a serious problem. + Check syslog messages. Deny all users while in this state. + The process should then be killed. */ + + if (Read_denyusers() == 1) + { + while (1) + { + fgets(wstr, 255, stdin); + puts("ERR"); + fflush(stdout); + } + } + + /* An alarm timer is used to check the denied user file for changes + every minute. Reload the file if it has changed. */ + + TimeOut.it_interval.tv_sec = 60; + TimeOut.it_interval.tv_usec = 0; + TimeOut.it_value.tv_sec = 60; + TimeOut.it_value.tv_usec = 0; + setitimer(ITIMER_REAL, &TimeOut, 0); + signal(SIGALRM, Checkforchange); + signal(SIGHUP, Checkforchange); while (1) { - scanf("%s %s", username, password); + /* Read whole line from standard input. Terminate on break. */ + if (fgets(wstr, 255, stdin) == NULL) + break; + + /* Clear any current settings */ + username[0] = '\0'; + password[0] = '\0'; + sscanf(wstr, "%s %s", username, password); /* Extract parameters */ + + /* Check for invalid or blank entries */ + if ((username[0] == '\0') || (password[0] == '\0')) + { + puts("ERR"); + fflush(stdout); + continue; + } + if (Check_user(username) == 1) /* Check if user is denied */ + puts("ERR"); + else + { if (Valid_User(username, password, PRIMARY_DC, BACKUP_DC, NTDOMAIN) == 0) puts("OK"); else puts("ERR"); } + + fflush(stdout); + } + + return 0; } /* Valid_User return codes - Index: squid/errors/Estonian/ERR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_ACCESS_DENIED,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_ACCESS_DENIED 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_ACCESS_DENIED 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -18,5 +18,5 @@ Juurdepääsu kontrolli konfiguratsioon blokeerib teie päringut. Kui te arvate, et blokeering pole õige, kontakteeruge palun teenuse pakkujaga. -

+

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -1,9 +1,9 @@ -VIGA: Cache kasutamine blokeeritud +VIGA: Vahem鋖u serveri kasutamine blokeeritud

VIGA

-

Cache kasutamine keelatud

+

Vahem鋖u serveri kasutamine keelatud

Sooritades päringut URLile @@ -13,7 +13,7 @@

  • -Cache kasutamine keelatud. +Vahem鋖u serveri kasutamine keelatud.

@@ -26,7 +26,7 @@

Autoriseerimiseks on teil vaja brauserit mis toetab HTTP/1.1 standardit, nagu Netscape versioon 2.0 või uuem, või MS Internet Explorer -3.0. Palun kontakteeruge cache administraatoriga, +3.0. Palun kontakteeruge vahem鋖u serveri administraatoriga, kui teil on probleeme autoriseerimisega või vahetage/a> oma parool.

Index: squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -1,9 +1,9 @@ -VIGA: Cache haldaja kasutamine blokeeritud +VIGA: Vahem鋖u serveri haldaja kasutamine blokeeritud

VIGA

-

Cache haldaja kasutamine blokeeritud

+

Vahem鋖u serveri haldaja kasutamine blokeeritud

Sooritades päringut URLile @@ -13,19 +13,19 @@

  • -Cache haldaja kasutamine keelatud. +Vahem鋖u serveri haldaja kasutamine keelatud.

Vabandust, teil pole õigust päringule: 

    %U
-sellele cache haldajale, kuni te pole läbinud autoriseerimist. +sellele vahem鋖u serveri haldajale, kuni te pole läbinud autoriseerimist.

Autoriseerimiseks on teil vaja brauserit mis toetab HTTP/1.1 standardit, nagu Netscape versioon 2.0 või uuem, või MS Internet Explorer -3.0. Palun kontakteeruge cache administraatoriga, +3.0. Palun kontakteeruge vahem鋖u serveri administraatoriga, kui teil on probleeme autoriseerimisega või kui te olete -administraator, lugege Squidi dokumentatsiooni cache haldaja interfeisi kohta -ja kontrollige cache logi vea täpsema kirjelduse saamiseks.

+administraator, lugege Squidi dokumentatsiooni vahem鋖u serveri haldaja interfeisi kohta +ja kontrollige vahem鋖u serveri logi täpsema veakirjelduse saamiseks.

Index: squid/errors/Estonian/ERR_CANNOT_FORWARD =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_CANNOT_FORWARD,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_CANNOT_FORWARD 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_CANNOT_FORWARD 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -18,10 +18,10 @@

Päringut ei õnnestunud edastada ei originaali serverile ega -ühelegi vanem cache serverile. Ilmselt on põhjus: +ühelegi vanem vahem鋖u serverile. Ilmselt on põhjus:

    -
  • Cache administraator ei võimalda teha otseseid päringuid +
  • Vahem鋖u serveri administraator ei võimalda teha otseseid päringuid originaali serverile ja -
  • Kõik kirjeldatud vanem vanem cached on hetkel kättesaamatud. +
  • Kõik kirjeldatud vanem vahem鋖u serverid on hetkel kättesaamatud.
-

+

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_CONNECT_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_CONNECT_FAIL,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_CONNECT_FAIL 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_CONNECT_FAIL 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -23,4 +23,4 @@

Server või arvutivõrk ei tööta. Palun korrake päringut. -

+

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_DNS_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_DNS_FAIL,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_DNS_FAIL 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_DNS_FAIL 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -22,8 +22,7 @@

Mis tähendab: 

- Cache ei suutnud lahendada URLis antud hosti nime. Palun kontrollige
+ Vahem鋖u server ei suutnud lahendada URLis antud hosti nime. Palun kontrollige
  aadressi korrektsust.
-

- +

Teie teenuseVahem鋖u serve aadress on %w. Index: squid/errors/Estonian/ERR_FORWARDING_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FORWARDING_DENIED,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FORWARDING_DENIED 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FORWARDING_DENIED 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -17,6 +17,6 @@

-Meie cache ei edasta teie päringut, kuna ta kasutab andmete edastamisel -ainult naaber cache meetodit. Ilmselt on %i vigaselt konfigureeritud cache. -

+Meie vahem鋖u server ei edasta teie päringut, kuna ta kasutab andmete edastamisel +ainult naaber vahem鋖u serverite meetodit. Ilmselt on %i vigaselt konfigureeritud vahem鋖u server. +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_DISABLED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_DISABLED,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_DISABLED 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_DISABLED 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -17,5 +17,5 @@

-See cache ei toeta FTPd. -

+See vahem鋖u server ei toeta FTPd. +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_FAILURE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_FAILURE,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_FAILURE 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_FAILURE 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -17,5 +17,4 @@ See olukord võib olla tekkinud, kui FTP URL on antud absoluutse teega (mis on vastuolus RFC 1738-ga). Kui see on nii, siis saab faili aadressilt %B. -

- +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_FORBIDDEN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_FORBIDDEN,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_FORBIDDEN 26 Jan 2000 03:23:10 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_FORBIDDEN 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -12,5 +12,4 @@ ja sai sellise vastuse 

%F
%g
-

- +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_NOT_FOUND =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_NOT_FOUND,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_NOT_FOUND 26 Jan 2000 03:23:10 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_NOT_FOUND 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -16,5 +16,4 @@ See olukord võib olla tekkinud, kui FTP URL on antud absoluutse teega (mis on vastuolus RFC 1738-ga). Kui see on nii, siis saab faili aadressilt %B. -

- +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_PUT_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_PUT_ERROR,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_PUT_ERROR 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_PUT_ERROR 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -21,5 +21,4 @@ 

 Kontrolli failiteed, õiguseid, ketta ruumi ja proovi uuesti.
-

- +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_FTP_UNAVAILABLE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_FTP_UNAVAILABLE,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_FTP_UNAVAILABLE 26 Jan 2000 03:23:10 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_FTP_UNAVAILABLE 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -13,5 +13,4 @@ ja sai sellise vastuse 

%F
%g
-

- +

Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_INVALID_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_INVALID_REQ,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_INVALID_REQ 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_INVALID_REQ 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -28,4 +28,4 @@

  • POST või PUT päringutel puudub Content-Length
  • keelatud sümbolid hosti nimes; alakriipsud pole lubatud -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_INVALID_URL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_INVALID_URL,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_INVALID_URL 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_INVALID_URL 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -24,4 +24,4 @@

  • Vigane topelt-kaldkriips URLi teel
  • Vigane sümbol hosti nimes; alakriipsud pole lubatud -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_LIFETIME_EXP =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_LIFETIME_EXP,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_LIFETIME_EXP 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_LIFETIME_EXP 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -18,4 +18,4 @@

    Squid katkestas päringu, kuna see kestis liiga kaua. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_NO_RELAY =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_NO_RELAY,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_NO_RELAY 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_NO_RELAY 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -17,6 +17,6 @@

    -Selles Caches on WAISi edastav host kirjeldamata! Kontakteeruge +Selles vahem鋖u serveris on WAISi edastav host kirjeldamata! Kontakteeruge administraatoriga. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -12,17 +12,16 @@

    • -Kehtiv dokument puudub cachest ja only-if-cached -Valid document was not found in the cache and päring sisaldas +Kehtiv dokument puudub vahem鋖u serverist ja päring sisaldas only-if-cached direktiivi.

    -Te edastasite päringu only-if-cached cache kontrolli -direktiiviga. Dokumenti ei leitud cachest võita +Te edastasite päringu only-if-cached vahem鋖u kontrolli +direktiiviga. Dokumenti ei leitud vahem鋖u serverist võita nõudis uuendamist, mis on aga keelatud only-if-cached direktiiviga. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_READ_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_READ_ERROR,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_READ_ERROR 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_READ_ERROR 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -22,4 +22,4 @@

    Andmete lugemisel tekkis veasituatsioon. Palun korrake päringut. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_READ_TIMEOUT =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_READ_TIMEOUT,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_READ_TIMEOUT 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_READ_TIMEOUT 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -23,4 +23,4 @@

    Lugejal katkes võrgust andmeid lugedes kannatus. Võrk või server võib olla maas või umbes. Proovige uuesti. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_SHUTTING_DOWN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_SHUTTING_DOWN,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_SHUTTING_DOWN 26 Jan 2000 03:23:10 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_SHUTTING_DOWN 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -14,4 +14,4 @@ Meie server on saanud käsu töö lõpetada ja ei saa teie päringut hetkel teenindada. Palun korrake oma päringut motilde;ne aja pärast. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_SOCKET_FAILURE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_SOCKET_FAILURE,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_SOCKET_FAILURE 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_SOCKET_FAILURE 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -23,4 +23,4 @@

    Squid ei suuda tekitada TCP pistikut, ilmselt ülekoormuse tõttu. palun korrake päringut. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_TOO_BIG =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_TOO_BIG,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -u -r1.1.1.1 -r1.1.1.1.16.1 --- squid/errors/Estonian/ERR_TOO_BIG 26 Jan 2000 03:25:00 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_TOO_BIG 22 May 2000 11:15:08 -0000 1.1.1.1.16.1 @@ -1,26 +1,25 @@ -ERROR: The requested URL could not be retrieved +IGA: Päring URLile ei saa vastust -

    ERROR

    -

    The requested URL could not be retrieved

    +

    Viga

    +

    Päring URLile ei saa vastust

    -While trying to retrieve the URL: +Sooritades päringut URLile %U

    -The following error was encountered: +tekkis järgnev viga:

    • -The request or reply is too large. +P鋜ing v鮥 vastus on liiga suur.

      -If you are making a POST or PUT request, then your request body -(the thing you are trying to upload) is too large. If you are -making a GET request, then the reply body (what you are trying -to download) is too large. These limits have been established -by the Internet Service Provider who operates this cache. Please -contact them directly if you feel this is an error. +Kui te sooritate POST v鮥 PUT p鋜ingut, siis teie p鋜ingu keha +(see asi, mida te serverisse laete) on liiga suur. Kui te +sooritate GET p鋜ingut, siis on vastuse keha (asi, mida te serverist +laete) liiga suur. Need piirangus on seadnud teie teenusepakkuja, kes +haldab seda vahem鋖u serverit. Kui te arvate, et tegemist on veaga, +kontakteeruge palun otse oma teenusepakkujaga.

    -

    -Your cache administrator is %w. +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_UNSUP_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_UNSUP_REQ,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_UNSUP_REQ 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_UNSUP_REQ 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -19,5 +19,4 @@

    Squid ei toeta kõiki päringu meetodeid kõikide protokollidega. Näiteks, te ei saa teha POST operatsiooni Gopher päringus. -

    - +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_URN_RESOLVE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_URN_RESOLVE,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_URN_RESOLVE 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_URN_RESOLVE 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -18,4 +18,4 @@

    Hei, mida sa ootad URNidelt %T peal:) -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_WRITE_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_WRITE_ERROR,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.20.1 diff -u -r1.1.1.1 -r1.1.1.1.20.1 --- squid/errors/Estonian/ERR_WRITE_ERROR 26 Jan 2000 03:21:47 -0000 1.1.1.1 +++ squid/errors/Estonian/ERR_WRITE_ERROR 22 May 2000 11:15:08 -0000 1.1.1.1.20.1 @@ -22,4 +22,4 @@

    Võrku kirjutades tekkis viga. Palun korrake päringut. -

    +

    Teie teenusepakkuja aadress on %w. Index: squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.20.1 diff -u -r1.1.1.2 -r1.1.1.2.20.1 --- squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT 26 Jan 2000 03:23:10 -0000 1.1.1.2 +++ squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT 22 May 2000 11:15:08 -0000 1.1.1.2.20.1 @@ -18,4 +18,4 @@

    Squid ei saanud selle päringu vastuseks midagi... -

    +

    Teie teenusepakkuja aadress on %w. --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,29 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Access Denied. +
      拒绝访问 +       +

      +Access control configuration prevents your request from +being allowed at this time. Please contact your service provider if +you feel this is incorrect. +
      +当前的存取控制设定禁止您的请求被接受， +如果您觉得这是错误的，请与您网路服务的提供者联系。 +

    +

    +

    本缓存服务器管理员：%w + --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,42 @@ + + +错误：网络缓存服务器拒绝访问 + + +

    错误

    +

    网络缓存服务器拒绝访问

    +
    +

    +当尝试读取下面的网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Cache Access Denied. +
      +缓存服务器拒绝访问 +       +
    +

    + +

    +抱歉，您不被允许通过本网络缓存服务器访问下列位置： +
    %U
    +除非您通过了我们的身份验证。 +

    + +

    +You need to use Netscape version 2.0 or greater, or Microsoft Internet +Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please +contact the cache administrator if you have +difficulties authenticating yourself or +change your default password. +
    +您需要使用 Netscape version 2.0 或更新的版本，或是使用 Microsoft Internet +Explorer 3.0，或是一个 HTTP/1.1 相容的浏览器来进行工作。如果您在身份验证上 +发生困难，请与 管理者 联系。 +或是更改您的密码。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,43 @@ + + +错误：缓存管理器拒绝访问 + + +

    错误

    +

    缓存管理器拒绝访问

    +
    +

    +当尝试读取下面的网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Cache Manager Access Denied. +
      +缓存管理器拒绝访问 +       +
    +

    + +

    +抱歉，您不被允许通过本缓存管理器访问以下位置： +
    %U
    +除非您通过我们的身份验证。 +

    + +

    You need to use Netscape version 2.0 or greater, or Microsoft Internet +Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please +contact the cache administrator if you have +difficulties authenticating yourself or, if you are the +administrator, read Squid documentation on cache manager interface and check +cache log for more detailed error messages. +
    +您需要使用 Netscape version 2.0 或最新的版本，或是使用 Microsoft Internet +Explorer 3.0，或是一个 HTTP/1.1 相容的浏览器来进行工作。如果您是在身份验证上发 +生问题，请先确定您有权对缓存使用管理器。 +或是与管理者联系。如果您就是管理者，请详细阅读 Squid 所附文件中与 +cache manager 有关部份或检查 cache log 以便得到更详尽的细节。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD Wed Feb 14 00:44:20 2007 @@ -0,0 +1,38 @@ + + +错误；您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取下面的网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Unable to forward this request at this time. +
      +目前无法将您的请求进行转送操作 +       +
    + +

    +This request could not be forwarded to the origin server or to any +parent caches. The most likely cause for this error is that: +

      +
    • The cache administrator does not allow this cache to make + direct connections to origin servers, and +
    • All configured parent caches are currently unreachable. +
    +

    +

    +您的请求无法被转送到原始网络服务器或其他的上层缓存服务器，发生这个问题最可能的原因是： +

      +
    • 缓存服务器管理员不允许本服务器与原始网络服务器直接连结，而 +
    • 所有本服务器指定的上层缓存服务器都暂时无法连结。 +
    +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL Wed Feb 14 00:44:20 2007 @@ -0,0 +1,31 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Connection Failed +
      +连接失败 +       +
    + +

    +系统返回以下内容： +

        %E
    + +

    +The remote host or network may be down. Please try the request again. +
    +您要连结的网络服务器或网络可能发生故障。请稍后再试。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_DNS_FAIL Wed Feb 14 00:44:20 2007 @@ -0,0 +1,32 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

    +无法将您输入的主机名称：%H转换成 IP 地址 +
    + + +

    +域名服务器返回以下讯息： +

    +%z +
    + +

    +这表示： +

    + The cache was not able to resolve the hostname presented in the URL. 
+ Check if the address is correct. 
+ 缓存服务器无法解析您输入网址（URL）中的主机名称，
+ 请检查该名称是否正确。
+
    +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,30 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Forwarding Denied. +
      +拒绝转送 +       +
    + +

    +This cache will not forward your request because it is trying to enforce a +sibling relationship. Perhaps the client at %i is a cache which has been +misconfigured. +
    +本缓存服务器无法转送您的请求，也许您是通过一个并未被本缓存服务器 +设定为允许存取的缓存服务器（%i）来访问的。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_DISABLED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,27 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +FTP is Disabled +
      +禁止使用文件传输协议 +       +
    + +

    +This cache does not support FTP. +
    +本缓存服务器未开放文件传输服务。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_FAILURE Wed Feb 14 00:44:20 2007 @@ -0,0 +1,17 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时发生文件传输协议错误： +%U +

    +本缓存服务器发出以下 FTP 命令： +

    %f
    +然后收到如下回应： +
    %F
    +
    %g
    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN Wed Feb 14 00:44:20 2007 @@ -0,0 +1,18 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时文件传输协议（FTP）身份验证失败： +%U +

    +本缓存服务器发出以下 FTP 命令： +

    %f
    +然后收到如下回应： +
    %F
    +
    %g
    +

    + --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND Wed Feb 14 00:44:20 2007 @@ -0,0 +1,21 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +以下网址无法读取： +%U +

    +本缓存服务器发出以下 FTP 命令： +

    %f
    +然后收到如下回应： +
    %F
    +
    %g
    +

    +这可能是由于 FTP 网址（URL）中包含了绝对路径所致（不符合 RFC1738）。如果真的是这样， +文件可以从%B位置找到。 +

    + --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,10 @@ + + +文件上传 PUT 指令完成：文件已被建立 + +

    操作成功

    +

    文件已建立

    +
    +

    +

    + --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR Wed Feb 14 00:44:20 2007 @@ -0,0 +1,25 @@ + + +错误：文件上传失败 + +

    错误

    +

    文件上传（FTP PUT）操作失败

    +
    +

    +当尝试上传（PUT）到以下位置时： +%U +

    +本缓存服务器发出以下 FTP 命令： +

    
+        %f
+
    +然后收到如下回应： +
    
+        %F
+
    +

    +

    +请检查上传路径，上传位置读写权限，可用磁盘空间后再进行尝试。
+
    +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED Wed Feb 14 00:44:20 2007 @@ -0,0 +1,10 @@ + + +文件上传 PUT 指令完成：文件已被更新 + +

    操作成功

    +

    文件已更新

    +
    +

    +

    + --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE Wed Feb 14 00:44:20 2007 @@ -0,0 +1,18 @@ + + +错误: 您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时 FTP 服务器过忙： +%U +

    +本缓存服务器发出以下 FTP 命令： +

    %f
    +然后收到如下回应： +
    %F
    +
    %g
    +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_INVALID_REQ Wed Feb 14 00:44:20 2007 @@ -0,0 +1,43 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试进行以下请求时： +

    +%R
+
    +

    +发生了下列的错误： +

      +
    • + +Invalid Request +
      +无效的请求 +       +
    + +

    +Some aspect of the HTTP Request is invalid. Possible problems: +
    +HTTP 请求的某些方面是无效的。可能是下列问题： +

      +
    • Missing or unknown request method +
      缺少请求方式或未知的请求方式 +
    • Missing URL +
      缺少网址 +
    • Missing HTTP Identifier (HTTP/1.0) +
      缺少 HTTP 标识（HTTP/1.0） +
    • Request is too large +
      请求命令过长 +
    • Content-Length missing for POST or PUT requests +
      POST 或 PUT 请求缺少内容长度 +
    • Illegal character in hostname; underscores are not allowed +
      主机名称中包含不合法的字符；下划线是不允许的。 +
    +

    +

    本缓存服务器管理员：%w. --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_INVALID_URL Wed Feb 14 00:44:20 2007 @@ -0,0 +1,37 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Invalid URL +
      +无效的网址 +       +
    + +

    +Some aspect of the requested URL is incorrect. Possible problems: +
    +输入网址的某些地方有误，可能是因为： +

      +
    • Missing or incorrect access protocol (should be `http://'' or similar) +
      缺少或不正确的通讯协议（应该如 `http://''或类似的开头） +
    • Missing hostname +
      缺少欲连结的主机名称 +
    • Illegal double-escape in the URL-Path +
      网址路径中有不合法双重转义符 +
    • Illegal character in hostname; underscores are not allowed +
      主机名称中包含不合法的字符；下划线是不允许的。 +
    +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP Wed Feb 14 00:44:20 2007 @@ -0,0 +1,28 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Connection Lifetime Expired +
      +连接超时 +       +
    + +

    +Squid has terminated the request because it has exceeded the maximum +connection lifetime. +
    +缓存服务器已终止您的连接请求，因为已经超过了最大连接等待时间。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_NO_RELAY Wed Feb 14 00:44:20 2007 @@ -0,0 +1,27 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +No Wais Relay +
      +无 Wais 中继 +       +
    + +

    +There is no WAIS Relay host defined for this Cache! Yell at the administrator. +
    +本缓存服务器没有设定 WAIS 中继主机！如有疑问请与缓存服务器管理员联系。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS Wed Feb 14 00:44:20 2007 @@ -0,0 +1,34 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Valid document was not found in the cache and only-if-cached +directive was specified. +
      +请求的文件在本缓存服务器上未找到，而您设定了only-if-cached（只读取缓存） +指令。 +       +
    + +

    + +You have issued a request with a only-if-cached cache control +directive. The document was not found in the cache, or it required +revalidation prohibited by only-if-cached directive. +
    +您送出了一个包含 only-if-cached （只读取缓存）缓存控制指令的连结请求。 +而所要的文件并未存在于本缓存服务器中，或者这个连结请求需要刷新文件而 +only-if-cached 指令禁止这么做。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_READ_ERROR Wed Feb 14 00:44:20 2007 @@ -0,0 +1,32 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Read Error +
      +读取错误 +       +
    + +

    +系统回应： +

        %E
    + +

    +An error condition occurred while reading data from the network. Please +retry your request. +
    +正在通过网络读取数据时发生了错误，请重新尝试。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT Wed Feb 14 00:44:20 2007 @@ -0,0 +1,33 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +
    • + +Read Timeout +
      +读取超时 +       +
    + +

    +系统回应： +

        %E
    + +

    +A Timeout occurred while waiting to read data from the network. The network +or server may be down or congested. Please retry your request. +
    +当通过网络读取数据时，超过了等待时限。 +可能是因为网络堵塞或连接的网络服务器已关闭。请重新尝试。 +

    +

    本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN Wed Feb 14 00:44:20 2007 @@ -0,0 +1,22 @@ + + +错误：您所请求的网址（URL）无法获取 + +

    错误

    +

    您所请求的网址（URL）无法获取

    +
    +

    +当尝试读取以下网址（URL）时： +%U +

    +发生了下列的错误： +

      +

      +This cache is in the process of shutting down and can not +service your request at this time. Please retry your +request again soon. +
      +本缓存服务器正在关闭，暂时无法为您服务。 +请稍侯再试。 +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE Wed Feb 14 00:44:20 2007 @@ -0,0 +1,33 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +Socket Failure +
        +Socket 建立失败 +         +
      + +

      +系统回应： +

          %E
      + +

      +Squid is unable to create a TCP socket, presumably due to excessive load. +Please retry your request. +
      +Squid （缓存服务器）无法建立 TCP socket（无法向系统申请建立新的网络连接）， +可能是因为负荷过重，请重新尝试。 +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_TOO_BIG Wed Feb 14 00:44:20 2007 @@ -0,0 +1,25 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +请求或响应太大 + +

        +如果您正在进行 POST 或 PUT 请求，则您请求传送的内容太大（可能您 +正在上传文件）。如果您正在进行 GET 请求，则响应的内容太长。这些 +长度限制由操作本缓存服务器的服务提供者制定。如果您觉得这是错误的， +请与他们直接联系。 +

      +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_UNSUP_REQ Wed Feb 14 00:44:20 2007 @@ -0,0 +1,29 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +Unsupported Request Method and Protocol +
        +不支持的请求方式和协议 +         +
      + +

      +Squid does not support all request methods for all access protocols. +For example, you can not POST a Gopher request. +
      +Squid （缓存服务器）不能对所有的存取协议支持所有的请求方式。 +比如说，你不能对 GOPHER 进行一个 POST 请求。 +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_URN_RESOLVE Wed Feb 14 00:44:20 2007 @@ -0,0 +1,27 @@ + + +错误：您所请求的 URN 无法获取 + +

      错误

      +

      URN 中的一个网址（URL）无法获取

      +
      +

      +当尝试读取以下 URN 时： +%U +

      +发生了下列的错误： +

        +
      • + +Cannot Resolve URN +
        +无法解析 URN +         +
      + +

      +Hey, don't expect too much from URNs on %T :) +
      +抱歉！您不能对 %T 上的 URNs 期待太多 :) +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_WRITE_ERROR Wed Feb 14 00:44:20 2007 @@ -0,0 +1,32 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +Write Error +
        +写入错误 +         +
      + +

      +系统回应： +

          %E
      + +

      +An error condition occurred while writing to the network. Please retry your +request. +
      +通过网络写入数据时发生了错误，请重新尝试。 +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT Wed Feb 14 00:44:20 2007 @@ -0,0 +1,27 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +Zero Sized Reply +
        +响应内容长度为零 +         +
      + +

      +Squid did not receive any data for this request. +
      +本缓存服务器从被连接的服务器上没有收到任何数据。 +

      +

      本缓存服务器管理员：%w --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/README Wed Feb 14 00:44:20 2007 @@ -0,0 +1,11 @@ +This Simplify Chinese error pages is based on the +Erick C. Chang 's Traditional Chinese error pages. +and suitable for SQUID 2.3 STABLE 1. + +I first translate these pages from Traditional Chinese to Simplify Chinese +use a auto program. Then I check and compare with English pages to get more +accurate result. It take me over one half of time than direct translation +from english. Because the technical terms are very different in two area. +And I also fixed some minor mistakes. + +Wang DaQing wdq@bigfoot.com --- /dev/null Wed Feb 14 00:44:00 2007 +++ squid/errors/Simplify_Chinese/generic Wed Feb 14 00:44:20 2007 @@ -0,0 +1,30 @@ + + +错误：您所请求的网址（URL）无法获取 + +

      错误

      +

      您所请求的网址（URL）无法获取

      +
      +

      +当尝试读取以下网址（URL）时： +%U +

      +发生了下列的错误： +

        +
      • + +@SHORT_DESCRIPTION@ + +
      + +

      +系统回应以下信息： +

          %E
      + +

      +这表示： +

      +    @LONG_DESCRIPTION@
+
      +

      + --- squid/include/autoconf.h.in Wed Feb 14 00:44:20 2007 +++ /dev/null Wed Feb 14 00:44:00 2007 @@ -1,650 +0,0 @@ -/* include/autoconf.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if using alloca.c. */ -#undef C_ALLOCA - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -#undef CRAY_STACKSEG_END - -/* Define if you have alloca, as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define to `int' if doesn't define. */ -#undef mode_t - -/* Define to `long' if doesn't define. */ -#undef off_t - -/* Define to `int' if doesn't define. */ -#undef pid_t - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -#undef STACK_DIRECTION - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/********************************* - * START OF CONFIGURABLE OPTIONS * - *********************************/ -/* - * If you are upset that the cachemgr.cgi form comes up with the hostname - * field blank, then define this to getfullhostname() - */ -#undef CACHEMGR_HOSTNAME - -/* Define to do simple malloc debugging */ -#undef XMALLOC_DEBUG - -/* Define for log file trace of mem alloc/free */ -#undef MEM_GEN_TRACE - -/* Define to have malloc statistics */ -#undef XMALLOC_STATISTICS - -/* Define to have a detailed trace of memory allocations */ -#undef XMALLOC_TRACE - -#undef FORW_VIA_DB - -/* Define to use async disk I/O operations */ -#undef USE_ASYNC_IO - -/* Defines how many threads to use for async I/O */ -#undef NUMTHREADS - -/* - * If you want to use Squid's ICMP features (highly recommended!) then - * define this. When USE_ICMP is defined, Squid will send ICMP pings - * to origin server sites. This information is used in numerous ways: - * - Sent in ICP replies so neighbor caches know how close - * you are to the source. - * - For finding the closest instance of a URN. - * - With the 'test_reachability' option. Squid will return - * ICP_OP_MISS_NOFETCH for sites which it cannot ping. - */ -#undef USE_ICMP - -/* - * Traffic management via "delay pools". - */ -#undef DELAY_POOLS - -/* - * If you want to log User-Agent request header values, define this. - * By default, they are written to useragent.log in the Squid log - * directory. - */ -#undef USE_USERAGENT_LOG - -/* - * A dangerous feature which causes Squid to kill its parent process - * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. - * Use with caution. - */ -#undef KILL_PARENT_OPT - -/* Define to enable SNMP monitoring of Squid */ -#undef SQUID_SNMP - -/* - * Define to enable WCCP - */ -#define USE_WCCP 1 - -/* - * Squid frequently calls gettimeofday() for accurate timestamping. - * If you are concerned that gettimeofday() is called too often, and - * could be causing performance degradation, then you can define - * ALARM_UPDATES_TIME and cause Squid's clock to be updated at regular - * intervals (one second) with ALARM signals. - */ -#undef ALARM_UPDATES_TIME - -/* - * Define this to include code which lets you specify access control - * elements based on ethernet hardware addresses. This code uses - * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?). - */ -#undef USE_ARP_ACL - -/* - * Define this to include code for the Hypertext Cache Protocol (HTCP) - */ -#undef USE_HTCP - -/* - * Use Cache Digests for locating objects in neighbor caches. This - * code is still semi-experimental. - */ -#undef USE_CACHE_DIGESTS - -/* - * Cache Array Routing Protocol - */ -#undef USE_CARP - -/* Define if struct tm has tm_gmtoff member */ -#undef HAVE_TM_GMTOFF - -/* Define if struct mallinfo has mxfast member */ -#undef HAVE_EXT_MALLINFO - -/* Default FD_SETSIZE value */ -#undef DEFAULT_FD_SETSIZE - -/* Maximum number of open filedescriptors */ -#undef SQUID_MAXFD - -/* UDP send buffer size */ -#undef SQUID_UDP_SO_SNDBUF - -/* UDP receive buffer size */ -#undef SQUID_UDP_SO_RCVBUF - -/* TCP send buffer size */ -#undef SQUID_TCP_SO_SNDBUF - -/* TCP receive buffer size */ -#undef SQUID_TCP_SO_RCVBUF - -/* Host type from configure */ -#undef CONFIG_HOST_TYPE - -/* If we need to declare sys_errlist[] as external */ -#undef NEED_SYS_ERRLIST - -/* If gettimeofday is known to take only one argument */ -#undef GETTIMEOFDAY_NO_TZP - -/* If libresolv.a has been hacked to export _dns_ttl_ */ -#undef LIBRESOLV_DNS_TTL_HACK - -/* Define if struct ip has ip_hl member */ -#undef HAVE_IP_HL - -/* Define if your compiler supports prototyping */ -#undef HAVE_ANSI_PROTOTYPES - -/* Define if we should use GNU regex */ -#undef USE_GNUREGEX - -/* signed size_t, grr */ -#undef ssize_t - -/* - * Yay! Another Linux brokenness. Its not good enough to know that - * setresuid() exists, because RedHat 5.0 declare setresuid() but - * doesn't implement it. - */ -#undef HAVE_SETRESUID - -/* Define if you have struct rusage */ -#undef HAVE_STRUCT_RUSAGE - -/* - * This makes warnings go away. If you have socklen_t defined in your - * /usr/include files, then this should remain undef'd. Otherwise it - * should be defined to int. - */ -#undef socklen_t - -/* - * By default (for now anyway) Squid includes options which allows - * the cache administrator to violate the HTTP protocol specification - * in terms of cache behaviour. Setting this to '0' will disable - * such code. - */ -#define HTTP_VIOLATIONS 1 - -/* - * Enable support for Transparent Proxy on systems using IP-Filter - * address redirection. This provides "masquerading" support for non - * Linux system. - */ -#undef IPF_TRANSPARENT - -/* - * Enable code for assiting in finding memory leaks. Hacker stuff only. - */ -#undef USE_LEAKFINDER - -/* - * type of fd_set array - */ -#undef fd_mask - -/* - * If _res structure has nsaddr_list member - */ -#undef HAVE_RES_NSADDR_LIST - -/* - * If _res structure has ns_list member - */ -#undef HAVE_RES_NS_LIST - -/* - * Compile in support for Ident (RFC 931) lookups? Enabled by default. - */ -#define USE_IDENT 1 - -/* - * If your system has statvfs(), and if it actually works! - */ -#undef HAVE_STATVFS - -/* - * If --disable-internal-dns was given to configure, then we'll use - * the dnsserver processes instead. - */ -#undef USE_DNSSERVERS - -/* - * we check for the existance of struct mallinfo - */ -#undef HAVE_STRUCT_MALLINFO - -/* - * Do we want to use truncate(2) or unlink(2)? - */ -#undef USE_TRUNCATE - -/* - * Allow underscores in host names - */ -#undef ALLOW_HOSTNAME_UNDERSCORES - -/* - * Use the heap-based replacement techniques - */ -#undef HEAP_REPLACEMENT - -/* The number of bytes in a int. */ -#undef SIZEOF_INT - -/* The number of bytes in a long. */ -#undef SIZEOF_LONG - -/* The number of bytes in a void *. */ -#undef SIZEOF_VOID_P - -/* Define if you have the bcopy function. */ -#undef HAVE_BCOPY - -/* Define if you have the crypt function. */ -#undef HAVE_CRYPT - -/* Define if you have the drand48 function. */ -#undef HAVE_DRAND48 - -/* Define if you have the fchmod function. */ -#undef HAVE_FCHMOD - -/* Define if you have the getdtablesize function. */ -#undef HAVE_GETDTABLESIZE - -/* Define if you have the getpagesize function. */ -#undef HAVE_GETPAGESIZE - -/* Define if you have the getrlimit function. */ -#undef HAVE_GETRLIMIT - -/* Define if you have the getrusage function. */ -#undef HAVE_GETRUSAGE - -/* Define if you have the getspnam function. */ -#undef HAVE_GETSPNAM - -/* Define if you have the lrand48 function. */ -#undef HAVE_LRAND48 - -/* Define if you have the mallinfo function. */ -#undef HAVE_MALLINFO - -/* Define if you have the mallocblksize function. */ -#undef HAVE_MALLOCBLKSIZE - -/* Define if you have the mallopt function. */ -#undef HAVE_MALLOPT - -/* Define if you have the memcpy function. */ -#undef HAVE_MEMCPY - -/* Define if you have the memmove function. */ -#undef HAVE_MEMMOVE - -/* Define if you have the memset function. */ -#undef HAVE_MEMSET - -/* Define if you have the mktime function. */ -#undef HAVE_MKTIME - -/* Define if you have the mstats function. */ -#undef HAVE_MSTATS - -/* Define if you have the poll function. */ -#undef HAVE_POLL - -/* Define if you have the pthread_attr_setschedparam function. */ -#undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM - -/* Define if you have the pthread_attr_setscope function. */ -#undef HAVE_PTHREAD_ATTR_SETSCOPE - -/* Define if you have the pthread_setschedparam function. */ -#undef HAVE_PTHREAD_SETSCHEDPARAM - -/* Define if you have the putenv function. */ -#undef HAVE_PUTENV - -/* Define if you have the random function. */ -#undef HAVE_RANDOM - -/* Define if you have the regcomp function. */ -#undef HAVE_REGCOMP - -/* Define if you have the regexec function. */ -#undef HAVE_REGEXEC - -/* Define if you have the regfree function. */ -#undef HAVE_REGFREE - -/* Define if you have the res_init function. */ -#undef HAVE_RES_INIT - -/* Define if you have the rint function. */ -#undef HAVE_RINT - -/* Define if you have the seteuid function. */ -#undef HAVE_SETEUID - -/* Define if you have the setgroups function. */ -#undef HAVE_SETGROUPS - -/* Define if you have the setpgrp function. */ -#undef HAVE_SETPGRP - -/* Define if you have the setrlimit function. */ -#undef HAVE_SETRLIMIT - -/* Define if you have the setsid function. */ -#undef HAVE_SETSID - -/* Define if you have the sigaction function. */ -#undef HAVE_SIGACTION - -/* Define if you have the snprintf function. */ -#undef HAVE_SNPRINTF - -/* Define if you have the srand48 function. */ -#undef HAVE_SRAND48 - -/* Define if you have the srandom function. */ -#undef HAVE_SRANDOM - -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR - -/* Define if you have the sysconf function. */ -#undef HAVE_SYSCONF - -/* Define if you have the syslog function. */ -#undef HAVE_SYSLOG - -/* Define if you have the tempnam function. */ -#undef HAVE_TEMPNAM - -/* Define if you have the timegm function. */ -#undef HAVE_TIMEGM - -/* Define if you have the vsnprintf function. */ -#undef HAVE_VSNPRINTF - -/* Define if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Define if you have the header file. */ -#undef HAVE_ARPA_NAMESER_H - -/* Define if you have the header file. */ -#undef HAVE_ASSERT_H - -/* Define if you have the header file. */ -#undef HAVE_BSTRING_H - -/* Define if you have the header file. */ -#undef HAVE_CONFIG_H - -/* Define if you have the header file. */ -#undef HAVE_CRYPT_H - -/* Define if you have the header file. */ -#undef HAVE_CTYPE_H - -/* Define if you have the header file. */ -#undef HAVE_DIRENT_H - -/* Define if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define if you have the header file. */ -#undef HAVE_GNUMALLOC_H - -/* Define if you have the header file. */ -#undef HAVE_GRP_H - -/* Define if you have the header file. */ -#undef HAVE_IP_COMPAT_H - -/* Define if you have the header file. */ -#undef HAVE_IP_FIL_H - -/* Define if you have the header file. */ -#undef HAVE_IP_NAT_H - -/* Define if you have the header file. */ -#undef HAVE_LIBC_H - -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define if you have the header file. */ -#undef HAVE_MATH_H - -/* Define if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define if you have the header file. */ -#undef HAVE_MOUNT_H - -/* Define if you have the header file. */ -#undef HAVE_NDIR_H - -/* Define if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IF_ETHER_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IP_COMPAT_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IP_FIL_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IP_NAT_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_TCP_H - -/* Define if you have the header file. */ -#undef HAVE_POLL_H - -/* Define if you have the header file. */ -#undef HAVE_PWD_H - -/* Define if you have the header file. */ -#undef HAVE_REGEX_H - -/* Define if you have the header file. */ -#undef HAVE_RESOLV_H - -/* Define if you have the header file. */ -#undef HAVE_SCHED_H - -/* Define if you have the header file. */ -#undef HAVE_SIGNAL_H - -/* Define if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define if you have the header file. */ -#undef HAVE_STDIO_H - -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define if you have the header file. */ -#undef HAVE_STRING_H - -/* Define if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_DIR_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_FILE_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_MOUNT_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_NDIR_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_STATVFS_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SYSCALL_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_UN_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_VFS_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define if you have the header file. */ -#undef HAVE_TIME_H - -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if you have the header file. */ -#undef HAVE_VARARGS_H - -/* Define if you have the 44bsd library (-l44bsd). */ -#undef HAVE_LIB44BSD - -/* Define if you have the bind library (-lbind). */ -#undef HAVE_LIBBIND - -/* Define if you have the bsd library (-lbsd). */ -#undef HAVE_LIBBSD - -/* Define if you have the crypt library (-lcrypt). */ -#undef HAVE_LIBCRYPT - -/* Define if you have the gnumalloc library (-lgnumalloc). */ -#undef HAVE_LIBGNUMALLOC - -/* Define if you have the intl library (-lintl). */ -#undef HAVE_LIBINTL - -/* Define if you have the m library (-lm). */ -#undef HAVE_LIBM - -/* Define if you have the malloc library (-lmalloc). */ -#undef HAVE_LIBMALLOC - -/* Define if you have the nsl library (-lnsl). */ -#undef HAVE_LIBNSL - -/* Define if you have the pthread library (-lpthread). */ -#undef HAVE_LIBPTHREAD - -/* Define if you have the resolv library (-lresolv). */ -#undef HAVE_LIBRESOLV - -/* Define if you have the socket library (-lsocket). */ -#undef HAVE_LIBSOCKET Index: squid/include/version.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/version.h,v retrieving revision 1.1.1.3.4.2.4.1 retrieving revision 1.1.1.3.4.2.4.2 diff -u -r1.1.1.3.4.2.4.1 -r1.1.1.3.4.2.4.2 --- squid/include/version.h 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.2.4.1 +++ squid/include/version.h 22 May 2000 11:15:09 -0000 1.1.1.3.4.2.4.2 @@ -1,10 +1,10 @@ /* - * $Id: version.h,v 1.1.1.3.4.2.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: version.h,v 1.1.1.3.4.2.4.2 2000/05/22 11:15:09 hno Exp $ * * SQUID_VERSION - String for version id of this distribution */ #ifndef SQUID_VERSION -#define SQUID_VERSION "2.3.STABLE2-hno.CVS" +#define SQUID_VERSION "2.3.STABLE3-hno.CVS" #endif #ifndef SQUID_RELEASE_TIME Index: squid/src/asn.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/asn.c,v retrieving revision 1.1.1.3.4.1 retrieving revision 1.1.1.3.4.1.4.1 diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.4.1 --- squid/src/asn.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1 +++ squid/src/asn.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.1 @@ -1,5 +1,5 @@ /* - * $Id: asn.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $ + * $Id: asn.c,v 1.1.1.3.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 53 AS Number handling * AUTHOR: Duane Wessels, Kostas Anagnostakis @@ -235,6 +235,12 @@ memFree(buf, MEM_4K_BUF); asStateFree(asState); return; + } else if (HTTP_OK != e->mem_obj->reply->sline.status) { + debug(53, 1) ("WARNING: AS %d whois request failed\n", + asState->as_number); + memFree(buf, MEM_4K_BUF); + asStateFree(asState); + return; } s = buf; while (s - buf < size && *s != '\0') { Index: squid/src/cache_cf.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v retrieving revision 1.1.1.3.4.2.4.1 retrieving revision 1.1.1.3.4.2.4.2 diff -u -r1.1.1.3.4.2.4.1 -r1.1.1.3.4.2.4.2 --- squid/src/cache_cf.c 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.2.4.1 +++ squid/src/cache_cf.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.2.4.2 @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.c,v 1.1.1.3.4.2.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: cache_cf.c,v 1.1.1.3.4.2.4.2 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -1037,11 +1037,14 @@ p->tcp_up = PEER_TCP_MAGIC_COUNT; p->test_fd = -1; #if USE_CARP +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> ((sizeof(u_long)*8)-(n)))) if (p->carp.load_factor) { /* calculate this peers hash for use in CARP */ p->carp.hash = 0; for (token = p->host; *token != 0; token++) - p->carp.hash += (p->carp.hash << 19) + *token; + p->carp.hash += ROTATE_LEFT(p->carp.hash, 19) + *token; + p->carp.hash += p->carp.hash * 0x62531965; + p->carp.hash += ROTATE_LEFT(p->carp.hash, 21); } #endif /* This must preceed peerDigestCreate */ Index: squid/src/carp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/carp.c,v retrieving revision 1.1.1.1.4.1 retrieving revision 1.1.1.1.4.1.4.1 diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.4.1 --- squid/src/carp.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1 +++ squid/src/carp.c 22 May 2000 11:15:10 -0000 1.1.1.1.4.1.4.1 @@ -1,5 +1,5 @@ /* - * $Id: carp.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $ + * $Id: carp.c,v 1.1.1.1.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 39 Cache Array Routing Protocol * AUTHOR: Eric Stern @@ -84,6 +84,7 @@ peer * carpSelectParent(request_t * request) { +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> ((sizeof(u_long)*8)-(n)))) const char *c; peer *p = NULL; peer *tp; @@ -94,7 +95,7 @@ /* calculate url hash */ debug(39, 2) ("carpSelectParent: CARP Calculating hash for %s\n", url); for (c = url; *c != 0; c++) - url_hash += (url_hash << 19) + *c; + url_hash += ROTATE_LEFT(url_hash, 19) + *c; /* select peer */ for (tp = Config.peers; tp; tp = tp->next) { if (0.0 == tp->carp.load_factor) @@ -104,7 +105,7 @@ assert(tp->type == PEER_PARENT); combined_hash = (url_hash ^ tp->carp.hash); combined_hash += combined_hash * 0x62531965; - combined_hash = combined_hash << 21; + combined_hash = ROTATE_LEFT(combined_hash, 21); combined_hash = combined_hash * tp->carp.load_multiplier; debug(39, 3) ("carpSelectParent: %s combined_hash %d\n", tp->host, combined_hash); Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.1.1.3.4.2.4.1 retrieving revision 1.1.1.3.4.2.4.2 diff -u -r1.1.1.3.4.2.4.1 -r1.1.1.3.4.2.4.2 --- squid/src/client_side.c 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.2.4.1 +++ squid/src/client_side.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.2.4.2 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.1.1.3.4.2.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: client_side.c,v 1.1.1.3.4.2.4.2 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -1195,9 +1195,10 @@ * the objects age, so a Age: 0 header does not add any useful * information to the reply in any case. */ - if (http->entry->timestamp < squid_curtime) - httpHeaderPutInt(hdr, HDR_AGE, - squid_curtime - http->entry->timestamp); + if (http->entry->timestamp > -1) + if (http->entry->timestamp < squid_curtime) + httpHeaderPutInt(hdr, HDR_AGE, + squid_curtime - http->entry->timestamp); } /* Append X-Cache */ httpHeaderPutStrf(hdr, HDR_X_CACHE, "%s from %s", @@ -1386,12 +1387,18 @@ http->log_type = LOG_TCP_IMS_HIT; clientSendMoreData(data, buf, size); } else { + time_t timestamp = e->timestamp; MemBuf mb = httpPacked304Reply(e->mem_obj->reply); http->log_type = LOG_TCP_IMS_HIT; memFree(buf, MEM_CLIENT_SOCK_BUF); storeUnregister(e, http); storeUnlockObject(e); e = clientCreateStoreEntry(http, http->request->method, null_request_flags); + /* + * Copy timestamp from the original entry so the 304 + * reply has a meaningful Age: header. + */ + e->timestamp = timestamp; http->entry = e; httpReplyParse(e->mem_obj->reply, mb.buf, mb.size); storeAppend(e, mb.buf, mb.size); Index: squid/src/comm_select.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/comm_select.c,v retrieving revision 1.1.1.3.4.1 retrieving revision 1.1.1.3.4.1.4.1 diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.4.1 --- squid/src/comm_select.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1 +++ squid/src/comm_select.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.1 @@ -1,6 +1,6 @@ /* - * $Id: comm_select.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $ + * $Id: comm_select.c,v 1.1.1.3.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 5 Socket Functions * @@ -324,9 +324,9 @@ int calldns = 0; static time_t last_timeout = 0; double timeout = current_dtime + (msec / 1000.0); - double start; do { #if !ALARM_UPDATES_TIME + double start; getCurrentTime(); start = current_dtime; #endif Index: squid/src/delay_pools.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/delay_pools.c,v retrieving revision 1.1.1.3.4.1.4.1 retrieving revision 1.1.1.3.4.1.4.2 diff -u -r1.1.1.3.4.1.4.1 -r1.1.1.3.4.1.4.2 --- squid/src/delay_pools.c 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.1.4.1 +++ squid/src/delay_pools.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.2 @@ -1,6 +1,6 @@ /* - * $Id: delay_pools.c,v 1.1.1.3.4.1.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: delay_pools.c,v 1.1.1.3.4.1.4.2 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 77 Delay Pools * AUTHOR: David Luyer @@ -320,14 +320,10 @@ ch.my_port = r->my_port; ch.request = r; if (r->client_addr.s_addr == INADDR_BROADCAST) { - - debug(77, 2) ("delayClient: WARNING: Called with 'allones' address, ignoring\n"); - - return delayId(0, 0); - + debug(77, 2) ("delayClient: WARNING: Called with 'allones' address, ignoring\n"); + return delayId(0, 0); } - - for (pool = 0; pool < Config.Delay.pools; pool++) { + for (pool = 0; pool < Config.Delay.pools; pool++) { if (aclCheckFast(Config.Delay.access[pool], &ch)) break; } @@ -475,11 +471,10 @@ int mpos; unsigned int i, j; char individual_255_used; - /* delaySetSpec may be pointer to partial structure so MUST pass by * reference. */ - if (rates->aggregate.restore_bps != -1 && + if (rates->aggregate.restore_bps != -1 && (class3->aggregate += rates->aggregate.restore_bps * incr) > rates->aggregate.max_bytes) class3->aggregate = rates->aggregate.max_bytes; @@ -492,17 +487,14 @@ individual_restore_bytes *= incr; network_restore_bytes *= incr; for (i = 0; i < ((class3->network_255_used) ? NET_MAP_SZ : NET_MAP_SZ - 1); ++i) { - - assert(i < NET_MAP_SZ); + assert(i < NET_MAP_SZ); if (i != 255 && class3->network_map[i] == 255) return; if (individual_restore_bytes != -incr) { mpos = i << 8; individual_255_used = class3->individual_255_used[i / 8] & (1 << (i % 8)); - - for (j = 0; j < ((individual_255_used) ? IND_MAP_SZ : IND_MAP_SZ - 1); ++j, ++mpos) { - - assert(i < NET_MAP_SZ); + for (j = 0; j < ((individual_255_used) ? IND_MAP_SZ : IND_MAP_SZ - 1); ++j, ++mpos) { + assert(i < NET_MAP_SZ); assert(j < IND_MAP_SZ); if (j != 255 && class3->individual_map[i][j] == 255) break; Index: squid/src/icmp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/icmp.c,v retrieving revision 1.1.1.2.4.1 retrieving revision 1.1.1.2.4.1.4.1 diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.4.1 --- squid/src/icmp.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1 +++ squid/src/icmp.c 22 May 2000 11:15:10 -0000 1.1.1.2.4.1.4.1 @@ -1,6 +1,6 @@ /* - * $Id: icmp.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $ + * $Id: icmp.c,v 1.1.1.2.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -84,10 +84,6 @@ icmpClose(); return; } - if (n == 0) { - debug(37, 1) ("icmpRecv: pinger process disappeared?\n"); - icmpClose(); - } fail_count = 0; if (n == 0) /* test probe from pinger */ return; Index: squid/src/store.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store.c,v retrieving revision 1.1.1.3.4.1.4.1 retrieving revision 1.1.1.3.4.1.4.2 diff -u -r1.1.1.3.4.1.4.1 -r1.1.1.3.4.1.4.2 --- squid/src/store.c 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.1.4.1 +++ squid/src/store.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.2 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.1.1.3.4.1.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: store.c,v 1.1.1.3.4.1.4.2 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -661,8 +661,14 @@ if (e->mem_obj->request) e->mem_obj->request->hier.store_complete_stop = current_time; #endif - InvokeHandlers(e); + /* + * We used to call InvokeHandlers, then storeSwapOut. However, + * Madhukar Reddy reported that + * responses without content length would sometimes get released + * in client_side, thinking that the response is incomplete. + */ storeSwapOut(e); + InvokeHandlers(e); } /* @@ -1225,8 +1231,8 @@ age = (time_t) (z * 60.0); if (age < 60) age = 60; - else if (age > 31536000) - age = 31536000; + else if (age > Config.referenceAge) + age = Config.referenceAge; return age; } #endif Index: squid/src/store_dir.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store_dir.c,v retrieving revision 1.1.1.3.4.1 retrieving revision 1.1.1.3.4.1.4.1 diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.4.1 --- squid/src/store_dir.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1 +++ squid/src/store_dir.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $ + * $Id: store_dir.c,v 1.1.1.3.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -330,6 +330,8 @@ int dirn = fn >> SWAP_DIR_SHIFT; SwapDir *SD = &Config.cacheSwap.swapDirs[dirn]; assert(0 <= dirn && dirn < Config.cacheSwap.n_configured); + if (SD->cur_size >= SD->max_size) + return; SD->max_size = SD->cur_size; debug(20, 1) ("WARNING: Shrinking cache_dir #%d to %d KB\n", dirn, SD->cur_size); Index: squid/src/store_io_asyncufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/store_io_asyncufs.c,v retrieving revision 1.1.1.1.4.2 retrieving revision 1.1.1.1.4.2.4.1 diff -u -r1.1.1.1.4.2 -r1.1.1.1.4.2.4.1 --- squid/src/store_io_asyncufs.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.2 +++ squid/src/store_io_asyncufs.c 22 May 2000 11:15:10 -0000 1.1.1.1.4.2.4.1 @@ -232,6 +232,13 @@ if (cbdataValid(their_data)) callback(their_data, sio->type.aufs.read_buf, rlen); cbdataUnlock(their_data); + /* + * XXX is this safe? The above callback may have caused sio + * to be freed/closed already? Philip Guenther + * says it fixes his FD leaks, with no side effects. + */ + if (sio->type.aufs.flags.close_request) + storeAufsIOCallback(sio, DISK_OK); } /* Index: squid/src/url.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/url.c,v retrieving revision 1.1.1.3.4.1.4.1 retrieving revision 1.1.1.3.4.1.4.2 diff -u -r1.1.1.3.4.1.4.1 -r1.1.1.3.4.1.4.2 --- squid/src/url.c 17 Apr 2000 02:49:20 -0000 1.1.1.3.4.1.4.1 +++ squid/src/url.c 22 May 2000 11:15:10 -0000 1.1.1.3.4.1.4.2 @@ -1,6 +1,6 @@ /* - * $Id: url.c,v 1.1.1.3.4.1.4.1 2000/04/17 02:49:20 hno Exp $ + * $Id: url.c,v 1.1.1.3.4.1.4.2 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 23 URL Parsing * AUTHOR: Duane Wessels @@ -142,6 +142,7 @@ assert(0 == matchDomainName("FOO.com", "foo.COM")); assert(0 < matchDomainName("bfoo.com", "afoo.com")); assert(0 > matchDomainName("afoo.com", "bfoo.com")); + assert(0 < matchDomainName("x-foo.com", ".foo.com")); /* more cases? */ } @@ -469,6 +470,15 @@ /* * We found different characters in the same position (from the end). */ + /* + * If one of those character is '.' then its special. In order + * for splay tree sorting to work properly, "x-foo.com" must + * be greater than ".foo.com" even though '-' is less than '.'. + */ + if ('.' == d[dl]) + return 1; + if ('.' == h[hl]) + return -1; return (xtolower(h[hl]) - xtolower(d[dl])); } Index: squid/src/whois.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/whois.c,v retrieving revision 1.1.1.2.4.1 retrieving revision 1.1.1.2.4.1.4.1 diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.4.1 --- squid/src/whois.c 17 Apr 2000 00:56:54 -0000 1.1.1.2.4.1 +++ squid/src/whois.c 22 May 2000 11:15:10 -0000 1.1.1.2.4.1.4.1 @@ -1,6 +1,6 @@ /* - * $Id: whois.c,v 1.1.1.2.4.1 2000/04/17 00:56:54 hno Exp $ + * $Id: whois.c,v 1.1.1.2.4.1.4.1 2000/05/22 11:15:10 hno Exp $ * * DEBUG: section 75 WHOIS protocol * AUTHOR: Duane Wessels, Kostas Anagnostakis @@ -86,6 +86,7 @@ WhoisState *p = data; StoreEntry *entry = p->entry; char *buf = memAllocate(MEM_4K_BUF); + MemObject *mem = entry->mem_obj; int len; Counter.syscalls.sock.reads++; len = read(fd, buf, 4095); @@ -93,6 +94,8 @@ debug(75, 3) ("whoisReadReply: FD %d read %d bytes\n", fd, len); debug(75, 5) ("{%s}\n", buf); if (len > 0) { + if (0 == mem->inmem_hi) + mem->reply->sline.status = HTTP_OK; fd_bytes(fd, len, FD_READ); kb_incr(&Counter.server.all.kbytes_in, len); kb_incr(&Counter.server.http.kbytes_in, len); @@ -103,7 +106,7 @@ fd, xstrerror()); if (ignoreErrno(errno)) { commSetSelect(fd, COMM_SELECT_READ, whoisReadReply, p, Config.Timeout.read); - } else if (entry->mem_obj->inmem_hi == 0) { + } else if (mem->inmem_hi == 0) { ErrorState *err; err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR); err->xerrno = errno;