From: Bruno Haible Date: Sun, 21 Jul 2024 12:02:58 +0000 (+0200) Subject: bootstrap: Avoid failure when gnulib-tool removed gettext.m4. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4c0b93ab3613d7a8014938034cc24a7a27f704f6;p=gnulib.git bootstrap: Avoid failure when gnulib-tool removed gettext.m4. * top/bootstrap-funclib.sh (autogen): When gnulib-tool has removed gettext.m4 but the package needs gettext.m4, repeat the autopoint and gnulib-tool invocations. * build-aux/bootstrap: Regenerated. --- diff --git a/ChangeLog b/ChangeLog index 35c9b72f0c..8d0924ebe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-07-21 Bruno Haible + + bootstrap: Avoid failure when gnulib-tool removed gettext.m4. + * top/bootstrap-funclib.sh (autogen): When gnulib-tool has removed + gettext.m4 but the package needs gettext.m4, repeat the autopoint and + gnulib-tool invocations. + * build-aux/bootstrap: Regenerated. + 2024-07-20 Bruno Haible getpayload*: Do use glibc's implementation when it works. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index ac9433e3fd..a1842a329c 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1255,6 +1255,20 @@ autogen() $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ || die "gnulib-tool failed" + if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then + # The gnulib-tool invocation has removed $m4_base/gettext.m4, that the + # AUTOPOINT invocation had installed. This can occur when the gnulib + # module 'gettext' was previously present but is now not present any more. + # Repeat the AUTOPOINT invocation and the gnulib-tool invocation. + + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || return + + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" + fi + for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ || die "failed to symlink $file" diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index 5005d9b4a9..80592d3eff 100644 --- a/top/bootstrap-funclib.sh +++ b/top/bootstrap-funclib.sh @@ -1218,6 +1218,20 @@ autogen() $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ || die "gnulib-tool failed" + if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then + # The gnulib-tool invocation has removed $m4_base/gettext.m4, that the + # AUTOPOINT invocation had installed. This can occur when the gnulib + # module 'gettext' was previously present but is now not present any more. + # Repeat the AUTOPOINT invocation and the gnulib-tool invocation. + + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || return + + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" + fi + for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ || die "failed to symlink $file"