From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 21 Sep 2015 21:06:17 +0000 (-0400)
Subject: cmake: add detection for HAVE_CURL_MULTI_WAIT
X-Git-Tag: v10.0.3~134^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=048f3bd5a3bd3a3efc579936a680dc7b78b9cacf;p=ceph.git

cmake: add detection for HAVE_CURL_MULTI_WAIT

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/cmake/modules/Findlibcurl.cmake b/cmake/modules/Findlibcurl.cmake
index 2c4d6211fba0..301018273c10 100644
--- a/cmake/modules/Findlibcurl.cmake
+++ b/cmake/modules/Findlibcurl.cmake
@@ -1,9 +1,10 @@
 # Try to find libcurl
 # Once done, this will define
 #
-# CURL_FOUND - system has Profiler
-# CURL_INCLUDE_DIR - the Profiler include directories
-# CURL_LIBRARIES - link these to use Profiler
+# CURL_FOUND - system has curl
+# CURL_INCLUDE_DIR - the curl include directories
+# CURL_LIBRARIES - link these to use curl
+# HAVE_CURL_MULTI_WAIT - curl provides a curl_multi_wait() function
 
 if(CURL_INCLUDE_DIR AND CURL_LIBRARIES)
 	set(CURL_FIND_QUIETLY TRUE)
@@ -25,9 +26,15 @@ find_path(CURL_INCLUDE_DIR curl.h NO_DEFAULT_PATH PATHS
 find_library(LIBCURL NAMES curl)
 set(CURL_LIBRARIES ${LIBCURL})
 
+
+# check curl/multi.h for curl_multi_wait()
+set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES})
+CHECK_SYMBOL_EXISTS(curl_multi_wait "curl.h" HAVE_CURL_MULTI_WAIT)
+
 # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(libcurl DEFAULT_MSG CURL_LIBRARIES CURL_INCLUDE_DIR)
 
-mark_as_advanced(CURL_LIBRARIES CURL_INCLUDE_DIR)
+mark_as_advanced(CURL_LIBRARIES CURL_INCLUDE_DIR HAVE_CURL_MULTI_WAIT)
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index c82e8dcc1d41..421a729e5e2d 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -270,4 +270,7 @@
 /* Define if HAVE_REENTRANT_STRSIGNAL */
 #cmakedefine HAVE_REENTRANT_STRSIGNAL
 
+/* Defined if curl headers define curl_multi_wait() */
+#cmakedefine HAVE_CURL_MULTI_WAIT 1
+
 #endif /* CONFIG_H */