bzr push into mysql-trunk branch (Georgi.Kodinov:3722 to 3723)

[Georgi Kodinov]

 3723 Georgi Kodinov	2012-04-23 [merge]
      merge

    modified:
      configure.cmake
 3722 Kent Boortz	2012-04-23 [merge]
      Merge

    modified:
      storage/innobase/srv/srv0start.cc
=== modified file 'configure.cmake'
--- a/configure.cmake	2012-04-02 14:31:07 +0000
+++ b/configure.cmake	2012-04-23 13:35:00 +0000
@@ -193,7 +193,9 @@ IF(UNIX)
   SET(CMAKE_REQUIRED_LIBRARIES 
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
 
-  LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
+  IF(NOT ${CMAKE_REQUIRED_LIBRARIES} MATCHES '')
+    LIST(REMOVE_DUPLICATES ${CMAKE_REQUIRED_LIBRARIES})
+  ENDIF()  
   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
   
   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)

No bundle (reason: useless for push emails).