Merge from trunk

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6619f467780c85597e4795e8141d59102feb5272..bd7686508c91243d33c8dac8fc9323525af3ffd8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,16 +58,15 @@ check_PROGRAMS+= tests/testACLMaxUserIP
 endif
 DIST_SUBDIRS += auth
 
-SUBDIRS        += http ip icmp ident log ipc mgr
-DIST_SUBDIRS += http ip icmp ident log ipc mgr
+SUBDIRS        += http ip icmp ident log ipc mgr security
+DIST_SUBDIRS += http ip icmp ident log ipc mgr security
 
+SSL_LIBS=
 if ENABLE_SSL
 SUBDIRS += ssl
-SSL_LIBS = \
+SSL_LIBS += \
        ssl/libsslsquid.la \
        ssl/libsslutil.la
-else
-SSL_LOCAL_LIBS =
 endif
 DIST_SUBDIRS += ssl
 
@@ -614,6 +613,7 @@ squid_LDADD = \
        helper/libhelper.la \
        http/libsquid-http.la \
        parser/libsquid-parser.la \
+       security/libsecurity.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
@@ -1477,6 +1477,7 @@ tests_testCacheManager_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -1897,6 +1898,7 @@ tests_testEvent_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2140,6 +2142,7 @@ tests_testEventLoop_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2378,6 +2381,7 @@ tests_test_http_range_SOURCES = \
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2671,6 +2675,7 @@ tests_testHttpRequest_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -3487,6 +3492,7 @@ tests_testURL_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \