Polished after giving ICAP/ its own Makefile.

Removed eCAP hacks from ICAP.

diff --git a/src/ICAP/ICAPModXact.h b/src/ICAP/ICAPModXact.h
index e03053106d1a56861f82995bb7720e0474a86bf4..ebb69e1b3a49ecdbc18ff26f59da33d455b762d4 100644 (file)
--- a/src/ICAP/ICAPModXact.h
+++ b/src/ICAP/ICAPModXact.h
@@ -34,10 +34,6 @@
 #ifndef SQUID_ICAPMODXACT_H
 #define SQUID_ICAPMODXACT_H
 
-#if USE_ECAP_AS_ICAP_HACK
-#include "eCAP/Xaction.h"
-#else
-
 #include "BodyPipe.h"
 #include "ICAPXaction.h"
 #include "ICAPInOut.h"
@@ -327,6 +323,4 @@ private:
     CBDATA_CLASS2(ICAPModXactLauncher);
 };
 
-#endif /* USE_ECAP_AS_ICAP_HACK */
-
 #endif /* SQUID_ICAPMOD_XACT_H */

diff --git a/src/ICAP/ICAPServiceRep.h b/src/ICAP/ICAPServiceRep.h
index b98f1ffe961b48680666d831c714b64ed81fef06..7def2c59ddae64bb830c2d80c6a4dc34e7b92344 100644 (file)
--- a/src/ICAP/ICAPServiceRep.h
+++ b/src/ICAP/ICAPServiceRep.h
@@ -34,10 +34,6 @@
 #ifndef SQUID_ICAPSERVICEREP_H
 #define SQUID_ICAPSERVICEREP_H
 
-#if USE_ECAP_AS_ICAP_HACK
-#include "eCAP/ServiceRep.h"
-#else
-
 #include "cbdata.h"
 #include "ICAPInitiator.h"
 #include "ICAPElements.h"
@@ -178,6 +174,4 @@ private:
     CBDATA_CLASS2(ICAPServiceRep);
 };
 
-#endif /* USE_ECAP_AS_ICAP_HACK */
-
 #endif /* SQUID_ICAPSERVICEREP_H */

diff --git a/src/ICAP/Makefile.am b/src/ICAP/Makefile.am
index 9c0c35fc332884f102c15fc12e779182e99c17b1..86a3f3a50371b3e7bc6553b561a0d93eafb0cee3 100644 (file)
--- a/src/ICAP/Makefile.am
+++ b/src/ICAP/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES = \
        -I$(top_srcdir)/include \
         -I$(top_srcdir)/src
 
-noinst_LTLIBRARIES = libICAP.la
+noinst_LTLIBRARIES = libicap.la
 
-libICAP_la_SOURCES = \
+libicap_la_SOURCES = \
        ICAPClient.cc \
        ICAPClient.h \
        ICAPInitiator.cc \
@@ -21,7 +21,7 @@ libICAP_la_SOURCES = \
        ICAPElements.cc \
        ICAPElements.h \
        ICAPOptions.cc \
-       ICAPOptions.h
+       ICAPOptions.h \
        ICAPServiceRep.cc \
        ICAPServiceRep.h \
        ICAPLauncher.cc \

diff --git a/src/Makefile.am b/src/Makefile.am
index c6237833817aea4cbbf851359054ac9c1ffff160..e84ffce5e1179bc13efc29dbde9fcd10c06b7f7c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -219,8 +219,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
-EXTRA_LTLIBRARIES = adaptation/libadaptation.la ICAP/libICAP.la eCAP/libeCAP.la
-noinst_LTLIBRARIES = libsquid.la libauth.la ${ADAPTATION_LIBS}
+noinst_LTLIBRARIES = libsquid.la libauth.la
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include
 INCLUDES       += @SQUID_CPPUNIT_INC@