Commit 3cc7cfc0 authored by Constantin Rack's avatar Constantin Rack

Merge pull request #1657 from Kentzo/vmci

Don't build VMCI by default.
parents 765fd209 6ae70a94
...@@ -479,7 +479,7 @@ AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}") ...@@ -479,7 +479,7 @@ AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}")
if test "x$with_norm_ext" != "xno"; then if test "x$with_norm_ext" != "xno"; then
AC_DEFINE(ZMQ_HAVE_NORM, 1, [Have NORM protocol extension]) AC_DEFINE(ZMQ_HAVE_NORM, 1, [Have NORM protocol extension])
if test "x$wwith_norm_ext" != "xyes"; then if test "x$with_norm_ext" != "xyes"; then
norm_path="${with_norm_ext}" norm_path="${with_norm_ext}"
LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}" LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}"
LIBZMQ_EXTRA_LDFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_LDFLAGS}" LIBZMQ_EXTRA_LDFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_LDFLAGS}"
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include "ctx.hpp"
#include "err.hpp" #include "err.hpp"
zmq::vmci_address_t::vmci_address_t(ctx_t *parent_) : zmq::vmci_address_t::vmci_address_t(ctx_t *parent_) :
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
namespace zmq namespace zmq
{ {
// class ctx_t;
class vmci_address_t class vmci_address_t
{ {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment