[PHP-CVS] cvs: php-src /ext/curl config.w32

2009-04-24 Thread Pierre-Alain Joye 
pajoye  Fri Apr 24 09:25:14 2009 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - simplify and use PHP_CURL
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.10 php-src/ext/curl/config.w32:1.11
--- php-src/ext/curl/config.w32:1.10Thu Apr 23 08:46:15 2009
+++ php-src/ext/curl/config.w32 Fri Apr 24 09:25:14 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10 2009/04/23 08:46:15 pajoye Exp $
+// $Id: config.w32,v 1.11 2009/04/24 09:25:14 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
@@ -10,8 +10,8 @@
CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
 CHECK_LIB(winmm.lib, curl, PHP_CURL)
 CHECK_LIB(wldap32.lib, curl, PHP_CURL)
-(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, curl, 
PHP_ZIP) ||  CHECK_LIB(zlib.lib, curl, PHP_ZIP))) || 
-   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, curl, 
PHP_ZIP)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
+(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib;zlib.lib, 
curl, PHP_CURL))) || 
+   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, curl, 
PHP_CURL)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {
EXTENSION(curl, interface.c multi.c streams.c, true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2009-04-23 Thread Pierre-Alain Joye 
pajoye  Thu Apr 23 08:46:15 2009 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - c/p error
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.9 php-src/ext/curl/config.w32:1.10
--- php-src/ext/curl/config.w32:1.9 Sun Jan 25 16:22:44 2009
+++ php-src/ext/curl/config.w32 Thu Apr 23 08:46:15 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9 2009/01/25 16:22:44 pajoye Exp $
+// $Id: config.w32,v 1.10 2009/04/23 08:46:15 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
@@ -10,8 +10,8 @@
CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
 CHECK_LIB(winmm.lib, curl, PHP_CURL)
 CHECK_LIB(wldap32.lib, curl, PHP_CURL)
-(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, zip, 
PHP_ZIP) ||  CHECK_LIB(zlib.lib, zip, PHP_ZIP))) || 
-   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, zip, 
PHP_ZIP)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
+(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, curl, 
PHP_ZIP) ||  CHECK_LIB(zlib.lib, curl, PHP_ZIP))) || 
+   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, curl, 
PHP_ZIP)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
) {
EXTENSION(curl, interface.c multi.c streams.c, true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2009-01-25 Thread Pierre-Alain Joye 
pajoye  Sun Jan 25 16:22:47 2009 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - MFB:
   - update check for libs
   - add HAVE_CURL_EASY_STRERROR, HAVE_CURL_MULTI_STRERROR, 
HAVE_CURL_VERSION_INFO
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.8 php-src/ext/curl/config.w32:1.9
--- php-src/ext/curl/config.w32:1.8 Wed Nov 19 09:28:54 2008
+++ php-src/ext/curl/config.w32 Sun Jan 25 16:22:44 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2008/11/19 09:28:54 pajoye Exp $
+// $Id: config.w32,v 1.9 2009/01/25 16:22:44 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
@@ -7,13 +7,18 @@
if (CHECK_LIB(libcurl_a.lib;libcurl.lib, curl, PHP_CURL) 
CHECK_HEADER_ADD_INCLUDE(curl/easy.h, CFLAGS_CURL) 

CHECK_LIB(ssleay32.lib, curl, PHP_CURL) 
-   CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
-   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, curl, 
PHP_CURL) || CHECK_LIB(zlib.lib, curl, PHP_CURL))) || 
-   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, curl, 
PHP_CURL)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED))) 
-   CHECK_LIB(winmm.lib, curl, PHP_CURL)) {
-   EXTENSION(curl, interface.c multi.c streams.c);
+   CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
+CHECK_LIB(winmm.lib, curl, PHP_CURL)
+CHECK_LIB(wldap32.lib, curl, PHP_CURL)
+(((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, zip, 
PHP_ZIP) ||  CHECK_LIB(zlib.lib, zip, PHP_ZIP))) || 
+   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, zip, 
PHP_ZIP)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED)))
+   ) {
+   EXTENSION(curl, interface.c multi.c streams.c, true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+   AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have 
curl_easy_strerror in cURL');
+   AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have 
curl_multi_strerror in cURL');
+   AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info 
in cURL');
ADD_FLAG(CFLAGS_CURL, /D CURL_STATICLIB);
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL 
wrappers [experimental]');



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2008-11-19 Thread Pierre-Alain Joye 
pajoye  Wed Nov 19 09:28:54 2008 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - new naming and allow libcurl static build
  - c/p error for zlib
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.7 php-src/ext/curl/config.w32:1.8
--- php-src/ext/curl/config.w32:1.7 Tue Aug  5 19:39:51 2008
+++ php-src/ext/curl/config.w32 Wed Nov 19 09:28:54 2008
@@ -1,15 +1,15 @@
-// $Id: config.w32,v 1.7 2008/08/05 19:39:51 pajoye Exp $
+// $Id: config.w32,v 1.8 2008/11/19 09:28:54 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
 
 if (PHP_CURL != no) {
-   if (CHECK_LIB(libcurl.lib, curl, PHP_CURL) 
+   if (CHECK_LIB(libcurl_a.lib;libcurl.lib, curl, PHP_CURL) 
CHECK_HEADER_ADD_INCLUDE(curl/easy.h, CFLAGS_CURL) 

CHECK_LIB(ssleay32.lib, curl, PHP_CURL) 
CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
-   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
-   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED))) 
+   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, curl, 
PHP_CURL) || CHECK_LIB(zlib.lib, curl, PHP_CURL))) || 
+   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, curl, 
PHP_CURL)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED))) 
CHECK_LIB(winmm.lib, curl, PHP_CURL)) {
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2008-08-05 Thread Pierre-Alain Joye 
pajoye  Tue Aug  5 19:39:52 2008 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - fix zlib detection (shared/static) and add zlib_a support
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.6 php-src/ext/curl/config.w32:1.7
--- php-src/ext/curl/config.w32:1.6 Tue Nov 14 19:57:35 2006
+++ php-src/ext/curl/config.w32 Tue Aug  5 19:39:51 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2006/11/14 19:57:35 edink Exp $
+// $Id: config.w32,v 1.7 2008/08/05 19:39:51 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
@@ -8,7 +8,8 @@
CHECK_HEADER_ADD_INCLUDE(curl/easy.h, CFLAGS_CURL) 

CHECK_LIB(ssleay32.lib, curl, PHP_CURL) 
CHECK_LIB(libeay32.lib, curl, PHP_CURL) 
-   CHECK_LIB(zlib.lib, curl, PHP_CURL) 
+   (((PHP_ZLIB==no)  (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
CHECK_LIB(zlib.lib, gd, PHP_GD))) || 
+   (PHP_ZLIB_SHARED  CHECK_LIB(zlib.lib, gd, 
PHP_GD)) || (PHP_ZLIB == yes  (!PHP_ZLIB_SHARED))) 
CHECK_LIB(winmm.lib, curl, PHP_CURL)) {
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2006-11-14 Thread Edin Kadribasic 
edink   Tue Nov 14 19:57:35 2006 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  MFB: Tell linker that we're using stati libcurl
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.5 php-src/ext/curl/config.w32:1.6
--- php-src/ext/curl/config.w32:1.5 Sat Sep  9 20:03:55 2006
+++ php-src/ext/curl/config.w32 Tue Nov 14 19:57:35 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2006/09/09 20:03:55 bjori Exp $
+// $Id: config.w32,v 1.6 2006/11/14 19:57:35 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, cURL support, no);
@@ -13,6 +13,7 @@
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+   ADD_FLAG(CFLAGS_CURL, /D CURL_STATICLIB);
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL 
wrappers [experimental]');
} else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2004-01-12 Thread Sara Golemon 
pollita Tue Jan 13 00:30:53 2004 EDT

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  Don't even define this.
  
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.2 php-src/ext/curl/config.w32:1.3
--- php-src/ext/curl/config.w32:1.2 Fri Dec 19 07:52:39 2003
+++ php-src/ext/curl/config.w32 Tue Jan 13 00:30:53 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/19 12:52:39 wez Exp $
+// $Id: config.w32,v 1.3 2004/01/13 05:30:53 pollita Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, CURL support, no);
@@ -13,7 +13,7 @@
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have CURL library');
// TODO: check for curl_version_info
-   AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers 
[experimental]');
+   // AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers 
[experimental]');
} else {
WARNING(curl not enabled; libraries and headers not found);
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/curl config.w32

2003-12-19 Thread Wez Furlong 
wez Fri Dec 19 07:52:40 2003 EDT

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  copy-n-paste error
  
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.1 php-src/ext/curl/config.w32:1.2
--- php-src/ext/curl/config.w32:1.1 Wed Dec  3 22:46:12 2003
+++ php-src/ext/curl/config.w32 Fri Dec 19 07:52:39 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/04 03:46:12 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/19 12:52:39 wez Exp $
 // vim:ft=javascript
 
 ARG_WITH(curl, CURL support, no);
@@ -15,6 +15,6 @@
// TODO: check for curl_version_info
AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers 
[experimental]');
} else {
-   WARNING(cpdf not enabled; libraries and headers not found);
+   WARNING(curl not enabled; libraries and headers not found);
}
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php