From 42a7a704606027b3a61cbdb02c3055b96a620e68 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 31 Jul 2017 11:19:33 +0200 Subject: Only build odr-zmq2edi if EDI enabled --- configure.ac | 2 +- src/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d3d1a65..5e63c55 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ AC_DEFINE([HAVE_OUTPUT_ZEROMQ], [1], [Define if ZeroMQ output is enabled]) AC_DEFINE([HAVE_RC_ZEROMQ], [1], [Define if ZeroMQ enabled for rc]) # Link against cURL -AM_CONDITIONAL([HAVE_CURL_TEST], +AM_CONDITIONAL([HAVE_EDI_TEST], [test "x$enable_output_edi" = "xyes"]) # Do not build odr-zmq2farsync if no RAW output AM_CONDITIONAL([HAVE_OUTPUT_RAW_TEST], diff --git a/src/Makefile.am b/src/Makefile.am index c3c764f..2e0bb9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ else GITVERSION_FLAGS = endif -bin_PROGRAMS=odr-dabmux zmqinput-keygen odr-zmq2edi +bin_PROGRAMS=odr-dabmux zmqinput-keygen if HAVE_OUTPUT_RAW_TEST bin_PROGRAMS+=odr-zmq2farsync @@ -34,7 +34,8 @@ endif ZMQ_LIBS =-lzmq -if HAVE_CURL_TEST +if HAVE_EDI_TEST +bin_PROGRAMS+=odr-zmq2edi CURL_LIBS =-lcurl else CURL_LIBS = -- cgit v1.2.3