aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in63
-rw-r--r--src/Makefile.am43
-rw-r--r--src/charon/Makefile.am41
-rw-r--r--src/pluto/Makefile.am12
4 files changed, 122 insertions, 37 deletions
diff --git a/configure.in b/configure.in
index 572d6f652..de45f61b5 100644
--- a/configure.in
+++ b/configure.in
@@ -156,6 +156,18 @@ AC_ARG_ENABLE(
AM_CONDITIONAL(USE_LIBLDAP, test x$ldap = xtrue)
AC_ARG_ENABLE(
+ [stroke],
+ AS_HELP_STRING([--disable-stroke],[disable charons stroke (pluto compatibility) configuration backend. (default is NO).]),
+ [if test x$enableval = xyes; then
+ stroke=true
+ else
+ stroke=false
+ fi],
+ stroke=true
+)
+AM_CONDITIONAL(USE_STROKE, test x$stroke = xtrue)
+
+AC_ARG_ENABLE(
[dbus],
AS_HELP_STRING([--enable-dbus],[enable DBUS configuration and control interface (default is NO). Requires libdbus.]),
[if test x$enableval = xyes; then
@@ -220,7 +232,16 @@ AC_ARG_ENABLE(
eap_sim=true
fi]
)
-AM_CONDITIONAL(BUILD_EAP_SIM, test x$eap_sim = xtrue)
+AM_CONDITIONAL(USE_EAP_SIM, test x$eap_sim = xtrue)
+
+AC_ARG_ENABLE(
+ [eap-identity],
+ AS_HELP_STRING([--enable-eap-identity],[build EAP module providing EAP-Identity helper (default is NO).]),
+ [if test x$enableval = xyes; then
+ eap_identity=true
+ fi]
+)
+AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
AC_ARG_ENABLE(
[nat-transport],
@@ -307,16 +328,44 @@ AC_ARG_ENABLE(
AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
AC_ARG_ENABLE(
- [raw-socket],
- AS_HELP_STRING([--disable-raw-socket],[disable charons RAW socket and use a normal socket instead. Prevents charon and pluto to run in parallel. (default is NO).]),
+ [pluto],
+ AS_HELP_STRING([--disable-pluto],[disable the IKEv1 keying daemon pluto. (default is NO).]),
+ [if test x$enableval = xyes; then
+ pluto=true
+ else
+ pluto=false
+ fi],
+ pluto=true
+)
+AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
+
+AC_ARG_ENABLE(
+ [charon],
+ AS_HELP_STRING([--disable-charon],[disable the IKEv2 keying daemon charon. (default is NO).]),
+ [if test x$enableval = xyes; then
+ charon=true
+ else
+ charon=false
+ fi],
+ charon=true
+)
+AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
+
+AC_ARG_ENABLE(
+ [tools],
+ AS_HELP_STRING([--disable-tools],[disable additional utilities (openac and scepclient). (default is NO).]),
[if test x$enableval = xyes; then
- raw_socket=true
+ tools=true
else
- raw_socket=false
+ tools=false
fi],
- raw_socket=true
+ tools=true
)
-AM_CONDITIONAL(USE_RAW_SOCKET, test x$raw_socket = 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 check required programs
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d41ea9e5..97542c62c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,32 @@
-SUBDIRS = include libfreeswan libcrypto libstrongswan pluto whack charon stroke starter openac scepclient ipsec _updown _updown_espmark _copyright
+SUBDIRS = include
+
+if USE_PLUTO
+ SUBDIRS += libfreeswan libcrypto pluto whack
+endif
+
+if USE_LIBSTRONGSWAN
+ SUBDIRS += libstrongswan
+endif
+
+if USE_CHARON
+ SUBDIRS += charon
+endif
+
+if USE_STROKE
+ SUBDIRS += stroke
+endif
+
+if USE_FILE_CONFIG
+ SUBDIRS += starter ipsec _copyright
+endif
+
+if USE_PLUTO_OR_CHARON
+ SUBDIRS += _updown _updown_espmark
+endif
+
+if USE_TOOLS
+ SUBDIRS += openac scepclient
+endif
if USE_UML
SUBDIRS += dumm
@@ -8,3 +36,16 @@ if USE_MANAGER
SUBDIRS += manager
endif
+if USE_FILE_CONFIG
+install-exec-local :
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
+ mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
+ mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
+endif
+
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index bbefb2949..ab8a42b3d 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -86,7 +86,8 @@ sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
sa/tasks/task.c sa/tasks/task.h
-if USE_RAW_SOCKET
+# Use RAW socket if pluto gets built
+if USE_PLUTO
charon_SOURCES += network/socket-raw.c
else
charon_SOURCES += network/socket.c
@@ -111,27 +112,31 @@ if USE_LIBCURL
endif
-# build EAP plugins, EAP-Identity is always built
-#################################################
+# build EAP plugins
+###################
eap_LTLIBRARIES =
-eap_LTLIBRARIES += libcharon-eapidentity.la
-libcharon_eapidentity_la_SOURCES = sa/authenticators/eap/eap_identity.h sa/authenticators/eap/eap_identity.c
-libcharon_eapidentity_la_LDFLAGS = -module
+if USE_EAP_IDENTITY
+ eap_LTLIBRARIES += libcharon-eapidentity.la
+ libcharon_eapidentity_la_SOURCES = sa/authenticators/eap/eap_identity.h sa/authenticators/eap/eap_identity.c
+ libcharon_eapidentity_la_LDFLAGS = -module
+endif
-if BUILD_EAP_SIM
+if USE_EAP_SIM
eap_LTLIBRARIES += libcharon-eapsim.la
libcharon_eapsim_la_SOURCES = sa/authenticators/eap/eap_sim.h sa/authenticators/eap/eap_sim.c
libcharon_eapsim_la_LDFLAGS = -module
endif
-# build backends, local backend is always built
-###############################################
+# build backends
+################
backend_LTLIBRARIES =
-backend_LTLIBRARIES += libcharon-local.la
-libcharon_local_la_SOURCES = config/backends/local_backend.h config/backends/local_backend.c
-libcharon_local_la_LDFLAGS = -module
+if USE_STROKE
+ backend_LTLIBRARIES += libcharon-local.la
+ libcharon_local_la_SOURCES = config/backends/local_backend.h config/backends/local_backend.c
+ libcharon_local_la_LDFLAGS = -module
+endif
if USE_LIBSQLITE
backend_LTLIBRARIES += libcharon-sqlite.la
@@ -140,13 +145,15 @@ if USE_LIBSQLITE
libcharon_sqlite_la_LDFLAGS = -module
endif
-# build control interfaces, stroke interface is always built
-############################################################
+# build control interfaces
+##########################
interface_LTLIBRARIES =
-interface_LTLIBRARIES += libcharon-stroke.la
-libcharon_stroke_la_SOURCES = control/interfaces/stroke_interface.h control/interfaces/stroke_interface.c
-libcharon_stroke_la_LDFLAGS = -module
+if USE_STROKE
+ interface_LTLIBRARIES += libcharon-stroke.la
+ libcharon_stroke_la_SOURCES = control/interfaces/stroke_interface.h control/interfaces/stroke_interface.c
+ libcharon_stroke_la_LDFLAGS = -module
+endif
if USE_LIBDBUS
interface_LTLIBRARIES += libcharon-dbus.la
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 4519ef7bb..69902ad8f 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -132,15 +132,3 @@ if USE_LIBLDAP
pluto_LDADD += -lldap -llber
endif
-install-exec-local :
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
- mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
- mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
- chown -R $(ipsecuid):$(ipsecgid) $(DESTDIR)$(confdir)/ipsec.d
-