diff options
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | devices/Makefile.am | 13 | ||||
| -rw-r--r-- | src/req.cpp | 2 |
3 files changed, 2 insertions, 47 deletions
diff --git a/configure.in b/configure.in index e8302c6..2b02382 100644 --- a/configure.in +++ b/configure.in @@ -374,33 +374,6 @@ if test "x$werror" = "xyes" -a "x$pgm_ext" = "xno"; then LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror" fi -# Forwarder device -forwarder="no" -AC_ARG_WITH([forwarder], [AS_HELP_STRING([--with-forwarder], - [build forwarder device [default=no]])], [with_forwarder=yes], [with_forwarder=no]) - -if test "x$with_forwarder" != "xno"; then - forwarder="yes" -fi - -# Streamer device -streamer="no" -AC_ARG_WITH([streamer], [AS_HELP_STRING([--with-streamer], - [build streamer device [default=no]])], [with_streamer=yes], [with_streamer=no]) - -if test "x$with_streamer" != "xno"; then - streamer="yes" -fi - -# Queue device -queue="no" -AC_ARG_WITH([queue], [AS_HELP_STRING([--with-queue], - [build queue device [default=no]])], [with_queue=yes], [with_queue=no]) - -if test "x$with_queue" != "xno"; then - queue="yes" -fi - # Perf perf="no" AC_ARG_WITH([perf], [AS_HELP_STRING([--with-perf], @@ -416,9 +389,6 @@ fi AM_CONDITIONAL(BUILD_PGM, test "x$pgm_ext" = "xyes") AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno") -AM_CONDITIONAL(BUILD_FORWARDER, test "x$forwarder" = "xyes") -AM_CONDITIONAL(BUILD_STREAMER, test "x$streamer" = "xyes") -AM_CONDITIONAL(BUILD_QUEUE, test "x$queue" = "xyes") AM_CONDITIONAL(BUILD_PERF, test "x$perf" = "xyes") AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes") AM_CONDITIONAL(BUILD_PGM_EXAMPLES, test "x$with_pgm_examples" = "xyes") @@ -469,10 +439,6 @@ AC_MSG_RESULT([ tcp: yes]) AC_MSG_RESULT([ pgm (epgm): $pgm_ext]) AC_MSG_RESULT([ ipc: yes]) AC_MSG_RESULT([ inproc: yes]) -AC_MSG_RESULT([ Devices:]) -AC_MSG_RESULT([ Forwarder: $forwarder]) -AC_MSG_RESULT([ Streamer: $streamer]) -AC_MSG_RESULT([ Queue: $queue]) AC_MSG_RESULT([ Performance tests: $perf]) AC_MSG_RESULT([]) AC_MSG_RESULT([ ******************************************************** ]) diff --git a/devices/Makefile.am b/devices/Makefile.am index 4f20456..85fe596 100644 --- a/devices/Makefile.am +++ b/devices/Makefile.am @@ -1,14 +1,3 @@ -if BUILD_FORWARDER -FORWARDER_DIR = zmq_forwarder -endif -if BUILD_STREAMER -STREAMER_DIR = zmq_streamer -endif - -if BUILD_QUEUE -QUEUE_DIR = zmq_queue -endif - -SUBDIRS = $(FORWARDER_DIR) $(STREAMER_DIR) $(QUEUE_DIR) +SUBDIRS = zmq_forwarder zmq_streamer zmq_queue DIST_SUBDIRS = zmq_forwarder zmq_streamer zmq_queue diff --git a/src/req.cpp b/src/req.cpp index 5b09589..548cf52 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -75,7 +75,7 @@ void zmq::req_t::xdetach_inpipe (class reader_t *pipe_) active--; in_pipes.swap (index, active); out_pipes.swap (index, active); - if (current = active) + if (current == active) current = 0; } return; |