From: wessels <> Date: Thu, 22 Feb 1996 14:40:40 +0000 (+0000) Subject: misc X-Git-Tag: SQUID_3_0_PRE1~6436 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2877b8a94301e483e6e8791c8d968cafe74e2ecc;p=thirdparty%2Fsquid.git misc --- diff --git a/configure b/configure index dbcc7c4e02..a302475f56 100755 --- a/configure +++ b/configure @@ -11,7 +11,7 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_default_prefix=/usr/local/harvest +ac_default_prefix=/usr/local/squid # Initialize some variables set by options. # The variables have the same names as the options, with @@ -517,13 +517,13 @@ fi -# From configure.in Revision: 1.10.4.7 +# From configure.in Revision: 1.1.1.1 if test -n "$prefix"; then myprefix="$prefix"; else - myprefix='/usr/local/harvest'; + myprefix='/usr/local/squid'; fi INSTALL_TOPDIR="$myprefix"; @@ -630,22 +630,12 @@ fi XXXCC=`echo $CC | awk '{print $1}'` if test "`basename $XXXCC`" != "gcc" then - echo '**************************************************************'; - echo '**************************************************************'; - echo '**************************************************************'; echo '**************************************************************'; echo '**************************************************************'; echo '**'; - echo '** WARNING: You should compile Harvest using GNU cc.'; + echo '** WARNING: Squid is only guaranteed to compile with GNU cc.'; echo "** Currently, you're using $CC"; echo '** '; - echo '** For more information about the platforms on which'; - echo '** Harvest works, see: '; - echo '** http://harvest.cs.colorado.edu/harvest/FAQ.html#platforms'; - echo '** '; - echo '**************************************************************'; - echo '**************************************************************'; - echo '**************************************************************'; echo '**************************************************************'; echo '**************************************************************'; sleep 5 @@ -666,7 +656,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -680,7 +670,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -955,130 +945,6 @@ else echo "$ac_t""no" 1>&6 fi -# Extract the first word of "gzip", so it can be a program name with args. -set dummy gzip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_path_CMD_GZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CMD_GZIP" in - /*) - ac_cv_path_CMD_GZIP="$CMD_GZIP" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CMD_GZIP="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_CMD_GZIP" && ac_cv_path_CMD_GZIP="/bin/false" - ;; -esac -fi -CMD_GZIP="$ac_cv_path_CMD_GZIP" -if test -n "$CMD_GZIP"; then - echo "$ac_t""$CMD_GZIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "gunzip", so it can be a program name with args. -set dummy gunzip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_path_CMD_GUNZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CMD_GUNZIP" in - /*) - ac_cv_path_CMD_GUNZIP="$CMD_GUNZIP" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CMD_GUNZIP="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_CMD_GUNZIP" && ac_cv_path_CMD_GUNZIP="/bin/false" - ;; -esac -fi -CMD_GUNZIP="$ac_cv_path_CMD_GUNZIP" -if test -n "$CMD_GUNZIP"; then - echo "$ac_t""$CMD_GUNZIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "unzip", so it can be a program name with args. -set dummy unzip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_path_CMD_UNZIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CMD_UNZIP" in - /*) - ac_cv_path_CMD_UNZIP="$CMD_UNZIP" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CMD_UNZIP="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_CMD_UNZIP" && ac_cv_path_CMD_UNZIP="/bin/false" - ;; -esac -fi -CMD_UNZIP="$ac_cv_path_CMD_UNZIP" -if test -n "$CMD_UNZIP"; then - echo "$ac_t""$CMD_UNZIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "uncompress", so it can be a program name with args. -set dummy uncompress; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_path_CMD_UNCOMPRESS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$CMD_UNCOMPRESS" in - /*) - ac_cv_path_CMD_UNCOMPRESS="$CMD_UNCOMPRESS" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_CMD_UNCOMPRESS="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_CMD_UNCOMPRESS" && ac_cv_path_CMD_UNCOMPRESS="/bin/false" - ;; -esac -fi -CMD_UNCOMPRESS="$ac_cv_path_CMD_UNCOMPRESS" -if test -n "$CMD_UNCOMPRESS"; then - echo "$ac_t""$CMD_UNCOMPRESS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 @@ -1099,7 +965,7 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_CMD_PERL" && ac_cv_path_CMD_PERL="/bin/false" + test -z "$ac_cv_path_CMD_PERL" && ac_cv_path_CMD_PERL="/usr/local/bin/perl" ;; esac fi @@ -1123,7 +989,7 @@ 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> @@ -1163,7 +1029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < #include @@ -1279,7 +1145,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 @@ -1297,7 +1163,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 @@ -1318,7 +1184,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1358,7 +1224,7 @@ 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 @@ -1387,7 +1253,7 @@ fi done cat > conftest.$ac_ext < EOF @@ -1410,7 +1276,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1444,7 +1310,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1473,7 +1339,7 @@ EOF if test -x "/bin/uname"; then - if /bin/uname -sr | grep 'SunOS 5.[0-4]' >/dev/null 2>&1; then + if /bin/uname -sr | grep 'SunOS 5.[0-9]' >/dev/null 2>&1; then NO_LIBMALLOC=x XTRA_CFLAGS="-DUSE_MALLINFO=0 -DUSE_MALLOPT=0 $XTRA_CFLAGS" fi @@ -1488,7 +1354,7 @@ 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 < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/configure.in b/configure.in index e81ee3c540..1798eab10e 100644 --- a/configure.in +++ b/configure.in @@ -1,27 +1,23 @@ dnl -dnl Configuration input file for Harvest +dnl Configuration input file for Squid dnl -dnl Darren Hardy, hardy@cs.colorado.edu, July 1994 (autoconf v1.11) -dnl Darren Hardy, hardy@cs.colorado.edu, July 1995 (autoconf v2.4) +dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.7) dnl -dnl $Id: configure.in,v 1.1 1996/02/22 06:23:53 wessels Exp $ +dnl $Id: configure.in,v 1.2 1996/02/22 07:40:41 wessels Exp $ dnl dnl -dnl TODO: -dnl -dnl - use -lgen instead of -lregex on Solaris if available. dnl AC_INIT(include/config.h) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.1 $)dnl -AC_PREFIX_DEFAULT(/usr/local/harvest) +AC_REVISION($Revision: 1.2 $)dnl +AC_PREFIX_DEFAULT(/usr/local/squid) dnl Build a copy of prefix if test -n "$prefix"; then myprefix="$prefix"; else - myprefix='/usr/local/harvest'; + myprefix='/usr/local/squid'; fi INSTALL_TOPDIR="$myprefix"; @@ -57,22 +53,12 @@ dnl Warn if not using GNU cc XXXCC=`echo $CC | awk '{print $1}'` if test "`basename $XXXCC`" != "gcc" then - echo '**************************************************************'; - echo '**************************************************************'; - echo '**************************************************************'; echo '**************************************************************'; echo '**************************************************************'; echo '**'; - echo '** WARNING: You should compile Harvest using GNU cc.'; + echo '** WARNING: Squid is only guaranteed to compile with GNU cc.'; echo "** Currently, you're using $CC"; echo '** '; - echo '** For more information about the platforms on which'; - echo '** Harvest works, see: '; - echo '** http://harvest.cs.colorado.edu/harvest/FAQ.html#platforms'; - echo '** '; - echo '**************************************************************'; - echo '**************************************************************'; - echo '**************************************************************'; echo '**************************************************************'; echo '**************************************************************'; sleep 5 @@ -87,11 +73,7 @@ AC_PATH_PROG(RM, rm, /bin/false) AC_PATH_PROG(MV, mv, /bin/false) AC_PATH_PROG(MKDIR, mkdir, /bin/false) AC_PATH_PROG(LN, ln, cp) -AC_PATH_PROG(CMD_GZIP, gzip, /bin/false) -AC_PATH_PROG(CMD_GUNZIP, gunzip, /bin/false) -AC_PATH_PROG(CMD_UNZIP, unzip, /bin/false) -AC_PATH_PROG(CMD_UNCOMPRESS, uncompress, /bin/false) -AC_PATH_PROG(CMD_PERL, perl, /bin/false) +AC_PATH_PROG(CMD_PERL, perl, /usr/local/bin/perl) dnl Set PERL too PERL="$CMD_PERL" @@ -111,7 +93,7 @@ AC_CHECK_SIZEOF(long) dnl Decide if we should really use -lmalloc. It is known to have -dnl problems on SunOS 5.4 at least. +dnl problems on SunOS 5.x. dnl if test -x "/bin/uname"; then if /bin/uname -sr | grep ['SunOS 5.[0-9]'] >/dev/null 2>&1; then @@ -203,12 +185,9 @@ rm -f core AC_OUTPUT(\ ./lib/Makefile \ - ./server/Makefile \ + ./src/Makefile \ ./include/paths.h \ - ./regex/Makefile \ - ./url/Makefile \ ./scripts/Makefile \ ./scripts/RunCache \ ./scripts/RunAccel \ - ./announce/Makefile \ )