From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 30 Jun 2016 05:55:58 +0000 (+0000)
Subject: duplicate header change to dnsdist.cc; make openbsd exceptions
X-Git-Tag: rec-4.0.0~36^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424bdfb16ed167cce2713c8fbd81e741a514ca71;p=thirdparty%2Fpdns.git

duplicate header change to dnsdist.cc; make openbsd exceptions
---

diff --git a/pdns/README-dnsdist.md b/pdns/README-dnsdist.md
index 19158f6631..b4076558c4 100644
--- a/pdns/README-dnsdist.md
+++ b/pdns/README-dnsdist.md
@@ -30,7 +30,7 @@ make
 
 To build on OS X, `./configure LIBEDIT_LIBS='-L/usr/lib -ledit' LIBEDIT_CFLAGS=-I/usr/include/editline`
 
-To build on OpenBSD, `./configure CXX=eg++ CPP=ecpp LIBEDIT_LIBS='-ledit -lcurses' LIBEDIT_CFLAGS=-I/usr/include/readline`
+To build on OpenBSD, `./configure CXX=eg++ CPP=ecpp LIBEDIT_LIBS='-ledit -lcurses' LIBEDIT_CFLAGS=' '`
 
 On other recent platforms, installing a Lua and the system C++ compiler should be enough. 
 
diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc
index 1a5e1ff1e5..c909efc09a 100644
--- a/pdns/dnsdist-console.cc
+++ b/pdns/dnsdist-console.cc
@@ -1,6 +1,13 @@
 #include "dnsdist.hh"
 #include "sodcrypto.hh"
+
+#if defined (__OpenBSD__)
+#include <readline/readline.h>
+#include <readline/history.h>
+#else
 #include <editline/readline.h>
+#endif
+
 #include <fstream>
 #include "dolog.hh"
 #include "ext/json11/json11.hpp"
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index f3129ea024..f4504de5c5 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -27,7 +27,13 @@
 #include <netinet/tcp.h>
 #include <limits>
 #include "dolog.hh"
-#include <readline.h>
+
+#if defined (__OpenBSD__)
+#include <readline/readline.h>
+#else
+#include <editline/readline.h>
+#endif
+
 #include "dnsname.hh"
 #include "dnswriter.hh"
 #include "base64.hh"