--------------------- PatchSet 6139 Date: 2007/11/16 22:39:27 Author: rousskov Branch: ecap Tag: (none) Log: Enable eCAP support if loadable module support is enabled. Eventually, we may want to control eCAP support directly. Added eCAP directory to the Makefile. The eCAP directory contents will be committed later. Members: configure.in:1.159.2.2->1.159.2.3 src/Makefile.am:1.131.2.2->1.131.2.3 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.159.2.2 retrieving revision 1.159.2.3 diff -u -r1.159.2.2 -r1.159.2.3 --- squid3/configure.in 18 Oct 2007 19:04:12 -0000 1.159.2.2 +++ squid3/configure.in 16 Nov 2007 22:39:27 -0000 1.159.2.3 @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.159.2.2 2007/10/18 19:04:12 rousskov Exp $ +dnl $Id: configure.in,v 1.159.2.3 2007/11/16 22:39:27 rousskov Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE([tar-ustar]) -AC_REVISION($Revision: 1.159.2.2 $)dnl +AC_REVISION($Revision: 1.159.2.3 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -30,6 +30,7 @@ AC_PROG_CXX AC_CANONICAL_HOST + use_loadable_modules=1 AC_MSG_CHECKING(whether to use loadable modules) AC_ARG_ENABLE(loadable-modules, @@ -74,7 +75,7 @@ AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) -if test $use_loadable_modules != yes; +if test $use_loadable_modules = yes; then # Why is this needed? Should not libtool's AC_LIBTOOL_DLOPEN do that? LIBADD_DL=${lt_cv_dlopen_libs} @@ -751,6 +752,18 @@ AC_DEFINE(ESI,0,[Compile the ESI processor and Surrogate header support]) fi +dnl Currently, eCAP relies on loadable module support. +dnl Eventually, we may want to be able to turned it off independently +AM_CONDITIONAL(USE_ECAP, test $use_loadable_modules = yes) +if test $use_loadable_modules = yes; +then + ECAP_LIBS="eCAP/libeCAP.la" +else + ECAP_LIBS="" +fi +AC_SUBST(ECAP_LIBS) + + AM_CONDITIONAL(USE_ICAP_CLIENT, false) AC_ARG_ENABLE(icap-client, AC_HELP_STRING([--enable-icap-client],[Enable the ICAP client.]), @@ -3319,6 +3332,7 @@ src/fs/Makefile \ src/repl/Makefile \ src/auth/Makefile \ + src/eCAP/Makefile \ contrib/Makefile \ snmplib/Makefile \ icons/Makefile \ Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.131.2.2 retrieving revision 1.131.2.3 diff -u -r1.131.2.2 -r1.131.2.3 --- squid3/src/Makefile.am 18 Oct 2007 19:04:13 -0000 1.131.2.2 +++ squid3/src/Makefile.am 16 Nov 2007 22:39:27 -0000 1.131.2.3 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.131.2.2 2007/10/18 19:04:13 rousskov Exp $ +# $Id: Makefile.am,v 1.131.2.3 2007/11/16 22:39:27 rousskov Exp $ # # Uncomment and customize the following to suit your needs: # @@ -30,6 +30,10 @@ SUBDIRS = fs repl auth +if USE_ECAP +SUBDIRS += eCAP +endif + DELAY_POOL_ALL_SOURCE = \ CommonPool.h \ CompositePoolNode.h \ @@ -655,6 +659,7 @@ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @SSLLIB@ \ -lmiscutil \ @@ -669,6 +674,7 @@ @REPL_OBJS@ \ @AUTH_LINKOBJS@ \ @AUTH_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ if USE_LOADABLE_MODULES @@ -902,6 +908,7 @@ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @SSLLIB@ \ -lmiscutil \ @@ -916,6 +923,7 @@ @REPL_OBJS@ \ @AUTH_LINKOBJS@ \ @AUTH_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ nodist_ufsdump_SOURCES = \ @@ -1399,6 +1407,7 @@ libsquid.la \ libauth.la \ @REPL_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -1411,6 +1420,7 @@ tests_testCacheManager_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ tests_testDiskIO_SOURCES= \ @@ -1564,6 +1574,7 @@ libsquid.la \ libauth.la \ @REPL_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -1576,6 +1587,7 @@ tests_testEvent_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ ## Tests of the EventLoop module. @@ -1716,6 +1728,7 @@ libsquid.la \ libauth.la \ @REPL_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -1728,6 +1741,7 @@ tests_testEventLoop_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ ## test headers checks that individual headers can be parsed with no dependencies. @@ -1901,6 +1915,7 @@ libauth.la \ @REPL_OBJS@ \ @STORE_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -2052,6 +2067,7 @@ libsquid.la \ libauth.la \ @REPL_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -2064,6 +2080,7 @@ tests_testHttpRequest_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ @@ -2388,6 +2405,7 @@ libauth.la \ @REGEXLIB@ \ @REPL_OBJS@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@ \ @SNMPLIB@ \ -L../lib -lmiscutil \ @@ -2399,4 +2417,5 @@ tests_testURL_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ \ + @ECAP_LIBS@ \ @ICAP_LIBS@