[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 24 Dec 2024 03:38:21 -0500 (EST) |
branch: master
commit b466dc5ff9c336b92ff52116f240afee48d339de
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 23 17:13:12 2024 +0100
* tp/load_txi_modules.pl (BEGIN): load Texinfo::XSLoader in BEGIN
block and call set_XS_embedded to be sure that it is done before any
module with XS is loaded.
---
ChangeLog | 6 ++++++
tp/load_txi_modules.pl | 11 ++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 160696e31c..1dd3bcd754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-23 Patrice Dumas <pertusus@free.fr>
+
+ * tp/load_txi_modules.pl (BEGIN): load Texinfo::XSLoader in BEGIN
+ block and call set_XS_embedded to be sure that it is done before any
+ module with XS is loaded.
+
2024-12-23 Patrice Dumas <pertusus@free.fr>
* tp/texi2any.pl: use get_conf to determine if HTML_MATH and
diff --git a/tp/load_txi_modules.pl b/tp/load_txi_modules.pl
index effac14e3b..ee20c2d305 100755
--- a/tp/load_txi_modules.pl
+++ b/tp/load_txi_modules.pl
@@ -108,23 +108,22 @@ BEGIN
}
} # end BEGIN
-# This allows disabling use of XS modules when Texinfo is built.
BEGIN {
+ # important to load early to set XS embedded before loading any
+ # package loading XS modules
+ use Texinfo::XSLoader;
+ Texinfo::XSLoader::set_XS_embedded();
my $enable_xs = '@enable_xs@';
if ($enable_xs eq 'no') {
die ("Cannot have XS disabled and embedding Perl\n");
}
}
-use Texinfo::XSLoader;
-
use Locale::Messages;
use Texinfo::Common;
use Texinfo::Config;
use Texinfo::Report;
-Texinfo::XSLoader::set_XS_embedded();
-
# Paths and file names
#my $curdir = File::Spec->curdir();
#my $updir = File::Spec->updir();
@@ -297,4 +296,6 @@ use Texinfo::Document;
use Texinfo::Convert::Texinfo;
use Texinfo::Convert::Utils;
+#print STDERR "$0 has run\n";
+
1;