1.0.7 -> 1.0.8 merge

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 33539558751d0a6e644230dd9711432a2d5df2b3..2615aa6d2673c6ac1238363b6bb9c5c1e512d671 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -15,7 +15,7 @@ and ideas to make this software available.
        Ansgar Hockmann <Ansgar.Hockmann@hrz.uni-dortmund.de>
        Joe Ramey <ramey@jello.csc.ti.com>
        Kolics Bertold <bertold@tohotom.vein.hu>
-       Doug Urner <dlu@wobble.albatross.com>
+       Doug Urner <dlu@bsdi.com>
        Markus Gyger <mgyger@itr.ch>
        Richard Huveneers <Richard.Huveneers@hekkihek.hacom.nl>
        Markus Stumpf <maex@Space.NET>

diff --git a/configure b/configure
index 561387e127add81667fe5431a03e1684cb767ee0..3309da5d3b9ac03c74313a2f68ba618780bce82f 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.25 
+# From configure.in Revision: 1.26 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -671,13 +671,19 @@ fi
 
 
 XXXCC=`echo $CC | awk '{print $1}'`
-if test "`basename $XXXCC`" != "gcc"; then
+if test "`basename $XXXCC`" = "gcc"; then
+       :
+elif test "`basename $XXXCC`" = "shlicc"; then
+       :
+elif test "`basename $XXXCC`" = "shlicc2"; then
+       :
+else
         echo '**************************************************************';
         echo '**************************************************************';
         echo '**';
         echo '**   WARNING:  Squid is only guaranteed to compile with GNU cc.';
         echo "**   Currently, you're using $CC";
-        echo '**   ';
+        echo '**';
         echo '**************************************************************';
         echo '**************************************************************';
        sleep 5
@@ -729,7 +735,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 733 "configure"
+#line 739 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -743,7 +749,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 747 "configure"
+#line 753 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1041,7 +1047,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 <<EOF
-#line 1045 "configure"
+#line 1051 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1081,7 +1087,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1085 "configure"
+#line 1091 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1116,7 +1122,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1120 "configure"
+#line 1126 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1153,7 +1159,7 @@ else
   ac_cv_c_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 1157 "configure"
+#line 1163 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1175,7 +1181,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1179 "configure"
+#line 1185 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1197,7 +1203,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
-#line 1201 "configure"
+#line 1207 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1215,7 +1221,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
-#line 1219 "configure"
+#line 1225 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1236,7 +1242,7 @@ if test "$cross_compiling" = yes; then
   :
 else
 cat > conftest.$ac_ext <<EOF
-#line 1240 "configure"
+#line 1246 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1319,7 +1325,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
-#line 1323 "configure"
+#line 1329 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1350,7 +1356,7 @@ done
 
 echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1354 "configure"
+#line 1360 "configure"
 #include "confdefs.h"
 #include <time.h>
 #include <sys/time.h>
@@ -1376,7 +1382,7 @@ rm -f conftest*
 
 echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1380 "configure"
+#line 1386 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <malloc.h>
@@ -1408,7 +1414,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1412 "configure"
+#line 1418 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1442,7 +1448,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1452 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1476,7 +1482,7 @@ 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 <<EOF
-#line 1480 "configure"
+#line 1486 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1508,7 +1514,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1512 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1567,7 +1573,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 1577 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1596,7 +1602,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 1600 "configure"
+#line 1606 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1650,7 +1656,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1654 "configure"
+#line 1660 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1695,7 +1701,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1699 "configure"
+#line 1705 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1735,7 +1741,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1739 "configure"
+#line 1745 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1775,7 +1781,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1779 "configure"
+#line 1785 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1809,7 +1815,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1813 "configure"
+#line 1819 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1849,7 +1855,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+#line 1859 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1890,7 +1896,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l44bsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1894 "configure"
+#line 1900 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1924,7 +1930,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1928 "configure"
+#line 1934 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1959,7 +1965,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1963 "configure"
+#line 1969 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1996,7 +2002,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-labi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2000 "configure"
+#line 2006 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2030,7 +2036,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2034 "configure"
+#line 2040 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2137,7 +2143,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 2141 "configure"
+#line 2147 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2187,7 +2193,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2191 "configure"
+#line 2197 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2257,7 +2263,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2261 "configure"
+#line 2267 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2293,7 +2299,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2297 "configure"
+#line 2303 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2329,7 +2335,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
+#line 2339 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2365,7 +2371,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2369 "configure"
+#line 2375 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2398,7 +2404,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2402 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }

diff --git a/configure.in b/configure.in
index 0a2d56730647c1a0f075d070cac596540b0c239f..1c7ffbc2388e22e9820980320989d4eb84822026 100644 (file)
--- 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.26 1996/08/14 22:57:01 wessels Exp $
+dnl  $Id: configure.in,v 1.27 1996/08/19 23:09:43 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.26 $)dnl
+AC_REVISION($Revision: 1.27 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -49,13 +49,19 @@ AC_PROG_CC
 
 dnl Warn if not using GNU cc
 XXXCC=`echo $CC | awk '{print $1}'`
-if test "`basename $XXXCC`" != "gcc"; then
+if test "`basename $XXXCC`" = "gcc"; then
+       :
+elif test "`basename $XXXCC`" = "shlicc"; then
+       :
+elif test "`basename $XXXCC`" = "shlicc2"; then
+       :
+else
         echo '**************************************************************';
         echo '**************************************************************';
         echo '**';
         echo '**   WARNING:  Squid is only guaranteed to compile with GNU cc.';
         echo "**   Currently, you're using $CC";
-        echo '**   ';
+        echo '**';
         echo '**************************************************************';
         echo '**************************************************************';
        sleep 5

diff --git a/include/version.h b/include/version.h
index 7f53d12b47005ff86909e37711deed5c511af403..f837eca35db4a73cadb54889c759aea8148f6ae4 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -1,7 +1,11 @@
-/* $Id: version.h,v 1.27 1996/08/14 22:57:03 wessels Exp $
+/* $Id: version.h,v 1.28 1996/08/19 23:09:46 wessels Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
 #ifndef SQUID_VERSION
 #define SQUID_VERSION  "1.1.alpha9"
 #endif
+
+#ifndef SQUID_RELEASE_TIME
+#define SQUID_RELEASE_TIME squid_curtime
+#endif