[PATCH 1/2] Rename pkgconfig configuration directory variables

[Kalev Lember]

Just by looking at the names, it was hard to tell if the variables were
supposed to refer to the directory for dropping pkcs11 modules in, or to
the directory for configuration files. Renamed them to reduce ambiguity
and to pave the way for exposing some additional parameters.

p11_system_modules -> p11_system_modules_config_dir
p11_user_modules   -> p11_user_modules_config_dir

configure --with-pkcs11-dir
=>
configure --with-pkcs11-config-dir
---
 configure.ac            |   30 +++++++++++++++---------------
 p11-kit/modules.c       |    2 +-
 p11-kit/p11-kit-1.pc.in |    4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 10e35d7..9111cf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,28 +54,28 @@ 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([pkcs11-config-dir],
+            [AS_HELP_STRING([--with-pkcs11-config-dir], [Change PKCS#11 system config directory])],
+            [pkcs11_config_dir=$withval],
+            [pkcs11_config_dir=$sysconfdir/pkcs11])
 
 # We expand these so we have concrete paths
-p11_system_dir=$(eval echo $pkcs11_dir)
+p11_system_dir=$(eval echo $pkcs11_config_dir)
 p11_system_conf=$(eval echo $p11_system_dir/pkcs11.conf)
-p11_system_modules=$(eval echo $p11_system_dir/modules)
+p11_system_modules_config_dir=$(eval echo $p11_system_dir/modules)
 p11_user_conf="~/.pkcs11/pkcs11.conf"
-p11_user_modules="~/.pkcs11/modules"
+p11_user_modules_config_dir="~/.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_SYSTEM_MODULES_CONFIG_DIR, "$p11_system_modules_config_dir", [System modules configuration 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_DEFINE_UNQUOTED(P11_USER_MODULES_CONFIG_DIR, "$p11_user_modules_config_dir", [User modules configuration dir])
 
 AC_SUBST(p11_system_dir)
 AC_SUBST(p11_system_conf)
-AC_SUBST(p11_system_modules)
+AC_SUBST(p11_system_modules_config_dir)
 AC_SUBST(p11_user_conf)
-AC_SUBST(p11_user_modules)
+AC_SUBST(p11_user_modules_config_dir)
 
 # --------------------------------------------------------------------
 # Warnings to show if using GCC
@@ -188,8 +188,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_conf
+    User Global Config:              $p11_user_conf
+    System Module Config Directory:  $p11_system_modules_config_dir
+    User Module Config Directory:    $p11_user_modules_config_dir
 ])
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index e683c46..4cfb4cb 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -401,7 +401,7 @@ load_registered_modules_unlocked (void)
 
 	assert (mode != CONF_USER_INVALID);
 
-	configs = _p11_conf_load_modules (mode, P11_SYSTEM_MODULES, P11_USER_MODULES);
+	configs = _p11_conf_load_modules (mode, P11_SYSTEM_MODULES_CONFIG_DIR, P11_USER_MODULES_CONFIG_DIR);
 	if (configs == NULL) {
 		rv = (errno == ENOMEM) ? CKR_HOST_MEMORY : CKR_GENERAL_ERROR;
 		hash_free (config);
diff --git a/p11-kit/p11-kit-1.pc.in b/p11-kit/p11-kit-1.pc.in
index 9ef67a3..dac411a 100644
--- a/p11-kit/p11-kit-1.pc.in
+++ b/p11-kit/p11-kit-1.pc.in
@@ -6,9 +6,9 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 p11_system_conf=@p11_system_conf@
-p11_system_modules=@p11_system_modules@
+p11_system_modules_config_dir=@p11_system_modules_config_dir@
 p11_user_conf=@p11_user_conf@
-p11_user_modules=@p11_user_modules@
+p11_user_modules_config_dir=@p11_user_modules_config_dir@
 proxy_module=@libdir@/p11-kit-proxy.so
 
 Name: p11-kit
-- 
1.7.6.2