Allow the configuration file to be specified via an environment variable.

---
 src/gclue-config.c        | 13 ++++++++++---
 src/gclue-static-source.c |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gclue-config.c b/src/gclue-config.c
index acd6009..3045571 100644
--- a/src/gclue-config.c
+++ b/src/gclue-config.c
@@ -26,8 +26,8 @@
 
 #include "gclue-config.h"
 
-#define CONFIG_FILE_PATH SYSCONFDIR "/geoclue/geoclue.conf"
-#define CONFIG_D_DIRECTORY SYSCONFDIR "/geoclue/conf.d/"
+#define CONFIG_FILE_PATH "/etc/geoclue/geoclue.conf"
+#define CONFIG_D_DIRECTORY "/etc/geoclue/conf.d/"
 
 /* This class will be responsible for fetching configuration. */
 
@@ -546,8 +546,15 @@ gclue_config_init (GClueConfig *config)
         priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
         priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK);
 
-        /* Load config file from default path, log all missing parameters */
         priv->key_file = g_key_file_new ();
+
+        char *env_config_file = g_getenv ("GEOCLUE_CONFIG_FILE");
+        if (env_config_file) {
+                load_config_file (config, env_config_file);
+                goto out; // don't load conf.d
+        }
+
+        /* Load config file from default path, log all missing parameters */
         load_config_file (config, CONFIG_FILE_PATH);
 
         /*
diff --git a/src/gclue-static-source.c b/src/gclue-static-source.c
index 1c35cea..7957797 100644
--- a/src/gclue-static-source.c
+++ b/src/gclue-static-source.c
@@ -26,7 +26,7 @@
 #include "gclue-enum-types.h"
 
 #define GEO_FILE_NAME "geolocation"
-#define GEO_FILE_PATH SYSCONFDIR "/" GEO_FILE_NAME
+#define GEO_FILE_PATH "/etc/" GEO_FILE_NAME
 
 /* Rate limit of geolocation file monitoring.
  * In milliseconds.
-- 
2.46.0

put class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>root</a>/<a href='/guix/log/gnu?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>gnu</a>/<a href='/guix/log/gnu/tests?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>tests</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests?id=dd25c46887d1f0279f00232ef4d1bbda404563a6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-08 15:15:09 -0500'>2023-01-08</span></td><td><a href='/guix/commit/gnu/tests?id=064c5b7e450f9f6d55cfcd0ec2bc9e96ee0b2958'>gnu: Remove linux-libre 4.9.</a><span class='msg-avail'>...<span class='msg-tooltip'>This kernel series is no longer supported upstream:
https://lkml.iu.edu/hypermail/linux/kernel/2301.0/06398.html
https://www.kernel.org/category/releases.html

* gnu/packages/aux-files/linux-libre/4.9-i686.conf,
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf: Delete files.
* Makefile.am (AUX_FILES): Remove them.
* gnu/packages/linux.scm (linux-libre-4.9-version, linux-libre-4.9-gnu-revision,
deblob-scripts-4.9, linux-libre-4.9-pristine-source, linux-libre-4.9-source,
linux-libre-headers-4.9, linux-libre-4.9): Remove variables.
* gnu/tests/base.scm (%test-linux-libre-4.9): Likewise.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2022-12-12 20:23:32 +0100'>2022-12-12</span></td><td><a href='/guix/commit/gnu/tests?id=2c1b488d19831702288b8bdee4cecf661da91b60'>tests: Add system tests for each supported kernel version.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/base.scm (%test-basic-os): Rename to ...
(test-basic-os): ... this, and turn into procedure that takes optional KERNEL
argument.
(%test-basic-os): Use that procedure.
(%test-linux-libre-5.15, %test-linux-libre-5.10, %test-linux-libre-5.4,
%test-linux-libre-4.19, %test-linux-libre-4.14, %test-linux-libre-4.9): New
tests.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-12-12 15:03:35 +0100'>2022-12-12</span></td><td><a href='/guix/commit/gnu/tests?id=302a84a593e4be417d739caf4e5385df536e3943'>Merge branch 'version-1.4.0'</a></td><td>Ludovic Courtès</td></tr>