Disable --with-curlwrappers.

(Pending support from libcurl itself)

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 9570d39e34b9ca7de21111832d48792b15ddeb3f..2d3a7d425c84f9f303875089d5ec50bd64cee1e6 100644 (file)
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -6,8 +6,8 @@ PHP_ARG_WITH(curl, for CURL support,
 [  --with-curl[=DIR]       Include CURL support])
 
 dnl Temporary option while we develop this aspect of the extension
-PHP_ARG_WITH(curlwrappers, if we should use CURL for url streams,
-[  --with-curlwrappers     Use CURL for url streams], no, no)
+dnl PHP_ARG_WITH(curlwrappers, if we should use CURL for url streams,
+dnl [  --with-curlwrappers     Use CURL for url streams], no, no)
 
 if test "$PHP_CURL" != "no"; then
   if test -r $PHP_CURL/include/curl/easy.h; then
@@ -61,6 +61,13 @@ if test "$PHP_CURL" != "no"; then
     $CURL_LIBS -L$CURL_DIR/lib
   ])
 
+  PHP_CHECK_LIBRARY(curl,curl_version_info,
+  [
+    AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ])
+  ],[],[
+    $CURL_LIBS -L$CURL_DIR/lib
+  ])
+
   if test "$PHP_CURLWRAPPERS" != "no" ; then
        AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ])
   fi