diff options
| author | Remi Collet <remi@php.net> | 2017-08-27 07:50:31 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-27 07:50:31 +0200 |
| commit | 5f4a417537117ed5baadb4c0a1c738cdb4638c86 (patch) | |
| tree | 3b461a7615a9e09429dff094246d460b8ad3b995 /ext/curl | |
| parent | bd6630ea8e1b533b8ebf636accdb5525d37a66ba (diff) | |
| parent | cc577749a8c95e6f15f5a859961a995a82828c8e (diff) | |
| download | php-git-5f4a417537117ed5baadb4c0a1c738cdb4638c86.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Improve pkg-config usage - use default path when run using --with-curl=/usr (for debian) - fallback to headers search when libcurl.pc not found - issue warnings for explanation
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/config.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index a34d582ee7..c0d4f864a2 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -14,7 +14,7 @@ if test "$PHP_CURL" != "no"; then dnl using pkg-config output AC_MSG_CHECKING(for libcurl.pc) - if test "$PHP_CURL" == "yes"; then + if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then PKNAME=libcurl AC_MSG_RESULT(using default path) elif test -r $PHP_CURL/$PHP_LIBDIR/pkgconfig/libcurl.pc; then @@ -24,9 +24,12 @@ if test "$PHP_CURL" != "no"; then PKNAME=$PHP_CURL/lib/pkgconfig/libcurl.pc AC_MSG_RESULT(using $PKNAME) else - AC_MSG_ERROR(Could not find libcurl.pc) + AC_MSG_RESULT(not found) + AC_MSG_WARN(Could not find libcurl.pc. Try without $PHP_CURL or set PKG_CONFIG_PATH) fi + fi + if test -n "$PKNAME"; then AC_MSG_CHECKING(for cURL 7.10.5 or greater) if $PKG_CONFIG --atleast-version 7.10.5 $PKNAME; then curl_version_full=`$PKG_CONFIG --modversion $PKNAME` @@ -40,6 +43,7 @@ if test "$PHP_CURL" != "no"; then CURL_SSL=`$PKG_CONFIG --variable=supported_features $PKNAME| $EGREP SSL` else dnl fallback to old vay, using curl-config + AC_MSG_WARN(Fallback: search for curl headers and curl-config) if test -r $PHP_CURL/include/curl/easy.h; then CURL_DIR=$PHP_CURL |