diff options
| author | Kalev Lember <kalevlember@gmail.com> | 2011-09-14 08:10:45 +0300 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-09-14 16:05:21 +0200 |
| commit | 138c1efa9af4893536fb7c3a90d3cb1ac24cea89 (patch) | |
| tree | aba52220c4b20f1267dbcac66ea0794cf5ec52b5 /configure.ac | |
| parent | 1cecad87a968ab6441b020fafb95f991b97e84b3 (diff) | |
Rename pkgconfig configuration directory variables
Renamed them to reduce ambiguity and to pave the way for exposing
some additional parameters.
p11_system_modules -> p11_system_config_modules
p11_user_modules -> p11_user_config_modules
configure --with-pkcs11-dir
=>
configure --with-system-config
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 10e35d7..eb2dba0 100644 --- a/configure.ac +++ b/configure.ac @@ -54,28 +54,30 @@ GTK_DOC_CHECK([1.15]) # -------------------------------------------------------------------- # PKCS#11 Directories -AC_ARG_WITH([pkcs11-dir], - [AS_HELP_STRING([--with-pkcs11-dir], [Change PKCS#11 system config directory])], - [pkcs11_dir=$withval], - [pkcs11_dir=$sysconfdir/pkcs11]) +AC_ARG_WITH([system-config], + [AS_HELP_STRING([--with-system-config], [Change PKCS#11 system config directory])], + [system_config_dir=$withval], + [system_config_dir=$sysconfdir/pkcs11]) # We expand these so we have concrete paths -p11_system_dir=$(eval echo $pkcs11_dir) -p11_system_conf=$(eval echo $p11_system_dir/pkcs11.conf) -p11_system_modules=$(eval echo $p11_system_dir/modules) -p11_user_conf="~/.pkcs11/pkcs11.conf" -p11_user_modules="~/.pkcs11/modules" - -AC_DEFINE_UNQUOTED(P11_SYSTEM_CONF, "$p11_system_conf", [System configuration file]) -AC_DEFINE_UNQUOTED(P11_SYSTEM_MODULES, "$p11_system_modules", [System modules dir]) -AC_DEFINE_UNQUOTED(P11_USER_CONF, "$p11_user_conf", [User configuration file]) -AC_DEFINE_UNQUOTED(P11_USER_MODULES, "$p11_user_modules", [User modules dir]) - -AC_SUBST(p11_system_dir) -AC_SUBST(p11_system_conf) -AC_SUBST(p11_system_modules) -AC_SUBST(p11_user_conf) -AC_SUBST(p11_user_modules) +p11_system_config=$(eval echo $system_config_dir) +p11_system_config_file=$(eval echo $p11_system_config/pkcs11.conf) +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" + +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]) +AC_DEFINE_UNQUOTED(P11_USER_CONFIG_FILE, "$p11_user_config_file", [User configuration file]) +AC_DEFINE_UNQUOTED(P11_USER_CONFIG_MODULES, "$p11_user_config_modules", [User modules configuration dir]) + +AC_SUBST(p11_system_config) +AC_SUBST(p11_system_config_file) +AC_SUBST(p11_system_config_modules) +AC_SUBST(p11_user_config) +AC_SUBST(p11_user_config_file) +AC_SUBST(p11_user_config_modules) # -------------------------------------------------------------------- # Warnings to show if using GCC @@ -188,8 +190,8 @@ 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 + System Global Config: $p11_system_config_file + System Module Config Directory: $p11_system_config_modules + User Global Config: $p11_user_config_file + User Module Config Directory: $p11_user_config_modules ]) |