diff options
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/libcharon/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libhydra/Makefile.am | 7 | ||||
| -rw-r--r-- | src/libhydra/plugins/attr/Makefile.am (renamed from src/libcharon/plugins/attr/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/libhydra/plugins/attr/attr_plugin.c (renamed from src/libcharon/plugins/attr/attr_plugin.c) | 0 | ||||
| -rw-r--r-- | src/libhydra/plugins/attr/attr_plugin.h (renamed from src/libcharon/plugins/attr/attr_plugin.h) | 2 | ||||
| -rw-r--r-- | src/libhydra/plugins/attr/attr_provider.c (renamed from src/libcharon/plugins/attr/attr_provider.c) | 0 | ||||
| -rw-r--r-- | src/libhydra/plugins/attr/attr_provider.h (renamed from src/libcharon/plugins/attr/attr_provider.h) | 0 |
8 files changed, 13 insertions, 10 deletions
diff --git a/configure.in b/configure.in index eed4cbc1d..47d56b41b 100644 --- a/configure.in +++ b/configure.in @@ -745,6 +745,10 @@ if test x$gmp = xtrue; then libstrongswan_plugins=${libstrongswan_plugins}" gmp" pluto_plugins=${pluto_plugins}" gmp" fi +if test x$attr = xtrue; then + libhydra_plugins=${libhydra_plugins}" attr" + pluto_plugins=${pluto_plugins}" attr" +fi if test x$attr_sql = xtrue -o x$sql = xtrue; then libhydra_plugins=${libhydra_plugins}" attr-sql" pluto_plugins=${pluto_plugins}" attr-sql" @@ -904,6 +908,7 @@ AC_OUTPUT( src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile + src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile @@ -939,7 +944,6 @@ AC_OUTPUT( src/libcharon/plugins/android/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile - src/libcharon/plugins/attr/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/resolve/Makefile src/libcharon/plugins/unit_tester/Makefile diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 9ed1ffe11..14d3c39bb 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -245,14 +245,6 @@ if MONOLITHIC endif endif -if USE_ATTR - SUBDIRS += plugins/attr - PLUGINS += attr -if MONOLITHIC - libcharon_la_LIBADD += plugins/attr/libstrongswan-attr.la -endif -endif - if USE_EAP_IDENTITY SUBDIRS += plugins/eap_identity PLUGINS += eap-identity diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am index c669b4e11..cbf07c70d 100644 --- a/src/libhydra/Makefile.am +++ b/src/libhydra/Makefile.am @@ -26,6 +26,13 @@ else SUBDIRS = . endif +if USE_ATTR + SUBDIRS += plugins/attr +if MONOLITHIC + libhydra_la_LIBADD += plugins/attr/libstrongswan-attr.la +endif +endif + if USE_ATTR_SQL SUBDIRS += plugins/attr_sql if MONOLITHIC diff --git a/src/libcharon/plugins/attr/Makefile.am b/src/libhydra/plugins/attr/Makefile.am index 71401648e..71401648e 100644 --- a/src/libcharon/plugins/attr/Makefile.am +++ b/src/libhydra/plugins/attr/Makefile.am diff --git a/src/libcharon/plugins/attr/attr_plugin.c b/src/libhydra/plugins/attr/attr_plugin.c index 24c00bb44..24c00bb44 100644 --- a/src/libcharon/plugins/attr/attr_plugin.c +++ b/src/libhydra/plugins/attr/attr_plugin.c diff --git a/src/libcharon/plugins/attr/attr_plugin.h b/src/libhydra/plugins/attr/attr_plugin.h index 0c6eebfa7..29fb33839 100644 --- a/src/libcharon/plugins/attr/attr_plugin.h +++ b/src/libhydra/plugins/attr/attr_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup attr attr - * @ingroup cplugins + * @ingroup hplugins * * @defgroup attr_plugin attr_plugin * @{ @ingroup attr diff --git a/src/libcharon/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c index 548896f56..548896f56 100644 --- a/src/libcharon/plugins/attr/attr_provider.c +++ b/src/libhydra/plugins/attr/attr_provider.c diff --git a/src/libcharon/plugins/attr/attr_provider.h b/src/libhydra/plugins/attr/attr_provider.h index a41466718..a41466718 100644 --- a/src/libcharon/plugins/attr/attr_provider.h +++ b/src/libhydra/plugins/attr/attr_provider.h |