From 0df451bc07904f37c786cf0347d0f4a12ec2deff Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 25 Aug 2009 11:31:08 +0200 Subject: [PATCH] use ./configured plugins in keyid scripts --- scripts/Makefile.am | 1 + scripts/key2keyid.c | 2 +- scripts/keyid2sql.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f8d62b3bc..6c28b948f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = \ -DIPSEC_PLUGINDIR=\"${plugindir}\" \ +-DPLUGINS="\"${libstrongswan_plugins}\"" \ -DSTRONGSWAN_CONF=\"${strongswan_conf}\" noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql \ diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c index 3de69ffa6..e32c2baf3 100644 --- a/scripts/key2keyid.c +++ b/scripts/key2keyid.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) int read; library_init(NULL); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "gmp pubkey sha1"); + lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS); atexit(library_deinit); read = fread(buf, 1, sizeof(buf), stdin); diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c index 25a29d681..2ec011950 100644 --- a/scripts/keyid2sql.c +++ b/scripts/keyid2sql.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) int read, n; library_init(NULL); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "gmp pubkey sha1"); + lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS); atexit(library_deinit); read = fread(buf, 1, sizeof(buf), stdin);