Fix boost and boost::python ambiguity and numpy problems in run_action

configure.ac

@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED([INSTALL_PREFIX],"${prefix}", [python prefix])
 AC_DEFINE_UNQUOTED([PYTHON_DIR], "${PYLIBDIR}", [The directory name for the site-packages subdirectory of the standard Python install tree.])
 
 AC_DEFINE_UNQUOTED([CXXFLAGS],"${CXXFLAGS}", [c++ compilation options])
+AC_DEFINE_UNQUOTED([CPPFLAGS],"${CPPFLAGS}", [c++ preprocessor compilation options])
 
 AC_DEFINE_UNQUOTED([PACKAGE_DATA_DIR], "${packageprefix}/${packagedatadir}", [package data dir])
 AC_DEFINE_UNQUOTED([PACKAGE_DOC_DIR], "${packageprefix}/${packagedocdir}", [package doc dir])

src/graph/graph_bind.cc

@@ -41,7 +41,7 @@ struct LibInfo
     string GetVersion()   const {return VERSION " (commit " GIT_COMMIT
                                         ", " GIT_COMMIT_DATE ")";}
     string GetLicense()   const {return "GPL version 3 or above";}
-    string GetCXXFLAGS()  const {return CXXFLAGS;}
+    string GetCXXFLAGS()  const {return CXXFLAGS " " CPPFLAGS;}
     string GetInstallPrefix() const {return INSTALL_PREFIX;}
     string GetPythonDir() const {return PYTHON_DIR;}
 };

src/graph_tool/run_action/inline.py

@@ -92,7 +92,7 @@ def inline(g, code, arg_names=[], local_dict=None,
     python::object pg(python::handle<>
                         (python::borrowed((PyObject*)(self___graph))));
     GraphInterface& g = python::extract<GraphInterface&>(pg);
-    RunAction(g, make_action(make_tuple(${args}), return_val));
+    RunAction(g, make_action(boost::make_tuple(${args}), return_val));
     // support code hash: ${support_hash}
     """).substitute(args=", ".join(["&%s" %a for a in arg_names]),
                     code_hash=code_hash, support_hash=support_hash)