branch master updated: * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, xs_LTLIBRARIES): Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES instead.

[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 93aa4b01d3 * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, 
xs_LTLIBRARIES): Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES 
instead.
93aa4b01d3 is described below

commit 93aa4b01d3156d180dd42bdb0ec2e4e0723d3864
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 7 18:34:20 2023 +0000

    * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, xs_LTLIBRARIES):
    Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES instead.
---
 ChangeLog                 |  5 +++++
 tp/Texinfo/XS/Makefile.am | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2aca4eba6..7ea392696f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-11-07  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/Makefile.am (lib_LTLIBRARIES, xs_LTLIBRARIES):
+       Place libtexinfo.la and libtexinfoxs.la in xs_LTLIBRARIES instead.
+
 2023-11-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index f66675f324..6bbe1d9f19 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -104,10 +104,8 @@ EXTRA_DIST += XSParagraph.xs MiscXS.xs
 
 ########################## shared common library and parser library
 
-# FIXME this is an internal library.  Do not put it in lib?
-# it still needs to be found by the linker.
 if HAVE_ICONV
-lib_LTLIBRARIES = libtexinfo.la
+xs_LTLIBRARIES += libtexinfo.la
 endif
 
 # The files in the main directory correspond to code used both
@@ -276,10 +274,8 @@ $(srcdir)/main/options_init_free.c 
$(srcdir)/main/options_types.h $(srcdir)/main
 # and flags; it depends on perl and not on gnulib.  Both libraries
 # are used by following XS.
 
-# FIXME this is an internal library.  Do not put it in lib?
-# it still needs to be found by the linker.
 if HAVE_ICONV
-lib_LTLIBRARIES += libtexinfoxs.la
+xs_LTLIBRARIES += libtexinfoxs.la
 endif
 
 libtexinfoxs_la_SOURCES= \
@@ -298,6 +294,10 @@ libtexinfoxs_la_CFLAGS = $(XSLIBS_CFLAGS)
 libtexinfoxs_la_LIBADD = libtexinfo.la
 libtexinfoxs_la_LDFLAGS = -version-info 0:0:0 $(AM_LDFLAGS) 
$(PERL_CONF_ccdlflags) $(PLATFORM_LDFLAGS) $(LTLIBINTL)
 
+# FIXME libtexinfo.so.* and libtexinfoxs.so.* are sought in system
+# directories first (${libdir}) before the correct installed location, so
+# there is potential for the wrong library file to be dynamically loaded.
+
 
 ########################## Parsetexi XS parser