Post merge fixes

cmake/FindJudy.cmake

+# - Try to find Judy
+# Once done this will define
+#
+#  JUDY_FOUND - system has Judy
+#  JUDY_INCLUDE_DIR - the Judy include directory
+#  JUDY_LIBRARIES - Link these to use Judy
+#  JUDY_DEFINITIONS - Compiler switches required for using Judy
+
+IF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
+    SET(Judy_FIND_QUIETLY TRUE)
+ENDIF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
+
+FIND_PATH(JUDY_INCLUDE_DIR Judy.h)
+FIND_LIBRARY(JUDY_LIBRARIES NAMES Judy)
+
+IF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
+   SET(JUDY_FOUND TRUE)
+ELSE (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
+   SET(JUDY_FOUND FALSE)
+ENDIF (JUDY_INCLUDE_DIR AND JUDY_LIBRARIES)
+
+IF (JUDY_FOUND)
+  IF (NOT Judy_FIND_QUIETLY)
+    MESSAGE(STATUS "Found libjudy: ${JUDY_LIBRARIES}")
+  ENDIF (NOT Judy_FIND_QUIETLY)
+ELSE (JUDY_FOUND)
+  IF (Judy_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could NOT find libjudy")
+  ENDIF (Judy_FIND_REQUIRED)
+ENDIF (JUDY_FOUND)
+
+MARK_AS_ADVANCED(JUDY_INCLUDE_DIR JUDY_LIBRARIES)
+

storage/oqgraph/CMakeLists.txt

-FIND_PACKAGE(Boost 1.40.0)
+MESSAGE(STATUS "Configuring OQGraph")
+FIND_PACKAGE(Boost)
 IF(NOT Boost_FOUND)
+   MESSAGE(STATUS "Boost not found")
   RETURN()
 ENDIF()
 INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
 
+FIND_PACKAGE(JUDY)
+IF(NOT JUDY_FOUND)
+   MESSAGE(STATUS "Judy not found")
+  RETURN()
+ENDIF()
+INCLUDE_DIRECTORIES(${JUDY_INCLUDE_DIR})
+
 IF(MSVC)
   # lp:756966 OQGRAPH on Win64 does not compile
   IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -33,4 +42,6 @@ IF(BOOST_OK)
 
   MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE
                    MODULE_ONLY)
+ELSE(BOOST_OK)
+  MESSAGE(STATUS "Requisites for OQGraph not met")
 ENDIF(BOOST_OK)