aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2009-08-25 11:31:08 +0200
committerMartin Willi <martin@strongswan.org>2009-08-26 11:23:55 +0200
commit0df451bc07904f37c786cf0347d0f4a12ec2deff (patch)
tree4904d9ac62d39bf8ed1ec7b2462ee735ad8fcf3e
parent500aa2607f310744c2fdfec519c5b46527d8d597 (diff)
downloadstrongswan-0df451bc07904f37c786cf0347d0f4a12ec2deff.tar.bz2
strongswan-0df451bc07904f37c786cf0347d0f4a12ec2deff.tar.xz
use ./configured plugins in keyid scripts
-rw-r--r--scripts/Makefile.am1
-rw-r--r--scripts/key2keyid.c2
-rw-r--r--scripts/keyid2sql.c2
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);