Moving attr-sql plugin from libstrongswan to libhydra.
This commit is contained in:
parent
0bf68cbf7c
commit
75dc019252
18
configure.in
18
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
|
||||
|
|
|
@ -133,7 +133,7 @@ else
|
|||
SUBDIRS = .
|
||||
endif
|
||||
|
||||
PLUGINS = ${libstrongswan_plugins}
|
||||
PLUGINS = ${libstrongswan_plugins} ${libhydra_plugins}
|
||||
|
||||
if USE_LOAD_TESTER
|
||||
SUBDIRS += plugins/load_tester
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue