bzr commit into mysql-5.5-bugteam branch (jonathan.perkin:3201) Bug#58955

[Jonathan Perkin]

#At file:///Users/jperkin/bzr-mysql/mysql-5.5-bugteam/ based on revid:davi.arnaut@stripped

 3201 Jonathan Perkin	2010-12-16
      bug#58955: Must -DBUILD_CONFIG=mysql_release require libaio on Linux
      
      Allow users to build without aio if they really want to, by passing
      -DIGNORE_AIO_CHECK to cmake.

    modified:
      cmake/build_configurations/mysql_release.cmake
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-12-07 11:40:38 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-12-16 09:27:55 +0000
@@ -118,17 +118,21 @@ IF(UNIX)
   OPTION(WITH_PIC "" ON) # Why?
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # Ensure aio is available on Linux (required by InnoDB)
-    CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
-    CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
-    IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
-      MESSAGE(FATAL_ERROR "
-      aio is required on Linux, you need to install the required library:
-
-        Debian/Ubuntu:              apt-get install libaio-dev
-        RedHat/Fedora/Oracle Linux: yum install libaio-devel
-        SuSE:                       zypper install libaio-devel
-       ")
+    IF(NOT IGNORE_AIO_CHECK)
+      # Ensure aio is available on Linux (required by InnoDB)
+      CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
+      CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
+      IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
+        MESSAGE(FATAL_ERROR "
+        aio is required on Linux, you need to install the required library:
+
+          Debian/Ubuntu:              apt-get install libaio-dev
+          RedHat/Fedora/Oracle Linux: yum install libaio-devel
+          SuSE:                       zypper install libaio-devel
+
+        If you really do not want it, pass -DIGNORE_AIO_CHECK to cmake.
+        ")
+      ENDIF()
     ENDIF()
 
     # Enable fast mutexes on Linux


Attachment: [text/bzr-bundle] bzr/[e-mail]