summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-03-05 17:29:26 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-03-05 17:29:26 +0100
commit215021e3e2de93daa7ddaa94a16d6cbfc2982165 (patch)
treedab496063a8c39840e6f677a379f5f96cd54a5f0
parent126cc8829c003d483839fd230f979e47dcf856ae (diff)
downloaddabmux-215021e3e2de93daa7ddaa94a16d6cbfc2982165.tar.gz
dabmux-215021e3e2de93daa7ddaa94a16d6cbfc2982165.tar.bz2
dabmux-215021e3e2de93daa7ddaa94a16d6cbfc2982165.zip
Conditionally compile zmq2farsync
-rw-r--r--INSTALL.md1
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am3
3 files changed, 6 insertions, 1 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 6f1fedb..7d4bcba 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,6 +18,7 @@ Install libfec
% git clone https://github.com/Opendigitalradio/ka9q-fec.git
% cd ka9q-fec
+ % ./bootstrap
% ./configure # Run the configure script
% make # Build the library
[as root]
diff --git a/configure.ac b/configure.ac
index 0e61cce..927bdc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,6 +214,9 @@ AM_CONDITIONAL([HAVE_ZEROMQ_TEST],
# Link against cURL
AM_CONDITIONAL([HAVE_CURL_TEST],
[test "x$enable_output_edi" = "xyes"])
+# Do not build odr-zmq2farsync if no RAW output
+AM_CONDITIONAL([HAVE_OUTPUT_RAW_TEST],
+ [test "x$enable_output_raw" = "xyes"])
# Formats
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c467ff..1ecaf16 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,7 @@ zmqinput_keygen_SOURCES = zmqinput-keygen.c
zmqinput_keygen_LDADD = $(ZMQ_LIBS)
zmqinput_keygen_CFLAGS = -Wall $(GITVERSION_FLAGS)
+if HAVE_OUTPUT_RAW_TEST
odr_zmq2farsync_SOURCES = zmq2farsync/zmq2farsync.cpp \
dabOutput/dabOutput.h \
dabOutput/dabOutputRaw.cpp \
@@ -127,4 +128,4 @@ odr_zmq2farsync_SOURCES = zmq2farsync/zmq2farsync.cpp \
odr_zmq2farsync_LDADD = $(ZMQ_LIBS)
odr_zmq2farsync_CFLAGS = -Wall $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
odr_zmq2farsync_CXXFLAGS = -Wall $(GITVERSION_FLAGS) -I$(FARSYNC_DIR)
-
+endif