From: Michael Wallner <mike@php.net>
Date: Sat, 14 Jan 2012 10:52:22 +0000 (+0000)
Subject: anybody knows what's going on? I can't build with -lcurl anymore...
X-Git-Tag: DEV_2-before-client~75
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=59a1339c888c47745143739cd76970f1efdf18cf;ds=sidebyside

anybody knows what's going on? I can't build with -lcurl anymore...
---

diff --git a/config9.m4 b/config9.m4
index d6f2446..a470a30 100644
--- a/config9.m4
+++ b/config9.m4
@@ -243,6 +243,7 @@ dnl ----
 					AC_MSG_RESULT([yes])
 					AC_CHECK_HEADER([openssl/crypto.h], [
 						AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+						CURL_SSL="crypto"
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -266,6 +267,7 @@ dnl ----
 					AC_MSG_RESULT([yes])
 					AC_CHECK_HEADER([gcrypt.h], [
 						AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+						CURL_SSL="gcrypt"
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -301,6 +303,9 @@ dnl ----
 			PHP_ADD_INCLUDE($CURL_DIR/include)
 			PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 			PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
+			if test "x$CURL_SSL" != "x"; then
+				PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
+			fi
 			AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
 			HTTP_HAVE_A_REQUEST_LIB=true
 		fi