aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-22 13:55:52 +0000
committerFlorian Dold <florian.dold@gmail.com>2016-04-22 13:55:52 +0000
commit104cac085849940d33c706499ae7678273296caf (patch)
tree34a1bc27145af640214fe1e8a410b000a2a85fff /src
parentcd5084f02721786289459c0958537a6ffc24ac1e (diff)
downloadgnunet-104cac085849940d33c706499ae7678273296caf.tar.gz
gnunet-104cac085849940d33c706499ae7678273296caf.zip
Allow GNUNET_BASE_CONFIG to be customized.
Needed for GNU Taler.
Diffstat (limited to 'src')
-rw-r--r--src/util/configuration_loader.c5
-rw-r--r--src/util/os_installation.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 2caad8c05..07eeb98f0 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -43,8 +43,11 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
43 const char *filename) 43 const char *filename)
44{ 44{
45 char *baseconfig; 45 char *baseconfig;
46 const char *base_config_varname;
46 47
47 if (NULL != (baseconfig = getenv ("GNUNET_BASE_CONFIG"))) 48 base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;
49
50 if (NULL != (baseconfig = getenv (base_config_varname)))
48 { 51 {
49 baseconfig = GNUNET_strdup (baseconfig); 52 baseconfig = GNUNET_strdup (baseconfig);
50 } 53 }
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 45f5052aa..161b0535f 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -58,6 +58,7 @@ static const struct GNUNET_OS_ProjectData default_pd = {
58 .project_dirname = "gnunet", 58 .project_dirname = "gnunet",
59 .binary_name = "gnunet-arm", 59 .binary_name = "gnunet-arm",
60 .env_varname = "GNUNET_PREFIX", 60 .env_varname = "GNUNET_PREFIX",
61 .base_config_varname = "GNUNET_BASE_CONFIG",
61 .bug_email = "gnunet-developers@gnu.org", 62 .bug_email = "gnunet-developers@gnu.org",
62 .homepage = "http://www.gnu.org/s/gnunet/", 63 .homepage = "http://www.gnu.org/s/gnunet/",
63 .config_file = "gnunet.conf", 64 .config_file = "gnunet.conf",