Maik Zumstrull has cleaned up our Makefile so it is more correct, plus added reading...

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

diff --git a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am
index b9ce346fabc8a1e9e612f3e0abc269eac74eb860..1819cfed5501c910ba5974678af48a13dac1db56 100644 (file)
--- a/pdns/backends/bind/Makefile.am
+++ b/pdns/backends/bind/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=-I../.. -I ../../ext/polarssl/include
 noinst_LTLIBRARIES = libbind2backend.la
-AM_CPPFLAGS=@THREADFLAGS@
+AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@
 
 libbind2backend_la_SOURCES=bindbackend2.cc bindbackend2.hh bindparser.yy \
 bindlexer.l ../../zoneparser-tng.cc ../../misc.cc  \
@@ -27,9 +27,11 @@ zone2ldap_SOURCES=bindparser.yy bindlexer.l \
 ../../dnswriter.cc ../../rcpgenerator.cc ../../dnsparser.cc ../../base64.cc ../../sillyrecords.cc \
 ../../nsecrecords.cc ../../dnssecinfra.cc ../../dnsseckeeper.cc ../../base32.cc
 
-zone2ldap_LDFLAGS=@THREADFLAGS@ $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -L../../ext/polarssl/library -lpolarssl
+zone2ldap_LDFLAGS=@THREADFLAGS@ $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) -L../../ext/polarssl/library
+zone2ldap_LDADD=$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -lpolarssl
 
-zone2sql_LDFLAGS=@THREADFLAGS@ $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -L../../ext/polarssl/library -lpolarssl
+zone2sql_LDFLAGS=@THREADFLAGS@ $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) -L../../ext/polarssl/library
+zone2sql_LDADD=$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -lpolarssl
 
 AM_LFLAGS = -s -i
 AM_YFLAGS = -d --verbose --debug

diff --git a/pdns/pdns.in b/pdns/pdns.in
index 1f7db6f2bd5491b43f7fe19b52f57f50ab8a61aa..537b2a8841a987697cd26d66df38c9bcceabc03b 100755 (executable)
--- a/pdns/pdns.in
+++ b/pdns/pdns.in
@@ -10,6 +10,8 @@ SOCKETPATH=@socketdir@
 
 [ -f "$SBINARYPATH/pdns_server" ] || exit 0
 
+[ -r /etc/default/pdns ] && . /etc/default/pdns
+
 cd $SOCKETPATH
 suffix=`basename $0 | awk -F- '{print $2}'`
 if [ $suffix ]