From: wessels <> Date: Wed, 4 Dec 1996 03:28:46 +0000 (+0000) Subject: cleanup X-Git-Tag: SQUID_3_0_PRE1~5351 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cca06dabc46b6200239b0d68cb5fab73bf60c95;p=thirdparty%2Fsquid.git cleanup --- diff --git a/configure b/configure index 31cf478bf6..e3738fc381 100755 --- a/configure +++ b/configure @@ -514,7 +514,7 @@ fi -# From configure.in Revision: 1.56 +# From configure.in Revision: 1.57 ac_aux_dir= for ac_dir in aux $srcdir/aux; do if test -f $ac_dir/install-sh; then @@ -742,7 +742,7 @@ if test -z "$PRESET_CFLAGS"; then esac fi - case "$host" in + case "$host" in *-hp-hpux*) echo "Disabling 'ranlib' for HP-UX..." RANLIB=":" @@ -1581,10 +1581,10 @@ echo $ac_n "checking if ANSI prototypes work""... $ac_c" 1>&6 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then @@ -2796,6 +2796,7 @@ cat > conftest.$ac_ext < #include #include /* needed on FreeBSD */ #include @@ -2844,7 +2845,7 @@ main() { } EOF -{ (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then SQUID_MAXFD=`cat conftestval` else @@ -2863,9 +2864,11 @@ if test "$cross_compiling" = yes; then SQUID_UDP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < +#include #include #include #include @@ -2880,7 +2883,7 @@ main () } EOF -{ (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then SQUID_UDP_SO_SNDBUF=`cat conftestval` else @@ -2899,9 +2902,11 @@ if test "$cross_compiling" = yes; then SQUID_UDP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < +#include #include #include #include @@ -2916,7 +2921,7 @@ main () } EOF -{ (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then SQUID_UDP_SO_RCVBUF=`cat conftestval` else @@ -2935,9 +2940,11 @@ if test "$cross_compiling" = yes; then SQUID_TCP_SO_SNDBUF=16384 else cat > conftest.$ac_ext < +#include #include #include #include @@ -2952,7 +2959,7 @@ main () } EOF -{ (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then SQUID_TCP_SO_SNDBUF=`cat conftestval` else @@ -2971,9 +2978,11 @@ if test "$cross_compiling" = yes; then SQUID_TCP_SO_RCVBUF=16384 else cat > conftest.$ac_ext < +#include #include #include #include @@ -2988,7 +2997,7 @@ main () } EOF -{ (eval echo configure:2992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:3001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then SQUID_TCP_SO_RCVBUF=`cat conftestval` else @@ -3004,7 +3013,7 @@ EOF echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -3012,7 +3021,7 @@ int t() { char *s = sys_errlist[0]; ; return 0; } EOF -if { (eval echo configure:3016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3028,7 +3037,7 @@ rm -f conftest* echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF diff --git a/configure.in b/configure.in index 97727e0089..b3e1ad96b1 100644 --- a/configure.in +++ b/configure.in @@ -3,13 +3,13 @@ dnl Configuration input file for Squid dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.57 1996/12/03 00:46:04 wessels Exp $ +dnl $Id: configure.in,v 1.58 1996/12/03 20:28:46 wessels Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.57 $)dnl +AC_REVISION($Revision: 1.58 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(aux) @@ -76,8 +76,6 @@ if test -z "$PRESET_CFLAGS"; then esac fi - dnl Check if ANSI compile options are needed - dnl case "$host" in *-hp-hpux*) echo "Disabling 'ranlib' for HP-UX..." @@ -168,8 +166,8 @@ AC_CHECK_HEADERS( \ AC_C_CONST AC_MSG_CHECKING(if ANSI prototypes work) -AC_TRY_COMPILE([int foo(char *); int foo (char *bar) { }], -[return 1;], +AC_TRY_COMPILE([int foo(char *); int foo (char *bar) {return 1;}], +[foo("bar")], [AC_DEFINE(HAVE_ANSI_PROTOTYPES) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) @@ -354,6 +352,7 @@ AC_REPLACE_FUNCS(\ AC_MSG_CHECKING(Maximum number of filedescriptors we can open) AC_TRY_RUN([ +#include #include #include /* needed on FreeBSD */ #include @@ -409,6 +408,8 @@ AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD) AC_MSG_CHECKING(Default UDP send buffer size) AC_TRY_RUN([ +#include +#include #include #include #include @@ -430,6 +431,8 @@ AC_DEFINE_UNQUOTED(SQUID_UDP_SO_SNDBUF, $SQUID_UDP_SO_SNDBUF) AC_MSG_CHECKING(Default UDP receive buffer size) AC_TRY_RUN([ +#include +#include #include #include #include @@ -451,6 +454,8 @@ AC_DEFINE_UNQUOTED(SQUID_UDP_SO_RCVBUF, $SQUID_UDP_SO_RCVBUF) AC_MSG_CHECKING(Default TCP send buffer size) AC_TRY_RUN([ +#include +#include #include #include #include @@ -472,6 +477,8 @@ AC_DEFINE_UNQUOTED(SQUID_TCP_SO_SNDBUF, $SQUID_TCP_SO_SNDBUF) AC_MSG_CHECKING(Default TCP receive buffer size) AC_TRY_RUN([ +#include +#include #include #include #include