diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | configure.ac | 31 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
4 files changed, 12 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml index 5898586..791c9c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ script: popd - | ./bootstrap.sh - CC=gcc-5 CXX=g++-5 ./configure --disable-output-edi --disable-output-zeromq --disable-input-zeromq + CC=gcc-5 CXX=g++-5 ./configure --disable-output-edi make - | ./bootstrap.sh @@ -4,12 +4,10 @@ Required dependencies: * libfec from Phil Karn, with compatibility patch: [ka9q-fec](https://github.com/Opendigitalradio/ka9q-fec) * Boost 1.48 or later -* Optional ZeroMQ 4 from [http://www.zeromq.org](http://www.zeromq.org). +* ZeroMQ 4 from [http://www.zeromq.org](http://www.zeromq.org). Please prefer the zeromq from your distribution, but mind that some distributions ship ZeroMQ 2, which is not enough. -Use the --disable-output-zeromq ./configure option if you don't have ZeroMQ. - Simple install procedure using tarball release: =============================================== diff --git a/configure.ac b/configure.ac index 1767f81..4e5c559 100644 --- a/configure.ac +++ b/configure.ac @@ -118,14 +118,6 @@ AC_ARG_ENABLE([input_file], [], [enable_input_file=yes]) AS_IF([test "x$enable_input_file" = "xyes"], [AC_DEFINE(HAVE_INPUT_FILE, [1], [Define if FILE input is enabled])]) -# ZeroMQ -AC_ARG_ENABLE([input_zeromq], - [AS_HELP_STRING([--disable-input-zeromq], [Disable ZeroMQ input])], - [], [enable_input_zeromq=yes]) -AS_IF([test "x$enable_input_zeromq" = "xyes"], - [AC_CHECK_LIB(zmq, zmq_init, [] , AC_MSG_ERROR(ZeroMQ libzmq is required))]) -AS_IF([test "x$enable_input_zeromq" = "xyes"], - AC_DEFINE(HAVE_INPUT_ZEROMQ, [1], [Define if ZEROMQ input is enabled])) # PRBS AC_ARG_ENABLE([input_prbs], @@ -188,14 +180,7 @@ AC_ARG_ENABLE([output_simul], [], [enable_output_simul=yes]) AS_IF([test "x$enable_output_simul" = "xyes"], [AC_DEFINE(HAVE_OUTPUT_SIMUL, [1], [Define if SIMUL output is enabled])]) -# ZeroMQ message queue output -AC_ARG_ENABLE([output_zeromq], - [AS_HELP_STRING([--disable-output-zeromq], [Disable ZeroMQ output])], - [], [enable_output_zeromq=yes]) -AS_IF([test "x$enable_output_zeromq" = "xyes"], - AC_CHECK_LIB(zmq, zmq_init, [true], [AC_MSG_ERROR([ZeroMQ libzmq is required])])) -AS_IF([test "x$enable_output_zeromq" = "xyes"], - AC_DEFINE(HAVE_OUTPUT_ZEROMQ, [1], [Define if ZeroMQ output is enabled])) + # EDI AC_ARG_ENABLE([output_edi], [AS_HELP_STRING([--disable-output-edi], [Disable EDI output])], @@ -207,9 +192,11 @@ AS_IF([test "x$enable_output_edi" = "xyes"], AS_IF([test "x$enable_output_edi" = "xyes"], [AC_DEFINE(HAVE_CURL, [1], [Define if cURL is available])]) -# Link against lzmq -AM_CONDITIONAL([HAVE_ZEROMQ_TEST], - [test "x$enable_output_zeromq" = "xyes" -o "x$enable_input_zeromq" = "xyes"]) +# ZeroMQ +AC_CHECK_LIB(zmq, zmq_init, [] , AC_MSG_ERROR(ZeroMQ libzmq is required)) + +AC_DEFINE([HAVE_INPUT_ZEROMQ], [1], [Define if ZeroMQ input is enabled]) +AC_DEFINE([HAVE_OUTPUT_ZEROMQ], [1], [Define if ZeroMQ output is enabled]) # Link against cURL AM_CONDITIONAL([HAVE_CURL_TEST], @@ -275,10 +262,12 @@ AC_OUTPUT echo echo "***********************************************" echo +echo ZeroMQ input, output and management server enabled. +echo echo "Inputs:" enabled="" disabled="" -for output in prbs test slip udp fifo file zeromq +for output in prbs test slip udp fifo file do eval var=\$enable_input_$output AS_IF([test "x$var" = "xyes"], @@ -306,7 +295,7 @@ echo echo "Outputs:" enabled="" disabled="" -for output in file fifo udp tcp raw simul zeromq edi +for output in file fifo udp tcp raw simul edi do eval var=\$enable_output_$output AS_IF([test "x$var" = "xyes"], diff --git a/src/Makefile.am b/src/Makefile.am index 0cc51c2..268437c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,6 @@ endif FEC_FLAGS = FEC_LIBS =-lfec -if HAVE_ZEROMQ_TEST bin_PROGRAMS=odr-dabmux odr-bridgetest zmqinput-keygen if HAVE_OUTPUT_RAW_TEST @@ -37,11 +36,6 @@ bin_PROGRAMS+=odr-zmq2farsync endif ZMQ_LIBS =-lzmq -else -bin_PROGRAMS=odr-dabmux odr-bridgetest - -ZMQ_LIBS = -endif if HAVE_CURL_TEST CURL_LIBS =-lcurl |