From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 21 Oct 2013 19:23:59 +0000 (+0200)
Subject: link in yahttp
X-Git-Tag: rec-3.6.0-rc1~354^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bed19726e3ad8f0b10a4020fbe7930db34221dbe;p=pdns

link in yahttp
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 4e85064bf..8e88cc772 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
+AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include -Iext/yahttp
 
 AM_LFLAGS = -s -i
 AM_YFLAGS = -d --verbose --debug
@@ -20,7 +20,7 @@ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_
 	no-dnssec.schema.mysql.sql no-dnssec.schema.pgsql.sql no-dnssec.schema.sqlite3.sql \
 	bind-dnssec.schema.sqlite3.sql bindparser.h
 
-SUBDIRS= $(POLARSSL_SUBDIR)
+SUBDIRS= $(POLARSSL_SUBDIR) ext/yahttp
 
 BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h bindparser.h
 CLEANFILES=version_generated.h
@@ -67,7 +67,7 @@ version.hh version.cc rfc2136handler.cc responsestats.cc responsestats.hh
 
 #
 pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
-pdns_server_LDADD= $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS)
+pdns_server_LDADD= $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) -Lext/yahttp/yahttp -lyahttp
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
diff --git a/pdns/ext/yahttp/Makefile b/pdns/ext/yahttp/Makefile
new file mode 100644
index 000000000..c9fe151da
--- /dev/null
+++ b/pdns/ext/yahttp/Makefile
@@ -0,0 +1,22 @@
+.SILENT:
+
+all:
+	$(MAKE) -C yahttp all
+
+install:
+
+uninstall:
+
+distclean: clean
+
+clean:
+	$(MAKE) -C yahttp clean
+
+check:
+
+distdir:
+	mkdir -p $(distdir)
+	cp LICENSE Makefile $(distdir)
+	mkdir $(distdir)/yahttp
+	cp yahttp/Makefile yahttp/*.cpp yahttp/*.hpp $(distdir)/yahttp
+