From 4d893927e3685dd89a37e050e651785822a488fa Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Fri, 30 Nov 2012 21:07:40 +0000 Subject: [PATCH] we now depend on libjsoncpp git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2946 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- configure.ac | 4 ++++ pdns/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6e51bd509..66be75a1a 100644 --- a/configure.ac +++ b/configure.ac @@ -498,6 +498,10 @@ then AC_DEFINE(HAVE_SQLITE3,1,[If we have sqlite3]) fi +PKG_CHECK_MODULES(JSONCPP, jsoncpp, HAVE_JSONCPP=yes, AC_MSG_ERROR([Could not find jsoncpp]) +AC_SUBST(JSONCPP_LIBS) +AC_SUBST(JSONCPP_CFLAGS)) + if test "$needcdb" then PKG_CHECK_MODULES(CDB, libcdb, HAVE_CDB=yes, AC_MSG_ERROR([+Could not find libcdb/tinycdb])) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index a70b27676..1d9121742 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@ +AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ @JSONCPP_FLAGS@ 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) -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 -- 2.40.0