From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 17 May 2013 10:48:56 +0000 (+0200)
Subject: Merge branch '606' of github.com:cyclops1982/pdns into cyclops1982-606
X-Git-Tag: auth-3.3-rc1~29^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=797489704f30953951407331cac4e5f066f18424;p=pdns

Merge branch '606' of github.com:cyclops1982/pdns into cyclops1982-606
---

797489704f30953951407331cac4e5f066f18424
diff --cc pdns/Makefile.am
index ea20bfef6,9d188ab54..12c1b930c
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -108,10 -109,11 +108,11 @@@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeep
  	signingpipe.cc dnslabeltext.cc ednssubnet.cc cachecleaner.hh \
  	aes/aescpp.h \
  	aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \
- 	aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc
+ 	aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc \
+ 	serialtweaker.cc 
  
  
 -pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 +pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
  pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
  
  if BOTAN110