---------------------
PatchSet 6154 
Date: 2007/11/20 15:28:54
Author: rousskov
Branch: ecap
Tag: (none) 
Log:
When eCAP is enabled, to support USE_ECAP_AS_ICAP_HACK, ignore ICAP files that
eCAP overwrites.

Members: 
	src/Makefile.am:1.131.2.3->1.131.2.4 

Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.131.2.3
retrieving revision 1.131.2.4
diff -u -r1.131.2.3 -r1.131.2.4
--- squid3/src/Makefile.am	16 Nov 2007 22:39:27 -0000	1.131.2.3
+++ squid3/src/Makefile.am	20 Nov 2007 15:28:54 -0000	1.131.2.4
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.131.2.3 2007/11/16 22:39:27 rousskov Exp $
+#  $Id: Makefile.am,v 1.131.2.4 2007/11/20 15:28:54 rousskov Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -701,24 +701,28 @@
 	ICAP/ICAPInitiate.cc \
 	ICAP/ICAPInitiate.h \
 	ICAP/ICAPInOut.h \
-	ICAP/ICAPLauncher.cc \
-	ICAP/ICAPLauncher.h \
 	ICAP/ICAPConfig.cc \
 	ICAP/ICAPConfig.h \
 	ICAP/ICAPElements.cc \
 	ICAP/ICAPElements.h \
-	ICAP/ICAPModXact.cc \
 	ICAP/ICAPModXact.h \
 	ICAP/ICAPOptions.cc \
 	ICAP/ICAPOptions.h \
+	ICAP/ICAPServiceRep.h \
+	ICAP/TextException.cc \
+	ICAP/TextException.h
+
+if !USE_ECAP
+ICAP_libicap_a_SOURCES += \
+	ICAP/ICAPLauncher.cc \
+	ICAP/ICAPLauncher.h \
 	ICAP/ICAPOptXact.cc \
 	ICAP/ICAPOptXact.h \
-	ICAP/ICAPServiceRep.cc \
-	ICAP/ICAPServiceRep.h \
 	ICAP/ICAPXaction.cc \
 	ICAP/ICAPXaction.h \
-	ICAP/TextException.cc \
-	ICAP/TextException.h
+	ICAP/ICAPModXact.cc \
+	ICAP/ICAPServiceRep.cc
+endif
 
 
 unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc