build: Fix build failure when perl exists but not perl's Locale::gettext module.

* gettext-runtime/man/x-to-1.in: Remove file.
* gettext-tools/man/x-to-1.in: Remove file.
* autogen.sh: Copy x-to-1.in from gnulib.

diff --git a/.gitignore b/.gitignore
index cab298641f2f221daade208e26b4caec3622d60a..83ca6de5cd4082675bdc06f8dd1ad930efacb281 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@
 /gettext-runtime/libasprintf/verify.h
 /gettext-runtime/libasprintf/xsize.c
 /gettext-runtime/libasprintf/xsize.h
+/gettext-runtime/man/x-to-1.in
 /gettext-tools/doc/relocatable.texi
 /gettext-tools/gnulib-m4/
 /gettext-tools/gnulib-lib/
@@ -273,6 +274,7 @@
 /gettext-tools/libgrep/regexec.c
 /gettext-tools/libgrep/warn-on-use.h
 /gettext-tools/libgrep/wcrtomb.c
+/gettext-tools/man/x-to-1.in
 /gettext-tools/tests/init.sh
 
 # Files brought in by "automake --add-missing --copy":

diff --git a/autogen.sh b/autogen.sh
index 7711187403b37a283f3aa88378fd051ae12905dc..2de683b71e4b506cd5c52af251a4ddb299e17837 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -338,6 +338,8 @@ if ! $skip_gnulib; then
   cp gettext-runtime/m4/intl.m4 gettext-tools/gnulib-m4/intl.m4
   # Import build tools.  We use --copy-file to avoid directory creation.
   $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $?
+  $GNULIB_TOOL --copy-file build-aux/x-to-1.in gettext-runtime/man/x-to-1.in || exit $?
+  $GNULIB_TOOL --copy-file build-aux/x-to-1.in gettext-tools/man/x-to-1.in || exit $?
   $GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $?
   $GNULIB_TOOL --copy-file build-aux/gitlog-to-changelog || exit $?
   $GNULIB_TOOL --copy-file build-aux/update-copyright || exit $?

diff --git a/gettext-runtime/man/x-to-1.in b/gettext-runtime/man/x-to-1.in
deleted file mode 100644 (file)
index 4ba4fdd..0000000
--- a/gettext-runtime/man/x-to-1.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-# This program creates a program's manual from the .x skeleton and its --help
-# output.
-
-update=
-while true; do
-  case "$1" in
-    --update) update=yes; shift;;
-    *) break;;
-  esac
-done
-
-if test $# != 5; then
-  echo "Usage: x-to-1 [OPTIONS] PERL HELP2MAN executable program.x program.1" 1>&2
-  exit 1
-fi
-PERL="$1"
-HELP2MAN="$2"
-executable="$3"
-aux="$4"
-output="$5"
-
-progname=`basename $aux .x`
-case "$PERL" in *"/missing perl") perlok=no;; *) perlok=yes;; esac
-if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; then
-  echo "Updating man page $output"
-  echo "$HELP2MAN --include=$aux $executable > $output"
-  rm -f t-$progname.1
-  $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1
-  if test -n "$update"; then
-    # In --update mode, don't overwrite the output if nothing would change.
-    if cmp t-$progname.1 $output >/dev/null 2>&1; then
-      rm -f t-$progname.1
-    else
-      mv t-$progname.1 $output
-    fi
-  else
-    mv t-$progname.1 $output
-  fi
-else
-  echo "WARNING: The man page $output cannot be updated yet."
-fi

diff --git a/gettext-tools/man/x-to-1.in b/gettext-tools/man/x-to-1.in
deleted file mode 100644 (file)
index 4ba4fdd..0000000
--- a/gettext-tools/man/x-to-1.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-# This program creates a program's manual from the .x skeleton and its --help
-# output.
-
-update=
-while true; do
-  case "$1" in
-    --update) update=yes; shift;;
-    *) break;;
-  esac
-done
-
-if test $# != 5; then
-  echo "Usage: x-to-1 [OPTIONS] PERL HELP2MAN executable program.x program.1" 1>&2
-  exit 1
-fi
-PERL="$1"
-HELP2MAN="$2"
-executable="$3"
-aux="$4"
-output="$5"
-
-progname=`basename $aux .x`
-case "$PERL" in *"/missing perl") perlok=no;; *) perlok=yes;; esac
-if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; then
-  echo "Updating man page $output"
-  echo "$HELP2MAN --include=$aux $executable > $output"
-  rm -f t-$progname.1
-  $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1
-  if test -n "$update"; then
-    # In --update mode, don't overwrite the output if nothing would change.
-    if cmp t-$progname.1 $output >/dev/null 2>&1; then
-      rm -f t-$progname.1
-    else
-      mv t-$progname.1 $output
-    fi
-  else
-    mv t-$progname.1 $output
-  fi
-else
-  echo "WARNING: The man page $output cannot be updated yet."
-fi