diff options
author | Daiki Ueno <ueno@gnu.org> | 2021-02-07 18:54:45 +0100 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2021-02-13 15:59:38 +0100 |
commit | 9e6751dabae5b9770e5c7cd92e3075ffc6cf24e1 (patch) | |
tree | 34fb2f974d8d0d481616a3ebea5853062dbb5e05 | |
parent | bedcdd218c6ec3fe4e42766f09cf5301befa34a0 (diff) | |
download | gnutls-9e6751dabae5b9770e5c7cd92e3075ffc6cf24e1.tar.gz |
bootstrap: update from Gnulib
Signed-off-by: Daiki Ueno <ueno@gnu.org>
-rwxr-xr-x | bootstrap | 32 |
1 files changed, 23 insertions, 9 deletions
@@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2019-01-04.17; # UTC +scriptversion=2020-11-18.17; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 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 @@ -71,7 +71,9 @@ Options: --no-git do not use git to update gnulib. Requires that --gnulib-srcdir point to a correct gnulib snapshot --skip-po do not download po files - +EOF + bootstrap_print_option_usage_hook + cat <<EOF If the file $me.conf exists in the same directory as this script, its contents are read as shell variables to configure the bootstrap. @@ -154,6 +156,18 @@ gnulib_files= : ${AUTOPOINT=autopoint} : ${AUTORECONF=autoreconf} +# A function to be called for each unrecognized option. Returns 0 if +# the option in $1 has been processed by the function. Returns 1 if +# the option has not been processed by the function. Override it via +# your own definition in bootstrap.conf + +bootstrap_option_hook() { return 1; } + +# A function to be called in order to print the --help information +# corresponding to user-defined command-line options. + +bootstrap_print_option_usage_hook() { :; } + # A function to be called right after gnulib-tool is run. # Override it via your own definition in bootstrap.conf. bootstrap_post_import_hook() { :; } @@ -166,7 +180,7 @@ bootstrap_epilogue() { :; } # specified directory. Fill in the first %s with the destination # directory and the second with the domain name. po_download_command_format=\ -"wget --mirror --level=1 -nd -q -A.po -P '%s' \ +"wget --mirror --level=1 -nd -nv -A.po -P '%s' \ https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else @@ -335,7 +349,7 @@ do --no-git) use_git=false;; *) - die "$option: unknown option";; + bootstrap_option_hook $option || die "$option: unknown option";; esac done @@ -968,10 +982,10 @@ bootstrap_post_import_hook \ # uninitialized submodules. # # Uninitialized submodules are listed with an initial dash. -#if $use_git && git submodule | grep '^-' >/dev/null; then -# die "some git submodules are not initialized. " \ -# "Run 'git submodule init' and bootstrap again." -#fi +if $use_git && git submodule | grep '^-' >/dev/null; then + die "some git submodules are not initialized. " \ + "Run 'git submodule update --init' and bootstrap again." +fi # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. |