From 3bb86b72ca5882b1e5684db837c75df810f283c3 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@collabora.co.uk>
Date: Thu, 21 Jul 2011 16:51:34 +0200
Subject: Expand the various pkcs11 config paths properly.

 * Without this the ${prefix} part of the variable wasn't being
   expanded and was making it into the #define.
---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c64fa8..5548117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,8 +46,9 @@ AC_ARG_WITH([pkcs11-dir],
             [pkcs11_dir=$withval],
             [pkcs11_dir=$sysconfdir/pkcs11])
 
-p11_system_conf="$pkcs11_dir/pkcs11.conf"
-p11_system_modules="$pkcs11_dir/modules"
+# We expand these so we have concrete paths
+p11_system_conf=$(eval echo $pkcs11_dir/pkcs11.conf)
+p11_system_modules=$(eval echo $pkcs11_dir/modules)
 p11_user_conf="~/.pkcs11/pkcs11.conf"
 p11_user_modules="~/.pkcs11/modules"
 
-- 
cgit v1.1