summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-06-09 11:03:16 +0200
committerStef Walter <stefw@collabora.co.uk>2011-06-09 11:03:16 +0200
commitd941244aaf0cf142fee986eb914c2767f564dc14 (patch)
treea69474955004d09cc5cb995c490758313a5d444b
parent4bb63ced295ddd64a019ae49cfae191524a34f07 (diff)
By default use /etc/pkcs11 for system configs and not ${prefix}
* Packagers can override this with the --with-pkcs11-dir configure arg.
-rw-r--r--configure.ac17
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 91c4bef..9b8bb57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,8 +41,13 @@ GTK_DOC_CHECK([1.15])
# --------------------------------------------------------------------
# PKCS#11 Directories
-p11_system_conf="$sysconfdir/pkcs11/pkcs11.conf"
-p11_system_modules="$sysconfdir/pkcs11/modules"
+AC_ARG_WITH([pkcs11-dir],
+ [AS_HELP_STRING([--with-pkcs11-dir], [Change PKCS#11 system config directory])],
+ [pkcs11_dir=$withval],
+ [pkcs11_dir=/etc/pkcs11])
+
+p11_system_conf="$pkcs11_dir/pkcs11.conf"
+p11_system_modules="$pkcs11_dir/modules"
p11_user_conf="~/.pkcs11/pkcs11.conf"
p11_user_modules="~/.pkcs11/modules"
@@ -160,3 +165,11 @@ AC_CONFIG_FILES([Makefile
tools/Makefile
])
AC_OUTPUT
+
+AC_MSG_NOTICE([build options:
+
+ System Global Config: $p11_system_conf
+ User Global Config: $p11_user_conf
+ System Module Directory: $p11_system_modules
+ User Module Directory: $p11_user_modules
+]) \ No newline at end of file