From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 10 Oct 2014 18:49:19 +0000 (+0200)
Subject: Cleanup linking with YaHTTP
X-Git-Tag: rec-3.7.0-rc1~189^2~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f974019a2bd1e7a40a5e87007d019b1f52375f3;p=thirdparty%2Fpdns.git

Cleanup linking with YaHTTP

Replace the hardcoded paths with variables.
---

diff --git a/configure.ac b/configure.ac
index 8240225e54..aa4e83f0bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,9 @@ AC_SUBST([AM_CPPFLAGS],
   ["AS_ESCAPE([-I$(top_builddir) -I$(top_srcdir)]) $THREADFLAGS $BOOST_CPPFLAGS"]
 )
 
+AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/pdns/ext/yahttp'])
+AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/pdns/ext/yahttp/yahttp -lyahttp'])
+
 export moduledirs moduleobjects modulelibs
 
 AC_CONFIG_FILES([
diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index b6e4fb4282..c48e49957a 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS += \
 	-I../../pdns/ext/rapidjson/include \
-	-I../../pdns/ext/yahttp \
+	$(YAHTTP_CFLAGS) \
 	$(POLARSSL_CFLAGS) \
 	$(LIBZMQ_CFLAGS)
 
@@ -46,7 +46,7 @@ libremotebackend_la_SOURCES = \
 
 libremotebackend_la_LDFLAGS = -module -avoid-version
 
-libremotebackend_la_LIBADD = ../../pdns/ext/yahttp/yahttp/libyahttp.la
+libremotebackend_la_LIBADD = $(YAHTTP_LIBS)
 
 if REMOTEBACKEND_ZEROMQ
 libremotebackend_la_LIBADD += $(LIBZMQ_LIBS)
@@ -103,7 +103,7 @@ libtestremotebackend_la_SOURCES = \
 	remotebackend.hh remotebackend.cc
 
 libtestremotebackend_la_LIBADD = \
-	-L../../pdns/ext/yahttp/yahttp -lyahttp \
+	$(YAHTTP_LIBS) \
 	$(POLARSSL_LIBS) \
 	$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
 	$(BOOST_SERIALIZATION_LIBS) \
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b79e812047..935b827ef0 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/pdns/ext/rapidjson/include \
-	-I$(top_srcdir)/pdns/ext/yahttp
+	$(YAHTTP_CFLAGS)
 
 AM_CXXFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -9,8 +9,6 @@ AM_CXXFLAGS = \
 	$(LUA_CFLAGS) \
 	$(POLARSSL_CFLAGS)
 
-YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp
-
 AM_LFLAGS = -i
 AM_YFLAGS = -d --verbose --debug
 
@@ -881,8 +879,6 @@ pdns_recursor_SOURCES = \
 	dnsrecords.cc dnsrecords.hh \
 	dnswriter.cc dnswriter.hh \
 	epollmplexer.cc \
-	ext/yahttp/yahttp/reqresp.cpp \
-	ext/yahttp/yahttp/router.cpp \
 	htimer.cc htimer.hh \
 	json.cc json.hh \
 	logger.cc \