[no subject]

[Gavin D. Smith]

branch: master
commit 9713b6efcf7b90acb04c569d479a31cb420628b2
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Nov 20 21:28:10 2024 +0000

    Revert "* tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm (BEGIN),"
    
    This reverts commit 803fb8345a72c828d1fdae5dc71662457260bb12.
---
 ChangeLog                | 7 -------
 tp/Texinfo/DocumentXS.pm | 1 +
 tp/Texinfo/Parser.pm     | 1 +
 tp/Texinfo/XSLoader.pm   | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 453495ba65..54586061ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,13 +15,6 @@
        function (such as libtexinfo or libtexinfoxs).
        (init): Comment out code handling additional libraries argument.
 
-2024-11-20  Patrice Dumas  <pertusus@free.fr>
-
-       * tp/Texinfo/XSLoader.pm (init), tp/Texinfo/DocumentXS.pm (BEGIN),
-       tp/Texinfo/Parser.pm (BEGIN): do not try to add libraries to
-       @DynaLoader::dl_resolve_using, in general they are not used when
-       loading XS object, only the paths registered in the objects are used.
-
 2024-11-20  Gavin Smith <gavinsmith0123@gmail.com>
 
        * README-hacking: add note about reproducibility of
diff --git a/tp/Texinfo/DocumentXS.pm b/tp/Texinfo/DocumentXS.pm
index bc78653275..332a07e592 100644
--- a/tp/Texinfo/DocumentXS.pm
+++ b/tp/Texinfo/DocumentXS.pm
@@ -30,6 +30,7 @@ BEGIN {
       undef,
       "DocumentXS",
       undef,
+      ['-ltexinfoxs', '-ltexinfo'],
   );
 }
 
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index e47ffe1972..d87901951f 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -34,6 +34,7 @@ BEGIN {
       "Texinfo::ParserNonXS",
       $shared_library_name,
       "Texinfo::XS::parsetexi::Parsetexi",
+      ['-ltexinfoxs', '-ltexinfo'],
   );
 }
 
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index ce7b8d0175..5663372a06 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -169,7 +169,7 @@ sub init {
      $fallback_module,
      $module_name,
      $perl_extra_file,
-     #$additional_libraries,
+     $additional_libraries,
    ) = @_;
 
   # Possible values for TEXINFO_XS environment variable: