bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4135 to 4136)

[magnus.blaudd]

 4136 magnus.blaudd@stripped	2012-12-04
      ndb
       - help FindJNI by setting JAVA_HOME to point at the java just found

    modified:
      storage/ndb/CMakeLists.txt
 4135 magnus.blaudd@stripped	2012-12-04 [merge]
      Merge

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/cmake/ndb_require_variable.cmake
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-12-03 13:24:40 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-12-04 15:08:14 +0000
@@ -248,6 +248,18 @@ IF(WITH_NDB_JAVA)
   NDB_REQUIRE_VARIABLE(JAVA_COMPILE)
   NDB_REQUIRE_VARIABLE(JAVA_ARCHIVE)
 
+  # Help FindJNI by setting JAVA_HOME (if not already set)
+  # to point at the java found above
+  IF(NOT DEFINED ENV{JAVA_HOME})
+    # Convert to realpath
+    GET_FILENAME_COMPONENT(java_home ${JAVA_RUNTIME} REALPATH)
+    # Remove filename
+    GET_FILENAME_COMPONENT(java_home ${java_home} PATH)
+    # Remove dir
+    GET_FILENAME_COMPONENT(java_home ${java_home} PATH)
+    SET(ENV{JAVA_HOME} ${java_home})
+  ENDIF()
+
   FIND_PACKAGE(JNI REQUIRED)
   MESSAGE(STATUS "JNI_FOUND: ${JNI_FOUND}")
   MESSAGE(STATUS "JNI_INCLUDE_DIRS: ${JNI_INCLUDE_DIRS}")

No bundle (reason: useless for push emails).