renamed xml plugin to smp to avoid confusion

added some dependency checks to configure
configure checks ClearSilver and fastcgi
cleanups in the build system here and there

configure.in

@@ -130,7 +130,6 @@ AC_ARG_ENABLE(
 		curl=true
 	fi]
 )
-AM_CONDITIONAL(USE_CURL, test x$curl = xtrue)
 
 AC_ARG_ENABLE(
 	[ldap],
@@ -139,7 +138,6 @@ AC_ARG_ENABLE(
 		ldap=true
 	fi]
 )
-AM_CONDITIONAL(USE_LDAP, test x$ldap = xtrue)
 
 AC_ARG_ENABLE(
 	[aes],
@@ -151,7 +149,6 @@ AC_ARG_ENABLE(
 	fi],
 	aes=true
 )
-AM_CONDITIONAL(USE_AES, test x$aes = xtrue)
 
 AC_ARG_ENABLE(
 	[des],
@@ -163,7 +160,6 @@ AC_ARG_ENABLE(
 	fi],
 	des=true
 )
-AM_CONDITIONAL(USE_DES, test x$des = xtrue)
 
 AC_ARG_ENABLE(
 	[md5],
@@ -175,7 +171,6 @@ AC_ARG_ENABLE(
 	fi],
 	md5=true
 )
-AM_CONDITIONAL(USE_MD5, test x$md5 = xtrue)
 
 AC_ARG_ENABLE(
 	[sha1],
@@ -187,7 +182,6 @@ AC_ARG_ENABLE(
 	fi],
 	sha1=true
 )
-AM_CONDITIONAL(USE_SHA1, test x$sha1 = xtrue)
 
 AC_ARG_ENABLE(
 	[sha2],
@@ -199,7 +193,6 @@ AC_ARG_ENABLE(
 	fi],
 	sha2=true
 )
-AM_CONDITIONAL(USE_SHA2, test x$sha2 = xtrue)
 
 AC_ARG_ENABLE(
 	[fips-prf],
@@ -211,7 +204,6 @@ AC_ARG_ENABLE(
 	fi],
 	fips_prf=true
 )
-AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue)
 
 AC_ARG_ENABLE(
 	[gmp],
@@ -223,7 +215,6 @@ AC_ARG_ENABLE(
 	fi],
 	gmp=true
 )
-AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue)
 
 AC_ARG_ENABLE(
 	[x509],
@@ -235,7 +226,6 @@ AC_ARG_ENABLE(
 	fi],
 	x509=true
 )
-AM_CONDITIONAL(USE_X509, test x$x509 = xtrue)
 
 AC_ARG_ENABLE(
 	[hmac],
@@ -247,7 +237,6 @@ AC_ARG_ENABLE(
 	fi],
 	hmac=true
 )
-AM_CONDITIONAL(USE_HMAC, test x$hmac = xtrue)
 
 AC_ARG_ENABLE(
 	[mysql],
@@ -256,7 +245,6 @@ AC_ARG_ENABLE(
 		mysql=true
 	fi]
 )
-AM_CONDITIONAL(USE_MYSQL, test x$mysql = xtrue)
 
 AC_ARG_ENABLE(
 	[sqlite],
@@ -265,7 +253,6 @@ AC_ARG_ENABLE(
 		sqlite=true
 	fi]
 )
-AM_CONDITIONAL(USE_SQLITE, test x$sqlite = xtrue)
 
 AC_ARG_ENABLE(
 	[stroke],
@@ -277,37 +264,22 @@ AC_ARG_ENABLE(
 	fi],
 	stroke=true
 )
-AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
 
 AC_ARG_ENABLE(
 	[med-db],
 	AS_HELP_STRING([--enable-med-db],[enable MySQL mediation database plugin (default is NO).]),
 	[if test x$enableval = xyes; then
 		med_db=true
-        AC_DEFINE(LIBDBUS)
 	fi]
 )
-AM_CONDITIONAL(USE_MED_DB, test x$med_db = xtrue)
 
 AC_ARG_ENABLE(
-    [dbus],
+	[smp],
-    AS_HELP_STRING([--enable-dbus],[enable DBUS configuration and control interface (default is NO). Requires libdbus.]),
+	AS_HELP_STRING([--enable-smp],[enable SMP configuration and control interface (default is NO). Requires libxml.]),
 	[if test x$enableval = xyes; then
-        dbus=true
+		smp=true
-        AC_DEFINE(LIBDBUS)
 	fi]
 )
