add --with-botan1.8 (not working yet), fix up missing BOOST LDADD

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

diff --git a/configure.ac b/configure.ac
index 6aa4bcdef89e9008201f6a1e90ed9770858872fc..83df833f5de2d66f5d97d94a240e850373b03590 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,12 @@ AC_ARG_ENABLE(botan1.9,
 AC_MSG_RESULT($enable_botan19)
 AM_CONDITIONAL(BOTAN19,test x"$enable_botan19" = "xyes")
 
+AC_MSG_CHECKING(whether we will be linking in Botan 1.8)
+AC_ARG_ENABLE(botan1.8, 
+ [  --enable-botan1.8  Use Botan 1.8],enable_botan18=yes, enable_botan18=no)
+AC_MSG_RESULT($enable_botan18)
+AM_CONDITIONAL(BOTAN18,test x"$enable_botan18" = "xyes")
+
 
 AC_MSG_CHECKING(whether we should build static binaries)
 

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d5b7b2f5179470f856b0759811bef1ff7425e6e0..1e0f2ad5bab3d86c89487d3c32bc761538245b3c 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -43,7 +43,7 @@ randomhelper.cc namespaces.hh nsecrecords.cc base32.cc dbdnsseckeeper.cc dnsseci
 dnsseckeeper.hh dnssecinfra.hh base32.hh dns.cc dnssecsigner.cc polarrsakeyinfra.cc
 
 #
-pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  -Lext/polarssl/library
+pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  -Lext/polarssl/library 
 pdns_server_LDADD= -lpolarssl
 
 if BOTAN19
@@ -67,7 +67,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh
        backends/gsql/gsqlbackend.hh backends/gsql/ssql.hh zoneparser-tng.cc \
        dynlistener.cc dns.cc randombackend.cc dnssecsigner.cc polarrsakeyinfra.cc
 
-pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ -Lext/polarssl/library/ 
+pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ -Lext/polarssl/library/ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) 
 pdnssec_LDADD= -lpolarssl $(BOOST_PROGRAM_OPTIONS_LIBS)
 
 if BOTAN19