Merge input-zeromq and output-zeromq configure options

9 files changed, 27 insertions, 36 deletions

diff --git a/INSTALL b/INSTALL
index 55385ba..bb14565 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,8 +2,8 @@ Required dependencies:
 ======================
 
     * Boost 1.41 or later
+    * Optional UHD for USRP
     * Optional ZeroMQ http://www.zeromq.org
-        Use --disable-input-zeromq if you don't have it
     * Optional FFTW 3.x (included KISS FFT is used as fallback)
 
 Simple install procedure:
@@ -11,7 +11,7 @@ Simple install procedure:
 
     % tar xjf odr-dabmod-X.Y.Z.tar.bz2      # Unpack the source
     % cd odr-dabmod-X.Y.Z                   # Change to the source directory
-    % ./configure --disable-debug --with-debug-malloc=yes
+    % ./configure --enable-zeromq --enable-output-uhd
                                             # Run the configure script
     % make                                  # Build ODR-DabMod
     [ as root ]
@@ -21,7 +21,8 @@ Configure options
 =================
 The configure script can be launch with a variety of options:
 
- --enable-input-zeromq  Enable ZeroMQ input (to be used with ODR-DabMux)
+ --enable-zeromq        Enable ZeroMQ input (to be used with ODR-DabMux),
+                        output and remotecontrol.
  --enable-output-uhd    Includes the binding to the UHD driver for USRPs
 
 You have the choice between two FFT libraries: KISS FFT and FFTW. KISS FFT is a
diff --git a/configure.ac b/configure.ac
index 615bf6d..739f54a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,12 +71,8 @@ AC_ARG_ENABLE([kiss_fft],
         [], [enable_kiss=no])
 
 # ZeroMQ message queue input
