From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 19 Apr 2013 08:43:42 +0000 (+0000)
Subject: rename bindparser.hh to avoid automake 1.12 clobbering it
X-Git-Tag: auth-3.3-rc1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c0cb150e02d1727ff9d281de638adda4e98d774;p=pdns

rename bindparser.hh to avoid automake 1.12 clobbering it

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3166 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index 62cd52731..9aa984722 100644
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -9,7 +9,7 @@ bind-dnssec.schema.sqlite3.sql.h: ../../bind-dnssec.schema.sqlite3.sql
 
 libbind2backend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
 bindlexer.l ../../zoneparser-tng.cc ../../misc.cc  \
-bindparser.hh ../../unix_utility.cc binddnssec.cc bind-dnssec.schema.sqlite3.sql.h
+bindparserclasses.hh ../../unix_utility.cc binddnssec.cc bind-dnssec.schema.sqlite3.sql.h
 
 libbind2backend_la_CXXFLAGS=$(AM_CXXFLAGS)
 libbind2backend_la_CFLAGS=$(AM_CFLAGS)
diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 74b29d1e2..b4267a41a 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -39,7 +39,7 @@
 #include "bindbackend2.hh"
 #include "dnspacket.hh"
 #include "zoneparser-tng.hh"
-#include "bindparser.hh"
+#include "bindparserclasses.hh"
 #include "logger.hh"
 #include "arguments.hh"
 #include "qtype.hh"
diff --git a/pdns/backends/bind/bindparser.yy b/pdns/backends/bind/bindparser.yy
index b1e63a473..ac80263ef 100644
--- a/pdns/backends/bind/bindparser.yy
+++ b/pdns/backends/bind/bindparser.yy
@@ -12,7 +12,7 @@
 #include "namespaces.hh"
 #define YYDEBUG 1
 extern int yydebug;
-#include "bindparser.hh"
+#include "bindparserclasses.hh"
 
 #define YYSTYPE char *
 
diff --git a/pdns/backends/bind/bindparser.hh b/pdns/backends/bind/bindparserclasses.hh
similarity index 100%
rename from pdns/backends/bind/bindparser.hh
rename to pdns/backends/bind/bindparserclasses.hh
diff --git a/pdns/backends/bind/zone2json.cc b/pdns/backends/bind/zone2json.cc
index e80d6d745..3de2ec556 100644
--- a/pdns/backends/bind/zone2json.cc
+++ b/pdns/backends/bind/zone2json.cc
@@ -28,7 +28,7 @@
 
 #include "dns.hh"
 #include "arguments.hh"
-#include "bindparser.hh"
+#include "bindparserclasses.hh"
 #include "statbag.hh"
 #include "misc.hh"
 #include "dnspacket.hh"
diff --git a/pdns/backends/bind/zone2ldap.cc b/pdns/backends/bind/zone2ldap.cc
index 4fb208b50..4cf88eb9e 100644
--- a/pdns/backends/bind/zone2ldap.cc
+++ b/pdns/backends/bind/zone2ldap.cc
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <stdio.h>
 #include "arguments.hh"
-#include "bindparser.hh"
+#include "bindparserclasses.hh"
 #include "statbag.hh"
 #include <boost/function.hpp>
 #include "dnsrecords.hh"
diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index 28c85e774..28d7e087c 100644
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -28,7 +28,7 @@
 
 #include "dns.hh"
 #include "arguments.hh"
-#include "bindparser.hh"
+#include "bindparserclasses.hh"
 #include "statbag.hh"
 #include "misc.hh"
 #include "dnspacket.hh"