From 21e99384e9951a00e969770c8273d0f09ab6f8a4 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 7 Oct 2014 22:34:59 +0200
Subject: [PATCH] Don't look in system include paths for pdns headers

---
 modules/db2backend/DB2Backend.cc               | 14 +++++++-------
 modules/geobackend/geobackend.cc               |  6 +++---
 modules/geobackend/geobackend.hh               |  4 ++--
 modules/ldapbackend/ldapbackend.hh             | 16 ++++++++--------
 modules/ldapbackend/powerldap.cc               |  2 +-
 modules/ldapbackend/utils.hh                   |  4 ++--
 modules/lmdbbackend/lmdbbackend.cc             | 18 +++++++++---------
 modules/lmdbbackend/lmdbbackend.hh             |  2 +-
 modules/mydnsbackend/mydnsbackend.cc           | 14 +++++++-------
 modules/opendbxbackend/odbxbackend.hh          | 16 ++++++++--------
 modules/pipebackend/coprocess.cc               |  4 ++--
 modules/pipebackend/pipebackend.cc             | 14 +++++++-------
 .../remotebackend/test-remotebackend-http.cc   | 14 +++++++-------
 .../remotebackend/test-remotebackend-json.cc   | 14 +++++++-------
 .../remotebackend/test-remotebackend-pipe.cc   | 14 +++++++-------
 .../remotebackend/test-remotebackend-post.cc   | 14 +++++++-------
 .../remotebackend/test-remotebackend-unix.cc   | 14 +++++++-------
 .../remotebackend/test-remotebackend-zeromq.cc | 14 +++++++-------
 modules/remotebackend/test-remotebackend.cc    | 14 +++++++-------
 modules/remotebackend/unixconnector.cc         |  2 +-
 modules/tinydnsbackend/cdb.cc                  |  4 ++--
 modules/tinydnsbackend/cdb.hh                  |  2 +-
 modules/tinydnsbackend/tinydnsbackend.cc       |  8 ++++----
 modules/tinydnsbackend/tinydnsbackend.hh       | 10 +++++-----
 pdns/dnsbackend.cc                             |  2 +-
 25 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/modules/db2backend/DB2Backend.cc b/modules/db2backend/DB2Backend.cc
index 19cb3a5b9..5e1d2cca1 100644
--- a/modules/db2backend/DB2Backend.cc
+++ b/modules/db2backend/DB2Backend.cc
@@ -7,13 +7,13 @@
 
 #include "pdns/namespaces.hh"
 
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 
 #include "DB2Exception.hh"
 #include "DB2Backend.hh"
diff --git a/modules/geobackend/geobackend.cc b/modules/geobackend/geobackend.cc
index 287db2fac..e8cb8444b 100644
--- a/modules/geobackend/geobackend.cc
+++ b/modules/geobackend/geobackend.cc
@@ -15,9 +15,9 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#include <pdns/misc.hh>
-#include <pdns/lock.hh>
-#include <pdns/dnspacket.hh>
+#include "pdns/misc.hh"
+#include "pdns/lock.hh"
+#include "pdns/dnspacket.hh"
 #include <boost/algorithm/string.hpp>
 #include "geobackend.hh"
 
diff --git a/modules/geobackend/geobackend.hh b/modules/geobackend/geobackend.hh
index 2be48f52b..1ae587438 100644
--- a/modules/geobackend/geobackend.hh
+++ b/modules/geobackend/geobackend.hh
@@ -10,8 +10,8 @@
 #include <map>
 #include <pthread.h>
 
-#include <pdns/dnsbackend.hh>
-#include <pdns/logger.hh>
+#include "pdns/dnsbackend.hh"
+#include "pdns/logger.hh"
 
 #include "ippreftree.hh"
 
diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index d563a8361..b48b971a4 100644
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -25,14 +25,14 @@
 #include <cstdlib>
 #include <cctype>
 #include <inttypes.h>
-#include <pdns/dns.hh>
-#include <pdns/utility.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/arguments.hh>
-#include <pdns/logger.hh>
+#include "pdns/dns.hh"
+#include "pdns/utility.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/arguments.hh"
+#include "pdns/logger.hh"
 #include "powerldap.hh"
 #include "utils.hh"
 
diff --git a/modules/ldapbackend/powerldap.cc b/modules/ldapbackend/powerldap.cc
index a0b84759f..18006462a 100644
--- a/modules/ldapbackend/powerldap.cc
+++ b/modules/ldapbackend/powerldap.cc
@@ -1,5 +1,5 @@
 #include "powerldap.hh"
-#include <pdns/misc.hh>
+#include "pdns/misc.hh"
 #include <sys/time.h>
 
 
diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh
index 25392c3d5..b2b5eef7f 100644
--- a/modules/ldapbackend/utils.hh
+++ b/modules/ldapbackend/utils.hh
@@ -2,8 +2,8 @@
 #include <vector>
 #include <time.h>
 #include <stdlib.h>
-#include <pdns/misc.hh>
-#include <pdns/utility.hh>
+#include "pdns/misc.hh"
+#include "pdns/utility.hh"
 
 
 #ifndef LDAPBACKEND_UTILS_HH
diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 92a218840..e8a623310 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -12,17 +12,17 @@
  * script which generates a simple zone.
  */
 
-#include <pdns/utility.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dns.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
+#include "pdns/utility.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dns.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
 #include <signal.h>
 #include "lmdbbackend.hh"
-#include <pdns/arguments.hh>
-#include <pdns/base32.hh>
-#include <pdns/lock.hh>
+#include "pdns/arguments.hh"
+#include "pdns/base32.hh"
+#include "pdns/lock.hh"
 
 #if 0
 #define DEBUGLOG(msg) L<<Logger::Error<<msg
diff --git a/modules/lmdbbackend/lmdbbackend.hh b/modules/lmdbbackend/lmdbbackend.hh
index 5e14faf7c..01f6ec824 100644
--- a/modules/lmdbbackend/lmdbbackend.hh
+++ b/modules/lmdbbackend/lmdbbackend.hh
@@ -5,7 +5,7 @@
 
 #include <lmdb.h>
 #include <pthread.h>
-#include <pdns/dnsbackend.hh>
+#include "pdns/dnsbackend.hh"
 
 class LMDBBackend : public DNSReversedBackend
 {
diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc
index 579ac97d6..0237d1f9f 100644
--- a/modules/mydnsbackend/mydnsbackend.cc
+++ b/modules/mydnsbackend/mydnsbackend.cc
@@ -27,14 +27,14 @@
 
 #include "pdns/namespaces.hh"
 
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
 #include "mydnsbackend.hh"
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 
 #include <modules/gmysqlbackend/smysql.hh>
 
diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh
index 56e4d0a8e..831d62b5f 100644
--- a/modules/opendbxbackend/odbxbackend.hh
+++ b/modules/opendbxbackend/odbxbackend.hh
@@ -22,14 +22,14 @@
 #include <cstdlib>
 #include <sstream>
 #include <sys/time.h>
-#include <pdns/dns.hh>
-#include <pdns/utility.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/arguments.hh>
-#include <pdns/logger.hh>
+#include "pdns/dns.hh"
+#include "pdns/utility.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/arguments.hh"
+#include "pdns/logger.hh"
 #include <odbx.h>
 
 
diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc
index 5fa8121ab..ee1415f37 100644
--- a/modules/pipebackend/coprocess.cc
+++ b/modules/pipebackend/coprocess.cc
@@ -8,8 +8,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
-#include <pdns/misc.hh>
-#include <pdns/pdnsexception.hh>
+#include "pdns/misc.hh"
+#include "pdns/pdnsexception.hh"
 #include <sys/stat.h>
 #include <unistd.h>
 #include <boost/algorithm/string.hpp>
diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index 9f256d1c5..62ccd2e5d 100644
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -12,13 +12,13 @@
 
 #include "pdns/namespaces.hh"
 
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index 134f79cfb..4a84792e0 100644
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -1,11 +1,11 @@
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index dea9c50a1..402986e8f 100644
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -1,11 +1,11 @@
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc
index 331c34e03..687a45499 100644
--- a/modules/remotebackend/test-remotebackend-pipe.cc
+++ b/modules/remotebackend/test-remotebackend-pipe.cc
@@ -7,13 +7,13 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index 9ad294346..3f093ac4c 100644
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -1,11 +1,11 @@
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc
index 7ee948025..ab30b4fd3 100644
--- a/modules/remotebackend/test-remotebackend-unix.cc
+++ b/modules/remotebackend/test-remotebackend-unix.cc
@@ -7,13 +7,13 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc
index 266ea1916..c06a54666 100644
--- a/modules/remotebackend/test-remotebackend-zeromq.cc
+++ b/modules/remotebackend/test-remotebackend-zeromq.cc
@@ -6,13 +6,13 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index 599091ad2..a4009c6b8 100644
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -6,13 +6,13 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
-#include <pdns/dns.hh>
-#include <pdns/dnsbackend.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/ueberbackend.hh>
-#include <pdns/pdnsexception.hh>
-#include <pdns/logger.hh>
-#include <pdns/arguments.hh>
+#include "pdns/dns.hh"
+#include "pdns/dnsbackend.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/ueberbackend.hh"
+#include "pdns/pdnsexception.hh"
+#include "pdns/logger.hh"
+#include "pdns/arguments.hh"
 #include <boost/lexical_cast.hpp>
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
diff --git a/modules/remotebackend/unixconnector.cc b/modules/remotebackend/unixconnector.cc
index f744462b2..1b9e05c43 100644
--- a/modules/remotebackend/unixconnector.cc
+++ b/modules/remotebackend/unixconnector.cc
@@ -1,6 +1,6 @@
 #include "remotebackend.hh"
 #include <sys/socket.h>
-#include <pdns/lock.hh> 
+#include "pdns/lock.hh" 
 #include <unistd.h>
 #include <fcntl.h>
 #ifndef UNIX_PATH_MAX 
diff --git a/modules/tinydnsbackend/cdb.cc b/modules/tinydnsbackend/cdb.cc
index 5b674c647..e67bea68b 100644
--- a/modules/tinydnsbackend/cdb.cc
+++ b/modules/tinydnsbackend/cdb.cc
@@ -1,7 +1,7 @@
 #include "cdb.hh"
 #include <cdb.h>
-#include <pdns/misc.hh>
-#include <pdns/iputils.hh>
+#include "pdns/misc.hh"
+#include "pdns/iputils.hh"
 #include <utility>
 
 
diff --git a/modules/tinydnsbackend/cdb.hh b/modules/tinydnsbackend/cdb.hh
index d758ac93a..707e8bff5 100644
--- a/modules/tinydnsbackend/cdb.hh
+++ b/modules/tinydnsbackend/cdb.hh
@@ -1,7 +1,7 @@
 #ifndef CDB_HH
 #define CDB_HH
 
-#include <pdns/logger.hh>
+#include "pdns/logger.hh"
 #include <cdb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index db6e988e6..43e3d10c5 100644
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -1,10 +1,10 @@
 #include "tinydnsbackend.hh"
 #include "pdns/lock.hh"
 #include <cdb.h>
-#include <pdns/misc.hh>
-#include <pdns/iputils.hh>
-#include <pdns/dnspacket.hh>
-#include <pdns/dnsrecords.hh>
+#include "pdns/misc.hh"
+#include "pdns/iputils.hh"
+#include "pdns/dnspacket.hh"
+#include "pdns/dnsrecords.hh"
 #include <utility>
 #include <boost/foreach.hpp>
 
diff --git a/modules/tinydnsbackend/tinydnsbackend.hh b/modules/tinydnsbackend/tinydnsbackend.hh
index 526b759fc..4dde2c29a 100644
--- a/modules/tinydnsbackend/tinydnsbackend.hh
+++ b/modules/tinydnsbackend/tinydnsbackend.hh
@@ -1,16 +1,16 @@
 #ifndef TINYDNSBACKEND_HH
 #define TINYDNSBACKEND_HH
 
-#include <pdns/dnsbackend.hh>
-#include <pdns/logger.hh>
-#include <pdns/iputils.hh>
-#include <pdns/dnspacket.hh>
+#include "pdns/dnsbackend.hh"
+#include "pdns/logger.hh"
+#include "pdns/iputils.hh"
+#include "pdns/dnspacket.hh"
 #include <cdb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "cdb.hh"
-#include <pdns/lock.hh>
+#include "pdns/lock.hh"
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/member.hpp>
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index e022edcdf..2eb0c67bc 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -26,7 +26,7 @@
 #include "logger.hh"
 
 #include <sys/types.h>
-#include <pdns/packetcache.hh>
+#include "pdns/packetcache.hh"
 #include "dnspacket.hh"
 #include "dns.hh"
 
-- 
2.49.0