Moving attr-sql plugin from libstrongswan to libhydra.

diff --git a/configure.in b/configure.in
index d7a0b204eb65368ad92bb638cae148f88e115aa3..09fa8c307d76a694f1910043d7ae588025af653d 100644 (file)
--- 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 274aa176d46cea1f4b6908127bbef0fcdee696c1..f8dd0e5e9db07071a585cb77c27389e9f746ab2d 100644 (file)
--- 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 702ee3e0d4bc4534b3dd076bb8be660cbbfba30a..f5583262c7949d801ea34f156d6bbb2625360daf 100644 (file)
--- 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/.gitignore
rename to src/libhydra/plugins/attr_sql/.gitignore

diff --git a/src/libstrongswan/plugins/attr_sql/Makefile.am b/src/libhydra/plugins/attr_sql/Makefile.am
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/Makefile.am
rename to 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c
rename to 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/attr_sql_plugin.h
rename to 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/pool.c
rename to 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/sql_attribute.c
rename to 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
similarity index 100%
rename from src/libstrongswan/plugins/attr_sql/sql_attribute.h
rename to src/libhydra/plugins/attr_sql/sql_attribute.h

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 2b80e619b787b0dece6b88ae63a00fd2f3157752..5620ff74b04d1aec636ba7a4f29a5a187d000c9f 100644 (file)
--- 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