grep branch, master, updated. v3.10-13-g92585cd

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  92585cde9b5938d433738a873c8d44713d005f2c (commit)
      from  0f2c2c256fd807f5ecd744135e3734b8dfa1b7b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=92585cde9b5938d433738a873c8d44713d005f2c


commit 92585cde9b5938d433738a873c8d44713d005f2c
Author: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date:   Sat Apr 22 02:03:48 2023 -0700

    build: prevent pkg-config from overriding PCRE_* settings
    
    The use of PCRE_CFLAGS and PCRE_LIBS, as documented in the output of
    `--help`, is meant to override those settings from pkg-config.
    
    * NEWS: mention this
    * m4/pcre.m4: avoid overriding user provided settings

diff --git a/NEWS b/NEWS
index f16c576..c15764c 100644
--- a/NEWS
+++ b/NEWS
@@ -19,10 +19,13 @@ GNU grep NEWS                                    -*- 
outline -*-
 
   grep --version now prints a line describing the version of PCRE2 it uses.
   For example, it prints this when built with the very latest from git:
-    grep -P uses PCRE2 10.43-DEV 2023-01-15
+    grep -P uses PCRE2 10.43-DEV 2023-04-14
   or this with what's currently available in Fedora 37:
     grep -P uses PCRE2 10.40 2022-04-14
 
+  previous versions of grep wouldn't respect the user provided settings for
+  PCRE_CFLAGS and PCRE_LIBS when building if a libpcre2-8 pkg-config module
+  found in the system.
 
 * Noteworthy changes in release 3.10 (2023-03-22) [stable]
 
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index a8ee55e..f4c71c7 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -21,7 +21,10 @@ AC_DEFUN([gl_FUNC_PCRE],
   use_pcre=no
 
   if test $test_pcre != no; then
-    PKG_CHECK_MODULES([PCRE], [libpcre2-8], [], [: ${PCRE_LIBS=-lpcre2-8}])
+
+    if test -z "$PCRE_CFLAGS" && test -z "$PCRE_LIBS"; then
+      PKG_CHECK_MODULES([PCRE], [libpcre2-8], [], [: ${PCRE_LIBS=-lpcre2-8}])
+    fi
 
     AC_CACHE_CHECK([for pcre2_compile], [pcre_cv_have_pcre2_compile],
       [pcre_saved_CFLAGS=$CFLAGS

-----------------------------------------------------------------------

Summary of changes:
 NEWS       | 5 ++++-
 m4/pcre.m4 | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep