From a076d51abe380f78f6a56402be5a228ec26e3b6d Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Sun, 5 Oct 2014 13:16:51 +0200 Subject: [PATCH] Conditionalize linking with zeromq --- modules/remotebackend/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index 3a05a96e21..b59626fca5 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -17,7 +17,11 @@ pkglib_LTLIBRARIES = libremotebackend.la libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc zmqconnector.cc libremotebackend_la_LDFLAGS=-module -avoid-version -libremotebackend_la_LIBADD=$(LIBZMQ_LIBS) ../../pdns/ext/yahttp/yahttp/libyahttp.la +libremotebackend_la_LIBADD = ../../pdns/ext/yahttp/yahttp/libyahttp.la + +if REMOTEBACKEND_ZEROMQ +libremotebackend_la_LIBADD += $(LIBZMQ_LIBS) +endif if UNIT_TESTS TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh @@ -38,7 +42,11 @@ libtestremotebackend_la_SOURCES=../../pdns/dnsbackend.hh ../../pdns/dnsbackend.c ../../pdns/dns.hh ../../pdns/dns.cc ../../pdns/json.hh ../../pdns/json.cc \ remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc zmqconnector.cc -libtestremotebackend_la_LIBADD=-L../../pdns/ext/yahttp/yahttp -lyahttp $(LIBZMQ_LIBS) $(POLARSSL_LIBS) +libtestremotebackend_la_LIBADD = -L../../pdns/ext/yahttp/yahttp -lyahttp $(POLARSSL_LIBS) + +if REMOTEBACKEND_ZEROMQ +libtestremotebackend_la_LIBADD += $(LIBZMQ_LIBS) +endif if PKCS11 libtestremotebackend_la_SOURCES += ../../pdns/pkcs11signers.hh ../../pdns/pkcs11signers.cc -- 2.47.2