From 87bf14457eac23c546efc0778711356ea5a5601d Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Sat, 27 Nov 2021 14:31:31 -0500
Subject: [PATCH] gdb: fix typos in configure

The variable names used to restore CFLAGS and LDFLAGS here don't quite
match the names used above, resulting in losing the original CFLAGS and
LDFLAGS.  Fix that.

Change-Id: I9cc2c3b48b1dc30c31a7143563c893fd6f426a0a
---
 gdb/configure    | 8 ++++----
 gdb/configure.ac | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/configure b/gdb/configure
index 90c1e3d7948..448167f3c6d 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -12138,8 +12138,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
+      save_CFLAGS="$CFLAGS"
+      save_LDFLAGS="$LDFLAGS"
       CFLAGS="$CFLAGS $srchigh_pkg_cflags"
       LDFLAGS="$LDFLAGS $srchigh_pkg_libs"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12163,8 +12163,8 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      CFLAGS="$SAVE_CFLAGS"
-      LDFLAGS="$SAVE_LDFLAGS"
+      CFLAGS="$save_CFLAGS"
+      LDFLAGS="$save_LDFLAGS"
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 29c1c4589c9..ada937316d7 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1265,8 +1265,8 @@ either use --disable-source-highlight or dnl
       # This situation can occur for instance when using a source highlight
       # library compiled with g++ 7.5.0 while building gdb with g++ 4.8.5.
       AC_LANG_PUSH(C++)
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
+      save_CFLAGS="$CFLAGS"
+      save_LDFLAGS="$LDFLAGS"
       CFLAGS="$CFLAGS $srchigh_pkg_cflags"
       LDFLAGS="$LDFLAGS $srchigh_pkg_libs"
       AC_LINK_IFELSE(
@@ -1278,8 +1278,8 @@ either use --disable-source-highlight or dnl
         [have_usable_source_highlight=yes],
         [have_usable_source_highlight=no]
       )
-      CFLAGS="$SAVE_CFLAGS"
-      LDFLAGS="$SAVE_LDFLAGS"
+      CFLAGS="$save_CFLAGS"
+      LDFLAGS="$save_LDFLAGS"
       AC_LANG_POP(C++)
 
       if test "${have_usable_source_highlight}" = "yes"; then
-- 
2.30.2