]> granicus.if.org Git - pdns/commitdiff
Make sure yahttp is linked into remotebackend
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 27 Sep 2014 20:27:34 +0000 (22:27 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 27 Sep 2014 20:27:34 +0000 (22:27 +0200)
Make sure that the yahttp directory is built first
and then link in the resulting library.

Checked with readelf -s .libs/libremotebackend.so | grep NOTYPE
that this fixes the undefined symbol.

Fixes #1732

modules/remotebackend/Makefile.am

index e5f171d2a399e02dde2c97ec4e7a044bafe5e8a1..4cd80075daa2d419042d259e2e5ae92fe9b3aa91 100644 (file)
@@ -4,6 +4,7 @@ AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) -I../../pdns/ext/rapidjson/include
 #       install .lib/libremotebackend.so.0.0.0 @libdir@
 #endif
 
+SUBDIRS=../../pdns/ext/yahttp
 EXTRA_DIST=OBJECTFILES OBJECTLIBS testrunner.sh unittest_http.rb unittest_json.rb unittest_pipe.rb unittest_zeromq.rb unittest_post.rb unittest.rb Gemfile Gemfile.lock
 EXTRA_PROGRAMS=test_remotebackend_pipe test_remotebackend_unix test_remotebackend_http test_remotebackend_post test_remotebackend_json test_remotebackend_zeromq
 EXTRA_LTLIBRARIES=libtestremotebackend.la
@@ -16,7 +17,7 @@ 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) 
+libremotebackend_la_LIBADD=$(LIBZMQ_LIBS) ../../pdns/ext/yahttp/yahttp/libyahttp.la
 
 if UNIT_TESTS
 TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh