branch master updated: * tp/Texinfo/XS/configure.ac: do not reset CPPFLAGS to user-provided PERL_EXT_CFLAGS, as CPPFLAGS is modified by gnulib macros (specifically libunistring). Report from Bruno Haible.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 30d55e4ec6 * tp/Texinfo/XS/configure.ac: do not reset CPPFLAGS to 
user-provided PERL_EXT_CFLAGS, as CPPFLAGS is modified by gnulib macros 
(specifically libunistring).  Report from Bruno Haible.
30d55e4ec6 is described below

commit 30d55e4ec676e4dcccc395f9571e522a4ad74fc3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Sep 21 20:01:14 2023 +0100

    * tp/Texinfo/XS/configure.ac: do not reset CPPFLAGS to
    user-provided PERL_EXT_CFLAGS, as CPPFLAGS is modified by
    gnulib macros (specifically libunistring).  Report from Bruno Haible.
---
 ChangeLog                  |  6 ++++++
 tp/Texinfo/XS/configure.ac | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f130983c08..6f012c796d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-09-21  Patrice Dumas <pertusus@free.fr>
+
+       * tp/Texinfo/XS/configure.ac: do not reset CPPFLAGS to
+       user-provided PERL_EXT_CFLAGS, as CPPFLAGS is modified by
+       gnulib macros (specifically libunistring).  Report from Bruno Haible.
+
 2023-09-21  Patrice Dumas <pertusus@free.fr>
 
        * configure.ac: require Unicode::Normalize.  Report from Bruno on
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index b9f9fcf658..ec369d3e7b 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -147,9 +147,15 @@ AM_CONDITIONAL([HAVE_ICONV],
                [test "x$am_func_iconv" = "xyes"])
 
 
-# Do not include Perl configuration values when outputting these variables
+# Do not include Perl configuration values when outputting these variables,
+# as advised in the automake manual for CFLAGS and LDFLAGS, which could be
+# reset by the user.  Here PERL_EXT_CFLAGS and PERL_EXT_LDFLAGS play the
+# same role as CFLAGS and LDFLAGS.  The Perl configuration values are then
+# readded in Makefile.am.
+# For CPPFLAGS we do not follow the same rule because we want to keep the
+# flags added by gnulib macros, as for libunistring there is no separate
+# CPPFLAGS-like variable, the main CPPFLAGS is modified.
 CFLAGS=$PERL_EXT_CFLAGS
-CPPFLAGS=$PERL_EXT_CPPFLAGS
 LDFLAGS=$PERL_EXT_LDFLAGS
 
 AC_CONFIG_FILES([Makefile gnulib/lib/Makefile])