attr-sql: Move plugin to libcharon
This commit is contained in:
parent
c6c7f97a1d
commit
82e4b83378
|
@ -1257,7 +1257,7 @@ ADD_PLUGIN([soup], [s charon pki scripts nm cmd])
|
|||
ADD_PLUGIN([mysql], [s charon pool manager medsrv attest])
|
||||
ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest])
|
||||
ADD_PLUGIN([attr], [c charon])
|
||||
ADD_PLUGIN([attr-sql], [h charon])
|
||||
ADD_PLUGIN([attr-sql], [c charon])
|
||||
ADD_PLUGIN([load-tester], [c charon])
|
||||
ADD_PLUGIN([kernel-libipsec], [c charon cmd])
|
||||
ADD_PLUGIN([kernel-wfp], [c charon])
|
||||
|
@ -1483,10 +1483,10 @@ AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
|
|||
AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue)
|
||||
AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue)
|
||||
AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue)
|
||||
AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue)
|
||||
|
||||
# hydra plugins
|
||||
# ---------------
|
||||
AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue)
|
||||
AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
|
||||
AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue)
|
||||
AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue)
|
||||
|
@ -1649,7 +1649,6 @@ AC_CONFIG_FILES([
|
|||
src/libstrongswan/plugins/test_vectors/Makefile
|
||||
src/libstrongswan/tests/Makefile
|
||||
src/libhydra/Makefile
|
||||
src/libhydra/plugins/attr_sql/Makefile
|
||||
src/libhydra/plugins/kernel_netlink/Makefile
|
||||
src/libhydra/plugins/kernel_pfkey/Makefile
|
||||
src/libhydra/plugins/kernel_pfroute/Makefile
|
||||
|
@ -1750,6 +1749,7 @@ AC_CONFIG_FILES([
|
|||
src/libcharon/plugins/load_tester/Makefile
|
||||
src/libcharon/plugins/resolve/Makefile
|
||||
src/libcharon/plugins/attr/Makefile
|
||||
src/libcharon/plugins/attr_sql/Makefile
|
||||
src/stroke/Makefile
|
||||
src/ipsec/Makefile
|
||||
src/starter/Makefile
|
||||
|
|
|
@ -644,3 +644,10 @@ if MONOLITHIC
|
|||
libcharon_la_LIBADD += plugins/attr/libstrongswan-attr.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_ATTR_SQL
|
||||
SUBDIRS += plugins/attr_sql
|
||||
if MONOLITHIC
|
||||
libcharon_la_LIBADD += plugins/attr_sql/libstrongswan-attr-sql.la
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra
|
||||
-I$(top_srcdir)/src/libhydra \
|
||||
-I$(top_srcdir)/src/libcharon
|
||||
|
||||
AM_CFLAGS = \
|
||||
$(PLUGIN_CFLAGS)
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
/**
|
||||
* @defgroup attr_sql attr_sql
|
||||
* @ingroup hplugins
|
||||
* @ingroup cplugins
|
||||
*
|
||||
* @defgroup sql_plugin sql_plugin
|
||||
* @{ @ingroup attr_sql
|
|
@ -37,13 +37,6 @@ else
|
|||
SUBDIRS = .
|
||||
endif
|
||||
|
||||
if USE_ATTR_SQL
|
||||
SUBDIRS += plugins/attr_sql
|
||||
if MONOLITHIC
|
||||
libhydra_la_LIBADD += plugins/attr_sql/libstrongswan-attr-sql.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_KERNEL_PFKEY
|
||||
SUBDIRS += plugins/kernel_pfkey
|
||||
if MONOLITHIC
|
||||
|
|
|
@ -11,11 +11,13 @@ pool.o : $(top_builddir)/config.status
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra \
|
||||
-I$(top_srcdir)/src/libcharon \
|
||||
-DPLUGINS=\""${pool_plugins}\""
|
||||
|
||||
pool_LDADD = \
|
||||
$(top_builddir)/src/libstrongswan/libstrongswan.la \
|
||||
$(top_builddir)/src/libhydra/libhydra.la
|
||||
$(top_builddir)/src/libhydra/libhydra.la \
|
||||
$(top_builddir)/src/libcharon/libcharon.la
|
||||
|
||||
endif USE_ATTR_SQL
|
||||
|
||||
|
|
Loading…
Reference in New Issue