Moved attr plugin from libcharon to libhydra.

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

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

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

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