From 138c1efa9af4893536fb7c3a90d3cb1ac24cea89 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 14 Sep 2011 08:10:45 +0300 Subject: 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 --- p11-kit/Makefile.am | 2 +- p11-kit/modules.c | 5 +++-- p11-kit/p11-kit-1.pc.in | 10 ++++++---- p11-kit/pkcs11.conf.example.in | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'p11-kit') diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index 9d28b5e..dc9f8ab 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -46,7 +46,7 @@ libp11_kit_testable_la_SOURCES = $(MODULE_SRCS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = p11-kit-1.pc -exampledir = $(p11_system_dir) +exampledir = $(p11_system_config) example_DATA = pkcs11.conf.example EXTRA_DIST = \ diff --git a/p11-kit/modules.c b/p11-kit/modules.c index e683c46..1e2095b 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -395,13 +395,14 @@ load_registered_modules_unlocked (void) return CKR_OK; /* Load the global configuration files */ - config = _p11_conf_load_globals (P11_SYSTEM_CONF, P11_USER_CONF, &mode); + config = _p11_conf_load_globals (P11_SYSTEM_CONFIG_FILE, P11_USER_CONFIG_FILE, &mode); if (config == NULL) return (errno == ENOMEM) ? CKR_HOST_MEMORY : CKR_GENERAL_ERROR; 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_CONFIG_MODULES, + P11_USER_CONFIG_MODULES); 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..0f596fa 100644 --- a/p11-kit/p11-kit-1.pc.in +++ b/p11-kit/p11-kit-1.pc.in @@ -5,10 +5,12 @@ includedir=@includedir@ datarootdir=@datarootdir@ datadir=@datadir@ sysconfdir=@sysconfdir@ -p11_system_conf=@p11_system_conf@ -p11_system_modules=@p11_system_modules@ -p11_user_conf=@p11_user_conf@ -p11_user_modules=@p11_user_modules@ +p11_system_config=@p11_system_config@ +p11_system_config_file=@p11_system_config_file@ +p11_system_config_modules=@p11_system_config_modules@ +p11_user_config=@p11_user_config@ +p11_user_config_file=@p11_user_config_file@ +p11_user_config_modules=@p11_user_config_modules@ proxy_module=@libdir@/p11-kit-proxy.so Name: p11-kit diff --git a/p11-kit/pkcs11.conf.example.in b/p11-kit/pkcs11.conf.example.in index bfc2cb3..ec01b14 100644 --- a/p11-kit/pkcs11.conf.example.in +++ b/p11-kit/pkcs11.conf.example.in @@ -1,4 +1,4 @@ -# This is an example @p11_system_conf@ file. Copy it into +# This is an example @p11_system_config_file@ file. Copy it into # place before use. # This setting controls whether to load user configuration from the -- cgit v1.1