- fix compiler/linker agnostic runpath switch

diff --git a/config9.m4 b/config9.m4
index 49ca9e4a2fc7f3fdf2198e879504a2404d873ffd..3712b31236acc66874aa2bc1c4b7dfae22d67935 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -187,7 +187,7 @@ dnl ----
                        save_CFLAGS="$CFLAGS"
                        CFLAGS="`$CURL_CONFIG --cflags`"
                        save_LDFLAGS="$LDFALGS"
                        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])
                        
                        AC_CHECK_HEADER([openssl/crypto.h], [
                                AC_MSG_CHECKING([for openssl support in libcurl])

diff --git a/package2.xml b/package2.xml
index 929da757f8d23c7c0bcdf43806d5569e622c1c97..4d85d5dbcbd466ece52cc22cca423d5c527bbd44 100644 (file)
--- 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[
  </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
 + Added 'retrycount' and 'retrydelay' request options
 + Added libevent support for libcurl (>= 7.16.0):
   o added --with-http-curl-libevent configure option