From: Viktor Szakats <commit@vsz.me>
Date: Mon, 11 Nov 2024 12:59:08 +0000 (+0100)
Subject: curl-rustls.m4: keep existing `CPPFLAGS`/`LDFLAGS` when detected
X-Git-Tag: curl-8_11_1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774844ab5db84e2368389e6cd9f0b8f81852b738;p=thirdparty%2Fcurl.git

curl-rustls.m4: keep existing `CPPFLAGS`/`LDFLAGS` when detected

Different variable names were used in flag save and restore operations,
which could cause existing `CPPFLAGS` and `LDFLAGS` be accidentally lost
when detecting Rustls.

Follow-up to 647e86a3efe1eea7a2a456c009cfe1eb55fe48eb #13179
Closes #15546
---

diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
index fdcbfcd5b1..593fe43bac 100644
--- a/m4/curl-rustls.m4
+++ b/m4/curl-rustls.m4
@@ -155,8 +155,8 @@ if test "x$OPT_RUSTLS" != xno; then
   fi
 
   dnl finally, set flags to use this TLS backend
-  CPPFLAGS="$CLEAN_CPPFLAGS $SSL_CPPFLAGS"
-  LDFLAGS="$CLAN_LDFLAGS $SSL_LDFLAGS"
+  CPPFLAGS="$CLEANCPPFLAGS $SSL_CPPFLAGS"
+  LDFLAGS="$CLEANLDFLAGS $SSL_LDFLAGS"
 
   if test "x$USE_RUSTLS" = "xyes"; then
     AC_MSG_NOTICE([detected Rustls])