generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-05-29 23:42:41 +02:00
Code Issues Projects Releases Wiki Activity

devices are built unconditionally

Browse Source
This commit is contained in:
Martin Sustrik 2010-03-12 18:58:29 +01:00
parent 430aa53334
commit 66b67fbdf2
3 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure.in
View File

@ -374,33 +374,6 @@ if test "x$werror" = "xyes" -a "x$pgm_ext" = "xno"; then
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror" LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror"
fi 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
perf="no" perf="no"
AC_ARG_WITH([perf], [AS_HELP_STRING([--with-perf], 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_PGM, test "x$pgm_ext" = "xyes")
AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno") 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(BUILD_PERF, test "x$perf" = "xyes")
AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes") AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes")
AM_CONDITIONAL(BUILD_PGM_EXAMPLES, test "x$with_pgm_examples" = "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([ pgm (epgm): $pgm_ext])
AC_MSG_RESULT([ ipc: yes]) AC_MSG_RESULT([ ipc: yes])
AC_MSG_RESULT([ inproc: 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([ Performance tests: $perf])
AC_MSG_RESULT([]) AC_MSG_RESULT([])
AC_MSG_RESULT([ ******************************************************** ]) AC_MSG_RESULT([ ******************************************************** ])

13
devices/Makefile.am
View File

@ -1,14 +1,3 @@
if BUILD_FORWARDER
FORWARDER_DIR = zmq_forwarder
endif
if BUILD_STREAMER SUBDIRS = zmq_forwarder zmq_streamer zmq_queue
STREAMER_DIR = zmq_streamer
endif
if BUILD_QUEUE
QUEUE_DIR = zmq_queue
endif
SUBDIRS = $(FORWARDER_DIR) $(STREAMER_DIR) $(QUEUE_DIR)
DIST_SUBDIRS = zmq_forwarder zmq_streamer zmq_queue DIST_SUBDIRS = zmq_forwarder zmq_streamer zmq_queue

2
src/req.cpp
View File

@ -75,7 +75,7 @@ void zmq::req_t::xdetach_inpipe (class reader_t *pipe_)
active--; active--;
in_pipes.swap (index, active); in_pipes.swap (index, active);
out_pipes.swap (index, active); out_pipes.swap (index, active);
if (current = active) if (current == active)
current = 0; current = 0;
} }
return; return;