bzr push into mysql-5.5-cluster branch (jonas.oreland:3378 to 3380)

[Jonas Oreland]

 3380 Jonas Oreland	2011-06-28
      ndb - add dummp.cpp (to give link type) if java/jdk not present

    added:
      storage/ndb/src/dummy.cpp
    modified:
      storage/ndb/src/CMakeLists.txt
 3379 Jonas Oreland	2011-06-28
      ndb 55 - extend cmake/configure.pl with ndb specific configure options

    modified:
      cmake/configure.pl
 3378 Jonas Oreland	2011-06-28
      ndb - produce both static and so lib of libndbclient

    modified:
      storage/ndb/config/type_ndbapitest.cmake
      storage/ndb/src/CMakeLists.txt
=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl	2010-11-12 01:33:19 +0000
+++ b/cmake/configure.pl	2011-06-28 12:47:14 +0000
@@ -190,6 +190,21 @@ foreach my $option (@ARGV)
     $cmakeargs = $cmakeargs." \"-DWITH_COMMENT=".substr($option,13)."\""; 
     next;
   }
+  if ($option =~ /with-classpath=/)
+  {
+    $cmakeargs = $cmakeargs." \"-DWITH_CLASSPATH=".substr($option,15)."\"";
+    next;
+  }
+  if ($option =~ /with-debug=/)
+  {
+    $cmakeargs = $cmakeargs." -DWITH_DEBUG=1";
+    next;
+  }
+  if ($option =~ /with-ndb-ccflags=/)
+  {
+    $cmakeargs = $cmakeargs." \"-DWITH_NDB_CCFLAGS=".substr($option,17)."\"";
+    next;
+  }
 
   $option = uc($option);
   $option =~ s/-/_/g;

=== modified file 'storage/ndb/src/CMakeLists.txt'
--- a/storage/ndb/src/CMakeLists.txt	2011-06-28 12:19:31 +0000
+++ b/storage/ndb/src/CMakeLists.txt	2011-06-28 13:12:15 +0000
@@ -44,7 +44,7 @@ MERGE_LIBRARIES(ndbclient STATIC ${NDBCL
 # Do a shared libd
 #
 SET(NDBCLIENT_SO_LIBS ${NDBCLIENT_LIBS})
-SET(EXTRA_SRC)
+SET(EXTRA_SRC dummy.cpp)
 
 IF(HAVE_JDK AND HAVE_JAVA)
 

=== added file 'storage/ndb/src/dummy.cpp'

No bundle (reason: useless for push emails).