3 files changed, 29 insertions, 21 deletions
diff --git a/storage/oqgraph/README b/storage/oqgraph/README
new file mode 100644
index 00000000000..cb4fba7295b
--- /dev/null
+++ b/storage/oqgraph/README
@@ -0,0 +1,16 @@
+OQGraph storage engine
+Copyright (C) 2007-2009 Arjen G Lentz & Antony T Curtis for Open Query
+
+The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
+hierarchies and more complex graph structures to be handled in a
+relational fashion. In a nutshell, tree structures and
+friend-of-a-friend style searches can now be done using standard SQL
+syntax, and results joined onto other tables.
+
+See http://openquery.com/graph for more information.
+
+
+INSTALLATION
+
+OQGraph requires at least version 1.40.0 of the Boost library. To
+obtain a copy of the Boost library, see http://www.boost.org/
diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc
index 178db2937ef..f9751cf682b 100644
--- a/storage/oqgraph/graphcore.cc
+++ b/storage/oqgraph/graphcore.cc
@@ -33,7 +33,7 @@
 #include <set>
 #include <stack>
 
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
 
 #include <boost/graph/graph_concepts.hpp>
 #include <boost/graph/graph_archetypes.hpp>
diff --git a/storage/oqgraph/plug.in b/storage/oqgraph/plug.in
index a39015c07b7..0cbbad9b381 100644
--- a/storage/oqgraph/plug.in
+++ b/storage/oqgraph/plug.in
@@ -7,26 +7,18 @@ AM_CONDITIONAL([BUILD_OQGRAPH_STANDALONE], false)
 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 <boost/version.hpp>
+#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 <boost/graph/graph_traits.hpp>
-  #include <boost/graph/adjacency_list.hpp>
-  #include <boost/graph/dijkstra_shortest_paths.hpp>
-
-  using namespace boost;
-]],[[
-  typedef adjacency_list<vecS, vecS, bidirectionalS> Graph;
-  Graph g(10);
-]])],[],[
-  mysql_plugin_oqgraph=no
-  with_plugin_oqgraph=no
-])
-CXXFLAGS="${save_CXXFLAGS}"
 AC_LANG_POP()