aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 6 insertions, 13 deletions
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"],