pluto and scepclient use the regular libstrongswan library

configure.in

@@ -996,7 +996,7 @@ AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
 AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue)
 AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
 AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
-AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
+AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue)
 AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
 AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue)
 

src/libstrongswan/Makefile.am

@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libstrongswan.la libstrongswan-lite.la
+lib_LTLIBRARIES = libstrongswan.la
 
 if USE_INTEGRITY_TEST
   libstrongswan_la_SOURCES = \
@@ -56,21 +56,6 @@ plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
 
 libstrongswan_la_LIBADD = -lpthread -ldl
 
-libstrongswan_lite_la_SOURCES = \
-chunk.c chunk.h \
-debug.c debug.h \
-enum.c enum.h \
-printf_hook.c printf_hook.h \
-settings.c settings.h \
-utils.c utils.h \
-asn1/asn1.c asn1/asn1.h \
-asn1/asn1_parser.c asn1/asn1_parser.h \
-asn1/oid.c asn1/oid.h \
-utils/enumerator.c utils/enumerator.h \
-utils/lexparser.c utils/lexparser.h \
-utils/linked_list.c utils/linked_list.h \
-utils/optionsfrom.c utils/optionsfrom.h
-
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
 -DIPSEC_DIR=\"${ipsecdir}\" \
@@ -81,9 +66,6 @@ if USE_LEAK_DETECTIVE
   AM_CFLAGS += -DLEAK_DETECTIVE
   libstrongswan_la_SOURCES += \
     utils/leak_detective.c utils/leak_detective.h
-  libstrongswan_lite_la_SOURCES += \
-    utils/leak_detective.c utils/leak_detective.h \
-    utils/backtrace.c utils/backtrace.h 
 endif
 
 if USE_LOCK_PROFILER

src/pluto/Makefile.am

@@ -90,7 +90,7 @@ AM_CFLAGS = \
 -Wformat=0
 
 pluto_LDADD = \
-$(LIBSTRONGSWANDIR)/libstrongswan-lite.la \
+$(LIBSTRONGSWANDIR)/libstrongswan.la \
 $(LIBFREESWANDIR)/libfreeswan.a \
 $(LIBCRYPTODIR)/libcrypto.a \
 -lgmp -lresolv -lpthread -ldl

src/scepclient/Makefile.am

@@ -28,7 +28,7 @@ scepclient_LDADD = \
 ca.o crl.o certs.o constants.o defs.o fetch.o id.o keys.o lex.o library.o \
 md2.o md5.o mp_defs.o ocsp.o pem.o pgp.o pkcs1.o pkcs7.o rnd.o sha1.o \
 smartcard.o x509.o \
-$(LIBSTRONGSWANDIR)/libstrongswan-lite.la \
+$(LIBSTRONGSWANDIR)/libstrongswan.la \
 $(LIBFREESWANBUILDDIR)/libfreeswan.a \
 $(LIBCRYPTOBUILDDIR)/libcrypto.a \
 -lgmp