diff options
| author | Remi Collet <remi@php.net> | 2017-08-18 14:52:22 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-18 14:52:22 +0200 |
| commit | acf09c416bd5bf9d188f5266abc63ebd30d0a769 (patch) | |
| tree | 2ceb2420617dff5c5117949e85e96f4af0be7ec9 /ext/curl | |
| parent | 4494ad69112ee835cbb80125105b4ab190d43436 (diff) | |
| parent | b28912b0f767cf2deebbfaca30b2bea900416ce0 (diff) | |
| download | php-git-acf09c416bd5bf9d188f5266abc63ebd30d0a769.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #75093 OpenSSL support not detected
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/config.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 63682e0f06..d99c4335ae 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -73,6 +73,8 @@ if test "$PHP_CURL" != "no"; then save_CFLAGS="$CFLAGS" CFLAGS="`$CURL_CONFIG --cflags`" + save_LDFLAGS="$LDFLAGS" + LDFLAGS="`$CURL_CONFIG --libs`" AC_PROG_CPP AC_MSG_CHECKING([for openssl support in libcurl]) @@ -130,6 +132,7 @@ int main(int argc, char *argv[]) ]) CFLAGS="$save_CFLAGS" + LDFLAGS="$save_LDFLAGS" else AC_MSG_RESULT([no]) fi |