Fix out of tree builds

When building out of tree, we need
to look for headers in the source dir.

This fixes out of tree builds and make distcheck.

This will resolve in some duplicate and unused
include paths, I'll clean those up in followup patches.

diff --git a/configure.ac b/configure.ac
index 3f21823e3f3b216b20290f37afb26f838ad510f6..f726e5f29ebee1147c3e3d8a6f4bf3e68ab59367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -329,6 +329,9 @@ done
 
 AC_SUBST(LIBS)
 
+AC_SUBST([AM_CPPFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
+AC_SUBST([AM_CXXFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
+
 export moduledirs moduleobjects modulelibs
 
 AC_CONFIG_FILES([

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 0638338f05d2b273873ea9c43f9176c5b5443eba..63faf95cc0e23ef69654188d0f5a5c14d5b84ddb 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include -Iext/yahttp
+AM_CXXFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"@socketdir@\" @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
 
 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp