]> granicus.if.org Git - php/commitdiff
Preserve CFLAGS/LDFLAGS for curl ssl check
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 12 Jun 2019 09:53:14 +0000 (11:53 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 12 Jun 2019 09:54:13 +0000 (11:54 +0200)
We need to add the curl-specific flags, but we also need to preserve
the general flags, to keep around important stuff like -m32.

ext/curl/config.m4

index cd02577907abda0e0e186287268af906adc9675e..9c78eb637eb3590d9a64ced19e40380d7c2b6da4 100644 (file)
@@ -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])