teach Recursor about 'ARCHFLAGS' for -m64 and make sure 'speedtest' compiles again...

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

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index e475aec6f8102eeec475e7a1e4d647e3d611556a..dc8fa8f5b843c9691d1ad528a084ebeaa142abaa 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -3,9 +3,9 @@ SBINDIR=/usr/sbin/
 BINDIR=/usr/bin/
 CONFIGDIR="/etc/powerdns/"
 OPTFLAGS?=-O3
-CXXFLAGS:= $(CXXFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) -pthread
-CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) -pthread
-LDFLAGS:=$(LDFLAGS) -pthread
+CXXFLAGS:= $(CXXFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
+CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
+LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
 
 LINKCC=$(CXX)
 CC?=gcc

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index a9d64dbf5e73c617621849f31979e12cd4840046..5640b415cb19bee0c2e67fbbd4d855d1266de2e8 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -81,7 +81,7 @@ tsig_tests_SOURCES=tsig-tests.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.
 
 speedtest_SOURCES=speedtest.cc dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
        misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
-       qtype.cc sillyrecords.cc logger.cc statbag.cc
+       qtype.cc sillyrecords.cc logger.cc statbag.cc nsecrecords.cc base32.cc
 
 dnswasher_SOURCES=dnswasher.cc misc.cc unix_utility.cc qtype.cc \
        logger.cc statbag.cc  dnspcap.cc dnspcap.hh dnsparser.hh