branch master updated: * tp/Texinfo/XS/Makefile.am, * tp/Texinfo/XS/configure.ac (PERL_INC, XSUBPPARGS): Define in configure.ac and propagate to Makefile.am, so it is more clear what "archlibexp" and "privlibexp" from the Perl conf are being used for.

[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 0e16cbc6eb * tp/Texinfo/XS/Makefile.am, * tp/Texinfo/XS/configure.ac 
(PERL_INC, XSUBPPARGS): Define in configure.ac and propagate to Makefile.am, so 
it is more clear what "archlibexp" and "privlibexp" from the Perl conf are 
being used for.
0e16cbc6eb is described below

commit 0e16cbc6ebf71932eb8406426ae9598c08a55a30
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Nov 22 19:34:44 2023 +0000

    * tp/Texinfo/XS/Makefile.am,
    * tp/Texinfo/XS/configure.ac (PERL_INC, XSUBPPARGS): Define in
    configure.ac and propagate to Makefile.am, so it is more clear what
    "archlibexp" and "privlibexp" from the Perl conf are being used for.
---
 ChangeLog                  | 7 +++++++
 tp/Texinfo/XS/Makefile.am  | 4 ----
 tp/Texinfo/XS/configure.ac | 7 +++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9267e4088..5daebfba94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-11-22  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/Makefile.am,
+       * tp/Texinfo/XS/configure.ac (PERL_INC, XSUBPPARGS): Define in
+       configure.ac and propagate to Makefile.am, so it is more clear what
+       "archlibexp" and "privlibexp" from the Perl conf are being used for.
+
 2023-11-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 577b9c997f..dbec30a00c 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -37,10 +37,6 @@ AM_CPPFLAGS += -DDATADIR=\"$(datadir)\"
 
 xsdir = $(pkglibdir)
 
-PERL_INC = $(PERL_CONF_archlibexp)/CORE
-
-XSUBPPARGS = -typemap $(PERL_CONF_privlibexp)/ExtUtils/typemap
-
 .xs.c:
        $(XSUBPP) $(XSUBPPARGS) $< > $*.xsc && mv $*.xsc $(srcdir)/$*.c
 
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index a29da0ead4..8a1a3db01d 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -70,6 +70,8 @@ AC_ARG_VAR([PERL_EXT_CC], [Compiler for a Perl extension])
 
 perl_conf_CFLAGS=
 perl_conf_LDFLAGS=
+XSUBPPARGS=
+PERL_INC=
 
 # See (automake)Conditional Subdirectories.  Even if --disable-perl-xs
 # is given, we still need to configure this directory minimally, so that
@@ -117,6 +119,8 @@ if test x$disable_xs != xyes; then
                    -e 's/^cygperl.*/-lperl/' `
   
   lookup_perl_conf_values([[archlibexp], [privlibexp]])
+  PERL_INC=${PERL_CONF_archlibexp}/CORE
+  XSUBPPARGS="-typemap ${PERL_CONF_privlibexp}/ExtUtils/typemap"
   
   AC_CONFIG_HEADERS([config.h:config.in])
 fi # not disable_xs
@@ -124,6 +128,9 @@ fi # not disable_xs
 AC_SUBST([perl_conf_CFLAGS], [$perl_conf_CFLAGS])
 AC_SUBST([perl_conf_LDFLAGS], [$perl_conf_LDFLAGS])
 
+AC_SUBST([PERL_INC], [$PERL_INC])
+AC_SUBST([XSUBPPARGS], [$XSUBPPARGS])
+
 
 AC_PROG_CC