Merge branch 'develop' of https://github.com/clicon/clixon into develop

This commit is contained in:
Olof hagsand 2018-01-27 13:33:16 +01:00
commit 7db1de19de
2 changed files with 2 additions and 2 deletions

2
configure vendored
View file

@ -1348,7 +1348,7 @@ Optional Packages:
--without-restconf disable support for restconf --without-restconf disable support for restconf
--with-keyvalue enable support for key-value xmldb datastore --with-keyvalue enable support for key-value xmldb datastore
--with-qdbm=dir Use QDBM here, if keyvalue --with-qdbm=dir Use QDBM here, if keyvalue
--with-configfile set default path to config file --with-configfile=FILE set default path to config file
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command

View file

@ -163,7 +163,7 @@ fi
# Set default config file location # Set default config file location
AC_ARG_WITH([configfile], AC_ARG_WITH([configfile],
[AS_HELP_STRING([--with-configfile],[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="/etc/clixon.xml"])