[GNUnet-SVN] r37061 - gnunet/src/util

[gnunet]

Author: dold
Date: 2016-04-22 15:55:52 +0200 (Fri, 22 Apr 2016)
New Revision: 37061

Modified:
   gnunet/src/util/configuration_loader.c
   gnunet/src/util/os_installation.c
Log:
Allow GNUNET_BASE_CONFIG to be customized.

Needed for GNU Taler.


Modified: gnunet/src/util/configuration_loader.c
===================================================================
--- gnunet/src/util/configuration_loader.c      2016-04-22 13:30:20 UTC (rev 
37060)
+++ gnunet/src/util/configuration_loader.c      2016-04-22 13:55:52 UTC (rev 
37061)
@@ -43,8 +43,11 @@
                            const char *filename)
 {
   char *baseconfig;
+  const char *base_config_varname;
 
-  if (NULL != (baseconfig = getenv ("GNUNET_BASE_CONFIG")))
+  base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;
+
+  if (NULL != (baseconfig = getenv (base_config_varname)))
   {
     baseconfig = GNUNET_strdup (baseconfig);
   }

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2016-04-22 13:30:20 UTC (rev 37060)
+++ gnunet/src/util/os_installation.c   2016-04-22 13:55:52 UTC (rev 37061)
@@ -58,6 +58,7 @@
   .project_dirname = "gnunet",
   .binary_name = "gnunet-arm",
   .env_varname = "GNUNET_PREFIX",
+  .base_config_varname = "GNUNET_BASE_CONFIG",
   .bug_email = "address@hidden",
   .homepage = "http://www.gnu.org/s/gnunet/";,
   .config_file = "gnunet.conf",