summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-04-13 15:12:15 +0200
committerBruno Haible <bruno@clisp.org>2019-04-13 15:12:48 +0200
commitab5b2560b129ae8dc939d79d0be4af6b5ec46885 (patch)
tree7f415654b6182953fd6ee1aed401341b2de06919
parentced06e07937781dcebe74847cd0901bac8291d54 (diff)
downloadgnulib-ab5b2560b129ae8dc939d79d0be4af6b5ec46885.tar.gz
x-to-1: Avoid failure due to missing perl modules.
* build-aux/x-to-1.in: Test whether all the perl modules that help2man needs are installed.
-rw-r--r--ChangeLog6
-rw-r--r--build-aux/x-to-1.in15
2 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 469003a5b9..9aeb2f42c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2019-04-13 Bruno Haible <bruno@clisp.org>
+ x-to-1: Avoid failure due to missing perl modules.
+ * build-aux/x-to-1.in: Test whether all the perl modules that help2man
+ needs are installed.
+
+2019-04-13 Bruno Haible <bruno@clisp.org>
+
openmp-init: New module.
* modules/openmp-init: New file.
* modules/openmp: (Files, Depends-on, configure.ac, Makefile.am): Revert
diff --git a/build-aux/x-to-1.in b/build-aux/x-to-1.in
index 1b09d33db4..b31175f904 100644
--- a/build-aux/x-to-1.in
+++ b/build-aux/x-to-1.in
@@ -41,7 +41,20 @@ aux="$4"
output="$5"
progname=`basename $aux .x`
-case "$PERL" in *"/missing perl") perlok=no;; *) perlok=yes;; esac
+# configure determined whether perl exists.
+case "$PERL" in
+ *"/missing perl")
+ perlok=no
+ ;;
+ *)
+ # Determine whether all the perl modules that help2man needs are installed.
+ if $PERL $HELP2MAN --help >/dev/null 2>/dev/null; then
+ perlok=yes
+ else
+ perlok=no
+ fi
+ ;;
+esac
if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; then
echo "Updating man page $output"
echo "$PERL $HELP2MAN --include=$aux $executable > $output"