Attachment 51308 Details for Bug 40985 – patch that fixes this issue

[patch] patch that fixes this issue

0001-Expand-libdir.patch (text/plain), 1.45 KB, created by Ionut Biru on 2011-09-18 03:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ionut Biru

Created: 2011-09-18 03:24:34 UTC

Size: 1.45 KB

patch

obsolete

>From 78db99fd28b8338679415cb2ffebe114f08f8148 Mon Sep 17 00:00:00 2001
>From: Ionut Biru <ibiru@archlinux.org>
>Date: Sun, 18 Sep 2011 10:20:04 +0000
>Subject: [PATCH] Expand libdir
>
>libdir is never expanded and p11-kit tries to load modules from
>${exec_prefix}/lib/pkcs11/
>
>Use a hack to avoid prefix and eprefix being NONE when is not
>specified.
>
>Signed-off-by: Ionut Biru <ibiru@archlinux.org>
>---
> configure.ac |   10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 50f323c..738b895 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -51,6 +51,14 @@ AC_CHECK_MEMBERS([struct dirent.d_type],,,[#include <dirent.h>])
> 
> GTK_DOC_CHECK([1.15])
> 
>+# HACK: Because autoconf is nasty
>+if test "${prefix}" = "NONE"; then
>+    prefix=/usr/local
>+fi
>+if test "${exec_prefix}" = "NONE"; then
>+    exec_prefix=$prefix
>+fi
>+
> # --------------------------------------------------------------------
> # PKCS#11 Directories
> 
>@@ -71,7 +79,7 @@ p11_system_config_modules=$(eval echo $p11_system_config/modules)
> p11_user_config="~/.pkcs11"
> p11_user_config_file="$p11_user_config/pkcs11.conf"
> p11_user_config_modules="$p11_user_config/modules"
>-p11_module_path="$module_path"
>+p11_module_path=$(eval echo $module_path)
> 
> AC_DEFINE_UNQUOTED(P11_SYSTEM_CONFIG_FILE, "$p11_system_config_file", [System configuration file])
> AC_DEFINE_UNQUOTED(P11_SYSTEM_CONFIG_MODULES, "$p11_system_config_modules", [System modules configuration dir])
>-- 
>1.7.6.1
>

Actions: View | Splinter Review

Attachments on bug 40985: 51308 | 51366

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.