- Added specific WITH_RESTCONF compile contants for _NATIVE and _FCGI for C code
- Restconf auth=none changes - Load clixon-restconf and resolve features earlier so that config features work - Removed auth=none code from example (this was non-std half-baked basic auth) - Changed tests that used auth-type=none to enable feature clixon-restconf:allow-auth-none - Moved cert creation from sub-shell to servercert function - Fixed typos for dockerfile rename of restconf evhtp to native
This commit is contained in:
parent
2bf75158a6
commit
244060fddc
38 changed files with 159 additions and 178 deletions
|
|
@ -209,6 +209,7 @@ AC_ARG_WITH([restconf],
|
|||
if test "x${with_restconf}" == xfcgi; then
|
||||
# Lives in libfcgi-dev
|
||||
AC_CHECK_LIB(fcgi, FCGX_Init,, AC_MSG_ERROR([libfcgi-dev missing]))
|
||||
AC_DEFINE(WITH_RESTCONF_FCGI, 1, [Use fcgi restconf mode]) # For c-code that cant use strings
|
||||
elif test "x${with_restconf}" == xnative; then
|
||||
AC_CHECK_LIB(ssl, OPENSSL_init_ssl ,, AC_MSG_ERROR([libssl missing]))
|
||||
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, , AC_MSG_ERROR([libcrypto missing]))
|
||||
|
|
@ -221,6 +222,7 @@ elif test "x${with_restconf}" == xnative; then
|
|||
#define EVHTP_DISABLE_EVTHR
|
||||
]])
|
||||
AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-levent -lssl -lcrypto])
|
||||
AC_DEFINE(WITH_RESTCONF_NATIVE, 1, [Use native restconf mode]) # For c-code that cant use strings
|
||||
elif test "x${with_restconf}" == xno; then
|
||||
# Cant get around "no" as an answer for --without-restconf that is reset here to undefined
|
||||
with_restconf=
|
||||
|
|
@ -228,7 +230,6 @@ else
|
|||
AC_MSG_ERROR([No such restconf package: ${with_restconf}])
|
||||
fi
|
||||
|
||||
|
||||
if test "x${with_restconf}" != "x"; then
|
||||
# This is so it appears in config.h
|
||||
AC_DEFINE_UNQUOTED(WITH_RESTCONF, ${with_restconf}, [Restconf package])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue