DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load a configuration file in SYSCONFDIR

Browse Source
This commit is contained in:
Pierre Pronchery 2017-11-18 04:32:52 +01:00
parent 5ebbcb4b78
commit fa81e2b8b9
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/configure.c
View File

@ -50,6 +50,9 @@
#ifndef PREFIX #ifndef PREFIX
# define PREFIX "/usr/local" # define PREFIX "/usr/local"
#endif #endif
#ifndef SYSCONFDIR
# define SYSCONFDIR PREFIX "/etc"
#endif
#ifndef DATADIR #ifndef DATADIR
# define DATADIR PREFIX "/share" # define DATADIR PREFIX "/share"
#endif #endif
@ -252,6 +255,14 @@ static int _new_load_config(Configure * configure)
configure_warning(0, "%s: %s", filename, configure_warning(0, "%s: %s", filename,
"Could not load program definitions"); "Could not load program definitions");
string_delete(filename); string_delete(filename);
#ifndef BASEDIR
if((filename = string_new(SYSCONFDIR "/" PACKAGE "/" PACKAGE CONFEXT))
== NULL)
return -configure_error(1, "%s", error_get(NULL));
/* we can ignore errors */
config_load(configure->config, filename);
string_delete(filename);
#endif
return 0; return 0;
} }