---------------------
PatchSet 6302 
Date: 2007/12/16 11:36:22
Author: chtsanti
Branch: async-calls
Tag: (none) 
Log:
The files ICAP/AsyncJob.o and ICAP/TextException.o files now included in libsquid.a library not in ICAP/libicap.a.
This will allow building async-calls with the ICAP client disabled

Members: 
	src/Makefile.am:1.131.4.2->1.131.4.3 

Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.131.4.2
retrieving revision 1.131.4.3
diff -u -r1.131.4.2 -r1.131.4.3
--- squid3/src/Makefile.am	5 Dec 2007 04:40:09 -0000	1.131.4.2
+++ squid3/src/Makefile.am	16 Dec 2007 11:36:22 -0000	1.131.4.3
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.131.4.2 2007/12/05 04:40:09 rousskov Exp $
+#  $Id: Makefile.am,v 1.131.4.3 2007/12/16 11:36:22 chtsanti Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -392,7 +392,11 @@
 	CommCalls.cc \
 	CommCalls.h \
 	IPInterception.cc \
-	IPInterception.h
+	IPInterception.h \
+        ICAP/AsyncJob.cc \
+        ICAP/AsyncJob.h \
+        ICAP/TextException.cc \
+        ICAP/TextException.h
 
 # authentication framework
 libauth_la_SOURCES = \
@@ -674,8 +678,6 @@
 	@ICAP_LIBS@
 
 ICAP_libicap_a_SOURCES = \
-	ICAP/AsyncJob.cc \
-	ICAP/AsyncJob.h \
  	ICAP/ChunkedCodingParser.cc \
  	ICAP/ChunkedCodingParser.h \
 	ICAP/ICAPClient.cc \
@@ -700,9 +702,7 @@
 	ICAP/ICAPServiceRep.cc \
 	ICAP/ICAPServiceRep.h \
 	ICAP/ICAPXaction.cc \
-	ICAP/ICAPXaction.h \
-	ICAP/TextException.cc \
-	ICAP/TextException.h
+	ICAP/ICAPXaction.h 
 
 
 unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc