use ./configured plugins in keyid scripts

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f8d62b3bc27790cd92f556d9d3461296d6659701..6c28b948fceee17bd32758df3a1ff1a53483b139 100644 (file)
--- 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 3de69ffa61a287989b793a1f77a9225b25b32a1f..e32c2baf34b2ad64ef7a7bc940d216fdb449c461 100644 (file)
--- 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 25a29d681b75ae8dd65bdc9580c140e68244e6dd..2ec011950e6724d6f6d68c789267a05466adf3ec 100644 (file)
--- 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);