Moving attr-sql plugin from libstrongswan to libhydra.

11 files changed, 17 insertions, 22 deletions

diff --git a/configure.in b/configure.in
index d7a0b204e..09fa8c307 100644
--- a/configure.in
+++ b/configure.in
@@ -632,11 +632,12 @@ if test x$integrity_test = xtrue; then
 	)
 fi
 
-dnl ======================================
-dnl  collect all plugins for libstrongswan
-dnl ======================================
+dnl ==========================================================
+dnl  collect all plugins for libstrongswan, libhydra and pluto
+dnl ==========================================================
 
 libstrongswan_plugins=
+libhydra_plugins=
 pluto_plugins=
 
 if test x$test_vectors = xtrue; then
@@ -714,10 +715,6 @@ if test x$sqlite = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" sqlite"
 	pluto_plugins=${pluto_plugins}" sqlite"
 fi
-if test x$attr_sql = xtrue -o x$sql = xtrue; then
-	libstrongswan_plugins=${libstrongswan_plugins}" attr-sql"
-	pluto_plugins=${pluto_plugins}" attr-sql"
-fi
 if test x$padlock = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" padlock"
 fi
@@ -746,8 +743,13 @@ if test x$gmp = xtrue; then
 	libstrongswan_plugins=${libstrongswan_plugins}" gmp"
 	pluto_plugins=${pluto_plugins}" gmp"
 fi
+if test x$attr_sql = xtrue -o x$sql = xtrue; then
+	libhydra_plugins=${libhydra_plugins}" attr-sql"
+	pluto_plugins=${pluto_plugins}" attr-sql"
+fi
 
 AC_SUBST(libstrongswan_plugins)
+AC_SUBST(libhydra_plugins)
 AC_SUBST(pluto_plugins)
 
 dnl =========================
@@ -892,13 +894,13 @@ AC_OUTPUT(
 	src/libstrongswan/plugins/ldap/Makefile
 	src/libstrongswan/plugins/mysql/Makefile
 	src/libstrongswan/plugins/sqlite/Makefile
-	src/libstrongswan/plugins/attr_sql/Makefile
 	src/libstrongswan/plugins/padlock/Makefile
 	src/libstrongswan/plugins/openssl/Makefile
 	src/libstrongswan/plugins/gcrypt/Makefile
 	src/libstrongswan/plugins/agent/Makefile
 	src/libstrongswan/plugins/test_vectors/Makefile
 	src/libhydra/Makefile
+	src/libhydra/plugins/attr_sql/Makefile
 	src/libfreeswan/Makefile
 	src/libsimaka/Makefile
 	src/pluto/Makefile
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 274aa176d..f8dd0e5e9 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -133,7 +133,7 @@ else
 SUBDIRS = .
 endif
 
-PLUGINS = ${libstrongswan_plugins}
+PLUGINS = ${libstrongswan_plugins} ${libhydra_plugins}
 
 if USE_LOAD_TESTER
   SUBDIRS += plugins/load_tester
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index 702ee3e0d..f5583262c 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -21,10 +21,10 @@ else
 SUBDIRS = .
 endif
 
-#if USE_FOO
-#  SUBDIRS += plugins/foo
-#if MONOLITHIC
-#  libhydra_la_LIBADD += plugins/foo/libstrongswan-foo.la
-#endif
-#endif
+if USE_ATTR_SQL
+  SUBDIRS += plugins/attr_sql
+if MONOLITHIC
+  libhydra_la_LIBADD += plugins/attr_sql/libstrongswan-attr-sql.la
+endif
+endif
 
diff --git a/src/libstrongswan/plugins/attr_sql/.gitignore b/src/libhydra/plugins/attr_sql/.gitignore
index eae4e6ad0..eae4e6ad0 100644
--- a/src/libstrongswan/plugins/attr_sql/.gitignore
+++ b/src/libhydra/plugins/attr_sql/.gitignore
diff --git a/src/libstrongswan/plugins/attr_sql/Makefile.am b/src/libhydra/plugins/attr_sql/Makefile.am
index 9d73f2e9b..9d73f2e9b 100644
--- a/src/libstrongswan/plugins/attr_sql/Makefile.am
+++ b/src/libhydra/plugins/attr_sql/Makefile.am
diff --git a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c
index 5d3d737bd..5d3d737bd 100644
--- a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c
+++ b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c
diff --git a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.h b/src/libhydra/plugins/attr_sql/attr_sql_plugin.h
index 12837fffa..12837fffa 100644
--- a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.h
+++ b/src/libhydra/plugins/attr_sql/attr_sql_plugin.h
diff --git a/src/libstrongswan/plugins/attr_sql/pool.c b/src/libhydra/plugins/attr_sql/pool.c
index 5ecf80b42..5ecf80b42 100644
--- a/src/libstrongswan/plugins/attr_sql/pool.c
+++ b/src/libhydra/plugins/attr_sql/pool.c
diff --git a/src/libstrongswan/plugins/attr_sql/sql_attribute.c b/src/libhydra/plugins/attr_sql/sql_attribute.c
index a89195b6d..a89195b6d 100644
--- a/src/libstrongswan/plugins/attr_sql/sql_attribute.c
+++ b/src/libhydra/plugins/attr_sql/sql_attribute.c
diff --git a/src/libstrongswan/plugins/attr_sql/sql_attribute.h b/src/libhydra/plugins/attr_sql/sql_attribute.h
index ca87eb27e..ca87eb27e 100644
--- a/src/libstrongswan/plugins/attr_sql/sql_attribute.h
+++ b/src/libhydra/plugins/attr_sql/sql_attribute.h
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 2b80e619b..5620ff74b 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -269,13 +269,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_ATTR_SQL
-  SUBDIRS += plugins/attr_sql
-if MONOLITHIC
-  libstrongswan_la_LIBADD += plugins/attr_sql/libstrongswan-attr-sql.la
-endif
-endif
-
 if USE_PADLOCK
   SUBDIRS += plugins/padlock
 if MONOLITHIC