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

[magnus.blaudd]

 4033 magnus.blaudd@stripped	2012-10-16
      ndb
       - make it possible to set the default value to use for
         WITH_NDB_JAVA true the environment variable WITH_NDB_JAVA_DEFAULT
       - set WITH_NDB_JAVA default to ON

    modified:
      storage/ndb/CMakeLists.txt
 4032 Jan Wedvik	2012-10-15
      Fix build break on Windows.

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-10-12 16:21:51 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-10-16 07:51:23 +0000
@@ -125,12 +125,6 @@ IF (NOT WITH_NDBCLUSTER)
   RETURN()
 ENDIF()
 
-OPTION(WITH_NDB_JAVA
-  "Include NDB Cluster Java components" OFF)
-IF(WITH_NDB_JAVA)
-  MESSAGE(STATUS "Include NDB Java components")
-ENDIF()
-
 IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
   MESSAGE(STATUS "Building NDB 32-bit")
 ELSE()
@@ -201,6 +195,15 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
 
 SET(HAVE_JAVA FALSE)
 SET(HAVE_JDK FALSE)
+SET(WITH_NDB_JAVA_DEFAULT ON)
+# Check if the default for WITH_NDB_JAVA should be overriden
+# by environment variable
+IF (DEFINED ENV{WITH_NDB_JAVA_DEFAULT})
+  SET(WITH_NDB_JAVA_DEFAULT $ENV{WITH_NDB_JAVA_DEFAULT})
+  MESSAGE(STATUS "Default value for WITH_NDB_JAVA set to ${WITH_NDB_JAVA_DEFAULT}")
+ENDIF()
+OPTION(WITH_NDB_JAVA
+  "Include NDB Cluster Java components" ${WITH_NDB_JAVA_DEFAULT})
 IF(WITH_NDB_JAVA)
   # Check for Java and JDK needed by ndbjtie and clusterj
   INCLUDE(FindJava)

No bundle (reason: useless for push emails).