From 4e0eaecb335867b9691a93621f726dac381bf79e Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Fri, 7 Nov 2025 18:39:40 +0100
Subject: [PATCH] Run ./configure for PCRE2 also with original CFLAGS (and not
 with the ones we add during ./Config like -Wall -Wextra etc...)

Seen while debugging some other problem
---
 configure    | 4 ++++
 configure.ac | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/configure b/configure
index 20d82ef54..4ab13d315 100755
--- a/configure
+++ b/configure
@@ -8576,7 +8576,11 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: configuring PCRE2 regex library" >&5
 printf "%s\n" "configuring PCRE2 regex library" >&6; }
 cd pcre2-$pcre2_version
+save_cflags="$CFLAGS"
+CFLAGS="$orig_cflags"
+export CFLAGS
 ./configure --enable-jit --enable-shared --prefix=$cur_dir/extras/pcre2 --libdir=$PRIVATELIBDIR || exit 1
+CFLAGS="$save_cflags"
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling PCRE2 regex library" >&5
 printf "%s\n" "compiling PCRE2 regex library" >&6; }
 $ac_cv_prog_MAKER || exit 1
diff --git a/configure.ac b/configure.ac
index 944a633f2..193c426dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,7 +640,11 @@ else
 fi
 AC_MSG_RESULT(configuring PCRE2 regex library)
 cd pcre2-$pcre2_version
+save_cflags="$CFLAGS"
+CFLAGS="$orig_cflags"
+export CFLAGS
 ./configure --enable-jit --enable-shared --prefix=$cur_dir/extras/pcre2 --libdir=$PRIVATELIBDIR || exit 1
+CFLAGS="$save_cflags"
 AC_MSG_RESULT(compiling PCRE2 regex library)
 $ac_cv_prog_MAKER || exit 1
 AC_MSG_RESULT(installing PCRE2 regex library)