bzr push into mysql-5.5-cluster branch (john.duncan:3507 to 3508)

[John David Duncan]

 3508 John David Duncan	2011-09-20
      CMake fixes (link with libm & fix syntax error in header check)

    modified:
      extra/memcached/CMakeLists.txt
 3507 John David Duncan	2011-09-20
      Because CMake processes files in order, and storage/ndb/ is included before
      extra/, I have to move the declaration of WITH_MEMCACHE option into 
      storage/ndb/CMakeLists.txt 

    modified:
      extra/CMakeLists.txt
      storage/ndb/CMakeLists.txt
      storage/ndb/memcache/CMakeLists.txt
      storage/ndb/memcache/FindMemcached.cmake
=== modified file 'extra/memcached/CMakeLists.txt'
--- a/extra/memcached/CMakeLists.txt	2011-09-20 15:22:11 +0000
+++ b/extra/memcached/CMakeLists.txt	2011-09-20 17:41:15 +0000
@@ -60,7 +60,7 @@ SET(MEMCACHED_SOURCES
 
 add_executable(memcached ${MEMCACHED_SOURCES})
 
-target_link_libraries(memcached event memcached_utilities)
+target_link_libraries(memcached event memcached_utilities m)
 
 CHECK_INCLUDE_FILE("link.h"          HAVE_LINK_H)
 CHECK_INCLUDE_FILE("stdbool.h"       HAVE_STDBOOL_H)
@@ -68,7 +68,7 @@ CHECK_INCLUDE_FILE("sysexits.h"      HAV
 CHECK_INCLUDE_FILE("netdb.h"         HAVE_NETDB_H)
 CHECK_INCLUDE_FILE("sys/uio.h"       HAVE_SYS_UIO_H)
 CHECK_INCLUDE_FILE("signal.h"        HAVE_SIGIGNORE)
-CHECK_INCLUDE_FILES(sys/types.h netinet/tcp.h HAVE_NETINET_TCP_H)
+CHECK_INCLUDE_FILES("sys/types.h;netinet/tcp.h" HAVE_NETINET_TCP_H)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_tests.in 
                ${CMAKE_CURRENT_SOURCE_DIR}/config.h)

No bundle (reason: useless for push emails).