Merge pull request #825 from dev-zero/master

Various build system fixes (3rd try)

diff --cc modules/remotebackend/Makefile.am
Simple merge

diff --cc pdns/Makefile.am
index d14778f0f6823e52641af25cd1dc43134a51374b,d5ec6885b1918bd98e92c7eb75fdca597a3d3a83..6d63908153f57a42de932d523da45978aa43add8
--- 1/pdns/Makefile.am
--- 2/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

diff --cc pdns/dnssecinfra.cc
Simple merge