diff options
author | Stef Walter <stef@thewalter.net> | 2013-07-17 11:58:05 +0200 |
---|---|---|
committer | Stef Walter <stef@thewalter.net> | 2013-07-18 13:04:35 +0200 |
commit | 52a84b84a924a9f1cd8090b0a47b9f7d00ca69f3 (patch) | |
tree | 32428cc8b83eaa360b8b53e92f769cac1cf8a17e /configure.ac | |
parent | 936e4c229a4ed205e9981fc4f31acea063701b69 (diff) | |
download | p11-kit-52a84b84a924a9f1cd8090b0a47b9f7d00ca69f3.tar.gz |
Support expanding $XDG_CONFIG_HOME in user config paths
If ~/.config is specified as a prefix to a configured path,
then it is expanded to the $XDG_CONFIG_HOME if that exists
Add --with-user-config ./configure option to configure a
different user config directory.
Interpolate the right directories into documentation.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2f92b8c..445bd4f 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,11 @@ AC_ARG_WITH([system-config], [system_config_dir=$withval], [system_config_dir=$sysconfdir/pkcs11]) +AC_ARG_WITH([user-config], + [AS_HELP_STRING([--with-system-config], [Change PKCS#11 user config directory])], + [user_config_dir=$withval], + [user_config_dir="~/.pkcs11"]) + AC_ARG_WITH([module-path], [AS_HELP_STRING([--with-module-path], [Load modules with relative path names from here])], [module_path=$withval], @@ -125,7 +130,7 @@ p11_system_config=$system_config_dir p11_system_config_file=$p11_system_config/pkcs11.conf p11_system_config_modules=$p11_system_config/modules p11_package_config_modules='${pkgdatadir}/modules' -p11_user_config="~/.pkcs11" +p11_user_config=$user_config_dir p11_user_config_file="$p11_user_config/pkcs11.conf" p11_user_config_modules="$p11_user_config/modules" p11_module_path="$module_path" @@ -487,7 +492,6 @@ AC_CONFIG_FILES([Makefile common/tests/Makefile doc/Makefile doc/manual/Makefile - doc/manual/version.xml po/Makefile.in p11-kit/Makefile p11-kit/tests/Makefile |