diff --git a/configure b/configure index f7b5c9e9..cead653a 100755 --- a/configure +++ b/configure @@ -5189,7 +5189,6 @@ do : ac_fn_c_check_header_compile "$LINENO" "evhtp/evhtp.h" "ac_cv_header_evhtp_evhtp_h" "$ac_includes_default #define EVHTP_DISABLE_REGEX #define EVHTP_DISABLE_EVTHR - #define EVHTP_EXPORT " if test "x$ac_cv_header_evhtp_evhtp_h" = xyes; then : diff --git a/configure.ac b/configure.ac index b6df8683..0a453c6c 100644 --- a/configure.ac +++ b/configure.ac @@ -219,7 +219,6 @@ elif test "x${with_restconf}" == xevhtp; then [AC_INCLUDES_DEFAULT[ #define EVHTP_DISABLE_REGEX #define EVHTP_DISABLE_EVTHR - #define EVHTP_EXPORT ]]) AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-lpthread -levent -levent_openssl -lssl -lcrypto]) elif test "x${with_restconf}" == xno; then diff --git a/lib/src/clixon_netns.c b/lib/src/clixon_netns.c index a6c21fbe..af22f90f 100644 --- a/lib/src/clixon_netns.c +++ b/lib/src/clixon_netns.c @@ -168,6 +168,7 @@ create_socket(struct sockaddr *sa, return retval; } +#ifdef HAVE_SETNS /*! Fork a child, create and bind a socket in a separate network namespace and send back to parent * * @param[in] netns Network namespace @@ -246,6 +247,7 @@ fork_netns_socket(const char *netns, clicon_debug(1, "%s %d", __FUNCTION__, retval); return retval; } +#endif /* HAVE_SETNS */ /*! Create and bind stream socket in network namespace * @param[in] netns Network namespace diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index bee130a5..4a43b576 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -254,7 +254,9 @@ case ${with_restconf} in . ./nginx.sh $dir $idfile $port $wwwuser ;; evhtp) - $sshcmd << 'EOF' + $sshcmd << EOF + test -d src || mkdir src + cd src test -d clixon-libevhtp || git clone https://github.com/clicon/clixon-libevhtp.git cd clixon-libevhtp; ./configure --libdir=/usr/lib # otherwise in /usr/local/lib where RH dont look