From: Bert Hubert Date: Fri, 30 Nov 2012 21:17:27 +0000 (+0000) Subject: hopefully fix up libjsoncpp compilation X-Git-Tag: auth-3.2-rc2~54 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=310863ad3fafb0e1b5a7a16dad28849f3dc1111a;p=pdns hopefully fix up libjsoncpp compilation git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2947 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 1d9121742..144736027 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -3,7 +3,7 @@ AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR= else AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include endif -AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ @JSONCPP_FLAGS@ +AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ $(JSONCPP_CPPFLAGS) if BOTAN110 AM_CPPFLAGS += $(BOTAN110_CFLAGS) @@ -67,7 +67,7 @@ md5.hh signingpipe.cc signingpipe.hh dnslabeltext.cc lua-pdns.cc lua-auth.cc lua ednssubnet.cc ednssubnet.hh cachecleaner.hh json.cc json.hh # -pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) @JSONCPP_LIBS@ -rdynamic +pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) $(JSONCPP_LIBS) -rdynamic pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) if BOTAN110