attr: Move plugin to libcharon
This commit is contained in:
parent
6bfd1fbb71
commit
c6c7f97a1d
|
@ -1256,7 +1256,7 @@ ADD_PLUGIN([winhttp], [s charon pki scripts])
|
||||||
ADD_PLUGIN([soup], [s charon pki scripts nm cmd])
|
ADD_PLUGIN([soup], [s charon pki scripts nm cmd])
|
||||||
ADD_PLUGIN([mysql], [s charon pool manager medsrv attest])
|
ADD_PLUGIN([mysql], [s charon pool manager medsrv attest])
|
||||||
ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest])
|
ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest])
|
||||||
ADD_PLUGIN([attr], [h charon])
|
ADD_PLUGIN([attr], [c charon])
|
||||||
ADD_PLUGIN([attr-sql], [h charon])
|
ADD_PLUGIN([attr-sql], [h charon])
|
||||||
ADD_PLUGIN([load-tester], [c charon])
|
ADD_PLUGIN([load-tester], [c charon])
|
||||||
ADD_PLUGIN([kernel-libipsec], [c charon cmd])
|
ADD_PLUGIN([kernel-libipsec], [c charon cmd])
|
||||||
|
@ -1482,10 +1482,10 @@ AM_CONDITIONAL(USE_FARP, test x$farp = xtrue)
|
||||||
AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
|
AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
|
||||||
AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue)
|
AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue)
|
||||||
AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue)
|
AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue)
|
||||||
|
AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue)
|
||||||
|
|
||||||
# hydra plugins
|
# hydra plugins
|
||||||
# ---------------
|
# ---------------
|
||||||
AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue)
|
|
||||||
AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue)
|
AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue)
|
||||||
AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = 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_PFKEY, test x$kernel_pfkey = xtrue)
|
||||||
|
@ -1649,7 +1649,6 @@ AC_CONFIG_FILES([
|
||||||
src/libstrongswan/plugins/test_vectors/Makefile
|
src/libstrongswan/plugins/test_vectors/Makefile
|
||||||
src/libstrongswan/tests/Makefile
|
src/libstrongswan/tests/Makefile
|
||||||
src/libhydra/Makefile
|
src/libhydra/Makefile
|
||||||
src/libhydra/plugins/attr/Makefile
|
|
||||||
src/libhydra/plugins/attr_sql/Makefile
|
src/libhydra/plugins/attr_sql/Makefile
|
||||||
src/libhydra/plugins/kernel_netlink/Makefile
|
src/libhydra/plugins/kernel_netlink/Makefile
|
||||||
src/libhydra/plugins/kernel_pfkey/Makefile
|
src/libhydra/plugins/kernel_pfkey/Makefile
|
||||||
|
@ -1750,6 +1749,7 @@ AC_CONFIG_FILES([
|
||||||
src/libcharon/plugins/unit_tester/Makefile
|
src/libcharon/plugins/unit_tester/Makefile
|
||||||
src/libcharon/plugins/load_tester/Makefile
|
src/libcharon/plugins/load_tester/Makefile
|
||||||
src/libcharon/plugins/resolve/Makefile
|
src/libcharon/plugins/resolve/Makefile
|
||||||
|
src/libcharon/plugins/attr/Makefile
|
||||||
src/stroke/Makefile
|
src/stroke/Makefile
|
||||||
src/ipsec/Makefile
|
src/ipsec/Makefile
|
||||||
src/starter/Makefile
|
src/starter/Makefile
|
||||||
|
|
|
@ -637,3 +637,10 @@ if MONOLITHIC
|
||||||
libcharon_la_LIBADD += plugins/resolve/libstrongswan-resolve.la
|
libcharon_la_LIBADD += plugins/resolve/libstrongswan-resolve.la
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_ATTR
|
||||||
|
SUBDIRS += plugins/attr
|
||||||
|
if MONOLITHIC
|
||||||
|
libcharon_la_LIBADD += plugins/attr/libstrongswan-attr.la
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/libstrongswan \
|
-I$(top_srcdir)/src/libstrongswan \
|
||||||
-I$(top_srcdir)/src/libhydra
|
-I$(top_srcdir)/src/libhydra \
|
||||||
|
-I$(top_srcdir)/src/libcharon
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
$(PLUGIN_CFLAGS)
|
$(PLUGIN_CFLAGS)
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @defgroup attr attr
|
* @defgroup attr attr
|
||||||
* @ingroup hplugins
|
* @ingroup cplugins
|
||||||
*
|
*
|
||||||
* @defgroup attr_plugin attr_plugin
|
* @defgroup attr_plugin attr_plugin
|
||||||
* @{ @ingroup attr
|
* @{ @ingroup attr
|
|
@ -17,8 +17,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES))
|
||||||
|
|
||||||
# adding the plugin source files
|
# adding the plugin source files
|
||||||
|
|
||||||
LOCAL_SRC_FILES += $(call add_plugin, attr)
|
|
||||||
|
|
||||||
LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey)
|
LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey)
|
||||||
|
|
||||||
LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink)
|
LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink)
|
||||||
|
@ -42,4 +40,3 @@ LOCAL_PRELINK_MODULE := false
|
||||||
LOCAL_SHARED_LIBRARIES += libstrongswan
|
LOCAL_SHARED_LIBRARIES += libstrongswan
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
|
|
|
@ -37,13 +37,6 @@ else
|
||||||
SUBDIRS = .
|
SUBDIRS = .
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_ATTR
|
|
||||||
SUBDIRS += plugins/attr
|
|
||||||
if MONOLITHIC
|
|
||||||
libhydra_la_LIBADD += plugins/attr/libstrongswan-attr.la
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
if USE_ATTR_SQL
|
if USE_ATTR_SQL
|
||||||
SUBDIRS += plugins/attr_sql
|
SUBDIRS += plugins/attr_sql
|
||||||
if MONOLITHIC
|
if MONOLITHIC
|
||||||
|
|
Loading…
Reference in New Issue