Moved attr plugin from libcharon to libhydra.

diff --git a/configure.in b/configure.in
index eed4cbc1d95da9c0ed1c91986d8f4848e365dce7..47d56b41b0a9f97c64bec159cf24bd1f8aa233fd 100644 (file)
--- 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 9ed1ffe11ec5fa012b0b00716a58d88d20f425cf..14d3c39bbc79e0c24ee09fc9413de2059cf52ab6 100644 (file)
--- 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 c669b4e112bd67f2b2e65c2f79ef12a7454879f0..cbf07c70dccdda4a890c2f767a4cdcb9e962723d 100644 (file)
--- 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
similarity index 100%
rename from src/libcharon/plugins/attr/Makefile.am
rename to src/libhydra/plugins/attr/Makefile.am

diff --git a/src/libcharon/plugins/attr/attr_plugin.c b/src/libhydra/plugins/attr/attr_plugin.c
similarity index 100%
rename from src/libcharon/plugins/attr/attr_plugin.c
rename to 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
similarity index 98%
rename from src/libcharon/plugins/attr/attr_plugin.h
rename to src/libhydra/plugins/attr/attr_plugin.h
index 0c6eebfa7715e883283f90c3f928ea8078ef17fb..29fb3383979c1dcb08a372da4d394478b82db94d 100644 (file)
--- 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
similarity index 100%
rename from src/libcharon/plugins/attr/attr_provider.c
rename to 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
similarity index 100%
rename from src/libcharon/plugins/attr/attr_provider.h
rename to src/libhydra/plugins/attr/attr_provider.h