[patch] patch for incorrect m4 macro

curl-php-fix.patch (text/plain), 1.08 KB, created by Rafał Mużyło on 2009-06-24 03:07:48 UTC

--- ext/curl/config.m4.old	2009-05-02 21:55:14.000000000 +0200
+++ ext/curl/config.m4	2009-06-24 04:10:03.000000000 +0200
@@ -44,7 +44,7 @@
   curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
   if test "$curl_version" -ge 7010005; then
     AC_MSG_RESULT($curl_version_full)
-    CURL_LIBS=`$CURL_CONFIG --libs`
+    CURL_LIBS="-lcurl"
   else
     AC_MSG_ERROR(cURL version 7.10.5 or later is required to compile php with cURL support)
   fi
@@ -61,6 +61,8 @@
    
     save_CFLAGS="$CFLAGS"
     CFLAGS="`$CURL_CONFIG --cflags`"
+    save_LIBS="$LIBS"
+    LIBS="$CURL_SHARED_LIBADD"
    
     AC_PROG_CPP
     AC_MSG_CHECKING([for openssl support in libcurl])
@@ -108,7 +110,7 @@
 }
 ], [
       AC_MSG_RESULT([yes])
-      AC_CHECK_HEADER([gcrypt.h], [
+      AC_CHECK_HEADERS([gcrypt.h], [
         AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
       ])
     ], [
@@ -118,6 +120,7 @@
     ])
    
     CFLAGS="$save_CFLAGS"
+    LIBS="$save_LIBS"
   else
     AC_MSG_RESULT([no])
   fi