bzr push into mysql-5.5-cluster branch (john.duncan:3524 to 3525)

[John David Duncan]

 3525 John David Duncan	2011-09-21
      Bugfixes re. moving of libevent and memcached sources

    modified:
      storage/ndb/memcache/CMakeLists.txt
      storage/ndb/memcache/FindMemcached.cmake
      storage/ndb/memcache/extra/memcached/CMakeLists.txt
 3524 John David Duncan	2011-09-21
      Move bundled libevent and memcached sources from extra/ to storage/ndb/memcache/extra/ 

    added:
      storage/ndb/memcache/extra/
    renamed:
      extra/libevent/ => storage/ndb/memcache/extra/libevent/
      extra/memcached/ => storage/ndb/memcache/extra/memcached/
    modified:
      extra/CMakeLists.txt
      storage/ndb/memcache/CMakeLists.txt
=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-09-22 05:28:51 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-09-22 05:56:14 +0000
@@ -174,10 +174,10 @@ add_subdirectory(unit)
 option(WITH_LIBEVENT "Use bundled libevent for building memcached" ON)
 
 if(WITH_MEMCACHE)
-  add_subdirectory(memcached)
+  add_subdirectory(extra/memcached)
 
   if(WITH_LIBEVENT)
-    add_subdirectory(libevent)
+    add_subdirectory(extra/libevent)
     add_dependencies(memcached event)
   endif()
 endif()

=== modified file 'storage/ndb/memcache/FindMemcached.cmake'
--- a/storage/ndb/memcache/FindMemcached.cmake	2011-09-21 09:21:54 +0000
+++ b/storage/ndb/memcache/FindMemcached.cmake	2011-09-22 05:56:14 +0000
@@ -8,8 +8,8 @@ SET(MEMCACHED_HOME "" CACHE PATH "Path t
 
 if(WITH_MEMCACHE) 
   # Use bundled memcached
-  set(MEMCACHED_ROOT_DIR ${CMAKE_SOURCE_DIR}/extra/memcached)
-  set(MEMCACHED_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extra/memcached/include)
+  set(MEMCACHED_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra/memcached)
+  set(MEMCACHED_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra/memcached/include)
   set(MEMCACHED_UTILITIES_LIBRARY memcached_utilities)
   set(MEMCACHED_BIN_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR}/memcached)
 else()   

=== modified file 'storage/ndb/memcache/extra/memcached/CMakeLists.txt'
--- a/storage/ndb/memcache/extra/memcached/CMakeLists.txt	2011-09-22 05:13:34 +0000
+++ b/storage/ndb/memcache/extra/memcached/CMakeLists.txt	2011-09-22 05:56:14 +0000
@@ -47,7 +47,9 @@ SET(LIBMEMCACHED_UTILITIES_SOURCES
                 utilities/util.c)
 
 ADD_LIBRARY(memcached_utilities SHARED ${LIBMEMCACHED_UTILITIES_SOURCES})
-
+IF(HAVE_LIBDL)
+target_link_library(memcached_utilities dl)
+ENDIF()
 
 SET(MEMCACHED_SOURCES
                 daemon/cache.h

No bundle (reason: useless for push emails).