From: robertc <> Date: Wed, 26 Sep 2001 05:45:12 +0000 (+0000) Subject: Move CACHE_HTTP_PORT and CACHE_ICP_PORT from config.h.in to acconfig.h. X-Git-Tag: SQUID_3_0_PRE1~1390 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d683a650c88cf261bfa520c6162e1f559ea43ca;p=thirdparty%2Fsquid.git Move CACHE_HTTP_PORT and CACHE_ICP_PORT from config.h.in to acconfig.h. Move config.h.in to config.h to reduce unneeded recompilations after a configure. Regenerate autotools files. --- diff --git a/Makefile.am b/Makefile.am index 62535b250d..20b1df43e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,12 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.2 2001/09/02 12:16:54 robertc Exp $ +# $Id: Makefile.am,v 1.3 2001/09/25 23:45:12 robertc Exp $ # AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects VERSION=1.5 DIST_SUBDIRS = lib snmplib scripts src icons errors contrib SUBDIRS = lib @makesnmplib@ scripts src icons errors -EXTRA_DIST = include/config.h.in DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* dist-hook: diff --git a/Makefile.in b/Makefile.in index a8e64e7112..ba4f7dad41 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.1 2001/08/31 11:19:05 robertc Exp $ +# $Id: Makefile.in,v 1.2 2001/09/25 23:45:12 robertc Exp $ # SHELL = @SHELL@ @@ -70,8 +70,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -91,7 +89,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ @@ -121,17 +121,16 @@ am__quote = @am__quote@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ -AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects +AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects VERSION=1.5 DIST_SUBDIRS = lib snmplib scripts src icons errors contrib SUBDIRS = lib @makesnmplib@ scripts src icons errors -EXTRA_DIST = include/config.h.in DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h -CONFIG_CLEAN_FILES = include/config.h +CONFIG_CLEAN_FILES = DIST_SOURCES = RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ @@ -186,8 +185,6 @@ $(srcdir)/./include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_s distclean-hdr: -rm -f include/autoconf.h -include/config.h: $(top_builddir)/config.status $(top_srcdir)/include/config.h.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -293,7 +290,7 @@ GZIP_ENV = --best distdir: $(DISTFILES) -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/./include $(distdir)/cfgaux $(distdir)/include $(distdir)/scripts + $(mkinstalldirs) $(distdir)/./include $(distdir)/cfgaux $(distdir)/scripts @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/aclocal.m4 b/aclocal.m4 index d92becb212..6529a72925 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.4s +# aclocal.m4 generated automatically by aclocal 1.5 # Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -164,8 +164,8 @@ AC_SUBST($1)]) # Define MISSING if not defined so far and test if it supports --run. # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], -[test x"${MISSING+set}" = xset || - MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing" +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -176,14 +176,6 @@ else fi ]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - # AM_AUX_DIR_EXPAND # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets @@ -229,6 +221,14 @@ AC_DEFUN([AM_AUX_DIR_EXPAND], [ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` ]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip diff --git a/configure b/configure index bafe5a1170..3f667931ed 100755 --- a/configure +++ b/configure @@ -1612,7 +1612,13 @@ if test -z "$CACHE_ICP_PORT"; then CACHE_ICP_PORT="3130" fi +cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:2817: checking how to run the C preprocessor" >&5 +echo "configure:2823: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2828,13 +2834,13 @@ else # 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:2838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2844: \"$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 : @@ -2845,13 +2851,13 @@ else 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:2855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2861: \"$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 : @@ -2862,13 +2868,13 @@ else 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:2872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2878: \"$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 : @@ -2904,7 +2910,7 @@ echo "$ac_t""$CPP" 1>&6 # 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:2908: checking for a BSD compatible install" >&5 +echo "configure:2914: 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 @@ -2959,7 +2965,7 @@ 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:2963: checking for $ac_word" >&5 +echo "configure:2969: 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 @@ -2987,7 +2993,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2991: checking whether ln -s works" >&5 +echo "configure:2997: 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 @@ -3010,7 +3016,7 @@ 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:3014: checking for $ac_word" >&5 +echo "configure:3020: 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 @@ -3046,7 +3052,7 @@ 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:3050: checking for $ac_word" >&5 +echo "configure:3056: 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 @@ -3082,7 +3088,7 @@ 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:3086: checking for $ac_word" >&5 +echo "configure:3092: 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 @@ -3118,7 +3124,7 @@ 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:3122: checking for $ac_word" >&5 +echo "configure:3128: 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 @@ -3154,7 +3160,7 @@ 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:3158: checking for $ac_word" >&5 +echo "configure:3164: 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 @@ -3190,7 +3196,7 @@ 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:3194: checking for $ac_word" >&5 +echo "configure:3200: 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 @@ -3226,7 +3232,7 @@ 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:3230: checking for $ac_word" >&5 +echo "configure:3236: 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 @@ -3262,7 +3268,7 @@ 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:3266: checking for $ac_word" >&5 +echo "configure:3272: 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 @@ -3298,7 +3304,7 @@ 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:3302: checking for $ac_word" >&5 +echo "configure:3308: 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 @@ -3358,12 +3364,12 @@ 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:3362: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3368: 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> @@ -3371,7 +3377,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3396,7 +3402,7 @@ 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:3400: checking for opendir in -ldir" >&5 +echo "configure:3406: 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 @@ -3404,7 +3410,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3437,7 +3443,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3441: checking for opendir in -lx" >&5 +echo "configure:3447: 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 @@ -3445,7 +3451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3479,12 +3485,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3483: checking for ANSI C header files" >&5 +echo "configure:3489: 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 @@ -3492,7 +3498,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3502: \"$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* @@ -3509,7 +3515,7 @@ 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 @@ -3527,7 +3533,7 @@ 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 @@ -3548,7 +3554,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3559,7 +3565,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3588,7 +3594,6 @@ for ac_hdr in \ arpa/nameser.h \ assert.h \ bstring.h \ - config.h \ crypt.h \ ctype.h \ errno.h \ @@ -3660,17 +3665,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3664: checking for $ac_hdr" >&5 +echo "configure:3669: 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:3674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3679: \"$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* @@ -3698,12 +3703,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3702: checking for working const" >&5 +echo "configure:3707: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3773,14 +3778,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3777: checking whether byte ordering is bigendian" >&5 +echo "configure:3782: 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 @@ -3791,11 +3796,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3800: \"$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 @@ -3806,7 +3811,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3826,7 +3831,7 @@ 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 +if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3864,20 +3869,20 @@ fi echo $ac_n "checking if ANSI prototypes work""... $ac_c" 1>&6 -echo "configure:3868: checking if ANSI prototypes work" >&5 +echo "configure:3873: 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 +if { (eval echo configure:3886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ansi_prototypes="yes" else @@ -3899,13 +3904,13 @@ EOF fi echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6 -echo "configure:3903: checking for tm->tm_gmtoff" >&5 +echo "configure:3908: 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 @@ -3914,7 +3919,7 @@ struct tm foo; foo.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:3918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_tm_gmoff="yes" else @@ -3936,13 +3941,13 @@ EOF fi echo $ac_n "checking for struct mallinfo""... $ac_c" 1>&6 -echo "configure:3940: checking for struct mallinfo" >&5 +echo "configure:3945: 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 @@ -3960,7 +3965,7 @@ struct mallinfo foo; foo.keepcost = 0; ; return 0; } EOF -if { (eval echo configure:3964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_mallinfo="yes" else @@ -3982,13 +3987,13 @@ EOF fi echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6 -echo "configure:3986: checking for extended mallinfo" >&5 +echo "configure:3991: 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 @@ -3997,7 +4002,7 @@ struct mallinfo foo; foo.mxfast = 0; ; return 0; } EOF -if { (eval echo configure:4001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ext_mallinfo="yes" else @@ -4019,13 +4024,13 @@ EOF fi echo $ac_n "checking for struct rusage""... $ac_c" 1>&6 -echo "configure:4023: checking for struct rusage" >&5 +echo "configure:4028: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_struct_rusage="yes" else @@ -4060,13 +4065,13 @@ EOF fi echo $ac_n "checking for ip->ip_hl""... $ac_c" 1>&6 -echo "configure:4064: checking for ip->ip_hl" >&5 +echo "configure:4069: 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 @@ -4085,7 +4090,7 @@ struct iphdr ip; ip.ip_hl= 0; ; return 0; } EOF -if { (eval echo configure:4089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ip_hl="yes" else @@ -4107,7 +4112,7 @@ EOF fi echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4111: checking size of void *" >&5 +echo "configure:4116: 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 @@ -4115,7 +4120,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4127,7 +4132,7 @@ main() exit(0); } EOF -if { (eval echo configure:4131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4136: \"$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 @@ -4147,7 +4152,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4151: checking size of short" >&5 +echo "configure:4156: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4155,7 +4160,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4167,7 +4172,7 @@ main() exit(0); } EOF -if { (eval echo configure:4171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -4187,7 +4192,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4191: checking size of int" >&5 +echo "configure:4196: 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 @@ -4195,7 +4200,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4207,7 +4212,7 @@ main() exit(0); } EOF -if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4216: \"$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 @@ -4227,7 +4232,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4231: checking size of long" >&5 +echo "configure:4236: 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 @@ -4235,7 +4240,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4247,7 +4252,7 @@ main() exit(0); } EOF -if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4256: \"$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 @@ -4267,7 +4272,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4271: checking size of long long" >&5 +echo "configure:4276: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4275,7 +4280,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4287,7 +4292,7 @@ main() exit(0); } EOF -if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -4307,7 +4312,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:4311: checking size of __int64" >&5 +echo "configure:4316: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4315,7 +4320,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4327,7 +4332,7 @@ main() exit(0); } EOF -if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -4347,7 +4352,7 @@ EOF echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:4351: checking size of int16_t" >&5 +echo "configure:4356: checking size of int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4355,7 +4360,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4367,7 +4372,7 @@ main() exit(0); } EOF -if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -4387,7 +4392,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:4391: checking size of uint16_t" >&5 +echo "configure:4396: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4395,7 +4400,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4407,7 +4412,7 @@ main() exit(0); } EOF -if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -4427,7 +4432,7 @@ EOF echo $ac_n "checking size of u_int16_t""... $ac_c" 1>&6 -echo "configure:4431: checking size of u_int16_t" >&5 +echo "configure:4436: checking size of u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4435,7 +4440,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4447,7 +4452,7 @@ main() exit(0); } EOF -if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int16_t=`cat conftestval` else @@ -4467,7 +4472,7 @@ EOF echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:4471: checking size of int32_t" >&5 +echo "configure:4476: checking size of int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4475,7 +4480,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4487,7 +4492,7 @@ main() exit(0); } EOF -if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -4507,7 +4512,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:4511: checking size of uint32_t" >&5 +echo "configure:4516: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4515,7 +4520,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4527,7 +4532,7 @@ main() exit(0); } EOF -if { (eval echo configure:4531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -4547,7 +4552,7 @@ EOF echo $ac_n "checking size of u_int32_t""... $ac_c" 1>&6 -echo "configure:4551: checking size of u_int32_t" >&5 +echo "configure:4556: checking size of u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4555,7 +4560,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4567,7 +4572,7 @@ main() exit(0); } EOF -if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int32_t=`cat conftestval` else @@ -4587,7 +4592,7 @@ EOF echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:4591: checking size of int64_t" >&5 +echo "configure:4596: checking size of int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4595,7 +4600,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4607,7 +4612,7 @@ main() exit(0); } EOF -if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -4627,7 +4632,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:4631: checking size of uint64_t" >&5 +echo "configure:4636: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4635,7 +4640,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4647,7 +4652,7 @@ main() exit(0); } EOF -if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -4667,7 +4672,7 @@ EOF echo $ac_n "checking size of u_int64_t""... $ac_c" 1>&6 -echo "configure:4671: checking size of u_int64_t" >&5 +echo "configure:4676: checking size of u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4675,7 +4680,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -4687,7 +4692,7 @@ main() exit(0); } EOF -if { (eval echo configure:4691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_u_int64_t=`cat conftestval` else @@ -4709,12 +4714,12 @@ EOF if test "x$ac_cv_sizeof_short" = "x2"; then echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:4713: checking for int16_t" >&5 +echo "configure:4718: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4743,12 +4748,12 @@ fi elif test "x$ac_cv_sizeof_int" = "x2"; then echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:4747: checking for int16_t" >&5 +echo "configure:4752: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4778,12 +4783,12 @@ fi fi if test "x$ac_cv_sizeof_uint16_t" = "x2"; then echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 -echo "configure:4782: checking for u_int16_t" >&5 +echo "configure:4787: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4812,12 +4817,12 @@ fi elif test "x$ac_cv_sizeof_short" = "x2"; then echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 -echo "configure:4816: checking for u_int16_t" >&5 +echo "configure:4821: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4846,12 +4851,12 @@ fi elif test "x$ac_cv_sizeof_int" = "x2"; then echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 -echo "configure:4850: checking for u_int16_t" >&5 +echo "configure:4855: checking for u_int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4881,12 +4886,12 @@ fi fi if test "x$ac_cv_sizeof_int" = "x4"; then echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:4885: checking for int32_t" >&5 +echo "configure:4890: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4915,12 +4920,12 @@ fi elif "x$ac_cv_sizeof_long" = "x4"; then echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:4919: checking for int32_t" >&5 +echo "configure:4924: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4950,12 +4955,12 @@ fi fi if test "x$ac_cv_sizeof_uint32_t" = "x4"; then echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:4954: checking for u_int32_t" >&5 +echo "configure:4959: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4984,12 +4989,12 @@ fi elif test "x$ac_cv_sizeof_int" = "x4"; then echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:4988: checking for u_int32_t" >&5 +echo "configure:4993: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5018,12 +5023,12 @@ fi elif test "x$ac_cv_sizeof_long" = "x4"; then echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:5022: checking for u_int32_t" >&5 +echo "configure:5027: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5053,12 +5058,12 @@ fi fi if test "x$ac_cv_sizeof_long" = "x8"; then echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:5057: checking for int64_t" >&5 +echo "configure:5062: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5087,12 +5092,12 @@ fi elif test "x$ac_cv_sizeof_long_long" = "x8"; then echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:5091: checking for int64_t" >&5 +echo "configure:5096: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5121,12 +5126,12 @@ fi elif test "x$ac_cv_sizeof___int64" = "x8"; then echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:5125: checking for int64_t" >&5 +echo "configure:5130: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5156,12 +5161,12 @@ fi fi if test "x$ac_cv_sizeof_uint64_t" = "x8"; then echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6 -echo "configure:5160: checking for u_int64_t" >&5 +echo "configure:5165: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5190,12 +5195,12 @@ fi elif test "x$ac_cv_sizeof_long" = "x8"; then echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6 -echo "configure:5194: checking for u_int64_t" >&5 +echo "configure:5199: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5224,12 +5229,12 @@ fi elif test "x$ac_cv_sizeof_long_long" = "x8"; then echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6 -echo "configure:5228: checking for u_int64_t" >&5 +echo "configure:5233: checking for u_int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5258,12 +5263,12 @@ fi elif test "x$ac_cv_sizeof___int64" = "x8"; then echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:5262: checking for int64_t" >&5 +echo "configure:5267: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5293,12 +5298,12 @@ fi fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5297: checking for pid_t" >&5 +echo "configure:5302: 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 @@ -5326,12 +5331,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5330: checking for size_t" >&5 +echo "configure:5335: 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 @@ -5359,12 +5364,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:5363: checking for ssize_t" >&5 +echo "configure:5368: 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 @@ -5392,12 +5397,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5396: checking for off_t" >&5 +echo "configure:5401: 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 @@ -5425,12 +5430,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5429: checking for mode_t" >&5 +echo "configure:5434: 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 @@ -5458,12 +5463,12 @@ EOF fi echo $ac_n "checking for fd_mask""... $ac_c" 1>&6 -echo "configure:5462: checking for fd_mask" >&5 +echo "configure:5467: 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 @@ -5494,19 +5499,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5498: checking for working alloca.h" >&5 +echo "configure:5503: 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:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5515: \"$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 @@ -5527,12 +5532,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5531: checking for alloca" >&5 +echo "configure:5536: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5569: \"$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 @@ -5592,12 +5597,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5596: checking whether alloca needs Cray hooks" >&5 +echo "configure:5601: 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 <&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:5626: checking for $ac_func" >&5 +echo "configure:5631: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5659: \"$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 @@ -5677,7 +5682,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5681: checking stack direction for C alloca" >&5 +echo "configure:5686: 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 @@ -5685,7 +5690,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5713: \"$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 @@ -5728,13 +5733,13 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:5732: checking for socklen_t" >&5 +echo "configure:5737: 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 @@ -5765,13 +5770,13 @@ EOF fi echo $ac_n "checking for mtyp_t""... $ac_c" 1>&6 -echo "configure:5769: checking for mtyp_t" >&5 +echo "configure:5774: checking for mtyp_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mtyp_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5799,7 +5804,7 @@ EOF fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5803: checking for main in -lnsl" >&5 +echo "configure:5808: 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 @@ -5807,14 +5812,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5842,7 +5847,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5846: checking for main in -lsocket" >&5 +echo "configure:5851: 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 @@ -5850,14 +5855,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5889,7 +5894,7 @@ 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:5893: checking for main in -lgnumalloc" >&5 +echo "configure:5898: 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 @@ -5897,14 +5902,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnumalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5947,7 +5952,7 @@ fi *) echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6 -echo "configure:5951: checking for main in -lmalloc" >&5 +echo "configure:5956: 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 @@ -5955,14 +5960,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5995,7 +6000,7 @@ fi fi echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:5999: checking for main in -lbsd" >&5 +echo "configure:6004: 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 @@ -6003,14 +6008,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6038,7 +6043,7 @@ else fi echo $ac_n "checking for main in -lregex""... $ac_c" 1>&6 -echo "configure:6042: checking for main in -lregex" >&5 +echo "configure:6047: 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 @@ -6046,14 +6051,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lregex $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6074,7 +6079,7 @@ else fi echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:6078: checking for gethostbyname in -lbind" >&5 +echo "configure:6083: 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 @@ -6082,7 +6087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6127,7 +6132,7 @@ if test $ac_cv_lib_bind_gethostbyname = "no" ; then ;; *) echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:6131: checking for inet_aton in -lresolv" >&5 +echo "configure:6136: 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 @@ -6135,7 +6140,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6162,7 +6167,7 @@ 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:6166: checking for inet_aton in -l44bsd" >&5 +echo "configure:6171: 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 @@ -6170,7 +6175,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l44bsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6213,7 +6218,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:6217: checking for main in -lresolv" >&5 +echo "configure:6222: 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 @@ -6221,14 +6226,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6259,7 +6264,7 @@ fi esac fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6263: checking for main in -lm" >&5 +echo "configure:6268: 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 @@ -6267,14 +6272,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6303,7 +6308,7 @@ fi echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:6307: checking for crypt in -lcrypt" >&5 +echo "configure:6312: 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 @@ -6311,7 +6316,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6345,7 +6350,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:6349: checking for dlopen in -ldl" >&5 +echo "configure:6354: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6353,7 +6358,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6387,7 +6392,7 @@ fi echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:6391: checking for main in -lpthread" >&5 +echo "configure:6396: 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 @@ -6395,14 +6400,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6425,7 +6430,7 @@ fi echo $ac_n "checking for aio_read in -lrt""... $ac_c" 1>&6 -echo "configure:6429: checking for aio_read in -lrt" >&5 +echo "configure:6434: checking for aio_read in -lrt" >&5 ac_lib_var=`echo rt'_'aio_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6433,7 +6438,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6469,7 +6474,7 @@ fi case "$host" in *-pc-sco3.2*) echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:6473: checking for strftime in -lintl" >&5 +echo "configure:6478: 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 @@ -6477,7 +6482,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6599,7 +6604,7 @@ if test -z "$ac_cv_func_poll"; then ac_cv_func_poll='no' ;; *-linux-*) - # Henrik Nordstrom (hno@hem.passagen.se) 19980817 + # Henrik Nordstrom (hno@squid-cache.org) 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}'` @@ -6673,12 +6678,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6677: checking for $ac_func" >&5 +echo "configure:6682: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6710: \"$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 @@ -6727,7 +6732,7 @@ done echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6 -echo "configure:6731: checking if setresuid is implemented" >&5 +echo "configure:6736: 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 @@ -6735,7 +6740,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -6748,7 +6753,7 @@ else } EOF -if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6757: \"$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 @@ -6773,7 +6778,7 @@ fi if test "$IPF_TRANSPARENT" ; then echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6 -echo "configure:6777: checking if IP-Filter header files are installed" >&5 +echo "configure:6782: checking if IP-Filter header files are installed" >&5 # hold on to your hats... if test "$ac_cv_header_ip_compat_h" = "yes" || test "$ac_cv_header_ip_fil_compat_h" = "yes" || @@ -6814,7 +6819,7 @@ fi if test "$LINUX_NETFILTER" ; then echo $ac_n "checking if Linux 2.4 kernel header files are installed""... $ac_c" 1>&6 -echo "configure:6818: checking if Linux 2.4 kernel header files are installed" >&5 +echo "configure:6823: checking if Linux 2.4 kernel header files are installed" >&5 # hold on to your hats... if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes"; then LINUX_NETFILTER="yes" @@ -6848,13 +6853,13 @@ if test -z "$USE_GNUREGEX" ; then esac fi echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6 -echo "configure:6852: checking if GNUregex needs to be compiled" >&5 +echo "configure:6857: 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 @@ -6862,7 +6867,7 @@ int main() { regex_t t; regcomp(&t,"",0); ; return 0; } EOF -if { (eval echo configure:6866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* USE_GNUREGEX="no" else @@ -6893,12 +6898,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6897: checking for $ac_func" >&5 +echo "configure:6902: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6930: \"$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 @@ -6949,12 +6954,12 @@ done echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6 -echo "configure:6953: checking Default FD_SETSIZE value" >&5 +echo "configure:6958: checking Default FD_SETSIZE value" >&5 if test "$cross_compiling" = yes; then DEFAULT_FD_SETSIZE=256 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6988: \"$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 @@ -6998,7 +7003,7 @@ EOF echo $ac_n "checking Maximum number of filedescriptors we can open""... $ac_c" 1>&6 -echo "configure:7002: checking Maximum number of filedescriptors we can open" >&5 +echo "configure:7007: checking Maximum number of filedescriptors we can open" >&5 TLDFLAGS="$LDFLAGS" case $host in i386-unknown-freebsd*) @@ -7010,7 +7015,7 @@ if test "$cross_compiling" = yes; then SQUID_MAXFD=256 else cat > conftest.$ac_ext < @@ -7070,7 +7075,7 @@ main() { } EOF -if { (eval echo configure:7074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7079: \"$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 @@ -7097,12 +7102,12 @@ fi LDFLAGS="$TLDFLAGS" echo $ac_n "checking Default UDP send buffer size""... $ac_c" 1>&6 -echo "configure:7101: checking Default UDP send buffer size" >&5 +echo "configure:7106: checking Default UDP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -7123,7 +7128,7 @@ main () } EOF -if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7132: \"$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 @@ -7142,12 +7147,12 @@ EOF echo $ac_n "checking Default UDP receive buffer size""... $ac_c" 1>&6 -echo "configure:7146: checking Default UDP receive buffer size" >&5 +echo "configure:7151: checking Default UDP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_UDP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -7168,7 +7173,7 @@ main () } EOF -if { (eval echo configure:7172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7177: \"$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 @@ -7187,12 +7192,12 @@ EOF echo $ac_n "checking Default TCP send buffer size""... $ac_c" 1>&6 -echo "configure:7191: checking Default TCP send buffer size" >&5 +echo "configure:7196: checking Default TCP send buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < @@ -7213,7 +7218,7 @@ main () } EOF -if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7222: \"$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 @@ -7232,12 +7237,12 @@ EOF echo $ac_n "checking Default TCP receive buffer size""... $ac_c" 1>&6 -echo "configure:7236: checking Default TCP receive buffer size" >&5 +echo "configure:7241: checking Default TCP receive buffer size" >&5 if test "$cross_compiling" = yes; then SQUID_TCP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < @@ -7258,7 +7263,7 @@ main () } EOF -if { (eval echo configure:7262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7267: \"$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 @@ -7277,19 +7282,19 @@ EOF echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6 -echo "configure:7281: checking if sys_errlist is already defined" >&5 +echo "configure:7286: 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:7293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_needs_sys_errlist="no" else @@ -7311,16 +7316,16 @@ EOF fi echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6 -echo "configure:7315: checking for libresolv _dns_ttl_ hack" >&5 +echo "configure:7320: checking for libresolv _dns_ttl_ hack" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7329: \"$ac_link\") 1>&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 @@ -7336,12 +7341,12 @@ fi rm -f conftest* echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6 -echo "configure:7340: checking if inet_ntoa() actually works" >&5 +echo "configure:7345: checking if inet_ntoa() actually works" >&5 if test "$cross_compiling" = yes; then INET_NTOA_RESULT="broken" else cat > conftest.$ac_ext < @@ -7360,7 +7365,7 @@ main () } EOF -if { (eval echo configure:7364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7369: \"$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 @@ -7386,9 +7391,9 @@ 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:7390: checking for working statvfs() interface" >&5 +echo "configure:7395: checking for working statvfs() interface" >&5 cat > conftest.$ac_ext < @@ -7405,7 +7410,7 @@ statvfs("/tmp", &sfs); ; return 0; } EOF -if { (eval echo configure:7409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_statvfs=yes else @@ -7425,12 +7430,12 @@ fi fi echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6 -echo "configure:7429: checking for _res.nsaddr_list" >&5 +echo "configure:7434: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_nsaddr_list="yes" else @@ -7475,12 +7480,12 @@ 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:7479: checking for _res.ns_list" >&5 +echo "configure:7484: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_res_ns_list="yes" else @@ -7652,7 +7657,6 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "\ Makefile \ lib/Makefile \ - include/config.h \ scripts/Makefile \ scripts/RunCache \ scripts/RunAccel \ @@ -7754,8 +7758,6 @@ s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g s%@ENABLE_WIN32SPECIFIC_TRUE@%$ENABLE_WIN32SPECIFIC_TRUE%g s%@ENABLE_WIN32SPECIFIC_FALSE@%$ENABLE_WIN32SPECIFIC_FALSE%g -s%@CACHE_HTTP_PORT@%$CACHE_HTTP_PORT%g -s%@CACHE_ICP_PORT@%$CACHE_ICP_PORT%g s%@LIBDLMALLOC@%$LIBDLMALLOC%g s%@LIB_MALLOC@%$LIB_MALLOC%g s%@SQUID_PTHREAD_LIB@%$SQUID_PTHREAD_LIB%g @@ -7863,7 +7865,6 @@ cat >> $CONFIG_STATUS < header file. */ #undef HAVE_BYTESWAP_H -/* Define if you have the header file. */ -#undef HAVE_CONFIG_H - /* Define if you have the header file. */ #undef HAVE_CRYPT_H diff --git a/include/config.h b/include/config.h new file mode 100644 index 0000000000..ca95a08e3c --- /dev/null +++ b/include/config.h @@ -0,0 +1,178 @@ +/* + * $Id: config.h,v 1.1 2001/09/25 23:45:15 robertc Exp $ + * + * AUTHOR: Duane Wessels + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +#include "autoconf.h" /* For GNU autoconf variables */ +#include "version.h" + +/**************************************************************************** + *--------------------------------------------------------------------------* + * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...* + *--------------------------------------------------------------------------* + ****************************************************************************/ + +#ifdef USE_POSIX_REGEX +#ifndef USE_RE_SYNTAX +#define USE_RE_SYNTAX REG_EXTENDED /* default Syntax */ +#endif +#endif + +/* define the _SQUID_TYPE_ based on a guess of the OS */ +#if defined(__sun__) || defined(__sun) /* SUN */ +#define _SQUID_SUN_ +#if defined(__SVR4) /* SOLARIS */ +#define _SQUID_SOLARIS_ +#else /* SUNOS */ +#define _SQUID_SUNOS_ +#endif + +#elif defined(__hpux) /* HP-UX - SysV-like? */ +#define _SQUID_HPUX_ +#define _SQUID_SYSV_ + +#elif defined(__osf__) /* OSF/1 */ +#define _SQUID_OSF_ + +#elif defined(__ultrix) /* Ultrix */ +#define _SQUID_ULTRIX_ + +#elif defined(_AIX) /* AIX */ +#define _SQUID_AIX_ + +#elif defined(__linux__) /* Linux */ +#define _SQUID_LINUX_ +#if USE_ASYNC_IO +#define _SQUID_LINUX_THREADS_ +#endif + +#elif defined(__FreeBSD__) /* FreeBSD */ +#define _SQUID_FREEBSD_ +#if USE_ASYNC_IO && defined(LINUXTHREADS) +#define _SQUID_LINUX_THREADS_ +#endif + +#elif defined(__sgi__) || defined(sgi) || defined(__sgi) /* SGI */ +#define _SQUID_SGI_ +#if !defined(_SVR4_SOURCE) +#define _SVR4_SOURCE /* for tempnam(3) */ +#endif +#if USE_ASYNC_IO +#define _ABI_SOURCE +#endif /* USE_ASYNC_IO */ + +#elif defined(__NeXT__) +#define _SQUID_NEXT_ + +#elif defined(__bsdi__) +#define _SQUID_BSDI_ /* BSD/OS */ + +#elif defined(__NetBSD__) +#define _SQUID_NETBSD_ + +#elif defined(__CYGWIN32__) || defined(__CYGWIN__) +#define _SQUID_CYGWIN_ + +#elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) +#define _SQUID_MSWIN_ + +#elif defined(__APPLE__) +#define _SQUID_APPLE_ + +#elif defined(sony_news) && defined(__svr4) +#define _SQUID_NEWSOS6_ + +#elif defined(__EMX__) || defined(OS2) || defined(__OS2__) +#define _SQUID_OS2_ +/* + * FIXME: the os2 port of bash seems to have problems checking + * the return codes of programs in if statements. These options + * need to be overridden. + */ +#ifndef socklen_t +#define socklen_t int +#endif +#ifndef fd_mask +#define fd_mask unsigned long +#endif +#endif + +#if !defined(CACHEMGR_HOSTNAME) +#define CACHEMGR_HOSTNAME "" +#endif + +#if SQUID_UDP_SO_SNDBUF > 16384 +#undef SQUID_UDP_SO_SNDBUF +#define SQUID_UDP_SO_SNDBUF 16384 +#endif + +#if SQUID_UDP_SO_RCVBUF > 16384 +#undef SQUID_UDP_SO_RCVBUF +#define SQUID_UDP_SO_RCVBUF 16384 +#endif + +#ifdef HAVE_MEMCPY +#define xmemcpy(d,s,n) memcpy((d),(s),(n)) +#elif HAVE_BCOPY +#define xmemcpy(d,s,n) bcopy((s),(d),(n)) +#elif HAVE_MEMMOVE +#define xmemcpy(d,s,n) memmove((d),(s),(n)) +#endif + +#ifdef HAVE_MEMMOVE +#define xmemmove(d,s,n) memmove((d),(s),(n)) +#elif HAVE_BCOPY +#define xmemmove(d,s,n) bcopy((s),(d),(n)) +#endif + +#define xisspace(x) isspace((unsigned char)x) +#define xtoupper(x) toupper((unsigned char)x) +#define xtolower(x) tolower((unsigned char)x) +#define xisdigit(x) isdigit((unsigned char)x) +#define xisascii(x) isascii((unsigned char)x) +#define xislower(x) islower((unsigned char)x) +#define xisalpha(x) isalpha((unsigned char)x) + +#if HAVE_RANDOM +#define squid_random random +#define squid_srandom srandom +#elif HAVE_LRAND48 +#define squid_random lrand48 +#define squid_srandom srand48 +#else +#define squid_random rand +#define squid_srandom srand +#endif + +#endif /* _CONFIG_H_ */ diff --git a/lib/Makefile.in b/lib/Makefile.in index 1f8930b240..b9b1067fae 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.50 2001/08/31 11:19:10 robertc Exp $ +# $Id: Makefile.in,v 1.51 2001/09/25 23:45:17 robertc Exp $ # SHELL = @SHELL@ @@ -70,8 +70,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -91,7 +89,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index a7143eb208..7065caf252 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -71,8 +71,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -92,7 +90,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index af14f42b91..b04adce2ee 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/Makefile.in b/src/Makefile.in index 0469fd18c8..3b03f30e70 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.213 2001/09/06 21:17:39 hno Exp $ +# $Id: Makefile.in,v 1.214 2001/09/25 23:45:19 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -73,8 +73,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -437,17 +435,17 @@ pinger_DEPENDENCIES = ../lib/libmiscutil.a pinger_LDFLAGS = @USE_DELAY_POOLS_FALSE@am__objects_1 = @USE_DELAY_POOLS_TRUE@am__objects_1 = delay_pools.$(OBJEXT) -@USE_DNSSERVER_FALSE@am__objects_2 = dns_internal.$(OBJEXT) @USE_DNSSERVER_TRUE@am__objects_2 = dns.$(OBJEXT) +@USE_DNSSERVER_FALSE@am__objects_2 = dns_internal.$(OBJEXT) @ENABLE_HTCP_TRUE@am__objects_3 = htcp.$(OBJEXT) -@MAKE_LEAKFINDER_TRUE@am__objects_4 = leakfinder.$(OBJEXT) @MAKE_LEAKFINDER_FALSE@am__objects_4 = +@MAKE_LEAKFINDER_TRUE@am__objects_4 = leakfinder.$(OBJEXT) @USE_SNMP_TRUE@am__objects_5 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT) @USE_SNMP_FALSE@am__objects_5 = -@ENABLE_SSL_FALSE@am__objects_6 = @ENABLE_SSL_TRUE@am__objects_6 = ssl_support.$(OBJEXT) -@ENABLE_UNLINKD_TRUE@am__objects_7 = unlinkd.$(OBJEXT) +@ENABLE_SSL_FALSE@am__objects_6 = @ENABLE_UNLINKD_FALSE@am__objects_7 = +@ENABLE_UNLINKD_TRUE@am__objects_7 = unlinkd.$(OBJEXT) @ENABLE_WIN32SPECIFIC_FALSE@am__objects_8 = @ENABLE_WIN32SPECIFIC_TRUE@am__objects_8 = win32.$(OBJEXT) am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \ diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index fd0ae7487b..183f745d8a 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -15,7 +15,7 @@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.2 2001/08/31 11:19:13 robertc Exp $ +# $Id: Makefile.in,v 1.3 2001/09/25 23:45:21 robertc Exp $ # SHELL = @SHELL@ @@ -71,8 +71,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -92,7 +90,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/auth/basic/Makefile.in b/src/auth/basic/Makefile.in index d2c046a250..0ac386f094 100644 --- a/src/auth/basic/Makefile.in +++ b/src/auth/basic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/auth/digest/Makefile.in b/src/auth/digest/Makefile.in index f3cfc95fdb..c0e473e5a7 100644 --- a/src/auth/digest/Makefile.in +++ b/src/auth/digest/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/auth/ntlm/Makefile.in b/src/auth/ntlm/Makefile.in index 2e7b49b3dc..4c5df44371 100644 --- a/src/auth/ntlm/Makefile.in +++ b/src/auth/ntlm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index dc81cf46ab..bf7482cbad 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.4 2001/08/31 11:19:29 robertc Exp $ +# $Id: Makefile.in,v 1.5 2001/09/25 23:45:38 robertc Exp $ # SHELL = @SHELL@ @@ -71,8 +71,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -92,7 +90,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/aufs/Makefile.in b/src/fs/aufs/Makefile.in index a4ad8d2630..791be92151 100644 --- a/src/fs/aufs/Makefile.in +++ b/src/fs/aufs/Makefile.in @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/coss/Makefile.in b/src/fs/coss/Makefile.in index 50478ea16f..15357ac73a 100644 --- a/src/fs/coss/Makefile.in +++ b/src/fs/coss/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/diskd/Makefile.in b/src/fs/diskd/Makefile.in index 329d9b2f70..b0f6b10bcb 100644 --- a/src/fs/diskd/Makefile.in +++ b/src/fs/diskd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -16,7 +16,7 @@ # # Makefile for the DISKD storage driver for the Squid Object Cache server # -# $Id: Makefile.in,v 1.2 2001/08/31 11:19:33 robertc Exp $ +# $Id: Makefile.in,v 1.3 2001/09/25 23:45:41 robertc Exp $ # SHELL = @SHELL@ @@ -72,8 +72,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -93,7 +91,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/null/Makefile.in b/src/fs/null/Makefile.in index d2c1f01952..28cbc1577f 100644 --- a/src/fs/null/Makefile.in +++ b/src/fs/null/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/fs/ufs/Makefile.in b/src/fs/ufs/Makefile.in index 6c6c0e669e..84cbf671d7 100644 --- a/src/fs/ufs/Makefile.in +++ b/src/fs/ufs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index 5d13370fb0..b2ccfe9479 100644 --- a/src/repl/Makefile.in +++ b/src/repl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.3 2001/08/31 11:19:35 robertc Exp $ +# $Id: Makefile.in,v 1.4 2001/09/25 23:45:43 robertc Exp $ # SHELL = @SHELL@ @@ -71,8 +71,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -92,7 +90,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/repl/heap/Makefile.in b/src/repl/heap/Makefile.in index 9dc557b7a4..f18968416e 100644 --- a/src/repl/heap/Makefile.in +++ b/src/repl/heap/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@ diff --git a/src/repl/lru/Makefile.in b/src/repl/lru/Makefile.in index 9716fbbfd2..86ef27e271 100644 --- a/src/repl/lru/Makefile.in +++ b/src/repl/lru/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4s from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -66,8 +66,6 @@ AUTH_MODULES = @AUTH_MODULES@ AUTH_OBJS = @AUTH_OBJS@ AWK = @AWK@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ -CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ -CACHE_ICP_PORT = @CACHE_ICP_PORT@ CC = @CC@ CPP = @CPP@ CRYPTLIB = @CRYPTLIB@ @@ -87,7 +85,9 @@ MKDIR = @MKDIR@ MV = @MV@ NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ OPT_PINGER_EXE = @OPT_PINGER_EXE@ PACKAGE = @PACKAGE@ PERL = @PERL@