From: Michael Wallner <mike@php.net>
Date: Sat, 19 May 2007 19:31:37 +0000 (+0000)
Subject: - fix compiler/linker agnostic runpath switch
X-Git-Tag: RELEASE_1_6_0b1~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5301527d060a7bed536005e10339bc53fe486303;p=m6w6%2Fext-http

- fix compiler/linker agnostic runpath switch
---

diff --git a/config9.m4 b/config9.m4
index 49ca9e4..3712b31 100644
--- a/config9.m4
+++ b/config9.m4
@@ -187,7 +187,7 @@ dnl ----
 			save_CFLAGS="$CFLAGS"
 			CFLAGS="`$CURL_CONFIG --cflags`"
 			save_LDFLAGS="$LDFALGS"
-			LDFLAGS="`$CURL_CONFIG --libs` -Wl,--rpath -Wl,$CURL_DIR/$PHP_LIBDIR"
+			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])
diff --git a/package2.xml b/package2.xml
index 929da75..4d85d5d 100644
--- a/package2.xml
+++ b/package2.xml
@@ -39,6 +39,7 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
+* Fixed libcurl SLL library detection for libcurl >= 7.16.2
 + Added 'retrycount' and 'retrydelay' request options
 + Added libevent support for libcurl (>= 7.16.0):
   o added --with-http-curl-libevent configure option