branch master updated: Fix XS configure check

[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 9a1ef02f22 Fix XS configure check
9a1ef02f22 is described below

commit 9a1ef02f2295d0a2ac2bb5da66f536aafd501c02
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Feb 24 17:58:02 2022 +0000

    Fix XS configure check
    
    * tp/Texinfo/XSLoader.pm: Put 'require Texinfo::ModulePath'
    inside an eval block and provide default values if the module
    wasn't loaded successfully.  This will be the case for the
    configure check using TestXS.pm.  Report from Patrice.
---
 ChangeLog              |  9 +++++++++
 tp/Texinfo/XSLoader.pm | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 22b80f7ee7..ebe4ed66a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-02-24  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix XS configure check
+
+       * tp/Texinfo/XSLoader.pm: Put 'require Texinfo::ModulePath'
+       inside an eval block and provide default values if the module
+       wasn't loaded successfully.  This will be the case for the
+       configure check using TestXS.pm.  Report from Patrice.
+
 2022-02-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (locate_include_file),
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 5bbecf4696..820851e04f 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -21,7 +21,15 @@ use warnings;
 
 use DynaLoader;
 
-require Texinfo::ModulePath;
+BEGIN {
+  eval 'require Texinfo::ModulePath';
+  if ($@ ne '') {
+    # For configure test in TestXS.pm where Texinfo/ModulePath.pm may
+    # not exist yet.
+    $Texinfo::ModulePath::texinfo_uninstalled = 1;
+    $Texinfo::ModulePath::builddir = '';
+  }
+}
 
 our $TEXINFO_XS;