diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | src/libcharon/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libcharon/plugins/addrblock/Makefile.am (renamed from src/libstrongswan/plugins/addrblock/Makefile.am) | 3 | ||||
| -rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_plugin.c (renamed from src/libstrongswan/plugins/addrblock/addrblock_plugin.c) | 0 | ||||
| -rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_plugin.h (renamed from src/libstrongswan/plugins/addrblock/addrblock_plugin.h) | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_validator.c (renamed from src/libstrongswan/plugins/addrblock/addrblock_validator.c) | 0 | ||||
| -rw-r--r-- | src/libcharon/plugins/addrblock/addrblock_validator.h (renamed from src/libstrongswan/plugins/addrblock/addrblock_validator.h) | 0 | ||||
| -rw-r--r-- | src/libstrongswan/Makefile.am | 7 |
8 files changed, 13 insertions, 14 deletions
diff --git a/configure.in b/configure.in index a7a3171cd..db70906ef 100644 --- a/configure.in +++ b/configure.in @@ -763,9 +763,6 @@ fi if test x$agent = xtrue; then libstrongswan_plugins=${libstrongswan_plugins}" agent" fi -if test x$addrblock = xtrue; then - libstrongswan_plugins=${libstrongswan_plugins}" addrblock" -fi if test x$gmp = xtrue; then libstrongswan_plugins=${libstrongswan_plugins}" gmp" pluto_plugins=${pluto_plugins}" gmp" @@ -821,7 +818,6 @@ AM_CONDITIONAL(USE_PADLOCK, test x$padlock = xtrue) AM_CONDITIONAL(USE_OPENSSL, test x$openssl = xtrue) AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = xtrue) AM_CONDITIONAL(USE_AGENT, test x$agent = xtrue) -AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue) dnl charon plugins dnl ============== @@ -858,6 +854,7 @@ AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue) AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue) AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue) AM_CONDITIONAL(USE_FARP, test x$farp = xtrue) +AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue) dnl hydra plugins dnl ============= @@ -947,7 +944,6 @@ AC_OUTPUT( src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile - src/libstrongswan/plugins/addrblock/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile @@ -985,6 +981,7 @@ AC_OUTPUT( src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile + src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/android/Makefile diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index d9540e656..44501c0d0 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -400,6 +400,14 @@ if MONOLITHIC endif endif +if USE_ADDRBLOCK + SUBDIRS += plugins/addrblock + PLUGINS += addrblock +if MONOLITHIC + libcharon_la_LIBADD += plugins/uci/libstrongswan-addrblock.la +endif +endif + if USE_UNIT_TESTS SUBDIRS += plugins/unit_tester PLUGINS += unit-tester diff --git a/src/libstrongswan/plugins/addrblock/Makefile.am b/src/libcharon/plugins/addrblock/Makefile.am index 159d2e781..d844674ff 100644 --- a/src/libstrongswan/plugins/addrblock/Makefile.am +++ b/src/libcharon/plugins/addrblock/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I$(top_srcdir)/src/libstrongswan +INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/libcharon AM_CFLAGS = -rdynamic diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.c b/src/libcharon/plugins/addrblock/addrblock_plugin.c index 6c1ef73e4..6c1ef73e4 100644 --- a/src/libstrongswan/plugins/addrblock/addrblock_plugin.c +++ b/src/libcharon/plugins/addrblock/addrblock_plugin.c diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h b/src/libcharon/plugins/addrblock/addrblock_plugin.h index e7c3a728e..87bd516f9 100644 --- a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h +++ b/src/libcharon/plugins/addrblock/addrblock_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup addrblock addrblock - * @ingroup plugins + * @ingroup cplugins * * @defgroup addrblock_plugin addrblock_plugin * @{ @ingroup addrblock diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.c b/src/libcharon/plugins/addrblock/addrblock_validator.c index 44ef38d85..44ef38d85 100644 --- a/src/libstrongswan/plugins/addrblock/addrblock_validator.c +++ b/src/libcharon/plugins/addrblock/addrblock_validator.c diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.h b/src/libcharon/plugins/addrblock/addrblock_validator.h index 423f0d41a..423f0d41a 100644 --- a/src/libstrongswan/plugins/addrblock/addrblock_validator.h +++ b/src/libcharon/plugins/addrblock/addrblock_validator.h diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 0ef26c831..eb0ceb530 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -314,13 +314,6 @@ if MONOLITHIC endif endif -if USE_ADDRBLOCK - SUBDIRS += plugins/addrblock -if MONOLITHIC - libstrongswan_la_LIBADD += plugins/addrblock/libstrongswan-addrblock.la -endif -endif - if USE_TEST_VECTORS SUBDIRS += plugins/test_vectors if MONOLITHIC |