Merge pull request #13 from rbgarga/fix_config_path2

Make default config to respect sysconfdir
This commit is contained in:
Olof Hagsand 2018-02-07 13:31:20 +01:00 committed by GitHub
commit 3ffe68d124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

2
configure vendored
View file

@ -4053,7 +4053,7 @@ fi
if test "${with_configfile+set}" = set; then : if test "${with_configfile+set}" = set; then :
withval=$with_configfile; DEFAULT_CONFIG="$withval" withval=$with_configfile; DEFAULT_CONFIG="$withval"
else else
DEFAULT_CONFIG="/etc/clixon.xml" DEFAULT_CONFIG="$(eval echo ${sysconfdir}/clixon.xml)"
fi fi

View file

@ -165,7 +165,7 @@ fi
AC_ARG_WITH([configfile], AC_ARG_WITH([configfile],
[AS_HELP_STRING([--with-configfile=FILE],[set default path to config file])], [AS_HELP_STRING([--with-configfile=FILE],[set default path to config file])],
[DEFAULT_CONFIG="$withval"], [DEFAULT_CONFIG="$withval"],
[DEFAULT_CONFIG="/etc/clixon.xml"]) [DEFAULT_CONFIG="$(eval echo ${sysconfdir}/clixon.xml)"])
AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(crypt, crypt)
AC_CHECK_HEADERS(crypt.h) AC_CHECK_HEADERS(crypt.h)