#At lp:maria
2789 knielsen@knielsen-hq.org 2010-03-29
Require Boost version 1.40.0 to build OQGraph (earlier versions have a bug).
modified:
storage/oqgraph/graphcore.cc
storage/oqgraph/plug.in
per-file messages:
storage/oqgraph/graphcore.cc
Fix using deprecated header that is gone in recent Boost.
storage/oqgraph/plug.in
Change Boost detection to look for version number (patch by Sergei Golubchik).
=== modified file 'storage/oqgraph/graphcore.cc'
--- a/storage/oqgraph/graphcore.cc 2010-01-04 08:27:50 +0000
+++ b/storage/oqgraph/graphcore.cc 2010-03-29 21:59:30 +0000
@@ -33,7 +33,7 @@
#include <set>
#include <stack>
-#include
+#include
#include
#include
=== modified file 'storage/oqgraph/plug.in'
--- a/storage/oqgraph/plug.in 2010-01-04 08:27:50 +0000
+++ b/storage/oqgraph/plug.in 2010-03-29 21:59:30 +0000
@@ -7,26 +7,18 @@ AM_CONDITIONAL([BUILD_OQGRAPH_STANDALONE
AM_CONDITIONAL([HAVE_DTRACE], false)
AC_LANG_PUSH([C++])
-AC_CHECK_HEADER([boost/graph/properties.hpp],[:],[
- mysql_plugin_oqgraph=no
- with_plugin_oqgraph=no
-])
-save_CXXFLAGS="${CXXFLAGS}"
-CXXFLAGS="-fexceptions -fimplicit-templates -O3 -fstrict-aliasing -falign-loops -fvisibility-inlines-hidden -funroll-loops -fno-trapping-math"
+AC_MSG_CHECKING([for Boost usable by OQGraph engine])
+AC_PREPROC_IFELSE(
+ [
+#include
+#if BOOST_VERSION >= 104000
+#else
+#error oops
+#endif
+ ],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ with_plugin_oqgraph=no])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include
- #include
-
- using namespace boost;
-]],[[
- typedef adjacency_list Graph;
- Graph g(10);
-]])],[],[
- mysql_plugin_oqgraph=no
- with_plugin_oqgraph=no
-])
-CXXFLAGS="${save_CXXFLAGS}"
AC_LANG_POP()