Added ICAP subdirectory and instructions to link with ICAP library

diff --git a/src/Makefile.am b/src/Makefile.am
index 4c142d47851654afc670e4fcc495846b7d74f5bc..09eb20ca7bdc502ad6df00c6fc4049bdca31ee53 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.117 2005/11/21 22:41:45 wessels Exp $
+#  $Id: Makefile.am,v 1.118 2005/11/21 23:18:57 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -25,6 +25,8 @@ endif
 TESTS=$(check_PROGRAMS)
 check_PROGRAMS=
 
+SUBDIRS                = fs repl auth
+
 DELAY_POOL_ALL_SOURCE = \
        CommonPool.h \
        CompositePoolNode.h \
@@ -92,6 +94,13 @@ else
   ESI_SOURCE = 
 endif
 
+if USE_ICAP_CLIENT
+  ICAP_LIBS = ICAP/libicap.a
+  SUBDIRS += ICAP
+else
+  ICAP_LIBS = 
+endif
+
 if ENABLE_XPROF_STATS
 XPROF_STATS_SOURCE = ProfStats.cc
 else
@@ -158,8 +167,6 @@ endif
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
-SUBDIRS                = fs repl auth
-
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
 
@@ -551,6 +558,7 @@ squid_LDADD = \
        @CRYPTLIB@ \
        @REGEXLIB@ \
        @SNMPLIB@ \
+       ${ICAP_LIBS} \
        @LIB_MALLOC@ \
        @SSLLIB@ \
        -lmiscutil \