File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ PHP NEWS
19
19
20
20
- CURL:
21
21
. Fixed bug #79033 (Curl timeout error with specific url and post). (cmb)
22
+ . Fixed bug #79063 (curl openssl does not respect PKG_CONFIG_PATH). (Nikita)
22
23
23
24
- Date:
24
25
. Fixed bug #79015 (undefined-behavior in php_date.c). (cmb)
Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ if test "$PHP_CURL" != "no"; then
23
23
esac
24
24
25
25
if test "$CURL_SSL" = yes; then
26
- save_CFLAGS="$CFLAGS"
27
- CFLAGS="$CFLAGS $CURL_CFLAGS"
28
26
save_LDFLAGS="$LDFLAGS"
29
27
LDFLAGS="$LDFLAGS $CURL_LIBS"
30
28
@@ -48,14 +46,17 @@ int main(int argc, char *argv[])
48
46
] ] ) ] ,[
49
47
AC_MSG_RESULT ( [ yes] )
50
48
AC_DEFINE ( [ HAVE_CURL_OPENSSL] , [ 1] , [ Have cURL with OpenSSL support] )
51
- AC_CHECK_HEADERS ( [ openssl/crypto.h] )
49
+ PKG_CHECK_MODULES([ OPENSSL] , [ openssl] , [
50
+ PHP_EVAL_LIBLINE($OPENSSL_LIBS, CURL_SHARED_LIBADD)
51
+ PHP_EVAL_INCLINE($OPENSSL_CFLAGS)
52
+ AC_CHECK_HEADERS ( [ openssl/crypto.h] )
53
+ ] , [ ] )
52
54
] , [
53
55
AC_MSG_RESULT ( [ no] )
54
56
] , [
55
57
AC_MSG_RESULT ( [ no] )
56
58
] )
57
59
58
- CFLAGS="$save_CFLAGS"
59
60
LDFLAGS="$save_LDFLAGS"
60
61
else
61
62
AC_MSG_RESULT ( [ no] )
You can’t perform that action at this time.
0 commit comments