pool: Install SQL schemas from src/pool

This allows us to install the schemas if either the attr-sql or sql
plugin is enabled, since both use the same schema (at least in parts).

diff --git a/src/Makefile.am b/src/Makefile.am
index 264a3cf3715d0126a8022d1c2b9d06af02bf5792..f290d9c85ba2cb68743a2f48cd3ddf5ae21b672f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,6 +98,10 @@ endif
 
 if USE_ATTR_SQL
   SUBDIRS += pool
+else
+if USE_SQL
+  SUBDIRS += pool
+endif
 endif
 
 if USE_TKM

diff --git a/src/libcharon/plugins/sql/Makefile.am b/src/libcharon/plugins/sql/Makefile.am
index 50b6dc393d380fc192eb6597942b2131805a8c06..fd5693123be66321a7e42010372da3b1b905cf80 100644 (file)
--- a/src/libcharon/plugins/sql/Makefile.am
+++ b/src/libcharon/plugins/sql/Makefile.am
@@ -17,6 +17,3 @@ libstrongswan_sql_la_SOURCES = \
        sql_cred.h sql_cred.c sql_logger.h sql_logger.c
 
 libstrongswan_sql_la_LDFLAGS = -module -avoid-version
-
-templatesdir = $(pkgdatadir)/templates/database/sql
-dist_templates_DATA = mysql.sql sqlite.sql

diff --git a/src/pool/Makefile.am b/src/pool/Makefile.am
index 8b429a4ba919298976ff5dfdfc19d32ec0971660..2756f93a54153fb0e853a7c9bc30b775ed455414 100644 (file)
--- a/src/pool/Makefile.am
+++ b/src/pool/Makefile.am
@@ -1,3 +1,5 @@
+if USE_ATTR_SQL
+
 ipsec_PROGRAMS = pool
 
 pool_SOURCES = \
@@ -14,3 +16,8 @@ AM_CPPFLAGS = \
 pool_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libhydra/libhydra.la
+
+endif !USE_ATTR_SQL
+
+templatesdir = $(pkgdatadir)/templates/database/sql
+dist_templates_DATA = mysql.sql sqlite.sql

diff --git a/src/libcharon/plugins/sql/mysql.sql b/src/pool/mysql.sql
similarity index 100%
rename from src/libcharon/plugins/sql/mysql.sql
rename to src/pool/mysql.sql

diff --git a/src/libcharon/plugins/sql/sqlite.sql b/src/pool/sqlite.sql
similarity index 100%
rename from src/libcharon/plugins/sql/sqlite.sql
rename to src/pool/sqlite.sql