diff options
| author | Martin Willi <martin@strongswan.org> | 2008-12-02 09:01:57 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-12-02 09:01:57 +0000 |
| commit | 6905f794bbdfbf82e4ab0fe6e5404db9c8eab3ad (patch) | |
| tree | cd3bfee8b4e584e3e20087f84eacb464da8208b0 | |
| parent | 2671a8fcee0102173192e12e3c8739a3ee1b15fc (diff) | |
| download | strongswan-6905f794bbdfbf82e4ab0fe6e5404db9c8eab3ad.tar.bz2 strongswan-6905f794bbdfbf82e4ab0fe6e5404db9c8eab3ad.tar.xz | |
added a --disable-threads ./configure option for pluto
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/pluto/Makefile.am | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 997d7ace7..a251c9912 100644 --- a/configure.in +++ b/configure.in @@ -570,6 +570,17 @@ AC_ARG_ENABLE( ) AC_ARG_ENABLE( + [threads], + AS_HELP_STRING([--disable-threads],[disable the use of threads in pluto. Charon always uses threads. (default is NO).]), + [if test x$enableval = xyes; then + threads=true + else + threads=false + fi], + threads=true +) + +AC_ARG_ENABLE( [charon], AS_HELP_STRING([--disable-charon],[disable the IKEv2 keying daemon charon. (default is NO).]), [if test x$enableval = xyes; then @@ -928,6 +939,7 @@ AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue) AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue) AM_CONDITIONAL(USE_CAPABILITIES, test x$capabilities = xlibcap) 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) diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am index 453636f96..f788bc3d1 100644 --- a/src/pluto/Makefile.am +++ b/src/pluto/Makefile.am @@ -85,7 +85,7 @@ AM_CFLAGS = \ -DIPSEC_PIDDIR=\"${piddir}\" \ -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \ -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \ --DPLUTO -DKLIPS -DDEBUG -DTHREADS +-DPLUTO -DKLIPS -DDEBUG pluto_LDADD = \ oid.o \ @@ -143,3 +143,6 @@ if USE_CAPABILITIES pluto_LDADD += -lcap endif +if USE_THREADS + AM_CFLAGS += -DTHREADS +endif |