branch master updated: Revert "* tp/Texinfo/XS/configure.ac (perl_conf_LDFLAGS) [MS-Windows]:"

[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 7b92d2754b Revert "* tp/Texinfo/XS/configure.ac (perl_conf_LDFLAGS) 
[MS-Windows]:"
7b92d2754b is described below

commit 7b92d2754b961f2d052df3020c2d84ec2f32053c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Nov 23 18:47:54 2023 +0000

    Revert "* tp/Texinfo/XS/configure.ac (perl_conf_LDFLAGS) [MS-Windows]:"
    
    This reverts commit b8247c616b368fd6dd6bf7aec43ff68c98da1ad0.
---
 ChangeLog                  | 15 ---------------
 tp/Texinfo/XS/Makefile.am  | 13 ++++++++++++-
 tp/Texinfo/XS/configure.ac | 21 +++++++++++----------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ae66d4f9f..a5e1c9b502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,3 @@
-2023-11-23  Gavin Smith <gavinsmith0123@gmail.com>
-
-       * tp/Texinfo/XS/configure.ac (perl_conf_LDFLAGS) [MS-Windows]:
-       Append extra flags to perl_conf_LDFLAGS after -no-undefined check,
-       rather than setting a HOST_NEEDS_NO_UNDEFINED automake conditional.
-       (lookup_perl_conf): No longer AC_SUBST perl config values as these
-       values are no longer required in Makefile.am.
-
-       * tp/Texinfo/XS/Makefile.am (PLATFORM_LDFLAGS): No longer set
-       or refer to separately from perl_conf_LDFLAGS.
-
-       Confining changes to the compilation flags to configure.ac
-       potentially makes it easier to include these changes in configure
-       checks if it is ever found to be necessary.
-
 2023-11-22  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texi2any_api.texi (Element Direction Information Type),
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 75c653467f..dbec30a00c 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -52,6 +52,17 @@ XSLIBS_LDFLAGS = -avoid-version -module
 
 XSLIBS_LDFLAGS += $(perl_conf_LDFLAGS)
 
+if HOST_NEEDS_NO_UNDEFINED
+  PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
+  # The -no-undefined flag is for MS-Windows.  See info node
+  # `(gnulib)Libtool and Windows'.  The -L and -l options after it show
+  # where to find the undefined symbols.
+else
+  PLATFORM_LDFLAGS =
+endif
+
+XSLIBS_LDFLAGS += $(PLATFORM_LDFLAGS)
+
 
 ########################## Test XS used in top source dir configure.ac
 
@@ -282,7 +293,7 @@ libtexinfoxs_la_SOURCES= \
 libtexinfoxs_la_CPPFLAGS = -I$(srcdir)/main -I$(srcdir)/convert $(AM_CPPFLAGS) 
$(XSLIBS_CPPFLAGS)
 libtexinfoxs_la_CFLAGS = $(XSLIBS_CFLAGS)
 libtexinfoxs_la_LIBADD = libtexinfo.la
-libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) $(LTLIBINTL)
+libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(perl_conf_LDFLAGS) 
$(PLATFORM_LDFLAGS) $(LTLIBINTL)
 
 # FIXME libtexinfo.so.* and libtexinfoxs.so.* are sought in system
 # directories first (${libdir}) before the correct installed location, so
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index a8811146c3..8a1a3db01d 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -40,6 +40,7 @@ AC_DEFUN([lookup_perl_conf],
          [AC_MSG_CHECKING([Perl configuration value $1])
           fetch_conf $1
           AC_MSG_RESULT([$conf_value])
+          AC_SUBST([PERL_CONF_$1], [$conf_value])
 ])
 
 AC_DEFUN([lookup_perl_conf_values],
@@ -124,6 +125,9 @@ if test x$disable_xs != xyes; then
   AC_CONFIG_HEADERS([config.h:config.in])
 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])
 
@@ -149,6 +153,13 @@ GL_GNULIB_MDA_FDOPEN=0
 GL_GNULIB_MDA_MKTEMP=0
 GL_GNULIB_MDA_PUTENV=0
 
+host_needs_no_undefined=no
+case "$host" in *-mingw32 | *-mingw64 | *-msdosdjgpp | *-cygwin )
+  host_needs_no_undefined=yes ;;
+esac     
+AM_CONDITIONAL([HOST_NEEDS_NO_UNDEFINED],
+               [test "x$host_needs_no_undefined" = "xyes"])
+
 AM_CONDITIONAL([HAVE_ICONV],
                [test "x$am_func_iconv" = "xyes"])
 
@@ -164,15 +175,5 @@ AM_CONDITIONAL([HAVE_ICONV],
 CFLAGS=$PERL_EXT_CFLAGS
 LDFLAGS=$PERL_EXT_LDFLAGS
 
-# Use the -no-undefined flag on MS-Windows.  See info node
-# `(gnulib)Libtool and Windows'.  The -L and -l options after it show
-# where to find the undefined symbols.
-case "$host" in *-mingw32 | *-mingw64 | *-msdosdjgpp | *-cygwin )
-  perl_conf_LDFLAGS += -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
-esac
-
-AC_SUBST([perl_conf_CFLAGS], [$perl_conf_CFLAGS])
-AC_SUBST([perl_conf_LDFLAGS], [$perl_conf_LDFLAGS])
-
 AC_CONFIG_FILES([Makefile gnulib/lib/Makefile])
 AC_OUTPUT