From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 12 Jun 2019 09:53:14 +0000 (+0200)
Subject: Preserve CFLAGS/LDFLAGS for curl ssl check
X-Git-Tag: php-7.4.0alpha1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f1d822d78ca8f34e67a06139ce36e6ff88fc158;p=php

Preserve CFLAGS/LDFLAGS for curl ssl check

We need to add the curl-specific flags, but we also need to preserve
the general flags, to keep around important stuff like -m32.
---

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index cd02577907..9c78eb637e 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -26,9 +26,9 @@ if test "$PHP_CURL" != "no"; then
     AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with  SSL support])
 
     save_CFLAGS="$CFLAGS"
-    CFLAGS=$CURL_CFLAGS
+    CFLAGS="$CFLAGS $CURL_CFLAGS"
     save_LDFLAGS="$LDFLAGS"
-    LDFLAGS=$CURL_LIBS
+    LDFLAGS="$LDFLAGS $CURL_LIBS"
 
     AC_PROG_CPP
     AC_MSG_CHECKING([for openssl support in libcurl])