-AM_CONDITIONAL(USE_LIBDBUS, test x$dbus = xtrue)
-
-AC_ARG_ENABLE(
-    [xml],
-    AS_HELP_STRING([--enable-xml],[enable XML configuration and control interface (default is NO). Requires libxml.]),
-    [if test x$enableval = xyes; then
-        xml=true
-        AC_DEFINE(LIBXML)
-    fi]
-)
-AM_CONDITIONAL(USE_LIBXML, test x$xml = xtrue)
 
 AC_ARG_ENABLE(
 	[sql],
@@ -316,17 +288,14 @@ AC_ARG_ENABLE(
 		sql=true
 	fi]
 )
-AM_CONDITIONAL(USE_SQL, test x$sql = xtrue)
 
 AC_ARG_ENABLE(
 	[smartcard],
 	AS_HELP_STRING([--enable-smartcard],[enable smartcard support (default is NO).]),
 	[if test x$enableval = xyes; then
 		smartcard=true
-        AC_DEFINE(SMARTCARD)
 	fi]
 )
-AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)
 
 AC_ARG_ENABLE(
 	[cisco-quirks],
@@ -335,7 +304,6 @@ AC_ARG_ENABLE(
 		cisco_quirks=true
 	fi]
 )
-AM_CONDITIONAL(USE_CISCO_QUIRKS, test x$cisco_quirks = xtrue)
 
 AC_ARG_ENABLE(
 	[leak-detective],
@@ -344,7 +312,6 @@ AC_ARG_ENABLE(
 		leak_detective=true
 	fi]
 )
-AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
 
 AC_ARG_ENABLE(
 	[unit-tests],
@@ -353,7 +320,6 @@ AC_ARG_ENABLE(
 		unittest=true
 	fi]
 )
-AM_CONDITIONAL(USE_UNIT_TESTS, test x$unittest = xtrue)
 
 AC_ARG_ENABLE(
 	[eap-sim],
@@ -362,7 +328,6 @@ AC_ARG_ENABLE(
 		eap_sim=true
 	fi]
 )
-AM_CONDITIONAL(USE_EAP_SIM, test x$eap_sim = xtrue)
 
 AC_ARG_ENABLE(
 	[eap-identity],
@@ -371,7 +336,6 @@ AC_ARG_ENABLE(
 		eap_identity=true
 	fi]
 )
-AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
 
 AC_ARG_ENABLE(
 	[eap-md5],
@@ -380,7 +344,6 @@ AC_ARG_ENABLE(
 		eap_md5=true
 	fi]
 )
-AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
 
 AC_ARG_ENABLE(
 	[eap-aka],
@@ -389,7 +352,6 @@ AC_ARG_ENABLE(
 		eap_aka=true
 	fi]
 )
-AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
 
 AC_ARG_ENABLE(
 	[nat-transport],
@@ -398,7 +360,6 @@ AC_ARG_ENABLE(
 		nat_transport=true
 	fi]
 )
-AM_CONDITIONAL(USE_NAT_TRANSPORT, test x$nat_transport = xtrue)
 
 AC_ARG_ENABLE(
 	[vendor-id],
@@ -410,7 +371,6 @@ AC_ARG_ENABLE(
 	fi],
 	vendor_id=true
 )
-AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue)
 
 AC_ARG_ENABLE(
 	[xauth-vid],
@@ -422,16 +382,14 @@ AC_ARG_ENABLE(
 	fi],
 	xauth_vid=true
 )
-AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue)
 
 AC_ARG_ENABLE(
-    [uml],
+	[dumm],
-    AS_HELP_STRING([--enable-uml],[build the UML test framework (default is NO).]),
+	AS_HELP_STRING([--enable-dumm],[build the DUMM UML test framework (default is NO).]),
 	[if test x$enableval = xyes; then
-        uml=true
+		dumm=true
 	fi]
 )
-AM_CONDITIONAL(USE_UML, test x$uml = xtrue)
 
 AC_ARG_ENABLE(
 	[fast],
@@ -440,36 +398,31 @@ AC_ARG_ENABLE(
 		fast=true
 	fi]
 )
-AM_CONDITIONAL(USE_FAST, test x$fast = xtrue)
 
 AC_ARG_ENABLE(
 	[manager],
 	AS_HELP_STRING([--enable-manager],[build web management console (default is NO).]),
 	[if test x$enableval = xyes; then
 		manager=true
+		xml=true
 	fi]
 )
-AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
 
 AC_ARG_ENABLE(
 	[mediation],
 	AS_HELP_STRING([--enable-mediation],[enable IKEv2 Mediation Extension (default is NO).]),
 	[if test x$enableval = xyes; then
 		me=true
-        AC_DEFINE(ME)
 	fi]
 )
-AM_CONDITIONAL(USE_ME, test x$me = xtrue)
 
 AC_ARG_ENABLE(
 	[integrity-test],
 	AS_HELP_STRING([--enable-integrity-test],[enable the integrity test of the crypto library (default is NO).]),
 	[if test x$enableval = xyes; then
 		integrity_test=true 
-        AC_DEFINE(INTEGRITY_TEST)
 	fi]
 )
-AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
 
 AC_ARG_ENABLE(
 	[self-test],
@@ -478,11 +431,9 @@ AC_ARG_ENABLE(
 		self_test=true
 	 else
 		self_test=false
-        AC_DEFINE(NO_SELF_TEST)
 	fi],
 	self_test=true
 )
-AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
 
 AC_ARG_ENABLE(
 	[pluto],
@@ -494,7 +445,6 @@ AC_ARG_ENABLE(
 	fi],
 	pluto=true
 )
-AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
 
 AC_ARG_ENABLE(
 	[charon],
@@ -506,7 +456,6 @@ AC_ARG_ENABLE(
 	fi],
 	charon=true
 )
-AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
 
 AC_ARG_ENABLE(
 	[tools],
@@ -518,11 +467,6 @@ AC_ARG_ENABLE(
 	fi],
 	tools=true
 )
-AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
-
-AM_CONDITIONAL(USE_PLUTO_OR_CHARON, test x$pluto = xtrue -o x$charon = xtrue)
-AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
-AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
 
 dnl =========================
 dnl  check required programs
@@ -536,43 +480,45 @@ AC_PROG_CC()
 AC_PATH_PROG([GPERF], [gperf], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
 AC_PATH_PROG([PERL], [perl], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
 
-dnl ==========================
+dnl =========================
-dnl  check required libraries
+dnl  dependency calculation
-dnl ==========================
+dnl =========================
+
+if test x$pluto = xtrue; then
+	gmp=true;
+fi
+
+if test x$tools = xtrue; then
+	gmp=true;
+fi
+
+if test x$smp = xtrue; then
+	xml=true
+fi
+
+if test x$manager = xtrue; then
+	fast=true
+fi
+
+dnl ==========================================
+dnl  check required libraries and header files
+dnl ==========================================
 
 AC_HAVE_LIBRARY(dl)
-
 AC_CHECK_FUNCS(backtrace)
 AC_CHECK_FUNCS(dladdr)
-AC_CHECK_FUNCS(getifaddrs)
 
+AC_MSG_CHECKING([capset() definition])
+AC_TRY_COMPILE(
+	[#include <linux/capset.h>],
+	[
+		void *test = capset;
+	], 
+	[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_DEFINE_UNQUOTED(NO_CAPSET_DEFINED, 1)]
+)
+
+if test x$gmp = xtrue; then
 	AC_HAVE_LIBRARY([gmp],[LIBS="$LIBS"],[AC_MSG_ERROR([GNU Multi Precision library gmp not found])])	
-if test "$ldap" = "true"; then
-    AC_HAVE_LIBRARY([ldap],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP enabled, but library ldap not found])])
-    AC_HAVE_LIBRARY([lber],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP enabled, but library lber not found])])
-fi
-if test "$curl" = "true"; then
-    AC_HAVE_LIBRARY([curl],[LIBS="$LIBS"],[AC_MSG_ERROR([CURL enabled, but library curl not found])])
-fi
-
-if test "$xml" = "true"; then
-	PKG_CHECK_MODULES(xml, [libxml-2.0],, AC_MSG_ERROR([No libxml2 package information found]))
-	AC_SUBST(xml_CFLAGS)
-	AC_SUBST(xml_LIBS)
-fi
-
-if test "$dbus" = "true"; then
-	PKG_CHECK_MODULES(dbus, [dbus-1],, AC_MSG_ERROR([No libdbus package information found]))
-	AC_SUBST(dbus_CFLAGS)
-	AC_SUBST(dbus_LIBS)
-fi
-
-
-dnl =============================
-dnl  check required header files
-dnl =============================
-
-
 	AC_MSG_CHECKING([gmp.h version >= 4.1.4])
 	AC_TRY_COMPILE(
 		[#include "gmp.h"],
@@ -583,21 +529,91 @@ AC_TRY_COMPILE(
 		], 
 		[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])]
 	)
