From: wessels <>
Date: Wed, 17 Jul 1996 23:49:10 +0000 (+0000)
Subject: squid-1.0.2 update
X-Git-Tag: SQUID_3_0_PRE1~6038
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58f24c1d4fce95cdec60e83614c3d718f9cf3261;p=thirdparty%2Fsquid.git

squid-1.0.2 update
---

diff --git a/configure b/configure
index 93991b5687..0486f4c4be 100755
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.22 
+# From configure.in Revision: 1.23 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -2005,6 +2005,12 @@ case "$host" in
         	LIBS=`echo $LIBS | sed -e s/-lmalloc//`
         	HAVE_LIBMALLOC="no"
 		;;
+	i386-*-solaris2.?)
+    		if test "$GCC" = "yes"; then
+			echo "Removing -O for gcc on $host"
+			CFLAGS="`echo $CFLAGS | sed -e s/-O//`"
+		fi
+		;;
 	*-sgi-irix*)
         	echo "Removing -lsocket for IRIX..."
         	LIBS=`echo $LIBS | sed -e s/-lsocket//`
@@ -2013,8 +2019,17 @@ case "$host" in
 		;;
 	*m88k*)
 		CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
+		cat >> confdefs.h <<\EOF
+#define GETTIMEOFDAY_NO_TZP 1
+EOF
+
 		;;
+	*-*-solaris2.0-4)
+		cat >> confdefs.h <<\EOF
+#define GETTIMEOFDAY_NO_TZP 1
+EOF
 
+		;;
 esac
 
 for ac_func in \
@@ -2050,7 +2065,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 <<EOF
-#line 2054 "configure"
+#line 2069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2100,7 +2115,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2104 "configure"
+#line 2119 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2168,7 +2183,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2172 "configure"
+#line 2187 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2204,7 +2219,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2208 "configure"
+#line 2223 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2240,7 +2255,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2259 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2276,7 +2291,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2280 "configure"
+#line 2295 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2309,7 +2324,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2328 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }
diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 56a5c61ea0..efda163b9f 100644
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -52,6 +52,9 @@
 /* If we need to declare sys_errlist[] as external */
 #undef NEED_SYS_ERRLIST
 
+/* If gettimeofday is known to take only one argument */
+#undef GETTIMEOFDAY_NO_TZP
+
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT