Merge pull request #197 from s-bauer/master

fix: Build breaks when using "--without-restconfig"
This commit is contained in:
Olof Hagsand 2021-04-07 10:25:34 +02:00 committed by GitHub
commit aeba2496c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions

11
configure vendored
View file

@ -5310,6 +5310,17 @@ cat >>confdefs.h <<_ACEOF
#define WWWDIR "$wwwdir" #define WWWDIR "$wwwdir"
_ACEOF _ACEOF
else
cat >>confdefs.h <<_ACEOF
#define WWWUSER ""
_ACEOF
cat >>confdefs.h <<_ACEOF
#define WWWDIR ""
_ACEOF
fi fi
# Set default config file location # Set default config file location

View file

@ -253,6 +253,9 @@ if test "x${with_restconf}" != "x"; then
AC_MSG_RESULT(www user is $wwwuser) AC_MSG_RESULT(www user is $wwwuser)
AC_DEFINE_UNQUOTED(WWWUSER, "$wwwuser", [WWW user for restconf daemon]) AC_DEFINE_UNQUOTED(WWWUSER, "$wwwuser", [WWW user for restconf daemon])
AC_DEFINE_UNQUOTED(WWWDIR, "$wwwdir", [WWW dir for restconf daemon]) AC_DEFINE_UNQUOTED(WWWDIR, "$wwwdir", [WWW dir for restconf daemon])
else
AC_DEFINE_UNQUOTED(WWWUSER, "", [WWW user for restconf daemon])
AC_DEFINE_UNQUOTED(WWWDIR, "", [WWW dir for restconf daemon])
fi fi
# Set default config file location # Set default config file location