-AC_ARG_ENABLE([input_zeromq],
-        AS_HELP_STRING([--enable-input-zeromq], [Enable ZeroMQ input]))
-
-# ZeroMQ message IQ output
-AC_ARG_ENABLE([output_zeromq],
-        AS_HELP_STRING([--enable-output-zeromq], [Enable ZeroMQ output]))
+AC_ARG_ENABLE([zeromq],
+        AS_HELP_STRING([--enable-zeromq], [Enable ZeroMQ input, output and remote control]))
 
 # UHD support control
 AC_ARG_ENABLE([output_uhd],
@@ -91,13 +87,10 @@ AS_IF([test "x$enable_fftw" = "xyes"],
       AC_MSG_NOTICE([Found FFTW3]),
       AC_MSG_NOTICE([Using Kiss FFT]) )
 
-echo "Checking input zeromq"
+echo "Checking zeromq"
 
-AS_IF([test "x$enable_input_zeromq" = "xyes"],
-        [AC_DEFINE(HAVE_INPUT_ZEROMQ, [1], [Define if ZeroMQ input is enabled]) ,
-         AC_CHECK_LIB(zmq, zmq_init, ZMQ_LIBS="-lzmq" ,[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]) ,
+AS_IF([test "x$enable_zeromq" = "xyes"],
+        [AC_DEFINE(HAVE_ZEROMQ, [1], [Define if ZeroMQ is enabled]) ,
          AC_CHECK_LIB(zmq, zmq_init, ZMQ_LIBS="-lzmq" ,[AC_MSG_ERROR([ZeroMQ libzmq is required])])])
 AS_IF([test "x$enable_debug" = "xno"],
         [OPTIM="-O2" DEBUG="" EXTRA="$EXTRA -DNDEBUG"],
@@ -203,7 +196,7 @@ echo "***********************************************"
 echo
 enabled=""
 disabled=""
-for feat in debug prof trace fftw fft_simd output_uhd input_zeromq output_zeromq
+for feat in debug prof trace fftw fft_simd output_uhd zeromq
 do
     eval var=\$enable_$feat
     AS_IF([test "x$var" = "xyes"],
diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 4912bee..cc7dd96 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -213,7 +213,7 @@ int main(int argc, char* argv[])
 
     Logger logger;
     InputFileReader inputFileReader(logger);
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
     InputZeroMQReader inputZeroMQReader(logger);
 #endif
     InputReader* inputReader;
@@ -352,15 +352,12 @@ int main(int argc, char* argv[])
         "\n";
 
     std::cerr << "Compiled with features: " <<
-#if defined(HAVE_INPUT_ZEROMQ)
-        "input_zeromq " <<
+#if defined(HAVE_ZEROMQ)
+        "zeromq " <<
 #endif
 #if defined(HAVE_OUTPUT_UHD)
         "output_uhd " <<
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
-        "output_zeromq " <<
-#endif
         "\n";
 
     if (use_configuration_file && use_configuration_cmdline) {
@@ -408,7 +405,7 @@ int main(int argc, char* argv[])
             }
         }
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
         if (pt.get("remotecontrol.zmqctrl", 0) == 1) {
             try {
                 std::string zmqCtrlEndpoint = pt.get("remotecontrol.zmqctrlendpoint", "");
@@ -592,7 +589,7 @@ int main(int argc, char* argv[])
             useUHDOutput = 1;
         }
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
         else if (output_selected == "zmq") {
             outputName = pt.get<std::string>("zmqoutput.listen");
             useZeroMQOutput = 1;
@@ -735,7 +732,7 @@ int main(int argc, char* argv[])
         inputReader = &inputFileReader;
     }
     else if (inputTransport == "zeromq") {
-#if !defined(HAVE_INPUT_ZEROMQ)
+#if !defined(HAVE_ZEROMQ)
         fprintf(stderr, "Error, ZeroMQ input transport selected, but not compiled in!\n");
         ret = -1;
         goto END_MAIN;
@@ -786,7 +783,7 @@ int main(int argc, char* argv[])
         }
     }
 #endif
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
     else if (useZeroMQOutput) {
         /* We normalise the same way as for the UHD output */
         normalise = 1.0f/50000.0f;
diff --git a/src/InputReader.h b/src/InputReader.h
index 164c5ac..3e0dcab 100644
--- a/src/InputReader.h
+++ b/src/InputReader.h
@@ -31,7 +31,7 @@
 #endif
 
 #include <cstdio>
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 #  include "zmq.hpp"
 #  include "ThreadsafeQueue.h"
 #endif
@@ -130,7 +130,7 @@ class InputFileReader : public InputReader
                             // after 2**32 * 24ms ~= 3.3 years
 };
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 /* A ZeroMQ input. See www.zeromq.org for more info */
 
 struct InputZeroMQThreadData
diff --git a/src/InputZeroMQReader.cpp b/src/InputZeroMQReader.cpp
index cfb56b2..f7f5702 100644
--- a/src/InputZeroMQReader.cpp
+++ b/src/InputZeroMQReader.cpp
@@ -29,7 +29,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 #include <string>
 #include <cstring>
diff --git a/src/OutputZeroMQ.cpp b/src/OutputZeroMQ.cpp
index 0e759dd..793e473 100644
--- a/src/OutputZeroMQ.cpp
+++ b/src/OutputZeroMQ.cpp
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sstream>
 
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 OutputZeroMQ::OutputZeroMQ(std::string endpoint, Buffer* dataOut)
     : ModOutput(ModFormat(1), ModFormat(0)),
@@ -63,5 +63,5 @@ int OutputZeroMQ::process(Buffer* dataIn, Buffer* dataOut)
     return dataIn->getLength();
 }
 
-#endif // HAVE_OUTPUT_ZEROMQ_H
+#endif // HAVE_ZEROMQ
 
diff --git a/src/OutputZeroMQ.h b/src/OutputZeroMQ.h
index 1c48fe7..a80eab4 100644
--- a/src/OutputZeroMQ.h
+++ b/src/OutputZeroMQ.h
@@ -31,7 +31,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_OUTPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 #include "ModOutput.h"
 #include "zmq.hpp"
@@ -54,7 +54,7 @@ class OutputZeroMQ : public ModOutput
         std::string m_name;
 };
 
-#endif // HAVE_OUTPUT_ZEROMQ_H
+#endif // HAVE_ZEROMQ
 
 #endif // OUTPUT_ZEROMQ_H
 
diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp
index 1e8dda5..65da3b7 100644
--- a/src/RemoteControl.cpp
+++ b/src/RemoteControl.cpp
@@ -248,7 +248,7 @@ void RemoteControllerTelnet::reply(tcp::socket& socket, string message)
 }
 
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 
 void RemoteControllerZmq::restart()
 {
diff --git a/src/RemoteControl.h b/src/RemoteControl.h
index 905e153..89a1583 100644
--- a/src/RemoteControl.h
+++ b/src/RemoteControl.h
@@ -33,7 +33,7 @@
 #   include "config.h"
 #endif
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 #include <zmq.hpp>
 #endif
 
@@ -295,7 +295,7 @@ class RemoteControllerTelnet : public BaseRemoteController {
         int m_port;
 };
 
-#if defined(HAVE_INPUT_ZEROMQ)
+#if defined(HAVE_ZEROMQ)
 /* Implements a Remote controller using zmq transportlayer
  * that listens on localhost
  */