)
dnl Perform configuration consistency checks for eCAP
+ECAPLIB=""
if test $use_ecap = yes;
then
dnl eCAP support requires loadable modules, which are enabled by default
dnl eCAP support requires libecap
AC_CHECK_LIB([ecap], [main],
- [ECAP_LIBS="-lecap"],
+ [ECAPLIB="-lecap"],
[AC_MSG_FAILURE([eCAP support requires libecap library, but no usable library was found])]
)
fi
AC_DEFINE(USE_ECAP,0,[Disable eCAP support])
ECAP_LIBS=""
fi
+dnl convenience library
AC_SUBST(ECAP_LIBS)
+dnl -lecap if needed
+AC_SUBST(ECAPLIB)
dnl enable adaptation if requested by specific adaptation mechanisms
# libraries used by many targets
COMMON_LIBS = \
+ base/libbase.la \
libsquid.la \
auth/libacls.la \
ident/libident.la \
acl/libstate.la \
auth/libauth.la \
acl/libapi.la \
- base/libbase.la \
ip/libip.la \
fs/libfs.la
## tools.cc wants ip/libip.la
## client_side.cc wants ip/libip.la
## mem.cc wants ClientInfo.h
+## libbase.la wants cbdata.*
+## libbase.la wants MemBuf.*
ufsdump_SOURCES = \
ClientInfo.h \
+ cbdata.h \
+ cbdata.cc \
debug.cc \
int.cc \
mem.cc \
+ MemBuf.cc \
+ MemBuf.cci \
+ MemBuf.h \
store_key_md5.cc \
StoreMeta.cc \
StoreMetaMD5.cc \
HttpRequestMethod.cc \
RemovalPolicy.cc \
squid.h \
- $(WIN32_SOURCE)
+ $(WIN32_SOURCE) \
+ tests/stub_fd.cc
ufsdump_LDADD = \
$(COMMON_LIBS) \
@XTRA_OBJS@ \
ServiceGroups.h
# add libraries for specific adaptation schemes
-libadaptation_la_LIBADD = @ECAP_LIBS@ @ICAP_LIBS@
+libadaptation_la_LIBADD = @ECAP_LIBS@ @ECAPLIB@ @ICAP_LIBS@
libadaptation_la_DEPENDENCIES = @ECAP_LIBS@ @ICAP_LIBS@
death(int sig)
{
std::cout << "Fatal: Signal " << sig;
- exit (1);
+ exit(1);
}
+void
+fatal(const char *message)
+{
+ fprintf(stderr, "FATAL: %s\n", message);
+ exit(1);
+}
/* end stub functions */