-AC_MSG_CHECKING([capset() definition])
-AC_TRY_COMPILE(
-    [#include <linux/capset.h>],
-    [
-    	void *test = capset;
-    ], 
-    [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_DEFINE_UNQUOTED(NO_CAPSET_DEFINED, 1)]
-)
-if test "$ldap" = "true"; then
-    AC_CHECK_HEADER([ldap.h],,[AC_MSG_ERROR([LDAP enabled, but ldap.h not found!])])
 fi
-if test "$curl" = "true"; then
+
-    AC_CHECK_HEADER([curl/curl.h],,[AC_MSG_ERROR([CURL enabled, but curl.h not found!])])
+if test x$ldap = xtrue; then
+	AC_HAVE_LIBRARY([ldap],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library ldap not found])])
+	AC_HAVE_LIBRARY([lber],[LIBS="$LIBS"],[AC_MSG_ERROR([LDAP library lber not found])])
+	AC_CHECK_HEADER([ldap.h],,[AC_MSG_ERROR([LDAP header ldap.h not found!])])
 fi
 
+if test x$curl = xtrue; then
+	AC_HAVE_LIBRARY([curl],[LIBS="$LIBS"],[AC_MSG_ERROR([CURL library curl not found])])
+	AC_CHECK_HEADER([curl/curl.h],,[AC_MSG_ERROR([CURL header curl/curl.h not found!])])
+fi
+
+if test x$xml = xtrue; then
+	PKG_CHECK_MODULES(xml, [libxml-2.0],, AC_MSG_ERROR([No libxml2 package information found]))
+	AC_SUBST(xml_CFLAGS)
+	AC_SUBST(xml_LIBS)
+fi
+
+if test x$fast = xtrue; then
+	AC_HAVE_LIBRARY([neo_cgi],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_cgi not found!])])
+	AC_HAVE_LIBRARY([neo_utl],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver library neo_utl not found!])])
+	AC_HAVE_LIBRARY([z],[LIBS="$LIBS"],[AC_MSG_ERROR([ClearSilver dependency zlib not found!])])
+dnl autoconf does not like CamelCase!? How to fix this?
+dnl	AC_CHECK_HEADER([ClearSilver/ClearSilver.h],,[AC_MSG_ERROR([ClearSilver header file ClearSilver/ClearSilver.h not found!])])
+	
+	AC_HAVE_LIBRARY([fcgi],[LIBS="$LIBS"],[AC_MSG_ERROR([FastCGI library fcgi not found!])])
+	AC_CHECK_HEADER([fcgiapp.h],,[AC_MSG_ERROR([FastCGI header file fcgiapp.h not found!])])
+fi
+
+if test x$mysql = xtrue; then
+	AC_HAVE_LIBRARY([mysqlclient_r],[LIBS="$LIBS"],[AC_MSG_ERROR([MySQL library mysqlclient_r not found])])
+	AC_CHECK_HEADER([mysql/mysql.h],,[AC_MSG_ERROR([MySQL header mysql/mysql.h not found!])])
+fi
+
+if test x$mysql = xtrue; then
+	AC_HAVE_LIBRARY([sqlite3],[LIBS="$LIBS"],[AC_MSG_ERROR([SQLite library sqlite3 not found])])
+	AC_CHECK_HEADER([sqlite3.h],,[AC_MSG_ERROR([SQLite header sqlite3.h not found!])])
+fi
+
+dnl =========================
+dnl  set Makefile.am vars
+dnl =========================
+
+AM_CONDITIONAL(USE_CURL, test x$curl = xtrue)
+AM_CONDITIONAL(USE_LDAP, test x$ldap = xtrue)
+AM_CONDITIONAL(USE_AES, test x$aes = xtrue)
+AM_CONDITIONAL(USE_DES, test x$des = xtrue)
+AM_CONDITIONAL(USE_MD5, test x$md5 = xtrue)
+AM_CONDITIONAL(USE_SHA1, test x$sha1 = xtrue)
+AM_CONDITIONAL(USE_SHA2, test x$sha2 = xtrue)
+AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue)
+AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue)
+AM_CONDITIONAL(USE_X509, test x$x509 = xtrue)
+AM_CONDITIONAL(USE_HMAC, test x$hmac = xtrue)
+AM_CONDITIONAL(USE_MYSQL, test x$mysql = xtrue)
+AM_CONDITIONAL(USE_SQLITE, test x$sqlite = xtrue)
+AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
+AM_CONDITIONAL(USE_MED_DB, test x$med_db = xtrue)
+AM_CONDITIONAL(USE_SMP, test x$smp = xtrue)
+AM_CONDITIONAL(USE_SQL, test x$sql = xtrue)
+AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)
+AM_CONDITIONAL(USE_CISCO_QUIRKS, test x$cisco_quirks = xtrue)
+AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
+AM_CONDITIONAL(USE_UNIT_TESTS, test x$unittest = xtrue)
+AM_CONDITIONAL(USE_EAP_SIM, test x$eap_sim = xtrue)
+AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
+AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
+AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
+AM_CONDITIONAL(USE_NAT_TRANSPORT, test x$nat_transport = xtrue)
+AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue)
+AM_CONDITIONAL(USE_XAUTH_VID, test x$xauth_vid = xtrue)
+AM_CONDITIONAL(USE_DUMM, test x$dumm = xtrue)
+AM_CONDITIONAL(USE_FAST, test x$fast = xtrue)
+AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
+AM_CONDITIONAL(USE_ME, test x$me = xtrue)
+AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
+AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
+AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
+AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
+AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
+AM_CONDITIONAL(USE_PLUTO_OR_CHARON, test x$pluto = xtrue -o x$charon = xtrue)
+AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
+AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
+
 dnl ==============================
 dnl  build Makefiles
 dnl ==============================
