From d8c2a7a8deb1e0bb746d1222517bcf81dcb38e17 Mon Sep 17 00:00:00 2001
From: robertc <>
Date: Tue, 21 Dec 2004 01:01:05 +0000
Subject: [PATCH] distribute new headers, enable digest and ntlm by default

---
 Makefile.in     | 2 +-
 configure       | 4 ++--
 configure.in    | 6 +++---
 src/Makefile.am | 4 +++-
 src/Makefile.in | 7 +++++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bff34b67e5..7a03987a4a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.62 2004/12/20 17:25:16 robertc Exp $
+# $Id: Makefile.in,v 1.63 2004/12/20 18:01:05 robertc Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
diff --git a/configure b/configure
index 683bf8d2f5..143a7f5b40 100755
--- a/configure
+++ b/configure
@@ -2136,7 +2136,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='${AMTAR} chf - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
@@ -22455,7 +22455,7 @@ if test "${enable_auth+set}" = set; then
 
 else
    if test -z "$AUTH_MODULES"; then
-    AUTH_MODULES="basic"
+    AUTH_MODULES="basic digest ntlm"
   fi
 
 fi;
diff --git a/configure.in b/configure.in
index 1218885af2..f5fe8766ac 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ 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.365 2004/12/20 16:30:13 robertc Exp $
+dnl  $Id: configure.in,v 1.366 2004/12/20 18:01:06 robertc Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.365 $)dnl
+AC_REVISION($Revision: 1.366 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1207,7 +1207,7 @@ AC_ARG_ENABLE(auth,
   esac
 ],
 [ if test -z "$AUTH_MODULES"; then
-    AUTH_MODULES="basic"
+    AUTH_MODULES="basic digest ntlm"
   fi
 ])
 if test -n "$AUTH_MODULES"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index a38c3eb283..d0056bee7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.98 2004/12/20 16:30:32 robertc Exp $
+#  $Id: Makefile.am,v 1.99 2004/12/20 18:01:06 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -365,7 +365,9 @@ squid_SOURCES = \
 	disk.cc \
 	DiskIO/DiskIOModule.cc \
 	DiskIO/ReadRequest.cc \
+	DiskIO/ReadRequest.h \
 	DiskIO/WriteRequest.cc \
+	DiskIO/WriteRequest.h \
 	$(DNSSOURCE) \
 	$(EPOLL_SOURCE) \
 	enums.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index a1e3f060c5..4b2b4fa250 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.329 2004/12/20 16:30:33 robertc Exp $
+#  $Id: Makefile.in,v 1.330 2004/12/20 18:01:06 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -169,7 +169,8 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc ACL.h \
 	DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
 	DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
 	NullDelayId.cc NullDelayId.h disk.cc DiskIO/DiskIOModule.cc \
-	DiskIO/ReadRequest.cc DiskIO/WriteRequest.cc dns_internal.cc \
+	DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+	DiskIO/WriteRequest.cc DiskIO/WriteRequest.h dns_internal.cc \
 	dns.cc comm_epoll.cc enums.h errorpage.cc ElementList.h ESI.cc \
 	ESI.h ESIAssign.cc ESIAssign.h ESIAttempt.h ESIContext.cc \
 	ESIContext.h ESICustomParser.cc ESICustomParser.h ESIElement.h \
@@ -965,7 +966,9 @@ squid_SOURCES = \
 	disk.cc \
 	DiskIO/DiskIOModule.cc \
 	DiskIO/ReadRequest.cc \
+	DiskIO/ReadRequest.h \
 	DiskIO/WriteRequest.cc \
+	DiskIO/WriteRequest.h \
 	$(DNSSOURCE) \
 	$(EPOLL_SOURCE) \
 	enums.h \
-- 
2.47.3