From: wessels <>
Date: Tue, 16 Jul 1996 07:47:16 +0000 (+0000)
Subject: set GETTIMEOFDAY_NO_TZP
X-Git-Tag: SQUID_3_0_PRE1~6052
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7149a49fb8cdd74e1aabb91f48b7d7e19f0cf859;p=thirdparty%2Fsquid.git

set GETTIMEOFDAY_NO_TZP
check for mallocblksize()
---

diff --git a/configure b/configure
index ef7772ce92..93991b5687 100755
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.21 
+# From configure.in Revision: 1.22 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -2022,6 +2022,7 @@ for ac_func in \
 	getdtablesize \
 	getrusage \
 	lrand48 \
+	mallocblksize \
 	mallinfo \
 	mallopt \
 	memmove \
@@ -2049,7 +2050,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 2053 "configure"
+#line 2054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2099,7 +2100,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2103 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2167,7 +2168,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2171 "configure"
+#line 2172 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2203,7 +2204,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2207 "configure"
+#line 2208 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2239,7 +2240,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2243 "configure"
+#line 2244 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2275,7 +2276,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2279 "configure"
+#line 2280 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2308,7 +2309,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2312 "configure"
+#line 2313 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }
diff --git a/configure.in b/configure.in
index 034eae283e..9f4c864aee 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.22 1996/07/09 04:46:47 wessels Exp $
+dnl  $Id: configure.in,v 1.23 1996/07/16 01:47:16 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.22 $)dnl
+AC_REVISION($Revision: 1.23 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -221,6 +221,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//`
@@ -229,8 +235,11 @@ case "$host" in
 		;;
 	*m88k*)
 		CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
+		AC_DEFINE(GETTIMEOFDAY_NO_TZP)
+		;;
+	*-*-solaris2.[0-4])
+		AC_DEFINE(GETTIMEOFDAY_NO_TZP)
 		;;
-
 esac
 
 dnl Check for library functions
@@ -239,6 +248,7 @@ AC_CHECK_FUNCS(\
 	getdtablesize \
 	getrusage \
 	lrand48 \
+	mallocblksize \
 	mallinfo \
 	mallopt \
 	memmove \
diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index e86925ac07..56a5c61ea0 100644
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -73,6 +73,9 @@
 /* Define if you have the mallinfo function.  */
 #undef HAVE_MALLINFO
 
+/* Define if you have the mallocblksize function.  */
+#undef HAVE_MALLOCBLKSIZE
+
 /* Define if you have the mallopt function.  */
 #undef HAVE_MALLOPT