@@ -630,7 +646,7 @@ AC_OUTPUT(
 	src/charon/plugins/eap_md5/Makefile
 	src/charon/plugins/eap_sim/Makefile
 	src/charon/plugins/dbus/Makefile
-	src/charon/plugins/xml/Makefile
+	src/charon/plugins/smp/Makefile
 	src/charon/plugins/sql/Makefile
 	src/charon/plugins/med_db/Makefile
 	src/charon/plugins/stroke/Makefile

src/Makefile.am

@@ -27,7 +27,7 @@ if USE_TOOLS
   SUBDIRS += openac scepclient
 endif
 
-if USE_UML
+if USE_DUMM
   SUBDIRS += dumm
 endif
 

src/charon/Makefile.am

@@ -91,6 +91,14 @@ credentials/sets/ocsp_response_wrapper.c credentials/sets/ocsp_response_wrapper.
 credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
 credentials/credential_set.h
 
+INCLUDES = -I${linuxdir} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+AM_CFLAGS = -rdynamic -DIPSEC_DIR=\"${ipsecdir}\" \
+	-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PLUGINDIR=\"${plugindir}\"
+charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm -ldl
+
+# compile options
+#################
+
 # Use RAW socket if pluto gets built
 if USE_PLUTO
   charon_SOURCES += network/socket-raw.c
@@ -99,6 +107,7 @@ else
 endif
 
 if USE_ME
+  AM_CFLAGS += -DME
   charon_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
     processing/jobs/mediation_job.c processing/jobs/mediation_job.h \
@@ -107,10 +116,13 @@ if USE_ME
     sa/tasks/ike_me.c sa/tasks/ike_me.h
 endif
 
-INCLUDES = -I${linuxdir} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+if USE_INTEGRITY_TEST
-AM_CFLAGS = -rdynamic -DIPSEC_DIR=\"${ipsecdir}\" \
+  AM_CFLAGS += -DINTEGRITY_TEST
-	-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PLUGINDIR=\"${plugindir}\"
+endif
-charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm -ldl
+
+if USE_SELF_TEST
+  AM_CFLAGS += -DSELF_TEST
+endif
 
 # build optional plugins
 ########################
@@ -125,12 +137,8 @@ if USE_STROKE
   SUBDIRS += plugins/stroke
 endif
 
-if USE_LIBDBUS
+if USE_SMP
-  SUBDIRS += plugins/dbus
+  SUBDIRS += plugins/smp
-endif
-
-if USE_LIBXML
-  SUBDIRS += plugins/xml
 endif
 
 if USE_SQL

src/charon/plugins/smp/Makefile.am

@@ -0,0 +1,10 @@
+
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon ${xml_CFLAGS}
+
+AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
+
+plugin_LTLIBRARIES = libcharon-smp.la
+libcharon_smp_la_SOURCES = smp.h smp.c
+libcharon_smp_la_LDFLAGS = -module
+libcharon_smp_la_LIBADD = ${xml_LIBS}
+

src/charon/plugins/smp/smp.c

@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 
-#include "xml.h"
+#include "smp.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -35,17 +35,17 @@
 #include <processing/jobs/callback_job.h>
 
 
-typedef struct private_xml_t private_xml_t;
+typedef struct private_smp_t private_smp_t;
 
 /**
- * Private data of an xml_t object.
+ * Private data of an smp_t object.
  */
-struct private_xml_t {
+struct private_smp_t {
 
 	/**
-	 * Public part of xml_t object.
+	 * Public part of smp_t object.
 	 */
-	xml_t public;
+	smp_t public;
 	
 	/**
 	 * XML unix socket fd
@@ -662,7 +662,7 @@ static job_requeue_t process(int *fdp)
 /**
  * accept from XML socket and create jobs to process connections
  */
-static job_requeue_t dispatch(private_xml_t *this)
+static job_requeue_t dispatch(private_smp_t *this)
 {
 	struct sockaddr_un strokeaddr;
 	int oldstate, fd, *fdp, strokeaddrlen = sizeof(strokeaddr);
@@ -691,7 +691,7 @@ static job_requeue_t dispatch(private_xml_t *this)
 /**
  * Implementation of itnerface_t.destroy.
  */
-static void destroy(private_xml_t *this)
+static void destroy(private_smp_t *this)
 {
 	this->job->cancel(this->job);
 	close(this->socket);
@@ -704,7 +704,7 @@ static void destroy(private_xml_t *this)
 plugin_t *plugin_create()
 {
 	struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"};
-	private_xml_t *this = malloc_thing(private_xml_t);
+	private_smp_t *this = malloc_thing(private_smp_t);
 	mode_t old;
 
 	this->public.plugin.destroy = (void (*)(plugin_t*))destroy;

src/charon/plugins/smp/smp.h

@@ -16,27 +16,27 @@
  */
 
 /**
- * @defgroup xml xml
+ * @defgroup smp smp
  * @ingroup cplugins
  *
- * @defgroup xml_i xml
+ * @defgroup smp_i smp
- * @{ @ingroup xml
+ * @{ @ingroup smp
  */
 
-#ifndef XML_H_
+#ifndef SMP_H_
-#define XML_H_
+#define SMP_H_
 
 #include <plugins/plugin.h>
 
-typedef struct xml_t xml_t;
+typedef struct smp_t smp_t;
 
 /**
- * XML configuration and control interface.
+ * SMP configuration and control interface.
  *
- * The XML interface uses a socket and a to communicate. The syntax is strict
+ * The SMP interface uses a socket and a to communicate. The syntax is strict
  * XML, defined in the schema.xml specification.
  */
-struct xml_t {
+struct smp_t {
 
 	/**
 	 * implements the plugin interface.
@@ -45,7 +45,7 @@ struct xml_t {
 };
 
 /**
- * Create a xml plugin instance.
+ * Create a smp plugin instance.
  */
 plugin_t *plugin_create();
 

src/charon/plugins/sql/sql_config.c

@@ -78,7 +78,7 @@ static traffic_selector_t *build_traffic_selector(private_sql_config_t *this,
 				*local = TRUE;
 				/* FALL */
 			case TS_REMOTE_DYNAMIC:
-				ts = traffic_selector_create_dynamic(protocol, type,
+				ts = traffic_selector_create_dynamic(protocol,
 								start_port, end_port);
 				break;
 			default:

src/charon/plugins/xml/Makefile.am

@@ -1,10 +0,0 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon ${xml_CFLAGS}
-
-AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
-
-plugin_LTLIBRARIES = libcharon-xml.la
-libcharon_xml_la_SOURCES = xml.h xml.c
-libcharon_xml_la_LDFLAGS = -module
-libcharon_xml_la_LIBADD = ${xml_LIBS}
-

src/pluto/Makefile.am

@@ -134,3 +134,8 @@ if USE_LDAP
   AM_CFLAGS += -DLIBLDAP
 endif
 
+# This compile option activates smartcard support
+if USE_SMARTCARD
+  AM_CFLAGS += -DSMARTCARD
+endif
+

src/scepclient/Makefile.am

@@ -25,9 +25,16 @@ scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \
 
 # This compile option activates smartcard support
 if USE_SMARTCARD
+  AM_CFLAGS += -DSMARTCARD
   scepclient_LDADD += -ldl
 endif
 
+# This compile option activates dynamic URL fetching using libcurl
+if USE_CURL
+  AM_CFLAGS += -DLIBCURL
+  scepclient_LDADD += -lcurl
+endif
+
 dist_man_MANS = scepclient.8
 
 asn1.o :	$(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h