janiSat May 2 19:55:14 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/curl config.m4
Log:
MFH:- Fixed bug #48132 (configure fails to test curl ssl support if
--disable-rpath is set)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1484r2=1.2027.2.547.2.1485diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1484 php-src/NEWS:1.2027.2.547.2.1485
--- php-src/NEWS:1.2027.2.547.2.1484Fri May 1 03:06:39 2009
+++ php-src/NEWSSat May 2 19:55:14 2009
@@ -11,6 +11,8 @@
- Fixed segfault on invalid session.save_path. (Hannes)
- Fixed leaks in imap when a mail_criteria is used. (Pierre)
+- Fixed bug #48132 (configure check for curl ssl support fails with
+ --disable-rpath). (Jani)
- Fixed bug #48038 (odbc_execute changes variables used to form params array).
(Felipe)
- Fixed bug #47997 (stream_copy_to_stream returns 1 on empty streams). (Arnaud)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.28.2.3.2.8r2=1.28.2.3.2.9diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.28.2.3.2.8
php-src/ext/curl/config.m4:1.28.2.3.2.9
--- php-src/ext/curl/config.m4:1.28.2.3.2.8 Fri Nov 7 21:18:45 2008
+++ php-src/ext/curl/config.m4 Sat May 2 19:55:14 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.3.2.8 2008/11/07 21:18:45 felipe Exp $
+dnl $Id: config.m4,v 1.28.2.3.2.9 2009/05/02 19:55:14 jani Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -48,75 +48,80 @@
else
AC_MSG_ERROR(cURL version 7.10.5 or later is required to compile php with
cURL support)
fi
+
+ PHP_ADD_INCLUDE($CURL_DIR/include)
+ PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test $CURL_SSL = SSL; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
- save_CFLAGS=$CFLAGS
- CFLAGS=`$CURL_CONFIG --cflags`
- save_LDFLAGS=$LDFLAGS
- LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR
+save_CFLAGS=$CFLAGS
+CFLAGS=`$CURL_CONFIG --cflags`
- AC_PROG_CPP
- AC_MSG_CHECKING([for openssl support in libcurl])
- AC_TRY_RUN([
-#include curl/curl.h
-int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
- }
- return 1;
-}
- ],[
-AC_MSG_RESULT([yes])
-AC_CHECK_HEADERS([openssl/crypto.h], [
- AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+AC_PROG_CPP
+AC_MSG_CHECKING([for openssl support in libcurl])
+AC_TRY_RUN([
+#include curl/curl.h
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data data-ssl_version *data-ssl_version) {
+const char *ptr = data-ssl_version;
+
+while(*ptr == ' ') ++ptr;
+return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
+ }
+ return 1;
+}
+],[
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADERS([openssl/crypto.h], [
+AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+ ])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
])
- ], [
-AC_MSG_RESULT([no])
- ], [
-AC_MSG_RESULT([no])
- ])
- AC_MSG_CHECKING([for gnutls support in libcurl])
- AC_TRY_RUN([
-#include curl/curl.h
-int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
- }
- return 1;
-}
- ], [
-AC_MSG_RESULT([yes])
-AC_CHECK_HEADER([gcrypt.h], [
- AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+AC_MSG_CHECKING([for gnutls support in libcurl])
+AC_TRY_RUN([
+#include curl/curl.h
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data data-ssl_version *data-ssl_version) {
+const char *ptr = data-ssl_version;
+
+while(*ptr == ' ') ++ptr;
+return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
+ }
+ return 1;
+}
+], [
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADER([gcrypt.h], [
+AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+ ])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
])
- ], [
-
