From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Sat, 23 Jan 2016 19:52:47 +0000 (+0100)
Subject: Merge pull request #3197 from cmouse/remotebackend-json11
X-Git-Tag: dnsdist-1.0.0-alpha2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf467cb610d12df40dd21682bcd5cb1f84ce9e44;p=thirdparty%2Fpdns.git

Merge pull request #3197 from cmouse/remotebackend-json11

Convert remotebackend to JSON11 and fix some small bugs
---

cf467cb610d12df40dd21682bcd5cb1f84ce9e44
diff --cc modules/remotebackend/Makefile.am
index ab73861054,304f98e8cd..1ee7e4b2d2
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@@ -1,8 -1,7 +1,8 @@@
  AM_CPPFLAGS += \
- 	-I$(top_srcdir)/ext/rapidjson/include \
+ 	-I$(top_srcdir)/ext/json11 \
  	$(YAHTTP_CFLAGS) \
  	$(MBEDTLS_CFLAGS) \
 +	$(OPENSSL_CFLAGS) \
  	$(LIBZMQ_CFLAGS)
  
  AM_LDFLAGS = $(THREADFLAGS)