configure.ac: Prevent internal includes to be overridden by CPPFLAGS

49714e7f · Tiago Peixoto · 51671878 · 49714e7f
Commit 49714e7f authored Mar 02, 2017 by Tiago Peixoto
--- a/configure.ac
+++ b/configure.ac
@@ -340,13 +340,14 @@ AC_DEFINE([GCC_VERSION], [(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATC
 # set automake variables

 # global CPP flags
+[CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/src/boost-workaround -DHAVE_CONFIG_H -I\$(top_srcdir)/src/graph -I\$(top_builddir)"]
 AC_SUBST(CPPFLAGS)

 # global CXX flags
 AC_SUBST(CXXFLAGS)

 # extra CPP flags for submodules
-[MOD_CPPFLAGS="${PYTHON_CPPFLAGS} ${BOOST_CPPFLAGS} ${NUMPY_CPPFLAGS} ${EXPAT_CFLAGS} -I\$(top_srcdir)/src/boost-workaround -DHAVE_CONFIG_H -I\$(top_srcdir)/src/graph -I\$(top_builddir)"]
+[MOD_CPPFLAGS="${PYTHON_CPPFLAGS} ${BOOST_CPPFLAGS} ${NUMPY_CPPFLAGS} ${EXPAT_CFLAGS}"]
 AC_SUBST(MOD_CPPFLAGS)

 # extra LIBADD flags for submodules