bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3681 to 3682)

[Mikael Ronstrom]

 3682 Mikael Ronstrom	2011-12-27
      Fix for platforms with JDK installed but not Java

    modified:
      storage/ndb/CMakeLists.txt
 3681 Mikael Ronstrom	2011-12-27
      Fixed build script for platforms with problems with static linking

    modified:
      BUILD/build_mccge.sh
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	revid:mikael.ronstrom@stripped
+++ b/storage/ndb/CMakeLists.txt	revid:mikael.ronstrom@stripped
@@ -222,7 +222,7 @@ ADD_SUBDIRECTORY(test)
 IF(WITH_NDB_TEST)
   ADD_SUBDIRECTORY(src/cw/cpcd)
 ENDIF()
-IF (HAVE_JDK)
+IF (HAVE_JAVA AND HAVE_JDK)
   ADD_SUBDIRECTORY(clusterj)
 ENDIF()
 ADD_SUBDIRECTORY(memcache)

No bundle (reason: useless for push emails).