diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-30 11:27:44 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-30 11:27:44 +0200 |
| commit | 05740b517eebc466a2795ad69ccaafabd69c53a1 (patch) | |
| tree | 96bb0de3a3d7ec2c3ce070773c949446d3869368 | |
| parent | c6a6e2580fc639e0e3b3c0c4810b3245fe9d3b09 (diff) | |
| download | gnutls-05740b517eebc466a2795ad69ccaafabd69c53a1.tar.gz | |
Some pakchois fixes.
| -rw-r--r-- | lib/m4/hooks.m4 | 3 | ||||
| -rw-r--r-- | lib/pakchois/pakchois.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 4fad2ba8a5..720a675e34 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -119,9 +119,6 @@ AC_DEFUN([LIBGNUTLS_HOOKS], AC_CHECK_LIB(dl, dlopen,, [AC_MSG_ERROR([could not find dlopen])]) - module_path="${libdir}:${libdir}/pkcs11" - - CPPFLAGS="$CPPFLAGS -DPAKCHOIS_MODPATH=\"\"" fi AC_ARG_WITH(lzo, diff --git a/lib/pakchois/pakchois.c b/lib/pakchois/pakchois.c index 946f714cba..17a45d7a88 100644 --- a/lib/pakchois/pakchois.c +++ b/lib/pakchois/pakchois.c @@ -85,7 +85,7 @@ struct slot { #define DIR_DELIMITER '/' -char* pkcs11ize(const char* name) +static char* pkcs11ize(const char* name) { int len; char* oname; @@ -150,7 +150,13 @@ static const char *suffix_prefixes[][2] = { static void *find_pkcs11_module(const char *name, CK_C_GetFunctionList *gfl) { - char module_path[] = PAKCHOIS_MODPATH; + + char module_path[] = +#ifdef PAKCHOIS_MODPATH + PAKCHOIS_MODPATH; +#else + ""; +#endif char *next = module_path; void *h; |