MFB: first check the SSL lib string in libcurl and then the header

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 21cfacee274c174ab303ebc98eeab747b98514f3..21425853d28ac2102048fc63b146a80d1c3511b2 100644 (file)
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -60,50 +60,51 @@ if test "$PHP_CURL" != "no"; then
    save_LDFLAGS="$LDFALGS"
    LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
    
-   AC_CHECK_HEADER([openssl/crypto.h], [
-    AC_MSG_CHECKING([for openssl support in libcurl])
-    AC_TRY_RUN([
-     #include <curl/curl.h>
-     int main(int argc, char *argv[]) {
-      curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-      if (data && data->ssl_version && *data->ssl_version) {
-       const char *ptr = data->ssl_version;
-       while(*ptr == ' ') ++ptr;
-       return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
-      }
-      return 1;
+   AC_PROG_CPP
+   AC_MSG_CHECKING([for openssl support in libcurl])
+   AC_TRY_RUN([
+    #include <curl/curl.h>
+    int main(int argc, char *argv[]) {
+     curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+     if (data && data->ssl_version && *data->ssl_version) {
+      const char *ptr = data->ssl_version;
+      while(*ptr == ' ') ++ptr;
+      return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
      }
-    ],[
-     AC_MSG_RESULT([yes])
+     return 1;
+    }
+   ],[
+    AC_MSG_RESULT([yes])
+    AC_CHECK_HEADER([openssl/crypto.h], [
      AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
-    ], [
-     AC_MSG_RESULT([no])
-    ], [
-     AC_MSG_RESULT([no])
     ])
+   ], [
+    AC_MSG_RESULT([no])
+   ], [
+    AC_MSG_RESULT([no])
    ])
    
-   AC_CHECK_HEADER([gcrypt.h], [
-    AC_MSG_CHECKING([for gnutls support in libcurl])
-    AC_TRY_RUN([
-     #include <curl/curl.h>
-     int main(int argc, char *argv[]) {
-      curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-      if (data && data->ssl_version && *data->ssl_version) {
-       const char *ptr = data->ssl_version;
-       while(*ptr == ' ') ++ptr;
-       return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
-      }
-      return 1;
+   AC_MSG_CHECKING([for gnutls support in libcurl])
+   AC_TRY_RUN([
+    #include <curl/curl.h>
+    int main(int argc, char *argv[]) {
+     curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+     if (data && data->ssl_version && *data->ssl_version) {
+      const char *ptr = data->ssl_version;
+      while(*ptr == ' ') ++ptr;
+      return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
      }
-    ], [
-     AC_MSG_RESULT([yes])
+     return 1;
+    }
+   ], [
+    AC_MSG_RESULT([yes])
+    AC_CHECK_HEADER([gcrypt.h], [
      AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
-    ], [
-     AC_MSG_RESULT([no])
-    ], [
-     AC_MSG_RESULT([no])
     ])
+   ], [
+    AC_MSG_RESULT([no])
+   ], [
+    AC_MSG_RESULT([no])
    ])
    
    CFLAGS="$save_CFLAGS"