From cba8df54abb961f558a171abff5e63d175eb58d8 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 10 Jul 2014 10:39:03 +0200 Subject: [PATCH] allow building of gpgsql/lua/mydnsbackend, plus yahttp, when boost is in a non-standard location. Fixes #1521 --- modules/gpgsqlbackend/Makefile.am | 2 +- modules/luabackend/Makefile.am | 2 +- modules/mydnsbackend/Makefile.am | 2 +- pdns/ext/yahttp/yahttp/Makefile.am | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 60ab289e08..3ab8c7715b 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@ +AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@ $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgpgsqlbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am index 22cd5900a5..0f75cf835d 100644 --- a/modules/luabackend/Makefile.am +++ b/modules/luabackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@ +AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@ $(BOOST_CPPFLAGS) #AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT @THREADFLAGS@ EXTRA_DIST=OBJECTFILES OBJECTLIBS diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am index f16f220a5d..89d943e1da 100644 --- a/modules/mydnsbackend/Makefile.am +++ b/modules/mydnsbackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ +AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libmydnsbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh diff --git a/pdns/ext/yahttp/yahttp/Makefile.am b/pdns/ext/yahttp/yahttp/Makefile.am index 2595854f4b..a2866513aa 100644 --- a/pdns/ext/yahttp/yahttp/Makefile.am +++ b/pdns/ext/yahttp/yahttp/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS=$(BOOST_CPPFLAGS) + noinst_LTLIBRARIES=libyahttp.la libyahttp_la_SOURCES=cookie.hpp exception.hpp reqresp.cpp reqresp.hpp router.cpp router.hpp url.hpp utility.hpp yahttp-config.h yahttp.hpp -- 2.47.2