We need to save/restore CFLAGS and LIBS

Erlend E. Aasland · Erlend E. Aasland · commit 0173b66cb41c · 2021-11-19T11:49:43.000+01:00
diff --git a/configure b/configure
@@ -11021,8 +11021,10 @@ $as_echo "yes" >&6; }
 fi
 as_fn_append LIBSQLITE3_CFLAGS ' -I$(srcdir)/Modules/_sqlite'
 
+save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
 CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
 LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
@@ -11147,8 +11149,10 @@ fi
 
 
 
+CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 
 # Check for support for loadable sqlite extensions
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5
diff --git a/configure.ac b/configure.ac
@@ -3175,9 +3175,12 @@ PKG_CHECK_MODULES(
 AS_VAR_APPEND([LIBSQLITE3_CFLAGS], [' -I$(srcdir)/Modules/_sqlite'])
 
 dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
-dnl hence CPPFLAGS instead of CFLAGS.
+dnl hence CPPFLAGS instead of CFLAGS. We still need to save CFLAGS, because it
+dnl is touched by AC_CHECK_HEADER.
+AS_VAR_COPY([save_CFLAGS], [CFLAGS])
 AS_VAR_COPY([save_CPPFLAGS], [CPPFLAGS])
 AS_VAR_COPY([save_LDFLAGS], [LDFLAGS])
+AS_VAR_COPY([save_LIBS], [LIBS])
 CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
 LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
@@ -3196,8 +3199,10 @@ AC_CHECK_HEADER([sqlite3.h], [
   AC_CHECK_LIB([sqlite3], [sqlite3_load_extension])
 ])
 
+AS_VAR_COPY([CFLAGS], [save_CFLAGS])
 AS_VAR_COPY([CPPFLAGS], [save_CPPFLAGS])
 AS_VAR_COPY([LDFLAGS], [save_LDFLAGS])
+AS_VAR_COPY([LIBS], [save_LIBS])
 
 # Check for support for loadable sqlite extensions
 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
