From: Peter van Dijk <peter@7bits.nl>
Date: Tue, 23 Jul 2013 09:49:53 +0000 (-0700)
Subject: Merge pull request #825 from dev-zero/master
X-Git-Tag: rec-3.6.0-rc1~542
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4058780f0c85fb8781a0398f83f9507beccc9b16;p=thirdparty%2Fpdns.git

Merge pull request #825 from dev-zero/master

Various build system fixes (3rd try)
---

4058780f0c85fb8781a0398f83f9507beccc9b16
diff --cc pdns/Makefile.am
index d14778f0f6,d5ec6885b1..6d63908153
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -66,11 -59,11 +59,11 @@@ randomhelper.cc namespaces.hh nsecrecor
  dnsseckeeper.hh dnssecinfra.hh base32.hh dns.cc dnssecsigner.cc polarrsakeyinfra.cc \
  md5.hh signingpipe.cc signingpipe.hh dnslabeltext.cc lua-pdns.cc lua-auth.cc lua-auth.hh serialtweaker.cc \
  ednssubnet.cc ednssubnet.hh cachecleaner.hh json.cc json.hh \
 -version.hh version.cc
 +version.hh version.cc rfc2136handler.cc
  
  #
- pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
- pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
+ pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
+ pdns_server_LDADD= $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
  
  if BOTAN110
  pdns_server_SOURCES += botan110signers.cc botansigners.cc