Merge pull request #1 from Habbie/4065-openbsd

duplicate header change to dnsdist.cc; make openbsd exceptions
PowerDNS · Jun 30, 2016 · 8b180cb · 8b180cb
2 parents 9c8aa82 + 424bdfb
commit 8b180cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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"