1998-11-02 16:34:05 +08:00
|
|
|
|
#! /bin/sh
|
2014-01-03 09:59:24 +08:00
|
|
|
|
## DO NOT EDIT - This file generated from build-aux/bootstrap.in
|
2019-02-19 23:19:59 +08:00
|
|
|
|
## by inline-source v2019-02-19.15
|
2011-11-03 16:23:45 +08:00
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# Bootstrap an Autotooled package from checked-out sources.
|
|
|
|
|
# Written by Gary V. Vaughan, 2010
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Inspired by a script written by Paul Eggert.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# This is free software. There is NO warranty; not even for
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
#
|
2024-07-24 22:50:15 +08:00
|
|
|
|
# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
#
|
|
|
|
|
# This file is dual licensed under the terms of the MIT license
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
|
|
|
|
|
# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# these licenses when using or redistributing this software or any of
|
|
|
|
|
# the files within it. See the URLs above, or the file `LICENSE`
|
|
|
|
|
# included in the Bootstrap distribution for the full license texts.
|
2014-01-03 09:59:24 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# You should place a copy of this script under version control in the
|
|
|
|
|
# top-level directory of your project. The intent is that all
|
|
|
|
|
# customization can be done with a `bootstrap.conf` file also maintained
|
|
|
|
|
# in your version control.
|
2014-01-03 09:59:24 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Please report bugs or propose patches to:
|
|
|
|
|
# <https://github.com/gnulib-modules/bootstrap/issues>
|
2014-01-03 09:59:24 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------ ##
|
|
|
|
|
## Usage. ##
|
|
|
|
|
## ------ ##
|
|
|
|
|
|
|
|
|
|
# Most GNUish projects do not keep all of the generated Autotool
|
|
|
|
|
# files under version control, but running all of the right tools
|
|
|
|
|
# with the right arguments, in the correct order to regenerate
|
|
|
|
|
# all of those files in readiness for configuration and building
|
|
|
|
|
# can be surprisingly involved! Many projects have a 'bootstrap'
|
|
|
|
|
# script under version control to invoke Autotools and perform
|
|
|
|
|
# other assorted book-keeping with version numbers and the like.
|
|
|
|
|
#
|
|
|
|
|
# This bootstrap script aims to probe the configure.ac and top
|
|
|
|
|
# Makefile.am of your project to automatically determine what
|
|
|
|
|
# the correct ordering and arguments are and then run the tools for
|
|
|
|
|
# you. In order to use it, you can generate an initial standalone
|
|
|
|
|
# script with:
|
|
|
|
|
#
|
|
|
|
|
# gl/build-aux/inline-source gl/build-aux/bootstrap.in > bootstrap
|
|
|
|
|
#
|
|
|
|
|
# You should then store than script in version control for other
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# developers in your project. It will give you instructions about
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# how to keep it up to date if the sources change.
|
|
|
|
|
#
|
|
|
|
|
# See gl/doc/bootstrap.texi for documentation on how to write
|
|
|
|
|
# a bootstrap.conf to customize it for your project's
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# idiosyncracies.
|
2014-01-03 09:59:24 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ================================================================== ##
|
|
|
|
|
## ##
|
|
|
|
|
## DO NOT EDIT THIS FILE, CUSTOMIZE IT USING A BOOTSTRAP.CONF ##
|
|
|
|
|
## ##
|
|
|
|
|
## ================================================================== ##
|
|
|
|
|
|
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
## User overridable command paths. ##
|
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
|
|
|
|
|
# All uppercase denotes values stored in the environment. These
|
|
|
|
|
# variables should generally be overridden by the user - however, we do
|
|
|
|
|
# set them to 'true' in some parts of this script to prevent them being
|
|
|
|
|
# called at the wrong time by other tools that we call ('autoreconf',
|
|
|
|
|
# for example).
|
|
|
|
|
#
|
|
|
|
|
# We also allow 'LIBTOOLIZE', 'M4', 'SHA1SUM' and some others to be
|
|
|
|
|
# overridden, and export the result for child processes, but they are
|
|
|
|
|
# handled by the function 'func_find_tool' and not defaulted in this
|
|
|
|
|
# section.
|
|
|
|
|
|
|
|
|
|
: ${ACLOCAL="aclocal"}
|
|
|
|
|
: ${AUTOCONF="autoconf"}
|
|
|
|
|
: ${AUTOHEADER="autoheader"}
|
|
|
|
|
: ${AUTOM4TE="autom4te"}
|
|
|
|
|
: ${AUTOHEADER="autoheader"}
|
|
|
|
|
: ${AUTOMAKE="automake"}
|
|
|
|
|
: ${AUTOPOINT="autopoint"}
|
|
|
|
|
: ${AUTORECONF="autoreconf"}
|
|
|
|
|
: ${CMP="cmp"}
|
|
|
|
|
: ${CONFIG_SHELL="/bin/sh"}
|
|
|
|
|
: ${DIFF="diff"}
|
|
|
|
|
: ${GIT="git"}
|
|
|
|
|
: ${LN_S="ln -s"}
|
|
|
|
|
: ${RM="rm"}
|
|
|
|
|
|
|
|
|
|
export ACLOCAL
|
|
|
|
|
export AUTOCONF
|
|
|
|
|
export AUTOHEADER
|
|
|
|
|
export AUTOM4TE
|
|
|
|
|
export AUTOHEADER
|
|
|
|
|
export AUTOMAKE
|
|
|
|
|
export AUTOPOINT
|
|
|
|
|
export AUTORECONF
|
|
|
|
|
export CONFIG_SHELL
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------- ##
|
|
|
|
|
## Configuration. ##
|
|
|
|
|
## -------------- ##
|
|
|
|
|
|
|
|
|
|
# A newline delimited list of triples of programs (that respond to
|
|
|
|
|
# --version), the minimum version numbers required (or just '-' in the
|
|
|
|
|
# version field if any version will be sufficient) and homepage URLs
|
|
|
|
|
# to help locate missing packages.
|
|
|
|
|
buildreq=
|
|
|
|
|
|
|
|
|
|
# Name of a file containing instructions on installing missing packages
|
|
|
|
|
# required in 'buildreq'.
|
|
|
|
|
buildreq_readme=README-hacking
|
|
|
|
|
|
|
|
|
|
# These are extracted from AC_INIT in configure.ac, though you can
|
|
|
|
|
# override those values in 'bootstrap.conf' if you prefer.
|
|
|
|
|
build_aux=
|
|
|
|
|
macro_dir=
|
|
|
|
|
package=
|
|
|
|
|
package_name=
|
|
|
|
|
package_version=
|
|
|
|
|
package_bugreport=
|
|
|
|
|
|
|
|
|
|
# These are extracted from 'gnulib-cache.m4', or else fall-back
|
|
|
|
|
# automatically on the gnulib defaults; unless you set the values
|
|
|
|
|
# manually in 'bootstrap.conf'.
|
|
|
|
|
doc_base=
|
|
|
|
|
gnulib_mk=
|
|
|
|
|
gnulib_name=
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
local_gl_path=
|
2014-01-03 09:59:24 +08:00
|
|
|
|
source_base=
|
|
|
|
|
tests_base=
|
|
|
|
|
|
|
|
|
|
# The list of gnulib modules required at 'gnulib-tool' time. If you
|
|
|
|
|
# check 'gnulib-cache.m4' into your repository, then this list will be
|
|
|
|
|
# extracted automatically.
|
|
|
|
|
gnulib_modules=
|
|
|
|
|
|
|
|
|
|
# Extra gnulib files that are not in modules, which override files of
|
|
|
|
|
# the same name installed by other bootstrap tools.
|
|
|
|
|
gnulib_non_module_files="
|
|
|
|
|
build-aux/compile
|
|
|
|
|
build-aux/install-sh
|
|
|
|
|
build-aux/mdate-sh
|
|
|
|
|
build-aux/texinfo.tex
|
|
|
|
|
build-aux/depcomp
|
|
|
|
|
build-aux/config.guess
|
|
|
|
|
build-aux/config.sub
|
|
|
|
|
doc/INSTALL
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
# Relative path to the local gnulib submodule, and url to the upstream
|
|
|
|
|
# git repository. If you have a gnulib entry in your .gitmodules file,
|
|
|
|
|
# these values are ignored.
|
|
|
|
|
gnulib_path=
|
|
|
|
|
gnulib_url=
|
|
|
|
|
|
2019-03-22 20:05:53 +08:00
|
|
|
|
# Date from which to clone github, to avoid a full clone.
|
|
|
|
|
gnulib_clone_since=
|
|
|
|
|
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# Additional gnulib-tool options to use.
|
|
|
|
|
gnulib_tool_options="
|
|
|
|
|
--no-changelog
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
# bootstrap removes any macro-files that are not included by aclocal.m4,
|
|
|
|
|
# except for files listed in this variable that are always kept.
|
|
|
|
|
gnulib_precious="
|
|
|
|
|
gnulib-tool.m4
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
# When truncating long commands for display, always allow at least this
|
|
|
|
|
# many characters before truncating.
|
|
|
|
|
min_cmd_len=160
|
|
|
|
|
|
|
|
|
|
# The command to download all .po files for a specified domain into
|
|
|
|
|
# a specified directory. Fill in the first %s is the domain name, and
|
|
|
|
|
# the second with the destination directory. Use rsync's -L and -r
|
|
|
|
|
# options because the latest/%s directory and the .po files within are
|
|
|
|
|
# all symlinks.
|
|
|
|
|
po_download_command_format=\
|
|
|
|
|
"rsync --delete --exclude '*.s1' -Lrtvz \
|
|
|
|
|
'translationproject.org::tp/latest/%s/' '%s'"
|
|
|
|
|
|
|
|
|
|
# Other locale categories that need message catalogs.
|
|
|
|
|
extra_locale_categories=
|
|
|
|
|
|
|
|
|
|
# Additional xgettext options to use. Gnulib might provide you with an
|
|
|
|
|
# extensive list of additional options to append to this, but gettext
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# 0.16.1 and newer appends them automaticaly, so you can safely ignore
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# the complaints from 'gnulib-tool' if your $configure_ac states:
|
|
|
|
|
#
|
|
|
|
|
# AM_GNU_GETTEXT_VERSION([0.16.1])
|
|
|
|
|
xgettext_options="
|
|
|
|
|
--flag=_:1:pass-c-format
|
|
|
|
|
--flag=N_:1:pass-c-format
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
# Package copyright holder for gettext files. Defaults to FSF if unset.
|
|
|
|
|
copyright_holder=
|
|
|
|
|
|
|
|
|
|
# File that should exist in the top directory of a checked out hierarchy,
|
|
|
|
|
# but not in a distribution tarball.
|
|
|
|
|
checkout_only_file=
|
|
|
|
|
|
|
|
|
|
# Whether to use copies instead of symlinks by default (if set to true,
|
|
|
|
|
# the --copy option has no effect).
|
|
|
|
|
copy=false
|
|
|
|
|
|
|
|
|
|
# Set this to ".cvsignore .gitignore" in 'bootstrap.conf' if you want
|
|
|
|
|
# those files to be generated in directories like 'lib/', 'm4/', and 'po/',
|
|
|
|
|
# or set it to "auto" to make this script select what to use based
|
|
|
|
|
# on what version control system (if any) is used in the source directory.
|
|
|
|
|
# Or set it to "none" to ignore VCS ignore files entirely. Default is
|
|
|
|
|
# "auto".
|
|
|
|
|
vc_ignore=
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------------------- ##
|
|
|
|
|
## External Libraries. ##
|
|
|
|
|
## ------------------- ##
|
|
|
|
|
|
2012-10-07 18:51:17 +08:00
|
|
|
|
# Source required external libraries:
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# Set a version string for this script.
|
2019-02-19 23:19:59 +08:00
|
|
|
|
scriptversion=2019-02-19.15; # UTC
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# General shell script boiler plate, and helper functions.
|
|
|
|
|
# Written by Gary V. Vaughan, 2004
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# This is free software. There is NO warranty; not even for
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
#
|
2024-07-24 22:50:15 +08:00
|
|
|
|
# Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
#
|
|
|
|
|
# This file is dual licensed under the terms of the MIT license
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
|
|
|
|
|
# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# these licenses when using or redistributing this software or any of
|
|
|
|
|
# the files within it. See the URLs above, or the file `LICENSE`
|
|
|
|
|
# included in the Bootstrap distribution for the full license texts.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Please report bugs or propose patches to:
|
|
|
|
|
# <https://github.com/gnulib-modules/bootstrap/issues>
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------ ##
|
|
|
|
|
## Usage. ##
|
|
|
|
|
## ------ ##
|
|
|
|
|
|
|
|
|
|
# Evaluate this file near the top of your script to gain access to
|
|
|
|
|
# the functions and variables defined here:
|
|
|
|
|
#
|
|
|
|
|
# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
|
|
|
|
|
#
|
|
|
|
|
# If you need to override any of the default environment variable
|
|
|
|
|
# settings, do that before evaluating this file.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
## Shell normalisation. ##
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
|
|
|
|
|
# Some shells need a little help to be as Bourne compatible as possible.
|
|
|
|
|
# Before doing anything else, make sure all that help has been provided!
|
|
|
|
|
|
|
|
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
|
|
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
|
|
|
|
emulate sh
|
|
|
|
|
NULLCMD=:
|
|
|
|
|
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
|
|
|
|
# is contrary to our usage. Disable this feature.
|
|
|
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
|
|
|
setopt NO_GLOB_SUBST
|
|
|
|
|
else
|
|
|
|
|
case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# NLS nuisances: We save the old values in case they are required later.
|
|
|
|
|
_G_user_locale=
|
|
|
|
|
_G_safe_locale=
|
|
|
|
|
for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
|
|
|
|
do
|
|
|
|
|
eval "if test set = \"\${$_G_var+set}\"; then
|
|
|
|
|
save_$_G_var=\$$_G_var
|
|
|
|
|
$_G_var=C
|
|
|
|
|
export $_G_var
|
|
|
|
|
_G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
|
|
|
|
|
_G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
|
|
|
|
|
fi"
|
|
|
|
|
done
|
2021-11-16 20:25:08 +08:00
|
|
|
|
# These NLS vars are set unconditionally (bootstrap issue #24). Unset those
|
|
|
|
|
# in case the environment reset is needed later and the $save_* variant is not
|
|
|
|
|
# defined (see the code above).
|
|
|
|
|
LC_ALL=C
|
|
|
|
|
LANGUAGE=C
|
|
|
|
|
export LANGUAGE LC_ALL
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Make sure IFS has a sensible default
|
|
|
|
|
sp=' '
|
|
|
|
|
nl='
|
|
|
|
|
'
|
2013-08-23 21:36:32 +08:00
|
|
|
|
IFS="$sp $nl"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# There are apparently some systems that use ';' as a PATH separator!
|
2013-10-28 11:06:40 +08:00
|
|
|
|
if test "${PATH_SEPARATOR+set}" != set; then
|
|
|
|
|
PATH_SEPARATOR=:
|
|
|
|
|
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
|
|
|
|
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
|
|
|
|
PATH_SEPARATOR=';'
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# func_unset VAR
|
|
|
|
|
# --------------
|
|
|
|
|
# Portably unset VAR.
|
|
|
|
|
# In some shells, an 'unset VAR' statement leaves a non-zero return
|
|
|
|
|
# status if VAR is already unset, which might be problematic if the
|
|
|
|
|
# statement is used at the end of a function (thus poisoning its return
|
|
|
|
|
# value) or when 'set -e' is active (causing even a spurious abort of
|
|
|
|
|
# the script in this case).
|
|
|
|
|
func_unset ()
|
|
|
|
|
{
|
|
|
|
|
{ eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
|
|
|
|
|
func_unset CDPATH
|
|
|
|
|
|
|
|
|
|
# Make sure ${,E,F}GREP behave sanely.
|
|
|
|
|
func_unset GREP_OPTIONS
|
|
|
|
|
|
2013-10-28 11:06:40 +08:00
|
|
|
|
|
|
|
|
|
## ------------------------- ##
|
|
|
|
|
## Locate command utilities. ##
|
|
|
|
|
## ------------------------- ##
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_executable_p FILE
|
|
|
|
|
# ----------------------
|
|
|
|
|
# Check that FILE is an executable regular file.
|
|
|
|
|
func_executable_p ()
|
|
|
|
|
{
|
|
|
|
|
test -f "$1" && test -x "$1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-10-28 13:50:36 +08:00
|
|
|
|
# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
|
|
|
|
|
# --------------------------------------------
|
|
|
|
|
# Search for either a program that responds to --version with output
|
|
|
|
|
# containing "GNU", or else returned by CHECK_FUNC otherwise, by
|
|
|
|
|
# trying all the directories in PATH with each of the elements of
|
|
|
|
|
# PROGS_LIST.
|
|
|
|
|
#
|
|
|
|
|
# CHECK_FUNC should accept the path to a candidate program, and
|
|
|
|
|
# set $func_check_prog_result if it truncates its output less than
|
|
|
|
|
# $_G_path_prog_max characters.
|
|
|
|
|
func_path_progs ()
|
|
|
|
|
{
|
|
|
|
|
_G_progs_list=$1
|
|
|
|
|
_G_check_func=$2
|
|
|
|
|
_G_PATH=${3-"$PATH"}
|
|
|
|
|
|
|
|
|
|
_G_path_prog_max=0
|
|
|
|
|
_G_path_prog_found=false
|
2015-01-21 01:21:37 +08:00
|
|
|
|
_G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
|
2013-10-28 13:50:36 +08:00
|
|
|
|
for _G_dir in $_G_PATH; do
|
|
|
|
|
IFS=$_G_save_IFS
|
|
|
|
|
test -z "$_G_dir" && _G_dir=.
|
|
|
|
|
for _G_prog_name in $_G_progs_list; do
|
|
|
|
|
for _exeext in '' .EXE; do
|
|
|
|
|
_G_path_prog=$_G_dir/$_G_prog_name$_exeext
|
|
|
|
|
func_executable_p "$_G_path_prog" || continue
|
|
|
|
|
case `"$_G_path_prog" --version 2>&1` in
|
|
|
|
|
*GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
|
|
|
|
|
*) $_G_check_func $_G_path_prog
|
|
|
|
|
func_path_progs_result=$func_check_prog_result
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
$_G_path_prog_found && break 3
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_save_IFS
|
|
|
|
|
test -z "$func_path_progs_result" && {
|
|
|
|
|
echo "no acceptable sed could be found in \$PATH" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-10-30 13:25:44 +08:00
|
|
|
|
# We want to be able to use the functions in this file before configure
|
|
|
|
|
# has figured out where the best binaries are kept, which means we have
|
|
|
|
|
# to search for them ourselves - except when the results are already set
|
|
|
|
|
# where we skip the searches.
|
|
|
|
|
|
2013-10-28 11:06:40 +08:00
|
|
|
|
# Unless the user overrides by setting SED, search the path for either GNU
|
|
|
|
|
# sed, or the sed that truncates its output the least.
|
|
|
|
|
test -z "$SED" && {
|
|
|
|
|
_G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
|
|
|
for _G_i in 1 2 3 4 5 6 7; do
|
2013-10-28 13:50:36 +08:00
|
|
|
|
_G_sed_script=$_G_sed_script$nl$_G_sed_script
|
2013-10-28 11:06:40 +08:00
|
|
|
|
done
|
|
|
|
|
echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
|
|
|
|
|
_G_sed_script=
|
|
|
|
|
|
2013-10-28 13:50:36 +08:00
|
|
|
|
func_check_prog_sed ()
|
|
|
|
|
{
|
|
|
|
|
_G_path_prog=$1
|
|
|
|
|
|
|
|
|
|
_G_count=0
|
2014-01-03 08:33:38 +08:00
|
|
|
|
printf 0123456789 >conftest.in
|
2013-10-28 13:50:36 +08:00
|
|
|
|
while :
|
|
|
|
|
do
|
|
|
|
|
cat conftest.in conftest.in >conftest.tmp
|
|
|
|
|
mv conftest.tmp conftest.in
|
|
|
|
|
cp conftest.in conftest.nl
|
2014-01-03 08:33:38 +08:00
|
|
|
|
echo '' >> conftest.nl
|
2013-10-28 13:50:36 +08:00
|
|
|
|
"$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
|
|
|
|
|
diff conftest.out conftest.nl >/dev/null 2>&1 || break
|
|
|
|
|
_G_count=`expr $_G_count + 1`
|
|
|
|
|
if test "$_G_count" -gt "$_G_path_prog_max"; then
|
|
|
|
|
# Best one so far, save it but keep looking for a better one
|
|
|
|
|
func_check_prog_result=$_G_path_prog
|
|
|
|
|
_G_path_prog_max=$_G_count
|
|
|
|
|
fi
|
|
|
|
|
# 10*(2^10) chars as input seems more than enough
|
|
|
|
|
test 10 -lt "$_G_count" && break
|
2013-10-28 11:06:40 +08:00
|
|
|
|
done
|
2013-10-28 13:50:36 +08:00
|
|
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out
|
2013-10-28 11:06:40 +08:00
|
|
|
|
}
|
2013-10-28 13:50:36 +08:00
|
|
|
|
|
2017-04-21 21:18:48 +08:00
|
|
|
|
func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
|
2014-01-05 12:13:47 +08:00
|
|
|
|
rm -f conftest.sed
|
2013-10-28 13:50:36 +08:00
|
|
|
|
SED=$func_path_progs_result
|
2013-10-28 11:06:40 +08:00
|
|
|
|
}
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
2013-10-28 12:38:23 +08:00
|
|
|
|
# Unless the user overrides by setting GREP, search the path for either GNU
|
2013-10-30 13:25:44 +08:00
|
|
|
|
# grep, or the grep that truncates its output the least.
|
2013-10-28 12:38:23 +08:00
|
|
|
|
test -z "$GREP" && {
|
2013-10-28 13:50:36 +08:00
|
|
|
|
func_check_prog_grep ()
|
|
|
|
|
{
|
|
|
|
|
_G_path_prog=$1
|
|
|
|
|
|
|
|
|
|
_G_count=0
|
|
|
|
|
_G_path_prog_max=0
|
2014-01-03 08:33:38 +08:00
|
|
|
|
printf 0123456789 >conftest.in
|
2013-10-28 13:50:36 +08:00
|
|
|
|
while :
|
|
|
|
|
do
|
|
|
|
|
cat conftest.in conftest.in >conftest.tmp
|
|
|
|
|
mv conftest.tmp conftest.in
|
|
|
|
|
cp conftest.in conftest.nl
|
2014-01-03 08:33:38 +08:00
|
|
|
|
echo 'GREP' >> conftest.nl
|
2013-10-28 13:50:36 +08:00
|
|
|
|
"$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
|
|
|
|
|
diff conftest.out conftest.nl >/dev/null 2>&1 || break
|
|
|
|
|
_G_count=`expr $_G_count + 1`
|
|
|
|
|
if test "$_G_count" -gt "$_G_path_prog_max"; then
|
|
|
|
|
# Best one so far, save it but keep looking for a better one
|
|
|
|
|
func_check_prog_result=$_G_path_prog
|
|
|
|
|
_G_path_prog_max=$_G_count
|
|
|
|
|
fi
|
|
|
|
|
# 10*(2^10) chars as input seems more than enough
|
|
|
|
|
test 10 -lt "$_G_count" && break
|
2013-10-28 12:38:23 +08:00
|
|
|
|
done
|
2013-10-28 13:50:36 +08:00
|
|
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out
|
2013-10-28 12:38:23 +08:00
|
|
|
|
}
|
2013-10-28 13:50:36 +08:00
|
|
|
|
|
2017-04-21 21:18:48 +08:00
|
|
|
|
func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
|
2013-10-28 13:50:36 +08:00
|
|
|
|
GREP=$func_path_progs_result
|
2013-10-28 12:38:23 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
## User overridable command paths. ##
|
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
|
|
|
|
|
# All uppercase variable names are used for environment variables. These
|
|
|
|
|
# variables can be overridden by the user before calling a script that
|
|
|
|
|
# uses them if a suitable command of that name is not already available
|
|
|
|
|
# in the command search PATH.
|
|
|
|
|
|
|
|
|
|
: ${CP="cp -f"}
|
2014-01-03 08:33:38 +08:00
|
|
|
|
: ${ECHO="printf %s\n"}
|
2013-10-28 12:38:23 +08:00
|
|
|
|
: ${EGREP="$GREP -E"}
|
|
|
|
|
: ${FGREP="$GREP -F"}
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
: ${LN_S="ln -s"}
|
|
|
|
|
: ${MAKE="make"}
|
|
|
|
|
: ${MKDIR="mkdir"}
|
|
|
|
|
: ${MV="mv -f"}
|
|
|
|
|
: ${RM="rm -f"}
|
|
|
|
|
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
## Useful sed snippets. ##
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
|
|
|
|
|
sed_dirname='s|/[^/]*$||'
|
|
|
|
|
sed_basename='s|^.*/||'
|
|
|
|
|
|
|
|
|
|
# Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
|
|
# metacharacters that are still active within double-quoted strings.
|
|
|
|
|
sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
|
|
|
|
|
|
|
|
|
|
# Same as above, but do not quote variable references.
|
|
|
|
|
sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
|
|
|
|
|
|
|
|
|
|
# Sed substitution that turns a string into a regex matching for the
|
|
|
|
|
# string literally.
|
|
|
|
|
sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
|
|
|
|
|
|
|
|
|
|
# Sed substitution that converts a w32 file name or path
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# that contains forward slashes, into one that contains
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# (escaped) backslashes. A very naive implementation.
|
|
|
|
|
sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Re-'\' parameter expansions in output of sed_double_quote_subst that
|
|
|
|
|
# were '\'-ed in input to the same. If an odd number of '\' preceded a
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# '$' in input to sed_double_quote_subst, that '$' was protected from
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# expansion. Since each input '\' is now two '\'s, look for any number
|
|
|
|
|
# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_bs='\\'
|
|
|
|
|
_G_bs2='\\\\'
|
|
|
|
|
_G_bs4='\\\\\\\\'
|
|
|
|
|
_G_dollar='\$'
|
|
|
|
|
sed_double_backslash="\
|
|
|
|
|
s/$_G_bs4/&\\
|
|
|
|
|
/g
|
|
|
|
|
s/^$_G_bs2$_G_dollar/$_G_bs&/
|
|
|
|
|
s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
|
|
|
|
|
s/\n//g"
|
|
|
|
|
|
2021-11-16 20:25:08 +08:00
|
|
|
|
# require_check_ifs_backslash
|
|
|
|
|
# ---------------------------
|
|
|
|
|
# Check if we can use backslash as IFS='\' separator, and set
|
|
|
|
|
# $check_ifs_backshlash_broken to ':' or 'false'.
|
|
|
|
|
require_check_ifs_backslash=func_require_check_ifs_backslash
|
|
|
|
|
func_require_check_ifs_backslash ()
|
|
|
|
|
{
|
|
|
|
|
_G_save_IFS=$IFS
|
|
|
|
|
IFS='\'
|
|
|
|
|
_G_check_ifs_backshlash='a\\b'
|
|
|
|
|
for _G_i in $_G_check_ifs_backshlash
|
|
|
|
|
do
|
|
|
|
|
case $_G_i in
|
|
|
|
|
a)
|
|
|
|
|
check_ifs_backshlash_broken=false
|
|
|
|
|
;;
|
|
|
|
|
'')
|
|
|
|
|
break
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
check_ifs_backshlash_broken=:
|
|
|
|
|
break
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_save_IFS
|
|
|
|
|
require_check_ifs_backslash=:
|
|
|
|
|
}
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
## Global variables. ##
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
|
|
|
|
|
# Except for the global variables explicitly listed below, the following
|
|
|
|
|
# functions in the '^func_' namespace, and the '^require_' namespace
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# variables initialised in the 'Resource management' section, sourcing
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# this file will not pollute your global namespace with anything
|
|
|
|
|
# else. There's no portable way to scope variables in Bourne shell
|
|
|
|
|
# though, so actually running these functions will sometimes place
|
|
|
|
|
# results into a variable named after the function, and often use
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# temporary variables in the '^_G_' namespace. If you are careful to
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# avoid using those namespaces casually in your sourcing script, things
|
|
|
|
|
# should continue to work as you expect. And, of course, you can freely
|
|
|
|
|
# overwrite any of the functions or variables defined here before
|
|
|
|
|
# calling anything to customize them.
|
|
|
|
|
|
|
|
|
|
EXIT_SUCCESS=0
|
|
|
|
|
EXIT_FAILURE=1
|
|
|
|
|
EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
|
|
|
|
|
EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
|
|
|
|
|
|
|
|
|
|
# Allow overriding, eg assuming that you follow the convention of
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# putting '$debug_cmd' at the start of all your functions, you can get
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# bash to show function call trace with:
|
|
|
|
|
#
|
|
|
|
|
# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
|
|
|
|
|
debug_cmd=${debug_cmd-":"}
|
|
|
|
|
exit_cmd=:
|
|
|
|
|
|
|
|
|
|
# By convention, finish your script with:
|
|
|
|
|
#
|
|
|
|
|
# exit $exit_status
|
|
|
|
|
#
|
|
|
|
|
# so that you can set exit_status to non-zero if you want to indicate
|
|
|
|
|
# something went wrong during execution without actually bailing out at
|
|
|
|
|
# the point of failure.
|
|
|
|
|
exit_status=$EXIT_SUCCESS
|
|
|
|
|
|
|
|
|
|
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
|
|
|
|
|
# is ksh but when the shell is invoked as "sh" and the current value of
|
|
|
|
|
# the _XPG environment variable is not equal to 1 (one), the special
|
|
|
|
|
# positional parameter $0, within a function call, is the name of the
|
|
|
|
|
# function.
|
|
|
|
|
progpath=$0
|
|
|
|
|
|
|
|
|
|
# The name of this program.
|
2014-01-03 08:33:38 +08:00
|
|
|
|
progname=`$ECHO "$progpath" |$SED "$sed_basename"`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Make sure we have an absolute progpath for reexecution:
|
|
|
|
|
case $progpath in
|
|
|
|
|
[\\/]*|[A-Za-z]:\\*) ;;
|
|
|
|
|
*[\\/]*)
|
2014-01-03 08:33:38 +08:00
|
|
|
|
progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
progdir=`cd "$progdir" && pwd`
|
|
|
|
|
progpath=$progdir/$progname
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
_G_IFS=$IFS
|
|
|
|
|
IFS=${PATH_SEPARATOR-:}
|
|
|
|
|
for progdir in $PATH; do
|
|
|
|
|
IFS=$_G_IFS
|
|
|
|
|
test -x "$progdir/$progname" && break
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_IFS
|
|
|
|
|
test -n "$progdir" || progdir=`pwd`
|
|
|
|
|
progpath=$progdir/$progname
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
## Standard options. ##
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
|
|
|
|
|
# The following options affect the operation of the functions defined
|
|
|
|
|
# below, and should be set appropriately depending on run-time para-
|
|
|
|
|
# meters passed on the command line.
|
|
|
|
|
|
|
|
|
|
opt_dry_run=false
|
|
|
|
|
opt_quiet=false
|
|
|
|
|
opt_verbose=false
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Categories 'all' and 'none' are always available. Append any others
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# you will pass as the first argument to func_warning from your own
|
|
|
|
|
# code.
|
|
|
|
|
warning_categories=
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# By default, display warnings according to 'opt_warning_types'. Set
|
|
|
|
|
# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# treat the next displayed warning as a fatal error.
|
|
|
|
|
warning_func=func_warn_and_continue
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Set to 'all' to display all warnings, 'none' to suppress all
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# warnings, or a space delimited list of some subset of
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'warning_categories' to display only the listed warnings.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
opt_warning_types=all
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
## Resource management. ##
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains definitions for functions that each ensure a
|
|
|
|
|
# particular resource (a file, or a non-empty configuration variable for
|
|
|
|
|
# example) is available, and if appropriate to extract default values
|
|
|
|
|
# from pertinent package files. Call them using their associated
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'require_*' variable to ensure that they are executed, at most, once.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
#
|
|
|
|
|
# It's entirely deliberate that calling these functions can set
|
|
|
|
|
# variables that don't obey the namespace limitations obeyed by the rest
|
|
|
|
|
# of this file, in order that that they be as useful as possible to
|
|
|
|
|
# callers.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_term_colors
|
|
|
|
|
# -------------------
|
|
|
|
|
# Allow display of bold text on terminals that support it.
|
|
|
|
|
require_term_colors=func_require_term_colors
|
|
|
|
|
func_require_term_colors ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2012-10-25 20:03:17 +08:00
|
|
|
|
test -t 1 && {
|
|
|
|
|
# COLORTERM and USE_ANSI_COLORS environment variables take
|
|
|
|
|
# precedence, because most terminfo databases neglect to describe
|
|
|
|
|
# whether color sequences are supported.
|
|
|
|
|
test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
|
|
|
|
|
|
|
|
|
|
if test 1 = "$USE_ANSI_COLORS"; then
|
|
|
|
|
# Standard ANSI escape sequences
|
|
|
|
|
tc_reset='[0m'
|
|
|
|
|
tc_bold='[1m'; tc_standout='[7m'
|
|
|
|
|
tc_red='[31m'; tc_green='[32m'
|
|
|
|
|
tc_blue='[34m'; tc_cyan='[36m'
|
|
|
|
|
else
|
|
|
|
|
# Otherwise trust the terminfo database after all.
|
|
|
|
|
test -n "`tput sgr0 2>/dev/null`" && {
|
|
|
|
|
tc_reset=`tput sgr0`
|
|
|
|
|
test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
|
|
|
|
|
tc_standout=$tc_bold
|
|
|
|
|
test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
|
|
|
|
|
test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
|
2012-10-25 14:29:28 +08:00
|
|
|
|
test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
|
2012-10-25 20:03:17 +08:00
|
|
|
|
test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
|
|
|
|
|
test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
}
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
require_term_colors=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
## Function library. ##
|
|
|
|
|
## ----------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains a variety of useful functions to call in your
|
|
|
|
|
# scripts. Take note of the portable wrappers for features provided by
|
|
|
|
|
# some modern shells, which will fall back to slower equivalents on
|
|
|
|
|
# less featureful shells.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_append VAR VALUE
|
|
|
|
|
# ---------------------
|
|
|
|
|
# Append VALUE onto the existing contents of VAR.
|
|
|
|
|
|
|
|
|
|
# We should try to minimise forks, especially on Windows where they are
|
|
|
|
|
# unreasonably slow, so skip the feature probes when bash or zsh are
|
|
|
|
|
# being used:
|
|
|
|
|
if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
|
|
|
|
|
: ${_G_HAVE_ARITH_OP="yes"}
|
|
|
|
|
: ${_G_HAVE_XSI_OPS="yes"}
|
|
|
|
|
# The += operator was introduced in bash 3.1
|
|
|
|
|
case $BASH_VERSION in
|
2012-10-25 20:31:20 +08:00
|
|
|
|
[12].* | 3.0 | 3.0*) ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
*)
|
|
|
|
|
: ${_G_HAVE_PLUSEQ_OP="yes"}
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# _G_HAVE_PLUSEQ_OP
|
|
|
|
|
# Can be empty, in which case the shell is probed, "yes" if += is
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# useable or anything else if it does not work.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
test -z "$_G_HAVE_PLUSEQ_OP" \
|
|
|
|
|
&& (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
|
|
|
|
|
&& _G_HAVE_PLUSEQ_OP=yes
|
|
|
|
|
|
|
|
|
|
if test yes = "$_G_HAVE_PLUSEQ_OP"
|
|
|
|
|
then
|
|
|
|
|
# This is an XSI compatible shell, allowing a faster implementation...
|
|
|
|
|
eval 'func_append ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
eval "$1+=\$2"
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
# ...otherwise fall back to using expr, which is often a shell builtin.
|
|
|
|
|
func_append ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
eval "$1=\$$1\$2"
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_append_quoted VAR VALUE
|
|
|
|
|
# ----------------------------
|
|
|
|
|
# Quote VALUE and append to the end of shell variable VAR, separated
|
|
|
|
|
# by a space.
|
|
|
|
|
if test yes = "$_G_HAVE_PLUSEQ_OP"; then
|
|
|
|
|
eval 'func_append_quoted ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote_arg pretty "$2"
|
|
|
|
|
eval "$1+=\\ \$func_quote_arg_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
func_append_quoted ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote_arg pretty "$2"
|
|
|
|
|
eval "$1=\$$1\\ \$func_quote_arg_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_append_uniq VAR VALUE
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Append unique VALUE onto the existing contents of VAR, assuming
|
|
|
|
|
# entries are delimited by the first character of VALUE. For example:
|
|
|
|
|
#
|
|
|
|
|
# func_append_uniq options " --another-option option-argument"
|
|
|
|
|
#
|
|
|
|
|
# will only append to $options if " --another-option option-argument "
|
|
|
|
|
# is not already present somewhere in $options already (note spaces at
|
|
|
|
|
# each end implied by leading space in second argument).
|
|
|
|
|
func_append_uniq ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-03 08:33:38 +08:00
|
|
|
|
eval _G_current_value='`$ECHO $'$1'`'
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_delim=`expr "$2" : '\(.\)'`
|
|
|
|
|
|
|
|
|
|
case $_G_delim$_G_current_value$_G_delim in
|
|
|
|
|
*"$2$_G_delim"*) ;;
|
|
|
|
|
*) func_append "$@" ;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_arith TERM...
|
|
|
|
|
# ------------------
|
|
|
|
|
# Set func_arith_result to the result of evaluating TERMs.
|
|
|
|
|
test -z "$_G_HAVE_ARITH_OP" \
|
|
|
|
|
&& (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
|
|
|
|
|
&& _G_HAVE_ARITH_OP=yes
|
|
|
|
|
|
|
|
|
|
if test yes = "$_G_HAVE_ARITH_OP"; then
|
|
|
|
|
eval 'func_arith ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_arith_result=$(( $* ))
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
func_arith ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_arith_result=`expr "$@"`
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_basename FILE
|
|
|
|
|
# ------------------
|
|
|
|
|
# Set func_basename_result to FILE with everything up to and including
|
|
|
|
|
# the last / stripped.
|
|
|
|
|
if test yes = "$_G_HAVE_XSI_OPS"; then
|
|
|
|
|
# If this shell supports suffix pattern removal, then use it to avoid
|
|
|
|
|
# forking. Hide the definitions single quotes in case the shell chokes
|
|
|
|
|
# on unsupported syntax...
|
|
|
|
|
_b='func_basename_result=${1##*/}'
|
|
|
|
|
_d='case $1 in
|
|
|
|
|
*/*) func_dirname_result=${1%/*}$2 ;;
|
|
|
|
|
* ) func_dirname_result=$3 ;;
|
|
|
|
|
esac'
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
# ...otherwise fall back to using sed.
|
|
|
|
|
_b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
|
|
|
|
|
_d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
|
|
|
|
|
if test "X$func_dirname_result" = "X$1"; then
|
|
|
|
|
func_dirname_result=$3
|
|
|
|
|
else
|
|
|
|
|
func_append func_dirname_result "$2"
|
|
|
|
|
fi'
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
eval 'func_basename ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
'"$_b"'
|
|
|
|
|
}'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_dirname FILE APPEND NONDIR_REPLACEMENT
|
|
|
|
|
# -------------------------------------------
|
|
|
|
|
# Compute the dirname of FILE. If nonempty, add APPEND to the result,
|
|
|
|
|
# otherwise set result to NONDIR_REPLACEMENT.
|
|
|
|
|
eval 'func_dirname ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
'"$_d"'
|
|
|
|
|
}'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
|
|
|
|
|
# --------------------------------------------------------
|
|
|
|
|
# Perform func_basename and func_dirname in a single function
|
|
|
|
|
# call:
|
|
|
|
|
# dirname: Compute the dirname of FILE. If nonempty,
|
|
|
|
|
# add APPEND to the result, otherwise set result
|
|
|
|
|
# to NONDIR_REPLACEMENT.
|
|
|
|
|
# value returned in "$func_dirname_result"
|
|
|
|
|
# basename: Compute filename of FILE.
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# value retuned in "$func_basename_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# For efficiency, we do not delegate to the functions above but instead
|
|
|
|
|
# duplicate the functionality here.
|
|
|
|
|
eval 'func_dirname_and_basename ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
'"$_b"'
|
|
|
|
|
'"$_d"'
|
|
|
|
|
}'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_echo ARG...
|
|
|
|
|
# ----------------
|
|
|
|
|
# Echo program name prefixed message.
|
|
|
|
|
func_echo ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_message=$*
|
|
|
|
|
|
|
|
|
|
func_echo_IFS=$IFS
|
|
|
|
|
IFS=$nl
|
|
|
|
|
for _G_line in $_G_message; do
|
|
|
|
|
IFS=$func_echo_IFS
|
2014-01-03 08:33:38 +08:00
|
|
|
|
$ECHO "$progname: $_G_line"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
done
|
|
|
|
|
IFS=$func_echo_IFS
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_echo_all ARG...
|
|
|
|
|
# --------------------
|
|
|
|
|
# Invoke $ECHO with all args, space-separated.
|
|
|
|
|
func_echo_all ()
|
|
|
|
|
{
|
|
|
|
|
$ECHO "$*"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_echo_infix_1 INFIX ARG...
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# Echo program name, followed by INFIX on the first line, with any
|
|
|
|
|
# additional lines not showing INFIX.
|
|
|
|
|
func_echo_infix_1 ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_term_colors
|
|
|
|
|
|
|
|
|
|
_G_infix=$1; shift
|
|
|
|
|
_G_indent=$_G_infix
|
|
|
|
|
_G_prefix="$progname: $_G_infix: "
|
|
|
|
|
_G_message=$*
|
|
|
|
|
|
|
|
|
|
# Strip color escape sequences before counting printable length
|
|
|
|
|
for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
|
|
|
|
|
do
|
|
|
|
|
test -n "$_G_tc" && {
|
2014-01-03 08:33:38 +08:00
|
|
|
|
_G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
|
|
|
|
|
_G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
done
|
2013-10-30 13:25:44 +08:00
|
|
|
|
_G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
func_echo_infix_1_IFS=$IFS
|
|
|
|
|
IFS=$nl
|
|
|
|
|
for _G_line in $_G_message; do
|
|
|
|
|
IFS=$func_echo_infix_1_IFS
|
2014-01-03 08:33:38 +08:00
|
|
|
|
$ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_prefix=$_G_indent
|
|
|
|
|
done
|
|
|
|
|
IFS=$func_echo_infix_1_IFS
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_error ARG...
|
|
|
|
|
# -----------------
|
|
|
|
|
# Echo program name prefixed message to standard error.
|
|
|
|
|
func_error ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_term_colors
|
|
|
|
|
|
2012-10-25 20:06:50 +08:00
|
|
|
|
func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_fatal_error ARG...
|
|
|
|
|
# -----------------------
|
|
|
|
|
# Echo program name prefixed message to standard error, and exit.
|
|
|
|
|
func_fatal_error ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_error "$*"
|
|
|
|
|
exit $EXIT_FAILURE
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_grep EXPRESSION FILENAME
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Check whether EXPRESSION matches any line of FILENAME, without output.
|
|
|
|
|
func_grep ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$GREP "$1" "$2" >/dev/null 2>&1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_len STRING
|
|
|
|
|
# ---------------
|
|
|
|
|
# Set func_len_result to the length of STRING. STRING may not
|
|
|
|
|
# start with a hyphen.
|
|
|
|
|
test -z "$_G_HAVE_XSI_OPS" \
|
|
|
|
|
&& (eval 'x=a/b/c;
|
|
|
|
|
test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
|
|
|
|
|
&& _G_HAVE_XSI_OPS=yes
|
|
|
|
|
|
|
|
|
|
if test yes = "$_G_HAVE_XSI_OPS"; then
|
|
|
|
|
eval 'func_len ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_len_result=${#1}
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
func_len ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_mkdir_p DIRECTORY-PATH
|
|
|
|
|
# ---------------------------
|
|
|
|
|
# Make sure the entire path to DIRECTORY-PATH is available.
|
|
|
|
|
func_mkdir_p ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_directory_path=$1
|
|
|
|
|
_G_dir_list=
|
|
|
|
|
|
|
|
|
|
if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Protect directory names starting with '-'
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
case $_G_directory_path in
|
|
|
|
|
-*) _G_directory_path=./$_G_directory_path ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
# While some portion of DIR does not yet exist...
|
|
|
|
|
while test ! -d "$_G_directory_path"; do
|
|
|
|
|
# ...make a list in topmost first order. Use a colon delimited
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# list incase some portion of path contains whitespace.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_dir_list=$_G_directory_path:$_G_dir_list
|
|
|
|
|
|
|
|
|
|
# If the last portion added has no slash in it, the list is done
|
|
|
|
|
case $_G_directory_path in */*) ;; *) break ;; esac
|
|
|
|
|
|
|
|
|
|
# ...otherwise throw away the child directory and loop
|
|
|
|
|
_G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
|
|
|
|
|
done
|
|
|
|
|
_G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
|
|
|
|
|
|
|
|
|
|
func_mkdir_p_IFS=$IFS; IFS=:
|
|
|
|
|
for _G_dir in $_G_dir_list; do
|
|
|
|
|
IFS=$func_mkdir_p_IFS
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# mkdir can fail with a 'File exist' error if two processes
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# try to create one of the directories concurrently. Don't
|
|
|
|
|
# stop in that case!
|
|
|
|
|
$MKDIR "$_G_dir" 2>/dev/null || :
|
|
|
|
|
done
|
|
|
|
|
IFS=$func_mkdir_p_IFS
|
|
|
|
|
|
|
|
|
|
# Bail out if we (or some other process) failed to create a directory.
|
|
|
|
|
test -d "$_G_directory_path" || \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_fatal_error "Failed to create '$1'"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_mktempdir [BASENAME]
|
|
|
|
|
# -------------------------
|
|
|
|
|
# Make a temporary directory that won't clash with other running
|
|
|
|
|
# libtool processes, and avoids race conditions if possible. If
|
|
|
|
|
# given, BASENAME is the basename for that directory.
|
|
|
|
|
func_mktempdir ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_template=${TMPDIR-/tmp}/${1-$progname}
|
|
|
|
|
|
|
|
|
|
if test : = "$opt_dry_run"; then
|
|
|
|
|
# Return a directory name, but don't create it in dry-run mode
|
|
|
|
|
_G_tmpdir=$_G_template-$$
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
# If mktemp works, use that first and foremost
|
|
|
|
|
_G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
|
|
|
|
|
|
|
|
|
|
if test ! -d "$_G_tmpdir"; then
|
|
|
|
|
# Failing that, at least try and use $RANDOM to avoid a race
|
|
|
|
|
_G_tmpdir=$_G_template-${RANDOM-0}$$
|
|
|
|
|
|
|
|
|
|
func_mktempdir_umask=`umask`
|
|
|
|
|
umask 0077
|
|
|
|
|
$MKDIR "$_G_tmpdir"
|
|
|
|
|
umask $func_mktempdir_umask
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If we're not in dry-run mode, bomb out on failure
|
|
|
|
|
test -d "$_G_tmpdir" || \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
$ECHO "$_G_tmpdir"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_normal_abspath PATH
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Remove doubled-up and trailing slashes, "." path components,
|
|
|
|
|
# and cancel out any ".." path components in PATH after making
|
|
|
|
|
# it an absolute path.
|
|
|
|
|
func_normal_abspath ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# These SED scripts presuppose an absolute path with a trailing slash.
|
|
|
|
|
_G_pathcar='s|^/\([^/]*\).*$|\1|'
|
|
|
|
|
_G_pathcdr='s|^/[^/]*||'
|
|
|
|
|
_G_removedotparts=':dotsl
|
|
|
|
|
s|/\./|/|g
|
|
|
|
|
t dotsl
|
|
|
|
|
s|/\.$|/|'
|
|
|
|
|
_G_collapseslashes='s|/\{1,\}|/|g'
|
|
|
|
|
_G_finalslash='s|/*$|/|'
|
|
|
|
|
|
|
|
|
|
# Start from root dir and reassemble the path.
|
|
|
|
|
func_normal_abspath_result=
|
|
|
|
|
func_normal_abspath_tpath=$1
|
|
|
|
|
func_normal_abspath_altnamespace=
|
|
|
|
|
case $func_normal_abspath_tpath in
|
|
|
|
|
"")
|
|
|
|
|
# Empty path, that just means $cwd.
|
|
|
|
|
func_stripname '' '/' "`pwd`"
|
|
|
|
|
func_normal_abspath_result=$func_stripname_result
|
|
|
|
|
return
|
|
|
|
|
;;
|
|
|
|
|
# The next three entries are used to spot a run of precisely
|
|
|
|
|
# two leading slashes without using negated character classes;
|
|
|
|
|
# we take advantage of case's first-match behaviour.
|
|
|
|
|
///*)
|
|
|
|
|
# Unusual form of absolute path, do nothing.
|
|
|
|
|
;;
|
|
|
|
|
//*)
|
|
|
|
|
# Not necessarily an ordinary path; POSIX reserves leading '//'
|
|
|
|
|
# and for example Cygwin uses it to access remote file shares
|
|
|
|
|
# over CIFS/SMB, so we conserve a leading double slash if found.
|
|
|
|
|
func_normal_abspath_altnamespace=/
|
|
|
|
|
;;
|
|
|
|
|
/*)
|
|
|
|
|
# Absolute path, do nothing.
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# Relative path, prepend $cwd.
|
|
|
|
|
func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
# Cancel out all the simple stuff to save iterations. We also want
|
|
|
|
|
# the path to end with a slash for ease of parsing, so make sure
|
|
|
|
|
# there is one (and only one) here.
|
|
|
|
|
func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
|
|
-e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
|
|
|
|
|
while :; do
|
|
|
|
|
# Processed it all yet?
|
|
|
|
|
if test / = "$func_normal_abspath_tpath"; then
|
|
|
|
|
# If we ascended to the root using ".." the result may be empty now.
|
|
|
|
|
if test -z "$func_normal_abspath_result"; then
|
|
|
|
|
func_normal_abspath_result=/
|
|
|
|
|
fi
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
|
|
-e "$_G_pathcar"`
|
|
|
|
|
func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
|
|
|
|
|
-e "$_G_pathcdr"`
|
|
|
|
|
# Figure out what to do with it
|
|
|
|
|
case $func_normal_abspath_tcomponent in
|
|
|
|
|
"")
|
|
|
|
|
# Trailing empty path component, ignore it.
|
|
|
|
|
;;
|
|
|
|
|
..)
|
|
|
|
|
# Parent dir; strip last assembled component from result.
|
|
|
|
|
func_dirname "$func_normal_abspath_result"
|
|
|
|
|
func_normal_abspath_result=$func_dirname_result
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# Actual path component, append it.
|
|
|
|
|
func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
# Restore leading double-slash if one was found on entry.
|
|
|
|
|
func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_notquiet ARG...
|
|
|
|
|
# --------------------
|
|
|
|
|
# Echo program name prefixed message only when not in quiet mode.
|
|
|
|
|
func_notquiet ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$opt_quiet || func_echo ${1+"$@"}
|
|
|
|
|
|
|
|
|
|
# A bug in bash halts the script if the last line of a function
|
|
|
|
|
# fails when set -e is in force, so we need another command to
|
|
|
|
|
# work around that:
|
|
|
|
|
:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_relative_path SRCDIR DSTDIR
|
|
|
|
|
# --------------------------------
|
|
|
|
|
# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
|
|
|
|
|
func_relative_path ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_relative_path_result=
|
|
|
|
|
func_normal_abspath "$1"
|
|
|
|
|
func_relative_path_tlibdir=$func_normal_abspath_result
|
|
|
|
|
func_normal_abspath "$2"
|
|
|
|
|
func_relative_path_tbindir=$func_normal_abspath_result
|
|
|
|
|
|
|
|
|
|
# Ascend the tree starting from libdir
|
|
|
|
|
while :; do
|
|
|
|
|
# check if we have found a prefix of bindir
|
|
|
|
|
case $func_relative_path_tbindir in
|
|
|
|
|
$func_relative_path_tlibdir)
|
|
|
|
|
# found an exact match
|
|
|
|
|
func_relative_path_tcancelled=
|
|
|
|
|
break
|
|
|
|
|
;;
|
|
|
|
|
$func_relative_path_tlibdir*)
|
|
|
|
|
# found a matching prefix
|
|
|
|
|
func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
|
|
|
|
|
func_relative_path_tcancelled=$func_stripname_result
|
|
|
|
|
if test -z "$func_relative_path_result"; then
|
|
|
|
|
func_relative_path_result=.
|
|
|
|
|
fi
|
|
|
|
|
break
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
func_dirname $func_relative_path_tlibdir
|
|
|
|
|
func_relative_path_tlibdir=$func_dirname_result
|
|
|
|
|
if test -z "$func_relative_path_tlibdir"; then
|
|
|
|
|
# Have to descend all the way to the root!
|
|
|
|
|
func_relative_path_result=../$func_relative_path_result
|
|
|
|
|
func_relative_path_tcancelled=$func_relative_path_tbindir
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
func_relative_path_result=../$func_relative_path_result
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Now calculate path; take care to avoid doubling-up slashes.
|
|
|
|
|
func_stripname '' '/' "$func_relative_path_result"
|
|
|
|
|
func_relative_path_result=$func_stripname_result
|
|
|
|
|
func_stripname '/' '/' "$func_relative_path_tcancelled"
|
|
|
|
|
if test -n "$func_stripname_result"; then
|
|
|
|
|
func_append func_relative_path_result "/$func_stripname_result"
|
|
|
|
|
fi
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Normalisation. If bindir is libdir, return '.' else relative path.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
if test -n "$func_relative_path_result"; then
|
|
|
|
|
func_stripname './' '' "$func_relative_path_result"
|
|
|
|
|
func_relative_path_result=$func_stripname_result
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
test -n "$func_relative_path_result" || func_relative_path_result=.
|
|
|
|
|
|
|
|
|
|
:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# func_quote_portable EVAL ARG
|
|
|
|
|
# ----------------------------
|
|
|
|
|
# Internal function to portably implement func_quote_arg. Note that we still
|
|
|
|
|
# keep attention to performance here so we as much as possible try to avoid
|
|
|
|
|
# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
|
|
|
|
|
func_quote_portable ()
|
2015-10-05 03:55:03 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2021-11-16 20:25:08 +08:00
|
|
|
|
$require_check_ifs_backslash
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote_portable_result=$2
|
2015-10-05 03:55:03 +08:00
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# one-time-loop (easy break)
|
|
|
|
|
while true
|
|
|
|
|
do
|
|
|
|
|
if $1; then
|
|
|
|
|
func_quote_portable_result=`$ECHO "$2" | $SED \
|
|
|
|
|
-e "$sed_double_quote_subst" -e "$sed_double_backslash"`
|
|
|
|
|
break
|
|
|
|
|
fi
|
2015-10-05 03:55:03 +08:00
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# Quote for eval.
|
|
|
|
|
case $func_quote_portable_result in
|
|
|
|
|
*[\\\`\"\$]*)
|
2021-11-16 20:25:08 +08:00
|
|
|
|
# Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
|
|
|
|
|
# contains the shell wildcard characters.
|
|
|
|
|
case $check_ifs_backshlash_broken$func_quote_portable_result in
|
|
|
|
|
:*|*[\[\*\?]*)
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
|
|
|
|
|
| $SED "$sed_quote_subst"`
|
2015-10-11 20:35:15 +08:00
|
|
|
|
break
|
2015-10-05 03:55:03 +08:00
|
|
|
|
;;
|
2015-10-11 20:35:15 +08:00
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
func_quote_portable_old_IFS=$IFS
|
|
|
|
|
for _G_char in '\' '`' '"' '$'
|
|
|
|
|
do
|
|
|
|
|
# STATE($1) PREV($2) SEPARATOR($3)
|
|
|
|
|
set start "" ""
|
|
|
|
|
func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
|
|
|
|
|
IFS=$_G_char
|
|
|
|
|
for _G_part in $func_quote_portable_result
|
|
|
|
|
do
|
|
|
|
|
case $1 in
|
|
|
|
|
quote)
|
|
|
|
|
func_append func_quote_portable_result "$3$2"
|
|
|
|
|
set quote "$_G_part" "\\$_G_char"
|
|
|
|
|
;;
|
|
|
|
|
start)
|
|
|
|
|
set first "" ""
|
|
|
|
|
func_quote_portable_result=
|
|
|
|
|
;;
|
|
|
|
|
first)
|
|
|
|
|
set quote "$_G_part" ""
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
2015-10-05 03:55:03 +08:00
|
|
|
|
done
|
2015-10-11 20:35:15 +08:00
|
|
|
|
IFS=$func_quote_portable_old_IFS
|
|
|
|
|
;;
|
|
|
|
|
*) ;;
|
|
|
|
|
esac
|
|
|
|
|
break
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
func_quote_portable_unquoted_result=$func_quote_portable_result
|
|
|
|
|
case $func_quote_portable_result in
|
|
|
|
|
# double-quote args containing shell metacharacters to delay
|
|
|
|
|
# word splitting, command substitution and variable expansion
|
|
|
|
|
# for a subsequent eval.
|
|
|
|
|
# many bourne shells cannot handle close brackets correctly
|
|
|
|
|
# in scan sets, so we specify it separately.
|
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
|
|
|
func_quote_portable_result=\"$func_quote_portable_result\"
|
2015-10-05 03:55:03 +08:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# func_quotefast_eval ARG
|
|
|
|
|
# -----------------------
|
|
|
|
|
# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
|
|
|
|
|
# but optimized for speed. Result is stored in $func_quotefast_eval.
|
|
|
|
|
if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
|
2015-11-02 04:43:31 +08:00
|
|
|
|
printf -v _GL_test_printf_tilde %q '~'
|
|
|
|
|
if test '\~' = "$_GL_test_printf_tilde"; then
|
|
|
|
|
func_quotefast_eval ()
|
|
|
|
|
{
|
|
|
|
|
printf -v func_quotefast_eval_result %q "$1"
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
# Broken older Bash implementations. Make those faster too if possible.
|
|
|
|
|
func_quotefast_eval ()
|
|
|
|
|
{
|
|
|
|
|
case $1 in
|
|
|
|
|
'~'*)
|
|
|
|
|
func_quote_portable false "$1"
|
|
|
|
|
func_quotefast_eval_result=$func_quote_portable_result
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
printf -v func_quotefast_eval_result %q "$1"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
fi
|
2015-10-11 20:35:15 +08:00
|
|
|
|
else
|
|
|
|
|
func_quotefast_eval ()
|
|
|
|
|
{
|
|
|
|
|
func_quote_portable false "$1"
|
|
|
|
|
func_quotefast_eval_result=$func_quote_portable_result
|
|
|
|
|
}
|
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# func_quote_arg MODEs ARG
|
|
|
|
|
# ------------------------
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Quote one ARG to be evaled later. MODEs argument may contain zero or more
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# specifiers listed below separated by ',' character. This function returns two
|
|
|
|
|
# values:
|
|
|
|
|
# i) func_quote_arg_result
|
|
|
|
|
# double-quoted (when needed), suitable for a subsequent eval
|
|
|
|
|
# ii) func_quote_arg_unquoted_result
|
|
|
|
|
# has all characters that are still active within double
|
|
|
|
|
# quotes backslashified. Available only if 'unquoted' is specified.
|
|
|
|
|
#
|
|
|
|
|
# Available modes:
|
|
|
|
|
# ----------------
|
|
|
|
|
# 'eval' (default)
|
|
|
|
|
# - escape shell special characters
|
|
|
|
|
# 'expand'
|
|
|
|
|
# - the same as 'eval'; but do not quote variable references
|
|
|
|
|
# 'pretty'
|
|
|
|
|
# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# be used later in func_quote to get output like: 'echo "a b"' instead
|
|
|
|
|
# of 'echo a\ b'. This is slower than default on some shells.
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# 'unquoted'
|
|
|
|
|
# - produce also $func_quote_arg_unquoted_result which does not contain
|
|
|
|
|
# wrapping double-quotes.
|
|
|
|
|
#
|
|
|
|
|
# Examples for 'func_quote_arg pretty,unquoted string':
|
|
|
|
|
#
|
|
|
|
|
# string | *_result | *_unquoted_result
|
|
|
|
|
# ------------+-----------------------+-------------------
|
|
|
|
|
# " | \" | \"
|
|
|
|
|
# a b | "a b" | a b
|
|
|
|
|
# "a b" | "\"a b\"" | \"a b\"
|
|
|
|
|
# * | "*" | *
|
|
|
|
|
# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\"
|
|
|
|
|
#
|
|
|
|
|
# Examples for 'func_quote_arg pretty,unquoted,expand string':
|
|
|
|
|
#
|
|
|
|
|
# string | *_result | *_unquoted_result
|
|
|
|
|
# --------------+---------------------+--------------------
|
|
|
|
|
# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\"
|
|
|
|
|
func_quote_arg ()
|
|
|
|
|
{
|
|
|
|
|
_G_quote_expand=false
|
|
|
|
|
case ,$1, in
|
|
|
|
|
*,expand,*)
|
|
|
|
|
_G_quote_expand=:
|
|
|
|
|
;;
|
|
|
|
|
esac
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
case ,$1, in
|
|
|
|
|
*,pretty,*|*,expand,*|*,unquoted,*)
|
|
|
|
|
func_quote_portable $_G_quote_expand "$2"
|
|
|
|
|
func_quote_arg_result=$func_quote_portable_result
|
|
|
|
|
func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# Faster quote-for-eval for some shells.
|
|
|
|
|
func_quotefast_eval "$2"
|
|
|
|
|
func_quote_arg_result=$func_quotefast_eval_result
|
|
|
|
|
;;
|
|
|
|
|
esac
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# func_quote MODEs ARGs...
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Quote all ARGs to be evaled later and join them into single command. See
|
|
|
|
|
# func_quote_arg's description for more info.
|
|
|
|
|
func_quote ()
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
2015-10-11 20:35:15 +08:00
|
|
|
|
_G_func_quote_mode=$1 ; shift
|
|
|
|
|
func_quote_result=
|
|
|
|
|
while test 0 -lt $#; do
|
|
|
|
|
func_quote_arg "$_G_func_quote_mode" "$1"
|
|
|
|
|
if test -n "$func_quote_result"; then
|
|
|
|
|
func_append func_quote_result " $func_quote_arg_result"
|
|
|
|
|
else
|
|
|
|
|
func_append func_quote_result "$func_quote_arg_result"
|
|
|
|
|
fi
|
|
|
|
|
shift
|
|
|
|
|
done
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_stripname PREFIX SUFFIX NAME
|
|
|
|
|
# ---------------------------------
|
|
|
|
|
# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
|
|
|
|
|
# PREFIX and SUFFIX must not contain globbing or regex special
|
|
|
|
|
# characters, hashes, percent signs, but SUFFIX may contain a leading
|
|
|
|
|
# dot (in which case that matches only a dot).
|
|
|
|
|
if test yes = "$_G_HAVE_XSI_OPS"; then
|
|
|
|
|
eval 'func_stripname ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
|
|
|
|
|
# positional parameters, so assign one to ordinary variable first.
|
|
|
|
|
func_stripname_result=$3
|
|
|
|
|
func_stripname_result=${func_stripname_result#"$1"}
|
|
|
|
|
func_stripname_result=${func_stripname_result%"$2"}
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
func_stripname ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
case $2 in
|
2012-10-25 18:11:33 +08:00
|
|
|
|
.*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
|
|
|
|
|
*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_show_eval CMD [FAIL_EXP]
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
|
|
|
|
|
# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
|
|
|
|
|
# is given, then evaluate it.
|
|
|
|
|
func_show_eval ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_cmd=$1
|
|
|
|
|
_G_fail_exp=${2-':'}
|
|
|
|
|
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote_arg pretty,expand "$_G_cmd"
|
|
|
|
|
eval "func_notquiet $func_quote_arg_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
$opt_dry_run || {
|
|
|
|
|
eval "$_G_cmd"
|
|
|
|
|
_G_status=$?
|
|
|
|
|
if test 0 -ne "$_G_status"; then
|
|
|
|
|
eval "(exit $_G_status); $_G_fail_exp"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_show_eval_locale CMD [FAIL_EXP]
|
|
|
|
|
# ------------------------------------
|
|
|
|
|
# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
|
|
|
|
|
# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
|
|
|
|
|
# is given, then evaluate it. Use the saved locale for evaluation.
|
|
|
|
|
func_show_eval_locale ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_cmd=$1
|
|
|
|
|
_G_fail_exp=${2-':'}
|
|
|
|
|
|
|
|
|
|
$opt_quiet || {
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote_arg expand,pretty "$_G_cmd"
|
|
|
|
|
eval "func_echo $func_quote_arg_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$opt_dry_run || {
|
|
|
|
|
eval "$_G_user_locale
|
|
|
|
|
$_G_cmd"
|
|
|
|
|
_G_status=$?
|
|
|
|
|
eval "$_G_safe_locale"
|
|
|
|
|
if test 0 -ne "$_G_status"; then
|
|
|
|
|
eval "(exit $_G_status); $_G_fail_exp"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_tr_sh
|
|
|
|
|
# ----------
|
|
|
|
|
# Turn $1 into a string suitable for a shell variable name.
|
|
|
|
|
# Result is stored in $func_tr_sh_result. All characters
|
|
|
|
|
# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
|
|
|
|
|
# if $1 begins with a digit, a '_' is prepended as well.
|
|
|
|
|
func_tr_sh ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
case $1 in
|
|
|
|
|
[0-9]* | *[!a-zA-Z0-9_]*)
|
2012-10-25 18:11:33 +08:00
|
|
|
|
func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
;;
|
|
|
|
|
* )
|
|
|
|
|
func_tr_sh_result=$1
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_verbose ARG...
|
|
|
|
|
# -------------------
|
|
|
|
|
# Echo program name prefixed message in verbose mode only.
|
|
|
|
|
func_verbose ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$opt_verbose && func_echo "$*"
|
|
|
|
|
|
|
|
|
|
:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_warn_and_continue ARG...
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Echo program name prefixed warning message to standard error.
|
|
|
|
|
func_warn_and_continue ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_term_colors
|
|
|
|
|
|
|
|
|
|
func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_warning CATEGORY ARG...
|
|
|
|
|
# ----------------------------
|
|
|
|
|
# Echo program name prefixed warning message to standard error. Warning
|
|
|
|
|
# messages can be filtered according to CATEGORY, where this function
|
|
|
|
|
# elides messages where CATEGORY is not listed in the global variable
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'opt_warning_types'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_warning ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# CATEGORY must be in the warning_categories list!
|
|
|
|
|
case " $warning_categories " in
|
|
|
|
|
*" $1 "*) ;;
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
*) func_internal_error "invalid warning category '$1'" ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
_G_category=$1
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
|
|
case " $opt_warning_types " in
|
|
|
|
|
*" $_G_category "*) $warning_func ${1+"$@"} ;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-10-26 10:33:07 +08:00
|
|
|
|
# func_sort_ver VER1 VER2
|
|
|
|
|
# -----------------------
|
|
|
|
|
# 'sort -V' is not generally available.
|
|
|
|
|
# Note this deviates from the version comparison in automake
|
2014-10-28 01:59:20 +08:00
|
|
|
|
# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
|
2013-10-26 10:33:07 +08:00
|
|
|
|
# but this should suffice as we won't be specifying old
|
|
|
|
|
# version formats or redundant trailing .0 in bootstrap.conf.
|
|
|
|
|
# If we did want full compatibility then we should probably
|
|
|
|
|
# use m4_version_compare from autoconf.
|
|
|
|
|
func_sort_ver ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-02 08:04:31 +08:00
|
|
|
|
printf '%s\n%s\n' "$1" "$2" \
|
|
|
|
|
| sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
|
2013-10-28 15:14:22 +08:00
|
|
|
|
}
|
2013-10-26 10:33:07 +08:00
|
|
|
|
|
2013-10-28 15:14:22 +08:00
|
|
|
|
# func_lt_ver PREV CURR
|
|
|
|
|
# ---------------------
|
|
|
|
|
# Return true if PREV and CURR are in the correct order according to
|
|
|
|
|
# func_sort_ver, otherwise false. Use it like this:
|
|
|
|
|
#
|
|
|
|
|
# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
|
|
|
|
|
func_lt_ver ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2013-10-30 13:25:44 +08:00
|
|
|
|
test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
|
2013-10-26 10:33:07 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# Local variables:
|
|
|
|
|
# mode: shell-script
|
|
|
|
|
# sh-indentation: 2
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
|
|
|
|
# time-stamp-time-zone: "UTC"
|
|
|
|
|
# End:
|
|
|
|
|
#! /bin/sh
|
|
|
|
|
|
|
|
|
|
# A portable, pluggable option parser for Bourne shell.
|
|
|
|
|
# Written by Gary V. Vaughan, 2010
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# This is free software. There is NO warranty; not even for
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
#
|
2024-07-24 22:50:15 +08:00
|
|
|
|
# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
#
|
|
|
|
|
# This file is dual licensed under the terms of the MIT license
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
|
|
|
|
|
# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# these licenses when using or redistributing this software or any of
|
|
|
|
|
# the files within it. See the URLs above, or the file `LICENSE`
|
|
|
|
|
# included in the Bootstrap distribution for the full license texts.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Please report bugs or propose patches to:
|
|
|
|
|
# <https://github.com/gnulib-modules/bootstrap/issues>
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Set a version string for this script.
|
2019-02-19 23:19:59 +08:00
|
|
|
|
scriptversion=2019-02-19.15; # UTC
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------ ##
|
|
|
|
|
## Usage. ##
|
|
|
|
|
## ------ ##
|
|
|
|
|
|
|
|
|
|
# This file is a library for parsing options in your shell scripts along
|
|
|
|
|
# with assorted other useful supporting features that you can make use
|
|
|
|
|
# of too.
|
|
|
|
|
#
|
|
|
|
|
# For the simplest scripts you might need only:
|
|
|
|
|
#
|
|
|
|
|
# #!/bin/sh
|
|
|
|
|
# . relative/path/to/funclib.sh
|
|
|
|
|
# . relative/path/to/options-parser
|
|
|
|
|
# scriptversion=1.0
|
|
|
|
|
# func_options ${1+"$@"}
|
|
|
|
|
# eval set dummy "$func_options_result"; shift
|
|
|
|
|
# ...rest of your script...
|
|
|
|
|
#
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# In order for the '--version' option to work, you will need to have a
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# suitably formatted comment like the one at the top of this file
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# starting with '# Written by ' and ending with '# Copyright'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
#
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# For '-h' and '--help' to work, you will also need a one line
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# description of your script's purpose in a comment directly above the
|
|
|
|
|
# '# Written by ' line, like the one at the top of this file.
|
|
|
|
|
#
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# The default options also support '--debug', which will turn on shell
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# execution tracing (see the comment above debug_cmd below for another
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# use), and '--verbose' and the func_verbose function to allow your script
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# to display verbose messages only when your user has specified
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# '--verbose'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
#
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# After sourcing this file, you can plug in processing for additional
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# options by amending the variables from the 'Configuration' section
|
|
|
|
|
# below, and following the instructions in the 'Option parsing'
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# section further down.
|
|
|
|
|
|
|
|
|
|
## -------------- ##
|
|
|
|
|
## Configuration. ##
|
|
|
|
|
## -------------- ##
|
|
|
|
|
|
|
|
|
|
# You should override these variables in your script after sourcing this
|
|
|
|
|
# file so that they reflect the customisations you have added to the
|
|
|
|
|
# option parser.
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# The usage line for option parsing errors and the start of '-h' and
|
|
|
|
|
# '--help' output messages. You can embed shell variables for delayed
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# expansion at the time the message is displayed, but you will need to
|
|
|
|
|
# quote other shell meta-characters carefully to prevent them being
|
|
|
|
|
# expanded when the contents are evaled.
|
|
|
|
|
usage='$progpath [OPTION]...'
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Short help message in response to '-h' and '--help'. Add to this or
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# override it after sourcing this library to reflect the full set of
|
|
|
|
|
# options your script accepts.
|
|
|
|
|
usage_message="\
|
|
|
|
|
--debug enable verbose shell tracing
|
|
|
|
|
-W, --warnings=CATEGORY
|
|
|
|
|
report the warnings falling in CATEGORY [all]
|
|
|
|
|
-v, --verbose verbosely report processing
|
|
|
|
|
--version print version information and exit
|
|
|
|
|
-h, --help print short or long help message and exit
|
|
|
|
|
"
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Additional text appended to 'usage_message' in response to '--help'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
long_help_message="
|
|
|
|
|
Warning categories include:
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
'all' show all warnings
|
|
|
|
|
'none' turn off all the warnings
|
|
|
|
|
'error' warnings are treated as fatal errors"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Help message printed before fatal option parsing errors.
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
fatal_help="Try '\$progname --help' for more information."
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------------------------- ##
|
|
|
|
|
## Hook function management. ##
|
|
|
|
|
## ------------------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains functions for adding, removing, and running hooks
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# in the main code. A hook is just a list of function names that can be
|
|
|
|
|
# run in order later on.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# func_hookable FUNC_NAME
|
|
|
|
|
# -----------------------
|
|
|
|
|
# Declare that FUNC_NAME will run hooks added with
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'func_add_hook FUNC_NAME ...'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_hookable ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_append hookable_fns " $1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_add_hook FUNC_NAME HOOK_FUNC
|
|
|
|
|
# ---------------------------------
|
|
|
|
|
# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# first have been declared "hookable" by a call to 'func_hookable'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_add_hook ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
case " $hookable_fns " in
|
|
|
|
|
*" $1 "*) ;;
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
*) func_fatal_error "'$1' does not accept hook functions." ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
eval func_append ${1}_hooks '" $2"'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_remove_hook FUNC_NAME HOOK_FUNC
|
|
|
|
|
# ------------------------------------
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Remove HOOK_FUNC from the list of hook functions to be called by
|
|
|
|
|
# FUNC_NAME.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_remove_hook ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-03 08:33:38 +08:00
|
|
|
|
eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# func_propagate_result FUNC_NAME_A FUNC_NAME_B
|
|
|
|
|
# ---------------------------------------------
|
|
|
|
|
# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
|
|
|
|
|
# *_result variable of FUNC_NAME_B.
|
|
|
|
|
func_propagate_result ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_propagate_result_result=:
|
|
|
|
|
if eval "test \"\${${1}_result+set}\" = set"
|
|
|
|
|
then
|
|
|
|
|
eval "${2}_result=\$${1}_result"
|
|
|
|
|
else
|
|
|
|
|
func_propagate_result_result=false
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# func_run_hooks FUNC_NAME [ARG]...
|
|
|
|
|
# ---------------------------------
|
|
|
|
|
# Run all hook functions registered to FUNC_NAME.
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# It's assumed that the list of hook functions contains nothing more
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# than a whitespace-delimited list of legal shell function names, and
|
|
|
|
|
# no effort is wasted trying to catch shell meta-characters or preserve
|
|
|
|
|
# whitespace.
|
|
|
|
|
func_run_hooks ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
case " $hookable_fns " in
|
|
|
|
|
*" $1 "*) ;;
|
2016-02-03 17:18:14 +08:00
|
|
|
|
*) func_fatal_error "'$1' does not support hook functions." ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
eval _G_hook_fns=\$$1_hooks; shift
|
|
|
|
|
|
|
|
|
|
for _G_hook in $_G_hook_fns; do
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_unset "${_G_hook}_result"
|
|
|
|
|
eval $_G_hook '${1+"$@"}'
|
|
|
|
|
func_propagate_result $_G_hook func_run_hooks
|
|
|
|
|
if $func_propagate_result_result; then
|
|
|
|
|
eval set dummy "$func_run_hooks_result"; shift
|
2015-10-05 19:16:08 +08:00
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## --------------- ##
|
|
|
|
|
## Option parsing. ##
|
|
|
|
|
## --------------- ##
|
|
|
|
|
|
|
|
|
|
# In order to add your own option parsing hooks, you must accept the
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# full positional parameter list from your hook function. You may remove
|
|
|
|
|
# or edit any options that you action, and then pass back the remaining
|
|
|
|
|
# unprocessed options in '<hooked_function_name>_result', escaped
|
|
|
|
|
# suitably for 'eval'.
|
|
|
|
|
#
|
|
|
|
|
# The '<hooked_function_name>_result' variable is automatically unset
|
|
|
|
|
# before your hook gets called; for best performance, only set the
|
|
|
|
|
# *_result variable when necessary (i.e. don't call the 'func_quote'
|
|
|
|
|
# function unnecessarily because it can be an expensive operation on some
|
|
|
|
|
# machines).
|
2015-10-05 19:16:08 +08:00
|
|
|
|
#
|
|
|
|
|
# Like this:
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
#
|
|
|
|
|
# my_options_prep ()
|
|
|
|
|
# {
|
|
|
|
|
# $debug_cmd
|
|
|
|
|
#
|
|
|
|
|
# # Extend the existing usage message.
|
|
|
|
|
# usage_message=$usage_message'
|
|
|
|
|
# -s, --silent don'\''t print informational messages
|
|
|
|
|
# '
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# # No change in '$@' (ignored completely by this hook). Leave
|
|
|
|
|
# # my_options_prep_result variable intact.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# }
|
|
|
|
|
# func_add_hook func_options_prep my_options_prep
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
# my_silent_option ()
|
|
|
|
|
# {
|
|
|
|
|
# $debug_cmd
|
|
|
|
|
#
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# args_changed=false
|
|
|
|
|
#
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# # Note that, for efficiency, we parse as many options as we can
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# # recognise in a loop before passing the remainder back to the
|
|
|
|
|
# # caller on the first unrecognised argument we encounter.
|
|
|
|
|
# while test $# -gt 0; do
|
|
|
|
|
# opt=$1; shift
|
|
|
|
|
# case $opt in
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# --silent|-s) opt_silent=:
|
|
|
|
|
# args_changed=:
|
|
|
|
|
# ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# # Separate non-argument short options:
|
|
|
|
|
# -s*) func_split_short_opt "$_G_opt"
|
|
|
|
|
# set dummy "$func_split_short_opt_name" \
|
|
|
|
|
# "-$func_split_short_opt_arg" ${1+"$@"}
|
|
|
|
|
# shift
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# args_changed=:
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# ;;
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# *) # Make sure the first unrecognised option "$_G_opt"
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# # is added back to "$@" in case we need it later,
|
|
|
|
|
# # if $args_changed was set to 'true'.
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# esac
|
|
|
|
|
# done
|
|
|
|
|
#
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# # Only call 'func_quote' here if we processed at least one argument.
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# if $args_changed; then
|
2015-10-11 20:35:15 +08:00
|
|
|
|
# func_quote eval ${1+"$@"}
|
|
|
|
|
# my_silent_option_result=$func_quote_result
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# }
|
|
|
|
|
# func_add_hook func_parse_options my_silent_option
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
# my_option_validation ()
|
|
|
|
|
# {
|
|
|
|
|
# $debug_cmd
|
|
|
|
|
#
|
|
|
|
|
# $opt_silent && $opt_verbose && func_fatal_help "\
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# '--silent' and '--verbose' options are mutually exclusive."
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# }
|
|
|
|
|
# func_add_hook func_validate_options my_option_validation
|
|
|
|
|
#
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# You'll also need to manually amend $usage_message to reflect the extra
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# options you parse. It's preferable to append if you can, so that
|
|
|
|
|
# multiple option parsing hooks can be added safely.
|
|
|
|
|
|
|
|
|
|
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# func_options_finish [ARG]...
|
|
|
|
|
# ----------------------------
|
|
|
|
|
# Finishing the option parse loop (call 'func_options' hooks ATM).
|
|
|
|
|
func_options_finish ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_run_hooks func_options ${1+"$@"}
|
|
|
|
|
func_propagate_result func_run_hooks func_options_finish
|
2015-10-05 19:16:08 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# func_options [ARG]...
|
|
|
|
|
# ---------------------
|
|
|
|
|
# All the functions called inside func_options are hookable. See the
|
|
|
|
|
# individual implementations for details.
|
|
|
|
|
func_hookable func_options
|
|
|
|
|
func_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
_G_options_quoted=false
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
2015-10-05 19:16:08 +08:00
|
|
|
|
for my_func in options_prep parse_options validate_options options_finish
|
|
|
|
|
do
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_unset func_${my_func}_result
|
|
|
|
|
func_unset func_run_hooks_result
|
|
|
|
|
eval func_$my_func '${1+"$@"}'
|
|
|
|
|
func_propagate_result func_$my_func func_options
|
|
|
|
|
if $func_propagate_result_result; then
|
|
|
|
|
eval set dummy "$func_options_result"; shift
|
|
|
|
|
_G_options_quoted=:
|
2015-10-05 19:16:08 +08:00
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
$_G_options_quoted || {
|
|
|
|
|
# As we (func_options) are top-level options-parser function and
|
|
|
|
|
# nobody quoted "$@" for us yet, we need to do it explicitly for
|
|
|
|
|
# caller.
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
func_options_result=$func_quote_result
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
}
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_options_prep [ARG]...
|
|
|
|
|
# --------------------------
|
|
|
|
|
# All initialisations required before starting the option parse loop.
|
|
|
|
|
# Note that when calling hook functions, we pass through the list of
|
|
|
|
|
# positional parameters. If a hook function modifies that list, and
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# needs to propagate that back to rest of this script, then the complete
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# modified list must be put in 'func_run_hooks_result' before returning.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_hookable func_options_prep
|
|
|
|
|
func_options_prep ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Option defaults:
|
|
|
|
|
opt_verbose=false
|
|
|
|
|
opt_warning_types=
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_run_hooks func_options_prep ${1+"$@"}
|
|
|
|
|
func_propagate_result func_run_hooks func_options_prep
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_parse_options [ARG]...
|
|
|
|
|
# ---------------------------
|
|
|
|
|
# The main option parsing loop.
|
|
|
|
|
func_hookable func_parse_options
|
|
|
|
|
func_parse_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
_G_parse_options_requote=false
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# this just eases exit handling
|
|
|
|
|
while test $# -gt 0; do
|
|
|
|
|
# Defer to hook functions for initial option parsing, so they
|
|
|
|
|
# get priority in the event of reusing an option name.
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_run_hooks func_parse_options ${1+"$@"}
|
|
|
|
|
func_propagate_result func_run_hooks func_parse_options
|
|
|
|
|
if $func_propagate_result_result; then
|
|
|
|
|
eval set dummy "$func_parse_options_result"; shift
|
|
|
|
|
# Even though we may have changed "$@", we passed the "$@" array
|
|
|
|
|
# down into the hook and it quoted it for us (because we are in
|
|
|
|
|
# this if-branch). No need to quote it again.
|
|
|
|
|
_G_parse_options_requote=false
|
2015-10-05 19:16:08 +08:00
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Break out of the loop if we already parsed every option.
|
|
|
|
|
test $# -gt 0 || break
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# We expect that one of the options parsed in this function matches
|
|
|
|
|
# and thus we remove _G_opt from "$@" and need to re-quote.
|
2015-10-05 19:16:08 +08:00
|
|
|
|
_G_match_parse_options=:
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_opt=$1
|
|
|
|
|
shift
|
|
|
|
|
case $_G_opt in
|
|
|
|
|
--debug|-x) debug_cmd='set -x'
|
2015-11-02 21:54:11 +08:00
|
|
|
|
func_echo "enabling shell trace mode" >&2
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
$debug_cmd
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
--no-warnings|--no-warning|--no-warn)
|
|
|
|
|
set dummy --warnings none ${1+"$@"}
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
--warnings|--warning|-W)
|
2015-10-05 19:16:08 +08:00
|
|
|
|
if test $# = 0 && func_missing_arg $_G_opt; then
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
_G_parse_options_requote=:
|
2015-10-05 19:16:08 +08:00
|
|
|
|
break
|
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
case " $warning_categories $1" in
|
|
|
|
|
*" $1 "*)
|
|
|
|
|
# trailing space prevents matching last $1 above
|
|
|
|
|
func_append_uniq opt_warning_types " $1"
|
|
|
|
|
;;
|
|
|
|
|
*all)
|
|
|
|
|
opt_warning_types=$warning_categories
|
|
|
|
|
;;
|
|
|
|
|
*none)
|
|
|
|
|
opt_warning_types=none
|
|
|
|
|
warning_func=:
|
|
|
|
|
;;
|
|
|
|
|
*error)
|
|
|
|
|
opt_warning_types=$warning_categories
|
|
|
|
|
warning_func=func_fatal_error
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
func_fatal_error \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"unsupported warning category: '$1'"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
--verbose|-v) opt_verbose=: ;;
|
|
|
|
|
--version) func_version ;;
|
|
|
|
|
-\?|-h) func_usage ;;
|
|
|
|
|
--help) func_help ;;
|
|
|
|
|
|
|
|
|
|
# Separate optargs to long options (plugins may need this):
|
|
|
|
|
--*=*) func_split_equals "$_G_opt"
|
|
|
|
|
set dummy "$func_split_equals_lhs" \
|
|
|
|
|
"$func_split_equals_rhs" ${1+"$@"}
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
# Separate optargs to short options:
|
|
|
|
|
-W*)
|
|
|
|
|
func_split_short_opt "$_G_opt"
|
|
|
|
|
set dummy "$func_split_short_opt_name" \
|
|
|
|
|
"$func_split_short_opt_arg" ${1+"$@"}
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
# Separate non-argument short options:
|
|
|
|
|
-\?*|-h*|-v*|-x*)
|
|
|
|
|
func_split_short_opt "$_G_opt"
|
|
|
|
|
set dummy "$func_split_short_opt_name" \
|
|
|
|
|
"-$func_split_short_opt_arg" ${1+"$@"}
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
--) _G_parse_options_requote=: ; break ;;
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
|
2015-10-05 19:16:08 +08:00
|
|
|
|
*) set dummy "$_G_opt" ${1+"$@"}; shift
|
|
|
|
|
_G_match_parse_options=false
|
|
|
|
|
break
|
|
|
|
|
;;
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
esac
|
2015-10-05 19:16:08 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
if $_G_match_parse_options; then
|
|
|
|
|
_G_parse_options_requote=:
|
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
done
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
if $_G_parse_options_requote; then
|
2015-10-05 19:16:08 +08:00
|
|
|
|
# save modified positional parameters for caller
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
func_parse_options_result=$func_quote_result
|
2015-10-05 19:16:08 +08:00
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_validate_options [ARG]...
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# Perform any sanity checks on option settings and/or unconsumed
|
|
|
|
|
# arguments.
|
|
|
|
|
func_hookable func_validate_options
|
|
|
|
|
func_validate_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Display all warnings if -W was not given.
|
|
|
|
|
test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
func_run_hooks func_validate_options ${1+"$@"}
|
|
|
|
|
func_propagate_result func_run_hooks func_validate_options
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Bail if the options were screwed!
|
|
|
|
|
$exit_cmd $EXIT_FAILURE
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
## Helper functions. ##
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# This section contains the helper functions used by the rest of the
|
|
|
|
|
# hookable option parser framework in ascii-betical order.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_fatal_help ARG...
|
|
|
|
|
# ----------------------
|
|
|
|
|
# Echo program name prefixed message to standard error, followed by
|
|
|
|
|
# a help hint, and exit.
|
|
|
|
|
func_fatal_help ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-03 08:33:38 +08:00
|
|
|
|
eval \$ECHO \""Usage: $usage"\"
|
|
|
|
|
eval \$ECHO \""$fatal_help"\"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_error ${1+"$@"}
|
|
|
|
|
exit $EXIT_FAILURE
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_help
|
|
|
|
|
# ---------
|
|
|
|
|
# Echo long help message to standard output and exit.
|
|
|
|
|
func_help ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
2011-11-03 16:23:45 +08:00
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_usage_message
|
2014-01-03 08:33:38 +08:00
|
|
|
|
$ECHO "$long_help_message"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
exit 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_missing_arg ARGNAME
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Echo program name prefixed message to standard error and set global
|
|
|
|
|
# exit_cmd.
|
|
|
|
|
func_missing_arg ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_error "Missing argument for '$1'."
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
exit_cmd=exit
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_split_equals STRING
|
|
|
|
|
# ------------------------
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Set func_split_equals_lhs and func_split_equals_rhs shell variables
|
|
|
|
|
# after splitting STRING at the '=' sign.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
test -z "$_G_HAVE_XSI_OPS" \
|
|
|
|
|
&& (eval 'x=a/b/c;
|
|
|
|
|
test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
|
|
|
|
|
&& _G_HAVE_XSI_OPS=yes
|
|
|
|
|
|
|
|
|
|
if test yes = "$_G_HAVE_XSI_OPS"
|
|
|
|
|
then
|
|
|
|
|
# This is an XSI compatible shell, allowing a faster implementation...
|
|
|
|
|
eval 'func_split_equals ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_split_equals_lhs=${1%%=*}
|
|
|
|
|
func_split_equals_rhs=${1#*=}
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
if test "x$func_split_equals_lhs" = "x$1"; then
|
|
|
|
|
func_split_equals_rhs=
|
|
|
|
|
fi
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
# ...otherwise fall back to using expr, which is often a shell builtin.
|
|
|
|
|
func_split_equals ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2012-10-22 17:58:29 +08:00
|
|
|
|
func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_split_equals_rhs=
|
2021-11-16 20:25:08 +08:00
|
|
|
|
test "x$func_split_equals_lhs=" = "x$1" \
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|| func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
|
|
|
|
|
}
|
|
|
|
|
fi #func_split_equals
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_split_short_opt SHORTOPT
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Set func_split_short_opt_name and func_split_short_opt_arg shell
|
|
|
|
|
# variables after splitting SHORTOPT after the 2nd character.
|
|
|
|
|
if test yes = "$_G_HAVE_XSI_OPS"
|
|
|
|
|
then
|
|
|
|
|
# This is an XSI compatible shell, allowing a faster implementation...
|
|
|
|
|
eval 'func_split_short_opt ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_split_short_opt_arg=${1#??}
|
|
|
|
|
func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
# ...otherwise fall back to using expr, which is often a shell builtin.
|
|
|
|
|
func_split_short_opt ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2021-11-16 20:25:08 +08:00
|
|
|
|
func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
|
|
|
|
|
}
|
|
|
|
|
fi #func_split_short_opt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_usage
|
|
|
|
|
# ----------
|
|
|
|
|
# Echo short help message to standard output and exit.
|
|
|
|
|
func_usage ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_usage_message
|
2014-01-03 08:33:38 +08:00
|
|
|
|
$ECHO "Run '$progname --help |${PAGER-more}' for full usage"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
exit 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_usage_message
|
|
|
|
|
# ------------------
|
|
|
|
|
# Echo short help message to standard output.
|
|
|
|
|
func_usage_message ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-03 08:33:38 +08:00
|
|
|
|
eval \$ECHO \""Usage: $usage"\"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
echo
|
2012-10-25 18:11:33 +08:00
|
|
|
|
$SED -n 's|^# ||
|
|
|
|
|
/^Written by/{
|
|
|
|
|
x;p;x
|
|
|
|
|
}
|
|
|
|
|
h
|
|
|
|
|
/^Written by/q' < "$progpath"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
echo
|
2014-01-03 08:33:38 +08:00
|
|
|
|
eval \$ECHO \""$usage_message"\"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_version
|
|
|
|
|
# ------------
|
|
|
|
|
# Echo version message to standard output and exit.
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# The version message is extracted from the calling file's header
|
|
|
|
|
# comments, with leading '# ' stripped:
|
|
|
|
|
# 1. First display the progname and version
|
|
|
|
|
# 2. Followed by the header comment line matching /^# Written by /
|
|
|
|
|
# 3. Then a blank line followed by the first following line matching
|
|
|
|
|
# /^# Copyright /
|
|
|
|
|
# 4. Immediately followed by any lines between the previous matches,
|
|
|
|
|
# except lines preceding the intervening completely blank line.
|
|
|
|
|
# For example, see the header comments of this file.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_version ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
printf '%s\n' "$progname $scriptversion"
|
2014-01-07 11:06:02 +08:00
|
|
|
|
$SED -n '
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
/^# Written by /!b
|
|
|
|
|
s|^# ||; p; n
|
|
|
|
|
|
2017-04-21 21:18:48 +08:00
|
|
|
|
:fwd2blnk
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
/./ {
|
|
|
|
|
n
|
2017-04-21 21:18:48 +08:00
|
|
|
|
b fwd2blnk
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
p; n
|
|
|
|
|
|
2017-04-21 21:18:48 +08:00
|
|
|
|
:holdwrnt
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
s|^# ||
|
|
|
|
|
s|^# *$||
|
2017-04-21 21:18:48 +08:00
|
|
|
|
/^Copyright /!{
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
/./H
|
|
|
|
|
n
|
2017-04-21 21:18:48 +08:00
|
|
|
|
b holdwrnt
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
|
|
|
|
|
s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
|
|
|
|
|
G
|
|
|
|
|
s|\(\n\)\n*|\1|g
|
|
|
|
|
p; q' < "$progpath"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
exit $?
|
|
|
|
|
}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# Local variables:
|
|
|
|
|
# mode: shell-script
|
|
|
|
|
# sh-indentation: 2
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
2018-07-24 15:06:44 +08:00
|
|
|
|
# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# time-stamp-time-zone: "UTC"
|
|
|
|
|
# End:
|
|
|
|
|
#! /bin/sh
|
|
|
|
|
|
|
|
|
|
# Extract macro arguments from autotools input with GNU M4.
|
|
|
|
|
# Written by Gary V. Vaughan, 2010
|
|
|
|
|
#
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# This is free software. There is NO warranty; not even for
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
#
|
2024-07-24 22:50:15 +08:00
|
|
|
|
# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
#
|
|
|
|
|
# This file is dual licensed under the terms of the MIT license
|
2024-01-17 09:01:41 +08:00
|
|
|
|
# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
|
|
|
|
|
# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# these licenses when using or redistributing this software or any of
|
|
|
|
|
# the files within it. See the URLs above, or the file `LICENSE`
|
|
|
|
|
# included in the Bootstrap distribution for the full license texts.
|
|
|
|
|
|
|
|
|
|
# Please report bugs or propose patches to:
|
|
|
|
|
# <https://github.com/gnulib-modules/bootstrap/issues>
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Make sure we've evaluated scripts we depend on.
|
|
|
|
|
test -z "$progpath" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh
|
|
|
|
|
test extract-trace = "$progname" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser
|
|
|
|
|
|
|
|
|
|
# Set a version string.
|
2019-02-19 23:19:59 +08:00
|
|
|
|
scriptversion=2019-02-19.15; # UTC
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------ ##
|
|
|
|
|
## Usage. ##
|
|
|
|
|
## ------ ##
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Run './extract-trace --help' for help with using this script from the
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# command line.
|
|
|
|
|
#
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Or source first 'options-parser' and then this file into your own
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# scripts in order to make use of the function and variable framework
|
|
|
|
|
# they define, and also to avoid the overhead of forking to run this
|
|
|
|
|
# script in its own process on every call.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
## Helper functions. ##
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# This section contains the helper functions used by the rest of
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'extract-trace'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_autoconf_configure MAYBE-CONFIGURE-FILE
|
|
|
|
|
# --------------------------------------------
|
|
|
|
|
# Ensure that MAYBE-CONFIGURE-FILE is the name of a file in the current
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# directory that contains an uncommented call to AC_INIT.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_autoconf_configure ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2012-10-25 18:11:33 +08:00
|
|
|
|
_G_sed_no_comment='
|
|
|
|
|
s|#.*$||
|
|
|
|
|
s|^dnl .*$||
|
|
|
|
|
s| dnl .*$||'
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_ac_init=
|
|
|
|
|
|
|
|
|
|
# If we were passed a genuine file, make sure it calls AC_INIT.
|
|
|
|
|
test -f "$1" \
|
2013-10-30 13:25:44 +08:00
|
|
|
|
&& _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |$GREP AC_INIT`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Otherwise it is not a genuine Autoconf input file.
|
|
|
|
|
test -n "$_G_ac_init"
|
|
|
|
|
_G_status=$?
|
|
|
|
|
|
|
|
|
|
test 0 -ne "$_G_status" \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
&& func_verbose "'$1' not using Autoconf"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
(exit $_G_status)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-12-04 02:53:08 +08:00
|
|
|
|
# func_tool_version_output CMD [FATAL-ERROR-MSG]
|
|
|
|
|
# ----------------------------------------------
|
|
|
|
|
# Attempt to run 'CMD --version', discarding errors. The output can be
|
|
|
|
|
# ignored by redirecting stdout, and this function used simply to test
|
|
|
|
|
# whether the command exists and exits normally when passed a
|
|
|
|
|
# '--version' argument.
|
|
|
|
|
# When FATAL-ERROR-MSG is given, then this function will display the
|
|
|
|
|
# message and exit if running 'CMD --version' returns a non-zero exit
|
|
|
|
|
# status.
|
|
|
|
|
func_tool_version_output ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_cmd=$1
|
|
|
|
|
_G_fatal_error_msg=$2
|
|
|
|
|
|
|
|
|
|
# Some tools, like 'git2cl' produce thousands of lines of output
|
|
|
|
|
# unless stdin is /dev/null - in that case we want to return
|
|
|
|
|
# successfully without saving all of that output. Other tools,
|
|
|
|
|
# such as 'help2man' exit with a non-zero status when stdin comes
|
|
|
|
|
# from /dev/null, so we re-execute without /dev/null if that
|
|
|
|
|
# happens. This means that occasionally, the output from both calls
|
|
|
|
|
# ends up in the result, but the alternative would be to discard the
|
|
|
|
|
# output from one call, and hope the other produces something useful.
|
|
|
|
|
{ $_G_cmd --version </dev/null || $_G_cmd --version; } 2>/dev/null
|
|
|
|
|
_G_status=$?
|
|
|
|
|
|
|
|
|
|
test 0 -ne "$_G_status" && test -n "$_G_fatal_error_msg" \
|
|
|
|
|
&& func_fatal_error "$_G_fatal_error_msg"
|
|
|
|
|
|
|
|
|
|
(exit $_G_status)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_tool_version_number CMD [FATAL-ERROR-MSG]
|
|
|
|
|
# ----------------------------------------------
|
|
|
|
|
# Pass arguments to func_tool_version_output, but set
|
|
|
|
|
# $func_tool_version_number_result to the last dot delimited digit string
|
|
|
|
|
# on the first line of output.
|
|
|
|
|
func_tool_version_number ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2015-01-21 01:21:37 +08:00
|
|
|
|
_G_verout=`func_tool_version_output "$@"`
|
2014-12-04 02:53:08 +08:00
|
|
|
|
_G_status=$?
|
|
|
|
|
|
|
|
|
|
# A version number starts with a digit following a space on the first
|
|
|
|
|
# line of output from `--version`.
|
2015-01-21 01:21:37 +08:00
|
|
|
|
_G_verout=`echo "$_G_verout" |sed 1q`
|
2014-12-04 02:53:08 +08:00
|
|
|
|
if test -n "$_G_verout"; then
|
|
|
|
|
_G_vernum=`expr "$_G_verout" : '.* \([0-9][^ ]*\)'`
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test -n "$_G_vernum"; then
|
|
|
|
|
printf '%s\n' "$_G_vernum"
|
|
|
|
|
else
|
|
|
|
|
printf '%s\n' "$_G_verout"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
(exit $_G_status)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# func_find_tool ENVVAR NAMES...
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# Search for a required program. Use the value of ENVVAR, if set,
|
|
|
|
|
# otherwise find the first of the NAMES that can be run (i.e.,
|
|
|
|
|
# supports --version). If found, set ENVVAR to the program name,
|
|
|
|
|
# die otherwise.
|
|
|
|
|
func_find_tool ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
_G_find_tool_envvar=$1
|
|
|
|
|
shift
|
|
|
|
|
_G_find_tool_names=$@
|
|
|
|
|
eval "_G_find_tool_res=\$$_G_find_tool_envvar"
|
|
|
|
|
if test -n "$_G_find_tool_res"; then
|
|
|
|
|
_G_find_tool_error_prefix="\$$find_tool_envvar: "
|
|
|
|
|
else
|
2014-12-04 02:53:08 +08:00
|
|
|
|
_G_find_tool_res=
|
|
|
|
|
_G_bestver=
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
for _G_prog
|
|
|
|
|
do
|
2014-12-04 02:53:08 +08:00
|
|
|
|
_G_find_tool_save_IFS=$IFS
|
2015-01-21 01:21:37 +08:00
|
|
|
|
IFS=${PATH_SEPARATOR-:}
|
2014-12-04 02:53:08 +08:00
|
|
|
|
for _G_dir in $PATH; do
|
|
|
|
|
IFS=$_G_find_tool_save_IFS
|
|
|
|
|
_G_progpath=$_G_dir/$_G_prog
|
2014-12-12 06:58:08 +08:00
|
|
|
|
test -r "$_G_progpath" && {
|
2014-12-04 02:53:08 +08:00
|
|
|
|
_G_curver=`func_tool_version_number $_G_progpath`
|
|
|
|
|
case $_G_bestver,$_G_curver in
|
|
|
|
|
,)
|
|
|
|
|
# first non--version responsive prog sticks!
|
|
|
|
|
test -n "$_G_progpath" || _G_find_tool_res=$_G_progpath
|
|
|
|
|
;;
|
|
|
|
|
,*)
|
|
|
|
|
# first --version responsive prog beats non--version responsive!
|
|
|
|
|
_G_find_tool_res=$_G_progpath
|
|
|
|
|
_G_bestver=$_G_curver
|
|
|
|
|
;;
|
|
|
|
|
*,*)
|
|
|
|
|
# another --version responsive prog must be newer to beat previous one!
|
|
|
|
|
test "x$_G_curver" = "x$_G_bestver" \
|
|
|
|
|
|| func_lt_ver "$_G_curver" "$_G_bestver" \
|
|
|
|
|
|| {
|
|
|
|
|
_G_find_tool_res=$_G_progpath
|
|
|
|
|
_G_bestver=$_G_curver
|
|
|
|
|
}
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_find_tool_save_IFS
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
if test -n "$_G_find_tool_res"; then
|
2014-12-04 02:53:08 +08:00
|
|
|
|
func_tool_version_number >/dev/null $_G_find_tool_res "\
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
${_G_find_tool_error_prefix}Cannot run '$_G_find_tool_res --version'"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# Make sure the result is exported to the environment for children
|
|
|
|
|
# to use.
|
|
|
|
|
eval "$_G_find_tool_envvar=\$_G_find_tool_res"
|
|
|
|
|
eval "export $_G_find_tool_envvar"
|
|
|
|
|
else
|
|
|
|
|
func_error "\
|
|
|
|
|
One of these is required:
|
|
|
|
|
$_G_find_tool_names"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
## Resource management. ##
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains definitions for functions that each ensure a
|
|
|
|
|
# particular resource (a file, or a non-empty configuration variable for
|
|
|
|
|
# example) is available, and if appropriate to extract default values
|
|
|
|
|
# from pertinent package files. Where a variable already has a non-
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# empty value (as set by the package's 'bootstrap.conf'), that value is
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# used in preference to deriving the default. Call them using their
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# associated 'require_*' variable to ensure that they are executed, at
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# most, once.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
#
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# It's entirely deliberate that calling these functions can set
|
|
|
|
|
# variables that don't obey the namespace limitations obeyed by the rest
|
|
|
|
|
# of this file, in order that that they be as useful as possible to
|
|
|
|
|
# callers.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_configure_ac
|
|
|
|
|
# --------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that there is a 'configure.ac' or 'configure.in' file in the
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# current directory that contains an uncommented call to AC_INIT, and
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# that '$configure_ac' contains its name.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
require_configure_ac=func_require_configure_ac
|
|
|
|
|
func_require_configure_ac ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -z "$configure_ac" \
|
|
|
|
|
&& func_autoconf_configure configure.ac && configure_ac=configure.ac
|
|
|
|
|
test -z "$configure_ac" \
|
|
|
|
|
&& func_autoconf_configure configure.in && configure_ac=configure.in
|
|
|
|
|
test -z "$configure_ac" \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
|| func_verbose "found '$configure_ac'"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
require_configure_ac=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_gnu_m4
|
|
|
|
|
# --------------
|
|
|
|
|
# Search for GNU M4, and export it in $M4.
|
|
|
|
|
require_gnu_m4=func_require_gnu_m4
|
|
|
|
|
func_require_gnu_m4 ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$M4" || {
|
|
|
|
|
# Find the first m4 binary that responds to --version.
|
|
|
|
|
func_find_tool M4 gm4 gnum4 m4
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test -n "$M4" || func_fatal_error "\
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
Please install GNU M4, or 'export M4=/path/to/gnu/m4'."
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
func_verbose "export M4='$M4'"
|
|
|
|
|
|
|
|
|
|
# Make sure the search result is visible to subshells
|
|
|
|
|
export M4
|
|
|
|
|
|
|
|
|
|
require_gnu_m4=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## --------------- ##
|
|
|
|
|
## Core functions. ##
|
|
|
|
|
## --------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains the high level functions used when calling this
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# file as a script. 'func_extract_trace' is probably the only one that you
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# won't want to replace if you source this file into your own script.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_extract_trace MACRO_NAMES [FILENAME]...
|
|
|
|
|
# --------------------------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# set '$func_extract_trace_result' to a colon delimited list of arguments
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# to any of the comma separated list of MACRO_NAMES in FILENAME. If no
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# FILENAME is given, then '$configure_ac' is assumed.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_extract_trace ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_configure_ac
|
|
|
|
|
$require_gnu_m4
|
|
|
|
|
|
2014-01-03 08:33:38 +08:00
|
|
|
|
_G_m4_traces=`$ECHO "--trace=$1" |$SED 's%,% --trace=%g'`
|
|
|
|
|
_G_re_macros=`$ECHO "($1)" |$SED 's%,%|%g'`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_macros="$1"; shift
|
|
|
|
|
test $# -gt 0 || {
|
|
|
|
|
set dummy $configure_ac
|
|
|
|
|
shift
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Generate an error if the first file is missing
|
|
|
|
|
<"$1"
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Sadly, we can't use 'autom4te' tracing to extract macro arguments,
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# because it complains about things we want to ignore at bootstrap
|
|
|
|
|
# time - like missing m4_include files; AC_PREREQ being newer than
|
|
|
|
|
# the installed autoconf; and returns nothing when tracing
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'AM_INIT_AUTOMAKE' when aclocal hasn't been generated yet.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
#
|
|
|
|
|
# The following tries to emulate a less persnickety version of (and
|
|
|
|
|
# due to not having to wait for Perl startup on every invocation,
|
|
|
|
|
# it's probably faster too):
|
|
|
|
|
#
|
|
|
|
|
# autom4te --language=Autoconf --trace=$my_macro:\$% "$@"
|
|
|
|
|
#
|
|
|
|
|
# First we give a minimal set of macro declarations to M4 to prime
|
|
|
|
|
# it for reading Autoconf macros, while still providing some of the
|
|
|
|
|
# functionality generally used at m4-time to supply dynamic
|
|
|
|
|
# arguments to Autocof functions, but without following
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'm4_s?include' files.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_mini='
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl Initialisation.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
m4_changequote([,])
|
|
|
|
|
m4_define([m4_copy], [m4_define([$2], m4_defn([$1]))])
|
|
|
|
|
m4_define([m4_rename], [m4_copy([$1], [$2])m4_undefine([$1])])
|
|
|
|
|
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl Replace macros which may abort m4 with a no-op variant.
|
|
|
|
|
m4_pushdef([m4_assert])
|
|
|
|
|
m4_pushdef([m4_exit])
|
|
|
|
|
m4_pushdef([m4_fatal])
|
|
|
|
|
m4_pushdef([m4_m4exit])
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl Replace macros that might break stderr of m4.
|
|
|
|
|
m4_pushdef([m4_errprint])
|
|
|
|
|
m4_pushdef([m4_errprintn])
|
|
|
|
|
m4_pushdef([m4_include])
|
|
|
|
|
m4_pushdef([m4_warn])
|
|
|
|
|
|
|
|
|
|
dnl Avoid side-effects of tracing by extract-trace.
|
|
|
|
|
m4_pushdef([m4_maketemp])
|
|
|
|
|
m4_pushdef([m4_mkstemp])
|
|
|
|
|
|
|
|
|
|
dnl TODO: reasons for this
|
|
|
|
|
m4_pushdef([m4_dnl])
|
|
|
|
|
m4_pushdef([m4_m4wrap])
|
|
|
|
|
|
|
|
|
|
dnl Copy and rename macros not handled by "m4 --prefix".
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
m4_define([dnl], [m4_builtin([dnl])])
|
|
|
|
|
m4_copy([m4_define], [m4_defun])
|
|
|
|
|
m4_rename([m4_ifelse], [m4_if])
|
|
|
|
|
m4_rename([m4_patsubst], [m4_bpatsubst])
|
|
|
|
|
m4_rename([m4_regexp], [m4_bregexp])
|
|
|
|
|
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl "m4sugar.mini" - useful m4-time macros for dynamic arguments.
|
|
|
|
|
dnl If we discover packages that need more m4 macros defined in
|
|
|
|
|
dnl order to bootstrap correctly, add them here:
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
m4_define([m4_bmatch],
|
|
|
|
|
[m4_if([$#], 0, [], [$#], 1, [], [$#], 2, [$2],
|
|
|
|
|
[m4_if(m4_bregexp([$1], [$2]), -1,
|
|
|
|
|
[$0([$1], m4_shift3($@))], [$3])])])
|
|
|
|
|
m4_define([m4_ifndef], [m4_ifdef([$1], [$3], [$2])])
|
|
|
|
|
m4_define([m4_ifset],
|
|
|
|
|
[m4_ifdef([$1], [m4_ifval(m4_defn([$1]), [$2], [$3])], [$3])])
|
|
|
|
|
m4_define([m4_require], [$1])
|
|
|
|
|
m4_define([m4_shift3], [m4_shift(m4shift(m4shift($@)))])
|
|
|
|
|
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl "autoconf.mini" - things from autoconf macros we care about.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
m4_copy([m4_defun], [AC_DEFUN])
|
|
|
|
|
|
2015-09-19 05:17:07 +08:00
|
|
|
|
dnl Dummy definitions for the macros we want to trace.
|
|
|
|
|
dnl AM_INIT_AUTOMAKE at least produces no trace without this.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
_G_save=$IFS
|
|
|
|
|
IFS=,
|
|
|
|
|
for _G_macro in $_G_macros; do
|
|
|
|
|
IFS=$_G_save
|
|
|
|
|
func_append _G_mini "AC_DEFUN([$_G_macro])$nl"
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_save
|
|
|
|
|
|
|
|
|
|
# We discard M4's stdout, but the M4 trace output from reading our
|
|
|
|
|
# "autoconf.mini" followed by any other files passed to this
|
|
|
|
|
# function is then scanned by sed to transform it into a colon
|
|
|
|
|
# delimited argument list assigned to a shell variable.
|
|
|
|
|
_G_transform='s|#.*$||; s|^dnl .*$||; s| dnl .*$||;'
|
|
|
|
|
|
|
|
|
|
# Unfortunately, alternation in regexp addresses doesn't work in at
|
|
|
|
|
# least BSD (and hence Mac OS X) sed, so we have to append a capture
|
|
|
|
|
# and print block for each traced macro to the sed transform script.
|
|
|
|
|
_G_save=$IFS
|
|
|
|
|
IFS=,
|
|
|
|
|
for _G_macro in $_G_macros; do
|
|
|
|
|
IFS=$_G_save
|
|
|
|
|
func_append _G_transform '
|
|
|
|
|
/^m4trace: -1- '"$_G_macro"'/ {
|
|
|
|
|
s|^m4trace: -1- '"$_G_macro"'[([]*||
|
|
|
|
|
s|], [[]|:|g
|
|
|
|
|
s|[])]*$|:|
|
|
|
|
|
s|\(.\):$|\1|
|
|
|
|
|
p
|
|
|
|
|
}'
|
|
|
|
|
done
|
|
|
|
|
IFS=$_G_save
|
|
|
|
|
|
|
|
|
|
# Save the command pipeline results for further use by callers of
|
|
|
|
|
# this function.
|
2014-01-03 08:33:38 +08:00
|
|
|
|
func_extract_trace_result=`$ECHO "$_G_mini" \
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|$M4 -daq --prefix $_G_m4_traces - "$@" 2>&1 1>/dev/null \
|
|
|
|
|
|$SED -n -e "$_G_transform"`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_extract_trace_first MACRO_NAMES [FILENAME]...
|
|
|
|
|
# --------------------------------------------------
|
|
|
|
|
# Exactly like func_extract_trace, except that only the first argument
|
|
|
|
|
# to the first invocation of one of the comma separated MACRO_NAMES is
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# returned in '$func_extract_trace_first_result'.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
func_extract_trace_first ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_extract_trace ${1+"$@"}
|
2014-01-03 08:33:38 +08:00
|
|
|
|
func_extract_trace_first_result=`$ECHO "$func_extract_trace_result" \
|
2012-10-25 18:11:33 +08:00
|
|
|
|
|$SED -e 's|:.*$||g' -e 1q`
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_main [ARG]...
|
|
|
|
|
# ------------------
|
|
|
|
|
func_main ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Configuration.
|
|
|
|
|
usage='$progname MACRO_NAME FILE [...]'
|
|
|
|
|
|
|
|
|
|
long_help_message='
|
|
|
|
|
The first argument to this program is the name of an autotools macro
|
|
|
|
|
whose arguments you want to extract by examining the files listed in the
|
|
|
|
|
remaining arguments using the same tool that Autoconf and Automake use,
|
|
|
|
|
GNU M4.
|
|
|
|
|
|
|
|
|
|
The arguments are returned separated by colons, with each traced call
|
|
|
|
|
on a separate line.'
|
|
|
|
|
|
|
|
|
|
# Option processing.
|
|
|
|
|
func_options "$@"
|
|
|
|
|
eval set dummy "$func_options_result"; shift
|
|
|
|
|
|
|
|
|
|
# Validate remaining non-option arguments.
|
|
|
|
|
test $# -gt 1 \
|
|
|
|
|
|| func_fatal_help "not enough arguments"
|
|
|
|
|
|
|
|
|
|
# Pass non-option arguments to extraction function.
|
|
|
|
|
func_extract_trace "$@"
|
|
|
|
|
|
|
|
|
|
# Display results.
|
|
|
|
|
test -n "$func_extract_trace_result" \
|
2014-01-03 08:33:38 +08:00
|
|
|
|
&& $ECHO "$func_extract_trace_result"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
# The End.
|
|
|
|
|
exit $EXIT_SUCCESS
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## --------------------------- ##
|
|
|
|
|
## Actually perform the trace. ##
|
|
|
|
|
## --------------------------- ##
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Only call 'func_main' if this script was called directly.
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
test extract-trace = "$progname" && func_main "$@"
|
|
|
|
|
|
|
|
|
|
# Local variables:
|
|
|
|
|
# mode: shell-script
|
|
|
|
|
# sh-indentation: 2
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
2018-07-24 15:06:44 +08:00
|
|
|
|
# time-stamp-pattern: "50/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
# time-stamp-time-zone: "UTC"
|
|
|
|
|
# End:
|
|
|
|
|
|
|
|
|
|
# Set a version string for *this* script.
|
2019-03-22 20:05:53 +08:00
|
|
|
|
scriptversion=2019-03-22.11; # UTC
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------------------- ##
|
|
|
|
|
## Hookable functions. ##
|
|
|
|
|
## ------------------- ##
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# After 'bootstrap.conf' has been sourced, execution proceeds by calling
|
|
|
|
|
# 'func_bootstrap'. Wherever a function is decorated with
|
|
|
|
|
# 'func_hookable func_name', you will find a matching 'func_run_hooks
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# func_name', which executes all functions added with 'func_add_hook
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# func_name my_func'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
#
|
|
|
|
|
# You might notice that many of these functions begin with a series of
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# '$require_foo' lines. See the docu-comments at the start of the
|
|
|
|
|
# 'Resource management' section for a description of what these are.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_bootstrap [ARG]...
|
|
|
|
|
# -----------------------
|
|
|
|
|
# All the functions called inside func_bootstrap are hookable. See the
|
|
|
|
|
# the individual implementations for details.
|
|
|
|
|
func_bootstrap ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Save the current positional parameters to prevent them being
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# corrupted by calls to 'set' in 'func_init'.
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
_G_saved_positional_parameters=$func_quote_result
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# Initialisation.
|
|
|
|
|
func_init
|
|
|
|
|
|
|
|
|
|
# Option processing.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
eval func_options "$_G_saved_positional_parameters"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# Post-option preparation.
|
|
|
|
|
func_prep
|
|
|
|
|
|
|
|
|
|
# Reconfigure the package.
|
|
|
|
|
func_reconfigure
|
|
|
|
|
|
|
|
|
|
# Ensure .version is up-to-date.
|
|
|
|
|
func_update_dotversion
|
|
|
|
|
|
|
|
|
|
# Finalisation.
|
|
|
|
|
func_fini
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_init
|
|
|
|
|
# ---------
|
|
|
|
|
# Any early initialisations can be hooked to this function. Consider
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# whether you can hook onto 'func_prep' instead, because if you hook
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# any slow to execute code in here, it will also add to the time before
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# './bootstrap --version' can respond.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_hookable func_init
|
|
|
|
|
func_init ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_init
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_prep
|
|
|
|
|
# ---------
|
|
|
|
|
# Function to perform preparation for remaining bootstrap process. If
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# your hooked code relies on the outcome of 'func_options' hook it here
|
|
|
|
|
# rather than to 'func_init'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
#
|
|
|
|
|
# All the functions called inside func_prep are hookable. See the
|
|
|
|
|
# individual implementations for details.
|
|
|
|
|
func_hookable func_prep
|
|
|
|
|
func_prep ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_buildtools_uptodate
|
|
|
|
|
$require_checkout_only_file
|
|
|
|
|
|
|
|
|
|
$require_gnulib_merge_changelog
|
|
|
|
|
|
2013-10-28 14:55:36 +08:00
|
|
|
|
# Report the results of SED and GREP searches from funclib.sh.
|
|
|
|
|
func_verbose "GREP='$GREP'"
|
|
|
|
|
func_verbose "SED='$SED'"
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# fetch update files from the translation project
|
|
|
|
|
func_update_translations
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_prep
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_update_translations
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Update package po files and translations.
|
|
|
|
|
func_hookable func_update_translations
|
|
|
|
|
func_update_translations ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$opt_skip_po || {
|
|
|
|
|
test -d po && {
|
|
|
|
|
$require_package
|
|
|
|
|
|
|
|
|
|
func_update_po_files po $package || exit $?
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_update_translations
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_reconfigure
|
|
|
|
|
# ----------------
|
|
|
|
|
# Reconfigure the current package by running the appropriate autotools in a
|
|
|
|
|
# suitable order.
|
|
|
|
|
func_hookable func_reconfigure
|
|
|
|
|
func_reconfigure ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-03 11:45:18 +08:00
|
|
|
|
$require_automake_options
|
|
|
|
|
|
2015-01-21 01:21:37 +08:00
|
|
|
|
# Automake (without 'foreign' option) requires that NEWS & README exist.
|
2014-01-03 11:45:18 +08:00
|
|
|
|
case " $automake_options " in
|
|
|
|
|
" foreign ") ;;
|
2015-01-21 01:21:37 +08:00
|
|
|
|
*)
|
|
|
|
|
func_ensure_NEWS
|
|
|
|
|
func_ensure_README
|
|
|
|
|
;;
|
2014-01-03 11:45:18 +08:00
|
|
|
|
esac
|
|
|
|
|
|
2013-09-15 21:35:15 +08:00
|
|
|
|
# Ensure ChangeLog presence.
|
|
|
|
|
if test -n "$gnulib_modules"; then
|
|
|
|
|
func_ifcontains "$gnulib_modules" gitlog-to-changelog \
|
|
|
|
|
func_ensure_changelog
|
|
|
|
|
else
|
|
|
|
|
$require_gnulib_cache
|
2013-10-30 13:25:44 +08:00
|
|
|
|
if $SED -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
|
2013-09-15 21:35:15 +08:00
|
|
|
|
func_grep_q gitlog-to-changelog
|
|
|
|
|
then
|
|
|
|
|
func_ensure_changelog
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Released 'autopoint' has the tendency to install macros that have
|
2014-01-03 11:45:18 +08:00
|
|
|
|
# been obsoleted in current 'gnulib', so run this before 'gnulib-tool'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_autopoint
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Autoreconf runs 'aclocal' before 'libtoolize', which causes spurious
|
|
|
|
|
# warnings if the initial 'aclocal' is confused by the libtoolized
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# (or worse: out-of-date) macro directory.
|
|
|
|
|
func_libtoolize
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# If you need to do anything after 'gnulib-tool' is done, but before
|
|
|
|
|
# 'autoreconf' runs, you don't need to override this whole function,
|
|
|
|
|
# because 'func_gnulib_tool' is hookable.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_gnulib_tool
|
|
|
|
|
|
|
|
|
|
func_autoreconf
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_reconfigure
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_gnulib_tool
|
|
|
|
|
# ----------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Run 'gnulib-tool' to fetch gnulib modules into the current package.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
#
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# It's assumed that since you are using gnulib's 'bootstrap' script,
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# you're also using gnulib elsewhere in your package. If not, then
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# you can replace this function in 'bootstrap.conf' with:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
#
|
|
|
|
|
# func_gnulib_tool () { :; }
|
|
|
|
|
#
|
|
|
|
|
# (although the function returns immediately if $gnulib_tool is set to
|
|
|
|
|
# true in any case).
|
|
|
|
|
func_hookable func_gnulib_tool
|
|
|
|
|
func_gnulib_tool ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_tool
|
|
|
|
|
$require_libtoolize
|
|
|
|
|
|
|
|
|
|
test true = "$gnulib_tool" || {
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
$require_gnulib_git_submodules
|
|
|
|
|
|
2013-08-23 21:17:50 +08:00
|
|
|
|
# bootstrap.conf written for gnulib bootstrap expects
|
|
|
|
|
# gnulib_tool_option_extras to which --no-changelog is appended,
|
|
|
|
|
# but libtool bootstrap expects you to append to gnulib_tool_options
|
|
|
|
|
# so that you can override the --no-changelog default: make sure we
|
|
|
|
|
# support both styles so users can migrate between them easily.
|
|
|
|
|
gnulib_tool_all_options="$gnulib_tool_options $gnulib_tool_option_extras"
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
if test -n "$gnulib_modules"; then
|
|
|
|
|
$require_gnulib_cache
|
2013-01-27 20:57:22 +08:00
|
|
|
|
$require_gnulib_tool_base_options
|
|
|
|
|
|
|
|
|
|
gnulib_mode=--import
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Try not to pick up any stale values from 'gnulib-cache.m4'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
rm -f "$gnulib_cache"
|
|
|
|
|
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$gnulib_tool_base_options" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_all_options " $gnulib_tool_base_options"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$gnulib_mk" \
|
2013-01-27 20:57:22 +08:00
|
|
|
|
&& func_append_uniq gnulib_tool_all_options " --makefile-name=$gnulib_mk"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$tests_base" && {
|
2013-01-27 20:57:22 +08:00
|
|
|
|
func_append_uniq gnulib_tool_all_options " --tests-base=$tests_base"
|
|
|
|
|
func_append_uniq gnulib_tool_all_options " --with-tests"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
|
|
|
|
|
# Use 'gnulib --update' to fetch gnulib modules.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
gnulib_mode=--update
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Add a sensible default libtool option to gnulib_tool_options.
|
|
|
|
|
# The embedded echo is to squash whitespace before globbing.
|
2013-01-27 20:57:22 +08:00
|
|
|
|
case `echo " "$gnulib_tool_all_options" "` in
|
2010-09-25 05:26:00 +08:00
|
|
|
|
*" --no-libtool "*|*" --libtool "*) ;;
|
|
|
|
|
*) if test true = "$LIBTOOLIZE"; then
|
2013-01-27 20:57:22 +08:00
|
|
|
|
func_append_uniq gnulib_tool_all_options " --no-libtool"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
else
|
2013-01-27 20:57:22 +08:00
|
|
|
|
func_append_uniq gnulib_tool_all_options " --libtool"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2013-01-27 20:57:22 +08:00
|
|
|
|
$opt_copy || func_append_uniq gnulib_tool_all_options " --symlink"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-01-27 20:57:22 +08:00
|
|
|
|
func_append_uniq gnulib_tool_all_options " $gnulib_mode"
|
|
|
|
|
func_append gnulib_tool_all_options " $gnulib_modules"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# The embedded echo is to squash whitespace before display.
|
2013-01-27 20:57:22 +08:00
|
|
|
|
gnulib_cmd=`echo $gnulib_tool $gnulib_tool_all_options`
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_show_eval "$gnulib_cmd" 'exit $?'
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Use 'gnulib-tool --copy-file' to install non-module files.
|
2012-09-16 12:47:22 +08:00
|
|
|
|
func_install_gnulib_non_module_files
|
|
|
|
|
}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_run_hooks func_gnulib_tool
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_fini
|
|
|
|
|
# ---------
|
|
|
|
|
# Function to perform all finalisation for the bootstrap process.
|
|
|
|
|
func_hookable func_fini
|
|
|
|
|
func_fini ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_gettext_configuration
|
|
|
|
|
func_clean_dangling_symlinks
|
|
|
|
|
func_clean_unused_macros
|
|
|
|
|
func_skip_po_recommendation
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_fini
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
$require_bootstrap_uptodate
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_echo "Done. Now you can run './configure'."
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_gettext_configuration
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Edit configuration values into po/Makevars.
|
|
|
|
|
func_hookable func_gettext_configuration
|
|
|
|
|
func_gettext_configuration ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_autopoint
|
|
|
|
|
|
|
|
|
|
test true = "$AUTOPOINT" || {
|
|
|
|
|
$require_copyright_holder
|
|
|
|
|
$require_extra_locale_categories
|
|
|
|
|
$require_package_bugreport
|
|
|
|
|
|
|
|
|
|
# Escape xgettext options for sed Makevars generation below.
|
|
|
|
|
# We have to delete blank lines in a separate script so that we don't
|
|
|
|
|
# append \\\ to the penultimate line, and then delete the last empty
|
|
|
|
|
# line, which messes up the variable substitution later in this
|
|
|
|
|
# function. Note that adding a literal \\\ requires double escaping
|
|
|
|
|
# here, once for the execution subshell, and again for the assignment,
|
|
|
|
|
# which is why there are actually 12 (!!) backslashes in the script.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_xgettext_options=`echo "$xgettext_options$nl" |$SED '/^$/d' |$SED '
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$b
|
|
|
|
|
s|$| \\\\\\\\\\\\|'`
|
|
|
|
|
|
|
|
|
|
# Create gettext configuration.
|
|
|
|
|
func_echo "Creating po/Makevars from po/Makevars.template ..."
|
|
|
|
|
$RM -f po/Makevars
|
|
|
|
|
$SED '
|
|
|
|
|
/^EXTRA_LOCALE_CATEGORIES *=/s|=.*|= '"$extra_locale_categories"'|
|
|
|
|
|
/^COPYRIGHT_HOLDER *=/s|=.*|= '"$copyright_holder"'|
|
|
|
|
|
/^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$package_bugreport"'|
|
|
|
|
|
/^XGETTEXT_OPTIONS *=/{
|
|
|
|
|
s|$| \\|
|
|
|
|
|
a\
|
2011-11-03 16:23:45 +08:00
|
|
|
|
'"$_G_xgettext_options"' \\\
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$${end_of_xgettext_options+}
|
|
|
|
|
}
|
2017-04-21 21:18:48 +08:00
|
|
|
|
s/ *$//
|
2010-09-25 05:26:00 +08:00
|
|
|
|
' po/Makevars.template >po/Makevars || exit 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func_run_hooks func_gettext_configuration
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## --------------- ##
|
|
|
|
|
## Core functions. ##
|
|
|
|
|
## --------------- ##
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# This section contains the main functions called from the 'Hookable
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# functions' (shown above), and are the ones you're most likely
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# to want to replace with your own implementations in 'bootstrap.conf'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_autopoint
|
|
|
|
|
# --------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# If this package uses gettext, then run 'autopoint'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_autopoint ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_autopoint
|
|
|
|
|
|
|
|
|
|
test true = "$AUTOPOINT" \
|
|
|
|
|
|| func_show_eval "$AUTOPOINT --force" 'exit $?'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_libtoolize
|
|
|
|
|
# ---------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# If this package uses libtool, then run 'libtoolize'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_libtoolize ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_libtoolize
|
|
|
|
|
|
|
|
|
|
test true = "$LIBTOOLIZE" || {
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_libtoolize_options=
|
|
|
|
|
$opt_copy && func_append _G_libtoolize_options " --copy"
|
|
|
|
|
$opt_force && func_append _G_libtoolize_options " --force"
|
|
|
|
|
$opt_verbose || func_append _G_libtoolize_options " --quiet"
|
|
|
|
|
func_show_eval "$LIBTOOLIZE$_G_libtoolize_options" 'exit $?'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_gnulib_tool_copy_file SRC DEST
|
|
|
|
|
# -----------------------------------
|
|
|
|
|
# Copy SRC, a path relative to the gnulib sub-tree, to DEST, a path
|
|
|
|
|
# relative to the top-level source directory using gnulib-tool so that
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# any patches or replacements in $local_gl_path are applied.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_gnulib_tool_copy_file ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_tool
|
2011-12-08 12:54:40 +08:00
|
|
|
|
$require_patch
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-10-26 13:58:35 +08:00
|
|
|
|
if test true = "$gnulib_tool"; then
|
|
|
|
|
# If gnulib-tool is not available (e.g. bootstrapping in a
|
|
|
|
|
# distribution tarball), make sure that at least we have some
|
|
|
|
|
# version of the required file already in place.
|
|
|
|
|
test -f "$2" || func_fatal_error "\
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
Can't find, copy or download '$2', a required
|
2011-11-03 16:23:45 +08:00
|
|
|
|
gnulib supplied file, please provide the location of a
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
complete 'gnulib' tree by setting 'gnulib_path' in your
|
|
|
|
|
'bootstrap.conf' or with the '--gnulib-srcdir' option -
|
|
|
|
|
or else specify the location of your 'git' binary by
|
|
|
|
|
setting 'GIT' in the environment so that a fresh
|
|
|
|
|
'gnulib' submodule can be cloned."
|
2011-10-26 13:58:35 +08:00
|
|
|
|
else
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_gnulib_copy_cmd
|
|
|
|
|
|
|
|
|
|
$gnulib_copy_cmd $1 $2 2>/dev/null || {
|
|
|
|
|
$require_gnulib_path
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_error "'$gnulib_path/$1' does not exist"
|
2011-10-26 13:58:35 +08:00
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
fi
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_install_gnulib_non_module_files
|
|
|
|
|
# ------------------------------------
|
|
|
|
|
# Get additional non-module files from gnulib, overriding existing files.
|
|
|
|
|
func_install_gnulib_non_module_files ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_build_aux
|
2011-10-26 13:58:35 +08:00
|
|
|
|
$require_gnulib_tool
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
test -n "$gnulib_non_module_files" && {
|
2011-10-26 13:58:35 +08:00
|
|
|
|
maybe_exit_cmd=:
|
|
|
|
|
|
|
|
|
|
for file in $gnulib_non_module_files; do
|
|
|
|
|
case $file in
|
|
|
|
|
*/COPYING*) dest=COPYING;;
|
|
|
|
|
*/INSTALL) dest=INSTALL;;
|
2012-09-16 12:47:22 +08:00
|
|
|
|
build-aux/missing) dest=
|
|
|
|
|
func_warning settings "\
|
|
|
|
|
Please remove build-aux/missing from gnulib_module_files in
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
'bootstrap.conf', as it may clash with Automake's version."
|
2012-09-16 12:47:22 +08:00
|
|
|
|
;;
|
2011-10-26 13:58:35 +08:00
|
|
|
|
build-aux/*) dest=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
|
|
|
|
|
*) dest=$file;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
# Be sure to show all copying errors before bailing out
|
2012-09-16 12:47:22 +08:00
|
|
|
|
test -z "$dest" \
|
|
|
|
|
|| func_gnulib_tool_copy_file "$file" "$dest" \
|
2011-10-26 13:58:35 +08:00
|
|
|
|
|| maybe_exit_cmd="exit $EXIT_FAILURE"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
$maybe_exit_cmd
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_ensure_changelog
|
|
|
|
|
# ---------------------
|
|
|
|
|
# Even with 'gitlog-to-changelog' generated ChangeLogs, automake
|
|
|
|
|
# will not run to completion with no ChangeLog file.
|
|
|
|
|
func_ensure_changelog ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -f ChangeLog && mv -f ChangeLog ChangeLog~
|
|
|
|
|
|
|
|
|
|
cat >ChangeLog <<'EOT'
|
|
|
|
|
## ---------------------- ##
|
|
|
|
|
## DO NOT EDIT THIS FILE! ##
|
|
|
|
|
## ---------------------- ##
|
|
|
|
|
|
|
|
|
|
ChangeLog is generated by gitlog-to-changelog.
|
|
|
|
|
EOT
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
_G_message="creating dummy 'ChangeLog'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -f ChangeLog~ \
|
2011-11-03 16:23:45 +08:00
|
|
|
|
&& func_append _G_message ' (backup in ChangeLog~)'
|
|
|
|
|
func_verbose "$_G_message"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2015-01-21 01:21:37 +08:00
|
|
|
|
# func_ensure_NEWS
|
|
|
|
|
# ----------------
|
|
|
|
|
# Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
|
|
|
|
|
# completion with no NEWS file, even though NEWS.md or NEWS.txt
|
|
|
|
|
# is often preferable.
|
|
|
|
|
func_ensure_NEWS ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -f NEWS || {
|
|
|
|
|
_G_NEWS=
|
|
|
|
|
for _G_news in NEWS.txt NEWS.md NEWS.rst; do
|
|
|
|
|
test -f "$_G_news" && break
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
test -f "$_G_news" && $LN_S $_G_news NEWS
|
|
|
|
|
func_verbose "$LN_S $_G_news NEWS"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-01-03 11:45:18 +08:00
|
|
|
|
# func_ensure_README
|
|
|
|
|
# ------------------
|
|
|
|
|
# Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
|
|
|
|
|
# completion with no README file, even though README.md or README.txt
|
|
|
|
|
# is often preferable.
|
2014-01-03 13:20:40 +08:00
|
|
|
|
func_ensure_README ()
|
2014-01-03 11:45:18 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -f README || {
|
|
|
|
|
_G_README=
|
|
|
|
|
for _G_readme in README.txt README.md README.rst; do
|
2014-01-03 13:20:40 +08:00
|
|
|
|
test -f "$_G_readme" && break
|
2014-01-03 11:45:18 +08:00
|
|
|
|
done
|
|
|
|
|
|
2014-01-03 13:20:40 +08:00
|
|
|
|
test -f "$_G_readme" && $LN_S $_G_readme README
|
2014-01-03 11:45:18 +08:00
|
|
|
|
func_verbose "$LN_S $_G_readme README"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-01-03 11:01:53 +08:00
|
|
|
|
# func_autoreconf [SUBDIR]
|
|
|
|
|
# ------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Being careful not to re-run 'autopoint' or 'libtoolize', and not to
|
|
|
|
|
# try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
|
|
|
|
|
# don't use them, defer to 'autoreconf' for execution of the remaining
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# autotools to bootstrap this package.
|
2014-01-03 11:01:53 +08:00
|
|
|
|
#
|
|
|
|
|
# Projects with multiple trees to reconfigure can hook another call to
|
|
|
|
|
# this function onto func_reconfigure:
|
|
|
|
|
#
|
|
|
|
|
# my_autoreconf_foo ()
|
|
|
|
|
# {
|
|
|
|
|
# func_autoreconf foo
|
|
|
|
|
# }
|
|
|
|
|
# func_add_hook func_reconfigure my_autoreconf_foo
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_autoreconf ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_autoheader
|
|
|
|
|
$require_build_aux # automake and others put files in here
|
|
|
|
|
$require_macro_dir # aclocal and others put files in here
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# We ran these manually already, and autoreconf won't exec ':'
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
save_AUTOPOINT=$AUTOPOINT; AUTOPOINT=true
|
|
|
|
|
save_LIBTOOLIZE=$LIBTOOLIZE; LIBTOOLIZE=true
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_autoreconf_options=
|
|
|
|
|
$opt_copy || func_append _G_autoreconf_options " --symlink"
|
|
|
|
|
$opt_force && func_append _G_autoreconf_options " --force"
|
|
|
|
|
$opt_verbose && func_append _G_autoreconf_options " --verbose"
|
2014-01-03 11:01:53 +08:00
|
|
|
|
func_show_eval "$AUTORECONF$_G_autoreconf_options --install${1+ $1}" 'exit $?'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
AUTOPOINT=$save_AUTOPOINT
|
|
|
|
|
LIBTOOLIZE=$save_LIBTOOLIZE
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_check_configuration VARNAME [CONFIGURE_MACRO]
|
|
|
|
|
# --------------------------------------------------
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# Exit with a suitable diagnostic for an important configuration change
|
|
|
|
|
# that needs to be made before bootstrap can run correctly.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_check_configuration ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_configure_ac
|
|
|
|
|
|
|
|
|
|
eval 'test -n "$'$1'"' || {
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
_G_error_msg="please set '$1' in 'bootstrap.conf'"
|
2011-11-03 16:23:45 +08:00
|
|
|
|
if test -n "$configure_ac" && test -n "$2"; then
|
|
|
|
|
func_append _G_error_msg "
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
or add the following (or similar) to your '$configure_ac':
|
2011-11-03 16:23:45 +08:00
|
|
|
|
$2"
|
|
|
|
|
fi
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_fatal_error "$_G_error_msg"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_clean_dangling_symlinks
|
|
|
|
|
# ----------------------------
|
|
|
|
|
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
|
|
|
|
|
# gnulib-populated directories. Such .m4 files would cause aclocal to
|
|
|
|
|
# fail. The following requires GNU find 4.2.3 or newer. Considering
|
|
|
|
|
# the usual portability constraints of this script, that may seem a very
|
|
|
|
|
# demanding requirement, but it should be ok. Ignore any failure,
|
|
|
|
|
# which is fine, since this is only a convenience to help developers
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# avoid the relatively unusual case where a symlinked-to .m4 file is
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# git-removed from gnulib between successive runs of this script.
|
|
|
|
|
func_clean_dangling_symlinks ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_macro_dir
|
|
|
|
|
$require_source_base
|
|
|
|
|
|
|
|
|
|
func_verbose "cleaning dangling symlinks"
|
|
|
|
|
|
|
|
|
|
find "$macro_dir" "$source_base" \
|
|
|
|
|
-depth \( -name '*.m4' -o -name '*.[ch]' \) \
|
|
|
|
|
-type l -xtype l -delete > /dev/null 2>&1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_clean_unused_macros
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Autopoint can result in over-zealously adding macros into $macro_dir
|
|
|
|
|
# even though they are not actually used, for example tests to help
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# build the 'intl' directory even though you have specified
|
|
|
|
|
# 'AM_GNU_GETTEXT([external])' in your configure.ac. This function
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# looks removes any macro files that can be found in gnulib, but
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# are not 'm4_include'd by 'aclocal.m4'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_clean_unused_macros ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_path
|
|
|
|
|
$require_macro_dir
|
|
|
|
|
|
|
|
|
|
test -n "$gnulib_path" && test -f aclocal.m4 && {
|
|
|
|
|
aclocal_m4s=`find . -name aclocal.m4 -print`
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# We use 'ls|grep' instead of 'ls *.m4' to avoid exceeding
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# command line length limits in some shells.
|
2013-10-30 13:25:44 +08:00
|
|
|
|
for file in `cd "$macro_dir" && ls -1 |$GREP '\.m4$'`; do
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# Remove a macro file when aclocal.m4 does not m4_include it...
|
|
|
|
|
func_grep_q 'm4_include([[]'$macro_dir/$file'])' $aclocal_m4s \
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
|| test ! -f "$gnulib_path/m4/$file" || {
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# ...and there is an identical file in gnulib...
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
if func_cmp_s "$gnulib_path/m4/$file" "$macro_dir/$file"; then
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# ...and it's not in the precious list ('echo' is needed
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# here to squash whitespace for the match expression).
|
|
|
|
|
case " "`echo $gnulib_precious`" " in
|
|
|
|
|
*" $file "*) ;;
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
*) rm -f "$macro_dir/$file"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_verbose \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"removing unused gnulib file '$macro_dir/$file'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_skip_po_recommendation
|
|
|
|
|
# ---------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# If there is a po directory, and '--skip-po' wasn't passed, let the
|
|
|
|
|
# user know that they can use '--skip-po' on subsequent invocations.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_skip_po_recommendation ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test ! -d po \
|
|
|
|
|
|| $opt_skip_po \
|
|
|
|
|
|| func_warning recommend "\
|
|
|
|
|
If your pofiles are up-to-date, you can rerun bootstrap
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
as '$progname --skip-po' to avoid redownloading."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_update_dotversion
|
|
|
|
|
# ----------------------
|
|
|
|
|
# Even with 'gitlog-to-changelog' generated ChangeLogs, automake
|
|
|
|
|
# will not run to completion with no ChangeLog file.
|
|
|
|
|
func_update_dotversion ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -f "$build_aux/git-version-gen" && {
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_message="updating .version"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -f .version && {
|
|
|
|
|
mv .version .version~
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_append _G_message " (backup in .version~)"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
func_verbose "updating .version"
|
|
|
|
|
|
|
|
|
|
$build_aux/git-version-gen dummy-arg > .version
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
## Resource management. ##
|
|
|
|
|
## -------------------- ##
|
|
|
|
|
|
|
|
|
|
# This section contains definitions for functions that each ensure a
|
|
|
|
|
# particular resource (a file, or a non-empty configuration variable for
|
|
|
|
|
# example) is available, and if appropriate to extract default values
|
|
|
|
|
# from pertinent package files. Where a variable already has a non-
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# empty value (as set by the package's 'bootstrap.conf'), that value is
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# used in preference to deriving the default. Call them using their
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# associated 'require_*' variable to ensure that they are executed, at
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# most, once.
|
|
|
|
|
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# require_gnulib_git_submodules
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Initialize all git modules from $gnulib_git_submodules before we
|
|
|
|
|
# run 'gnulib-tool'.
|
|
|
|
|
require_gnulib_git_submodules=func_require_gnulib_git_submodules
|
|
|
|
|
func_require_gnulib_git_submodules ()
|
|
|
|
|
{
|
|
|
|
|
test -n "$gnulib_git_submodules" && {
|
|
|
|
|
for _G_submodule in $gnulib_git_submodules
|
|
|
|
|
do
|
|
|
|
|
func_show_eval "git submodule init -- $_G_submodule" \
|
|
|
|
|
&& func_show_eval "git submodule update -- $_G_submodule" \
|
|
|
|
|
|| func_fatal_error "Unable to init git module '$_G_submodule'."
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_git_submodules=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_checkout_only_file
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Bail out if this package only bootstraps properly from a repository
|
|
|
|
|
# checkout.
|
|
|
|
|
require_checkout_only_file=func_require_checkout_only_file
|
|
|
|
|
func_require_checkout_only_file ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-10-26 13:58:35 +08:00
|
|
|
|
$opt_force || {
|
|
|
|
|
test -n "$checkout_only_file" && test ! -f "$checkout_only_file" \
|
|
|
|
|
&& func_fatal_error "\
|
2011-11-03 16:23:45 +08:00
|
|
|
|
Bootstrapping from a non-checked-out distribution is risky.
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
If you wish to bootstrap anyway, use the '--force' option."
|
2011-10-26 13:58:35 +08:00
|
|
|
|
}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
require_checkout_only_file=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_aclocal_amflags
|
|
|
|
|
# -----------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure '$aclocal_amflags' has a sensible default, extracted from
|
|
|
|
|
# 'Makefile.am' if necessary.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_aclocal_amflags=func_require_aclocal_amflags
|
|
|
|
|
func_require_aclocal_amflags ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_makefile_am
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_sed_extract_aclocal_amflags='s|#.*$||
|
2010-09-25 05:26:00 +08:00
|
|
|
|
/^[ ]*ACLOCAL_AMFLAGS[ ]*=/ {
|
|
|
|
|
s|^.*=[ ]*\(.*\)|aclocal_amflags="\1"|
|
|
|
|
|
p
|
|
|
|
|
}'
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_aclocal_flags_cmd=`$SED -n "$_G_sed_extract_aclocal_amflags" \
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"$makefile_am"`
|
2011-11-03 16:23:45 +08:00
|
|
|
|
eval "$_G_aclocal_flags_cmd"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_verbose "ACLOCAL_AMFLAGS='$aclocal_amflags'"
|
|
|
|
|
|
|
|
|
|
require_aclocal_amflags=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# require_autoheader
|
|
|
|
|
# ------------------
|
|
|
|
|
# Skip autoheader if it's not needed.
|
|
|
|
|
require_autoheader=func_require_autoheader
|
|
|
|
|
func_require_autoheader ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test true = "$AUTOHEADER" || {
|
|
|
|
|
func_extract_trace AC_CONFIG_HEADERS
|
|
|
|
|
test -n "$func_extract_trace_result" \
|
|
|
|
|
|| func_extract_trace AC_CONFIG_HEADER
|
|
|
|
|
|
|
|
|
|
test -n "$func_extract_trace_result" || {
|
|
|
|
|
AUTOHEADER=true
|
|
|
|
|
|
|
|
|
|
func_verbose "export AUTOHEADER='$AUTOHEADER'"
|
|
|
|
|
|
|
|
|
|
# Make sure the search result is visible to subshells
|
|
|
|
|
export AUTOHEADER
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_autoheader=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-01-03 11:45:18 +08:00
|
|
|
|
# require_automake_options
|
|
|
|
|
# ------------------------
|
|
|
|
|
# Extract options from AM_AUTOMAKE_INIT.
|
|
|
|
|
require_automake_options=func_require_automake_options
|
|
|
|
|
func_require_automake_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_extract_trace AM_INIT_AUTOMAKE
|
|
|
|
|
automake_options=$func_extract_trace_result
|
|
|
|
|
|
|
|
|
|
require_automake_options=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# require_autopoint
|
|
|
|
|
# -----------------
|
|
|
|
|
# Skip autopoint if it's not needed.
|
|
|
|
|
require_autopoint=func_require_autopoint
|
|
|
|
|
func_require_autopoint ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test true = "$AUTOPOINT" || {
|
|
|
|
|
func_extract_trace AM_GNU_GETTEXT_VERSION
|
|
|
|
|
|
|
|
|
|
test -n "$func_extract_trace_result" || {
|
|
|
|
|
AUTOPOINT=true
|
|
|
|
|
|
|
|
|
|
func_verbose "export AUTOPOINT='$AUTOPOINT'"
|
|
|
|
|
|
|
|
|
|
# Make sure the search result is visible to subshells
|
|
|
|
|
export AUTOPOINT
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_autopoint=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_bootstrap_uptodate
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Complain if the version of bootstrap in the gnulib directory differs
|
|
|
|
|
# from the one we are running.
|
|
|
|
|
require_bootstrap_uptodate=func_require_bootstrap_uptodate
|
|
|
|
|
func_require_bootstrap_uptodate ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
$require_build_aux
|
|
|
|
|
|
|
|
|
|
_G_bootstrap_sources="
|
|
|
|
|
$build_aux/bootstrap.in
|
|
|
|
|
$build_aux/extract-trace
|
|
|
|
|
$build_aux/funclib.sh
|
|
|
|
|
$build_aux/options-parser
|
|
|
|
|
"
|
2011-12-08 13:20:47 +08:00
|
|
|
|
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
_G_missing_bootstrap_sources=false
|
|
|
|
|
for _G_src in $_G_bootstrap_sources; do
|
|
|
|
|
test -f "$_G_src" || _G_missing_bootstrap_sources=:
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
if $_G_missing_bootstrap_sources; then
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_warning upgrade "\
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
Please add bootstrap to your gnulib_modules list in
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
'bootstrap.conf', so that I can tell you when there are
|
|
|
|
|
updates available."
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
else
|
2014-01-03 10:55:30 +08:00
|
|
|
|
rm -f bootstrap.new
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
$build_aux/inline-source $build_aux/bootstrap.in > bootstrap.new
|
|
|
|
|
|
|
|
|
|
if func_cmp_s "$progpath" bootstrap.new; then
|
|
|
|
|
rm -f bootstrap.new
|
|
|
|
|
func_verbose "bootstrap script up to date"
|
|
|
|
|
else
|
2014-01-03 09:59:24 +08:00
|
|
|
|
chmod 555 bootstrap.new
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_warning upgrade "\
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
An updated bootstrap script has been generated for you in
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
'bootstrap.new'. After you've verified that you want
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
the changes, you can update with:
|
2014-01-03 09:59:24 +08:00
|
|
|
|
mv -f bootstrap.new $progname
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
./$progname
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
|
|
|
|
|
Or you can disable this check permanently by adding the
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
following to 'bootstrap.conf':
|
|
|
|
|
require_bootstrap_uptodate=:"
|
bootstrap: move into local gl overrides directory.
In order to work as if it were already adopted by upstream
gnulib, put bootstrap and supporting scripts into the local
gnulib overrides directory.
* bootstrap, build-aux/extract-trace, build-aux/funclib.sh,
build-aux/inline-source, build-aux/options-parser: Move from
here...
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser: ...to here.
* gl/build-aux/options-parser (func_version): Show only the
first copyright notice on files generated with inline-source.
* gl/doc/bootstrap.texi: Developer documentation for bootstrap.
* gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/inline-source, gl/modules/options-parser: Describe
dependencies for gnulib-tool.
* bootstrap.conf (gnulib_modules): Add extract-trace,
inline-source and options-parser modules.
* bootstrap: Regenerated from gnulib overrides as a mono-
lithic script file using gl/build-aux/inline-source.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-13 15:39:45 +08:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2011-12-08 13:20:47 +08:00
|
|
|
|
|
|
|
|
|
require_bootstrap_uptodate=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_build_aux
|
|
|
|
|
# -----------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that '$build_aux' is set, and if it doesn't already point to an
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# existing directory, create one.
|
|
|
|
|
require_build_aux=func_require_build_aux
|
|
|
|
|
func_require_build_aux ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$build_aux" || {
|
2012-10-19 13:23:39 +08:00
|
|
|
|
func_extract_trace_first AC_CONFIG_AUX_DIR
|
|
|
|
|
build_aux=$func_extract_trace_first_result
|
2011-12-08 13:20:47 +08:00
|
|
|
|
func_check_configuration build_aux \
|
|
|
|
|
"AC_CONFIG_AUX_DIR([name of a directory for build scripts])"
|
|
|
|
|
|
|
|
|
|
func_verbose "build_aux='$build_aux'"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$require_vc_ignore_files
|
|
|
|
|
|
|
|
|
|
# If the build_aux directory doesn't exist, create it now, and mark it
|
|
|
|
|
# as ignored for the VCS.
|
|
|
|
|
if test ! -d "$build_aux"; then
|
|
|
|
|
func_show_eval "mkdir '$build_aux'"
|
|
|
|
|
|
|
|
|
|
test -n "$vc_ignore_files" \
|
2013-01-26 13:50:04 +08:00
|
|
|
|
|| func_insert_if_absent "$build_aux" $vc_ignore_files
|
2011-12-08 13:20:47 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
require_build_aux=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
# require_buildreq_autobuild
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# --------------------------
|
|
|
|
|
# Try to find whether the bootstrap requires autobuild.
|
2011-12-08 13:15:11 +08:00
|
|
|
|
require_buildreq_autobuild=func_require_buildreq_autobuild
|
2011-12-08 18:09:02 +08:00
|
|
|
|
func_require_buildreq_autobuild ()
|
2010-09-25 05:26:00 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-10-27 13:10:49 +08:00
|
|
|
|
$require_macro_dir
|
|
|
|
|
|
|
|
|
|
test -f "$macro_dir/autobuild.m4" \
|
|
|
|
|
|| printf '%s\n' "$buildreq" |func_grep_q '^[ ]*autobuild' \
|
|
|
|
|
|| {
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_extract_trace AB_INIT
|
|
|
|
|
test -n "$func_extract_trace_result" && {
|
|
|
|
|
func_append buildreq 'autobuild - http://josefsson.org/autobuild/
|
|
|
|
|
'
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_verbose "auto-adding 'autobuild' to build requirements"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
require_buildreq_autobuild=:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
# require_buildreq_autoconf
|
|
|
|
|
# require_buildreq_autopoint
|
|
|
|
|
# require_buildreq_libtoolize
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# ---------------------------
|
|
|
|
|
# Try to find the minimum compatible version of autoconf/libtool
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# required to bootstrap successfully, and add it to '$buildreq'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
for tool in autoconf libtoolize autopoint; do
|
|
|
|
|
b=$tool
|
2011-12-08 13:15:11 +08:00
|
|
|
|
v=require_buildreq_${tool}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
f=func_$v
|
|
|
|
|
case $tool in
|
|
|
|
|
autoconf) m=AC_PREREQ ;;
|
|
|
|
|
libtoolize) m=LT_PREREQ; b=libtool ;;
|
|
|
|
|
autopoint) m=AM_GNU_GETTEXT_VERSION b=gettext ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
eval $v'='$f'
|
|
|
|
|
'$f' ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# The following is ignored if undefined, but might be necessary
|
|
|
|
|
# in order for `func_find_tool` to run.
|
|
|
|
|
${require_'$tool'-:}
|
|
|
|
|
|
2011-12-08 13:24:00 +08:00
|
|
|
|
printf '\''%s\n'\'' "$buildreq" |func_grep_q '\''^[ ]*'$tool\'' || {
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_extract_trace '$m'
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_version=$func_extract_trace_result
|
2011-11-03 16:23:45 +08:00
|
|
|
|
test -n "$_G_version" && {
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_append buildreq "\
|
2024-01-17 09:01:41 +08:00
|
|
|
|
'$tool' $_G_version https://www.gnu.org/s/'$b'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"
|
|
|
|
|
func_verbose \
|
2013-10-29 12:08:49 +08:00
|
|
|
|
"auto-adding '\'$tool'-$_G_version'\'' to build requirements"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
'$v'=:
|
|
|
|
|
}
|
|
|
|
|
'
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
# require_buildreq_automake
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# -------------------------
|
|
|
|
|
# Try to find the minimum compatible version of automake required to
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# bootstrap successfully, and add it to '$buildreq'.
|
2011-12-08 13:15:11 +08:00
|
|
|
|
require_buildreq_automake=func_require_buildreq_automake
|
2011-12-08 18:09:02 +08:00
|
|
|
|
func_require_buildreq_automake ()
|
2010-09-25 05:26:00 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# if automake is not already listed in $buildreq...
|
|
|
|
|
printf '%s\n' "$buildreq" |func_grep_q automake || {
|
|
|
|
|
func_extract_trace AM_INIT_AUTOMAKE
|
|
|
|
|
|
|
|
|
|
# ...and AM_INIT_AUTOMAKE is declared...
|
|
|
|
|
test -n "$func_extract_trace_result" && {
|
2014-01-03 08:33:38 +08:00
|
|
|
|
automake_version=`$ECHO "$func_extract_trace_result" \
|
2012-10-25 18:11:33 +08:00
|
|
|
|
|$SED -e 's|[^0-9]*||' -e 's| .*$||'`
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
test -n "$automake_version" || automake_version=-
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_append buildreq "\
|
2024-01-17 09:01:41 +08:00
|
|
|
|
automake $automake_version https://www.gnu.org/s/automake
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"
|
|
|
|
|
func_verbose \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"auto-adding 'automake-$automake_version' to build requirements"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
require_buildreq_automake=:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# require_buildreq_patch
|
|
|
|
|
# ----------------------
|
|
|
|
|
# Automatically add a patch build-requirement if there are diff files
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# in $local_gl_path.
|
2011-12-08 13:20:47 +08:00
|
|
|
|
require_buildreq_patch=func_require_buildreq_patch
|
|
|
|
|
func_require_buildreq_patch ()
|
2010-09-25 05:26:00 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
$require_local_gl_path
|
2013-09-15 14:38:11 +08:00
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# This ensures PATCH is set appropriately by the time
|
|
|
|
|
# func_check_versions enforces $buildreq.
|
|
|
|
|
$require_patch
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
# If patch is not already listed in $buildreq...
|
|
|
|
|
printf '%s\n' "$buildreq" |func_grep_q '^[ ]*patch' || {
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
eval "set dummy $local_gl_path_quoted" ; shift
|
|
|
|
|
|
|
|
|
|
for _G_dir
|
|
|
|
|
do
|
|
|
|
|
# The ugly find invocation is necessary to exit with non-zero
|
|
|
|
|
# status for old find binaries that don't support -exec fully.
|
|
|
|
|
if test ! -d "$_G_dir" \
|
|
|
|
|
|| find "$_G_dir" -name "*.diff" -exec false {} \; ; then :
|
|
|
|
|
else
|
2024-01-17 09:01:41 +08:00
|
|
|
|
func_append buildreq "patch - https://www.gnu.org/s/patch$nl"
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-08 13:20:47 +08:00
|
|
|
|
require_buildreq_patch=:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 13:08:16 +08:00
|
|
|
|
# require_buildtools_uptodate
|
|
|
|
|
# ---------------------------
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Ensure all the packages listed in BUILDREQS are available on the build
|
|
|
|
|
# machine at the minimum versions or better.
|
|
|
|
|
require_buildtools_uptodate=func_require_buildtools_uptodate
|
|
|
|
|
func_require_buildtools_uptodate ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-12-08 13:15:11 +08:00
|
|
|
|
$require_buildreq_autobuild
|
|
|
|
|
$require_buildreq_autoconf
|
|
|
|
|
$require_buildreq_automake
|
|
|
|
|
$require_buildreq_libtoolize
|
|
|
|
|
$require_buildreq_autopoint
|
|
|
|
|
$require_buildreq_patch
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
test -n "$buildreq" && {
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_error_hdr=
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_check_versions $buildreq
|
|
|
|
|
$func_check_versions_result || {
|
|
|
|
|
test -n "$buildreq_readme" \
|
|
|
|
|
&& test -f "$buildreq_readme" \
|
2011-11-03 16:23:45 +08:00
|
|
|
|
&& _G_error_hdr="\
|
|
|
|
|
$buildreq_readme explains how to obtain these prerequisite programs:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_strtable 0 11 12 36 \
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"Program" "Min_version" "Homepage" $buildreq
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_fatal_error "$_G_error_hdr$func_strtable_result"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_buildtools_uptodate=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_copyright_holder
|
|
|
|
|
# ------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure there is a sensible non-empty default value in '$copyright_holder'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_copyright_holder=func_require_copyright_holder
|
|
|
|
|
func_require_copyright_holder ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$copyright_holder" || {
|
|
|
|
|
copyright_holder='Free Software Foundation, Inc.'
|
|
|
|
|
func_warning settings "\
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
Please set copyright_holder explicitly in 'bootstrap.conf';
|
|
|
|
|
defaulting to '$copyright_holder'."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_copyright_holder=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-09-15 14:38:11 +08:00
|
|
|
|
# require_doc_base
|
|
|
|
|
# ----------------
|
|
|
|
|
# Ensure doc_base has a sensible value, extracted from 'gnulib-cache.m4'
|
|
|
|
|
# if possible, otherwise letting 'gnulib-tool' pick a default.
|
|
|
|
|
require_doc_base=func_require_doc_base
|
|
|
|
|
func_require_doc_base ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_cache
|
|
|
|
|
|
|
|
|
|
test -f "$gnulib_cache" && test -z "$doc_base" && {
|
|
|
|
|
func_extract_trace_first "gl_DOC_BASE" "$gnulib_cache"
|
|
|
|
|
doc_base=$func_extract_trace_first_result
|
|
|
|
|
|
|
|
|
|
test -n "$doc_base" && func_verbose "doc_base='$doc_base'"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_doc_base=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_dotgitmodules
|
|
|
|
|
# ---------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure we have a '.gitmodules' file, with appropriate 'gnulib' settings.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_dotgitmodules=func_require_dotgitmodules
|
|
|
|
|
func_require_dotgitmodules ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_git
|
|
|
|
|
|
|
|
|
|
test true = "$GIT" || {
|
|
|
|
|
# A gnulib entry in .gitmodules always takes precedence.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_path=`$GIT config --file .gitmodules submodule.gnulib.path 2>/dev/null`
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
test -n "$_G_path" || {
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$require_vc_ignore_files
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_verbose "creating '.gitmodules'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# If the .gitmodules file doesn't exist, create it now, and mark
|
|
|
|
|
# it as ignored for the VCS.
|
|
|
|
|
test -n "$gnulib_path" || gnulib_path=gnulib
|
|
|
|
|
test -n "$gnulib_url" || gnulib_url=git://git.sv.gnu.org/gnulib
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
echo '[submodule "gnulib"]'
|
|
|
|
|
echo " path = $gnulib_path"
|
|
|
|
|
echo " url = $gnulib_url"
|
|
|
|
|
} >> .gitmodules
|
|
|
|
|
|
|
|
|
|
test -n "$vc_ignore_files" \
|
2013-01-26 13:50:04 +08:00
|
|
|
|
|| func_insert_if_absent ".gitmodules" $vc_ignore_files
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_dotgitmodules=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_extra_locale_categories
|
|
|
|
|
# -------------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure there is a default value in '$extra_locale_categories'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_extra_locale_categories=func_require_extra_locale_categories
|
|
|
|
|
func_require_extra_locale_categories ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Defaults to empty, so run with whatever value may have been set in
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'bootstrap.conf'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_extra_locale_categories=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_git
|
|
|
|
|
# -----------
|
|
|
|
|
# Ignore git if it's not available, or we're not in a git checkout tree.
|
|
|
|
|
require_git=func_require_git
|
|
|
|
|
func_require_git ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$opt_skip_git && GIT=true
|
|
|
|
|
|
|
|
|
|
test true = "$GIT" || {
|
2014-02-03 12:16:44 +08:00
|
|
|
|
if test -d .git/.; then
|
2014-01-15 15:10:29 +08:00
|
|
|
|
($GIT --version) >/dev/null 2>&1 || GIT=true
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func_verbose "GIT='$GIT'"
|
|
|
|
|
|
|
|
|
|
require_git=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_gnulib_cache
|
|
|
|
|
# --------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure there is a non-empty default for '$gnulib_cache', and that it
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# names an existing file.
|
|
|
|
|
require_gnulib_cache=func_require_gnulib_cache
|
|
|
|
|
func_require_gnulib_cache ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_macro_dir
|
|
|
|
|
|
|
|
|
|
test -n "$gnulib_cache" \
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
|| gnulib_cache=$macro_dir/gnulib-cache.m4
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_verbose "found '$gnulib_cache'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
require_gnulib_cache=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-09-15 14:38:11 +08:00
|
|
|
|
# require_gnulib_copy_cmd
|
|
|
|
|
# -----------------------
|
|
|
|
|
# Only calculate the options for copying files with gnulib once.
|
|
|
|
|
require_gnulib_copy_cmd=func_require_gnulib_copy_cmd
|
|
|
|
|
func_require_gnulib_copy_cmd ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_tool
|
|
|
|
|
$require_gnulib_tool_base_options
|
|
|
|
|
|
|
|
|
|
gnulib_copy_cmd="$gnulib_tool $gnulib_tool_base_options --copy-file"
|
|
|
|
|
$opt_copy || func_append gnulib_copy_cmd " --symlink"
|
|
|
|
|
$opt_quiet || func_append gnulib_copy_cmd " --verbose"
|
|
|
|
|
|
|
|
|
|
require_gnulib_copy_cmd=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_gnulib_merge_changelog
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# See if we can use gnulib's git-merge-changelog merge driver.
|
|
|
|
|
require_gnulib_merge_changelog=func_require_gnulib_merge_changelog
|
|
|
|
|
func_require_gnulib_merge_changelog ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -f ChangeLog && {
|
|
|
|
|
$require_git
|
|
|
|
|
|
2012-09-16 12:47:22 +08:00
|
|
|
|
func_grep_q '^\(/\|\)ChangeLog$' .gitignore || test true = "$GIT" || {
|
2012-10-04 21:04:32 +08:00
|
|
|
|
if $GIT config merge.merge-changelog.driver >/dev/null; then
|
2010-09-25 05:26:00 +08:00
|
|
|
|
:
|
2012-10-04 21:04:32 +08:00
|
|
|
|
elif (git-merge-changelog --version) >/dev/null 2>&1; then
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_echo "initializing git-merge-changelog driver"
|
|
|
|
|
$GIT config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
|
|
|
|
|
$GIT config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
|
|
|
|
|
else
|
|
|
|
|
func_warning recommend \
|
|
|
|
|
"Consider installing git-merge-changelog from gnulib."
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_merge_changelog=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_gnulib_mk
|
|
|
|
|
# -----------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure gnulib_mk has a sensible value, extracted from 'gnulib-cache.m4'
|
|
|
|
|
# if possible, otherwise letting 'gnulib-tool' pick a default.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_gnulib_mk=func_require_gnulib_mk
|
|
|
|
|
func_require_gnulib_mk ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_gnulib_cache
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-09-15 14:38:11 +08:00
|
|
|
|
test -f "$gnulib_cache" && test -z "$gnulib_mk" && {
|
2012-10-19 13:23:39 +08:00
|
|
|
|
func_extract_trace_first "gl_MAKEFILE_NAME" "$gnulib_cache"
|
|
|
|
|
gnulib_mk=$func_extract_trace_first_result
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
test -n "$gnulib_mk" && func_verbose "gnulib_mk='$gnulib_mk'"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_mk=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-09-15 14:38:11 +08:00
|
|
|
|
# require_gnulib_name
|
|
|
|
|
# -------------------
|
|
|
|
|
# Ensure gnulib_name has a sensible value, extracted from 'gnulib-cache.m4'
|
|
|
|
|
# if possible, otherwise letting 'gnulib-tool' pick a default.
|
|
|
|
|
require_gnulib_name=func_require_gnulib_name
|
|
|
|
|
func_require_gnulib_name ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_cache
|
|
|
|
|
|
|
|
|
|
test -f "$gnulib_cache" && test -z "$gnulib_name" && {
|
|
|
|
|
func_extract_trace_first "gl_LIB" "$gnulib_cache"
|
|
|
|
|
gnulib_name=$func_extract_trace_first_result
|
|
|
|
|
|
|
|
|
|
test -n "$gnulib_name" && func_verbose "gnulib_name='$gnulib_name'"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_name=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_gnulib_path
|
|
|
|
|
# require_gnulib_url
|
|
|
|
|
# -------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure 'gnulib_path' and 'gnulib_url' are set.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_gnulib_path=func_require_dotgitmodules_parameters
|
|
|
|
|
require_gnulib_url=func_require_dotgitmodules_parameters
|
|
|
|
|
func_require_dotgitmodules_parameters ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_git
|
|
|
|
|
|
2011-10-26 13:58:35 +08:00
|
|
|
|
test true = "$GIT" && {
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# If we can't find git (or if the user specified '--skip-git'),
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# then use an existing gnulib directory specified with
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# '--gnulib-srcdir' if possible.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$gnulib_path" \
|
|
|
|
|
|| test ! -x "$opt_gnulib_srcdir/gnulib-tool" \
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
|| gnulib_path=$opt_gnulib_srcdir
|
2011-10-26 13:58:35 +08:00
|
|
|
|
}
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
$require_dotgitmodules
|
|
|
|
|
|
2011-10-26 13:58:35 +08:00
|
|
|
|
test -f .gitmodules && {
|
|
|
|
|
# Extract the parameters with sed, since git may be missing
|
|
|
|
|
test -n "$gnulib_path" \
|
|
|
|
|
|| gnulib_path=`$SED -e '/^.submodule "gnulib".$/,${
|
|
|
|
|
/[ ]*path *= */{
|
syntax-check: fix violations and implement sc_prohibit_sed_s_comma.
I like to name temporary directories that I will remove shortly
with two leading commas so that they sort lexicographically at
the top of `ls' output. Now, `./configure
--prefix=`pwd`/,,inst' works again, for the first time in
several years.
* cfg.mk (sc_prohibit_sed_s_comma): Comma is too common a
character to use routinely as the separator for sed
substitutions on file paths and other variables determined by
the user, causing bugs like the one I describe above. Make sure
we don't accidentally reintroduce any comma separators in
future.
* Makefile.am, bootstrap, bootstrap.conf, build-aux/extract-trace,
build-aux/general.m4sh, build-aux/git-hooks/commit-msg,
build-aux/git-log-fix, build-aux/ltmain.m4sh, libtoolize.m4sh,
m4/libtool.m4, m4/ltdl.m4, tests/cdemo-undef.test,
tests/cmdline_wrap.at, tests/darwin.at, tests/defs.m4sh,
tests/getopt-m4sh.at, tests/install.at, tests/libtoolize.at,
tests/mdemo/Makefile.am, tests/need_lib_prefix.at,
tests/sysroot.at, tests/tagdemo-undef.test, tests/testsuite.at:
Try to use `|' as the default separator wherever possible,
otherwise something else that doesn't occur in the substitution
expression.
* NEWS: Updated.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-21 19:02:23 +08:00
|
|
|
|
s|[ ]*||g;s|^[^=]*=||;p
|
2011-10-26 13:58:35 +08:00
|
|
|
|
}
|
2012-10-25 18:11:33 +08:00
|
|
|
|
}
|
|
|
|
|
d' .gitmodules |$SED 1q`
|
2011-10-26 13:58:35 +08:00
|
|
|
|
test -n "$gnulib_url" \
|
|
|
|
|
|| gnulib_url=`$SED -e '/^.submodule "gnulib".$/,${
|
|
|
|
|
/[ ]*url *= */{
|
syntax-check: fix violations and implement sc_prohibit_sed_s_comma.
I like to name temporary directories that I will remove shortly
with two leading commas so that they sort lexicographically at
the top of `ls' output. Now, `./configure
--prefix=`pwd`/,,inst' works again, for the first time in
several years.
* cfg.mk (sc_prohibit_sed_s_comma): Comma is too common a
character to use routinely as the separator for sed
substitutions on file paths and other variables determined by
the user, causing bugs like the one I describe above. Make sure
we don't accidentally reintroduce any comma separators in
future.
* Makefile.am, bootstrap, bootstrap.conf, build-aux/extract-trace,
build-aux/general.m4sh, build-aux/git-hooks/commit-msg,
build-aux/git-log-fix, build-aux/ltmain.m4sh, libtoolize.m4sh,
m4/libtool.m4, m4/ltdl.m4, tests/cdemo-undef.test,
tests/cmdline_wrap.at, tests/darwin.at, tests/defs.m4sh,
tests/getopt-m4sh.at, tests/install.at, tests/libtoolize.at,
tests/mdemo/Makefile.am, tests/need_lib_prefix.at,
tests/sysroot.at, tests/tagdemo-undef.test, tests/testsuite.at:
Try to use `|' as the default separator wherever possible,
otherwise something else that doesn't occur in the substitution
expression.
* NEWS: Updated.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-21 19:02:23 +08:00
|
|
|
|
s|[ ]*||g;s|^[^=]*=||;p
|
2011-10-26 13:58:35 +08:00
|
|
|
|
}
|
2012-10-25 18:11:33 +08:00
|
|
|
|
}
|
|
|
|
|
d' .gitmodules |$SED 1q`
|
2011-10-26 13:58:35 +08:00
|
|
|
|
|
|
|
|
|
func_verbose "gnulib_path='$gnulib_path'"
|
|
|
|
|
func_verbose "gnulib_url='$gnulib_url'"
|
|
|
|
|
}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
require_gnulib_path=:
|
|
|
|
|
require_gnulib_url=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_gnulib_submodule
|
|
|
|
|
# ------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that there is a current gnulib submodule at '$gnulib_path'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_gnulib_submodule=func_require_gnulib_submodule
|
|
|
|
|
func_require_gnulib_submodule ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_git
|
|
|
|
|
|
|
|
|
|
if test true = "$GIT"; then
|
|
|
|
|
func_warning recommend \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"No 'git' found; imported gnulib modules may be outdated."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
else
|
|
|
|
|
$require_gnulib_path
|
|
|
|
|
$require_gnulib_url
|
|
|
|
|
|
|
|
|
|
if test -f .gitmodules && test -f "$gnulib_path/gnulib-tool"; then
|
2012-10-25 22:00:09 +08:00
|
|
|
|
: All present and correct.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
elif test -n "$opt_gnulib_srcdir"; then
|
|
|
|
|
# Older git can't clone into an empty directory.
|
|
|
|
|
rmdir "$gnulib_path" 2>/dev/null
|
|
|
|
|
func_show_eval "$GIT clone --reference '$opt_gnulib_srcdir' \
|
|
|
|
|
'$gnulib_url' '$gnulib_path'" \
|
2011-11-03 16:23:45 +08:00
|
|
|
|
|| func_fatal_error "Unable to fetch gnulib submodule."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# Without --gnulib-srcdir, and no existing checked out submodule, we
|
|
|
|
|
# create a new shallow clone of the remote gnulib repository.
|
|
|
|
|
else
|
|
|
|
|
trap func_cleanup_gnulib 1 2 13 15
|
|
|
|
|
|
|
|
|
|
shallow=
|
2019-03-22 20:05:53 +08:00
|
|
|
|
test -n "$gnulib_clone_since" && \
|
|
|
|
|
$GIT clone -h 2>&1 |func_grep_q -- --shallow-since \
|
|
|
|
|
&& shallow="--shallow-since=$gnulib_clone_since"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \
|
|
|
|
|
func_cleanup_gnulib
|
|
|
|
|
|
|
|
|
|
# FIXME: Solaris /bin/sh will try to execute '-' if any of
|
|
|
|
|
# these signals are caught after this.
|
|
|
|
|
trap - 1 2 13 15
|
|
|
|
|
fi
|
2012-10-25 22:00:09 +08:00
|
|
|
|
|
|
|
|
|
# Make sure we've checked out the correct revision of gnulib.
|
2014-10-28 01:59:20 +08:00
|
|
|
|
func_show_eval "$GIT submodule init -- $gnulib_path" \
|
|
|
|
|
&& func_show_eval "$GIT submodule update -- $gnulib_path" \
|
2012-10-25 22:00:09 +08:00
|
|
|
|
|| func_fatal_error "Unable to update gnulib submodule."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
require_gnulib_submodule=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_gnulib_tool
|
|
|
|
|
# -------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that '$gnulib_tool' is set, and points to an executable file,
|
|
|
|
|
# or else fall back to using the binary 'true' if the main gnulib
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# files appear to have been imported already.
|
|
|
|
|
require_gnulib_tool=func_require_gnulib_tool
|
|
|
|
|
func_require_gnulib_tool ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test true = "$gnulib_tool" || {
|
2013-08-29 21:44:42 +08:00
|
|
|
|
$require_gnulib_submodule
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$require_gnulib_path
|
|
|
|
|
|
|
|
|
|
test -n "$gnulib_tool" \
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
|| gnulib_tool=$gnulib_path/gnulib-tool
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
test -x "$gnulib_tool" || {
|
|
|
|
|
gnulib_tool=true
|
|
|
|
|
func_warning recommend \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"No 'gnulib-tool' found; gnulib modules may be missing."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test true = "$gnulib_tool" \
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
|| func_verbose "found '$gnulib_tool'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_tool=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-01-27 20:57:22 +08:00
|
|
|
|
# require_gnulib_tool_base_options
|
|
|
|
|
# --------------------------------
|
|
|
|
|
# Ensure that '$gnulib_tool_base_options' contains all the base options
|
|
|
|
|
# required according to user configuration from bootstrap.conf.
|
|
|
|
|
require_gnulib_tool_base_options=func_require_gnulib_tool_base_options
|
|
|
|
|
func_require_gnulib_tool_base_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_tool
|
|
|
|
|
|
|
|
|
|
gnulib_tool_base_options=
|
|
|
|
|
|
|
|
|
|
test true = "$gnulib_tool" || {
|
|
|
|
|
# 'gnulib_modules' and others are maintained in 'bootstrap.conf':
|
|
|
|
|
# Use 'gnulib --import' to fetch gnulib modules.
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_build_aux
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$build_aux" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_base_options " --aux-dir=$build_aux"
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_macro_dir
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$macro_dir" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_base_options " --m4-base=$macro_dir"
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_doc_base
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$doc_base" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_base_options " --doc-base=$doc_base"
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_gnulib_name
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$gnulib_name" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_base_options " --lib=$gnulib_name"
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
$require_local_gl_path
|
|
|
|
|
test -n "$local_gl_path" && {
|
|
|
|
|
eval "set dummy $local_gl_path_quoted" ; shift
|
|
|
|
|
for _G_dir
|
|
|
|
|
do
|
|
|
|
|
func_append_uniq gnulib_tool_base_options " --local-dir=$_G_dir"
|
|
|
|
|
done
|
|
|
|
|
}
|
2013-09-15 14:38:11 +08:00
|
|
|
|
$require_source_base
|
2013-01-27 20:57:22 +08:00
|
|
|
|
test -n "$source_base" \
|
|
|
|
|
&& func_append_uniq gnulib_tool_base_options " --source-base=$source_base"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require_gnulib_tool_base_options=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_libtoolize
|
|
|
|
|
# ------------------
|
|
|
|
|
# Skip libtoolize if it's not needed.
|
|
|
|
|
require_libtoolize=func_require_libtoolize
|
|
|
|
|
func_require_libtoolize ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Unless we're not searching for libtool use by this package, set
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# LIBTOOLIZE to true if none of 'LT_INIT', 'AC_PROG_LIBTOOL' and
|
|
|
|
|
# 'AM_PROG_LIBTOOL' are used in configure.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test true = "$LIBTOOLIZE" || {
|
|
|
|
|
func_extract_trace LT_INIT
|
|
|
|
|
test -n "$func_extract_trace_result" || func_extract_trace AC_PROG_LIBTOOL
|
|
|
|
|
test -n "$func_extract_trace_result" || func_extract_trace AM_PROG_LIBTOOL
|
|
|
|
|
test -n "$func_extract_trace_result" || LIBTOOLIZE=true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test -n "$LIBTOOLIZE" || {
|
|
|
|
|
# Find libtoolize, named glibtoolize in Mac Ports, but prefer
|
|
|
|
|
# user-installed libtoolize to ancient glibtoolize shipped by
|
|
|
|
|
# Apple with Mac OS X when Mac Ports is not installed.
|
|
|
|
|
func_find_tool LIBTOOLIZE libtoolize glibtoolize
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-04 21:35:38 +08:00
|
|
|
|
test -n "$LIBTOOLIZE" || func_fatal_error "\
|
|
|
|
|
Please install GNU Libtool, or 'export LIBTOOLIZE=/path/to/libtoolize'."
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_verbose "export LIBTOOLIZE='$LIBTOOLIZE'"
|
|
|
|
|
|
|
|
|
|
# Make sure the search result is visible to subshells
|
|
|
|
|
export LIBTOOLIZE
|
|
|
|
|
|
|
|
|
|
require_libtoolize=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# require_local_gl_path
|
|
|
|
|
# ---------------------
|
|
|
|
|
# Ensure local_gl_path has a sensible value, extracted from 'gnulib-cache.m4' if
|
|
|
|
|
# possible, otherwise letting 'gnulib-tool' pick a default.
|
|
|
|
|
require_local_gl_path=func_require_local_gl_path
|
|
|
|
|
func_require_local_gl_path ()
|
2013-09-15 14:38:11 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_cache
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
# Compat with older bootstrap versions.
|
|
|
|
|
test -n "$local_gl_dir" && {
|
|
|
|
|
func_warning settings "\
|
|
|
|
|
Please use 'local_gl_path' instead of 'local_gl_dir' in your
|
|
|
|
|
'bootstrap.conf' file."
|
|
|
|
|
local_gl_path=$local_gl_dir
|
|
|
|
|
local_gl_dir=
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test -f "$gnulib_cache" && test -z "$local_gl_path" && {
|
2013-09-15 14:38:11 +08:00
|
|
|
|
func_extract_trace_first "gl_LOCAL_DIR" "$gnulib_cache"
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
local_gl_path=$func_extract_trace_first_result
|
|
|
|
|
test -n "$local_gl_path" && func_verbose "local_gl_path='$local_gl_path'"
|
|
|
|
|
}
|
2013-09-15 14:38:11 +08:00
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
test -z "$local_gl_path_quoted" && test -n "$local_gl_path" && {
|
|
|
|
|
save_IFS=$IFS
|
|
|
|
|
set dummy
|
|
|
|
|
# Don't use PATH_SEPARATOR here, gnulib must be fixed to store only ':' as
|
|
|
|
|
# path separator into gnulib-cache.m4 (consistency reasons among systems).
|
|
|
|
|
IFS=:
|
|
|
|
|
for _G_dir in $local_gl_path
|
|
|
|
|
do
|
|
|
|
|
set "$@" "$_G_dir"
|
|
|
|
|
done
|
|
|
|
|
shift
|
|
|
|
|
IFS=$save_IFS
|
|
|
|
|
func_quote eval "$@"
|
|
|
|
|
local_gl_path_quoted=$func_quote_result
|
2013-09-15 14:38:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
bootstrap: use the upstream repo as git module
.. instead of copying it all the time; gnulib-tool and bootstrap
are now ready to do this correctly.
Bootstrap upstream is now dual-licensed as MIT/GPLv2+; so the
sources are redistributed automatically under GPLv3+ license in
in libtool project.
* .gitmodules (bootstrap): New submodule.
* bootstrap.conf (local_gl_dir): Renamed to local_gl_path.
(local_gl_path): Renamed from local_gl_dir. Two sub-directories
are now mentioned as two --local-dir's are used.
(gnulib_git_submodules): New option to automatically clone the
bootstrap git submodule.
* build-aux/ltmain.in (libtool_options_prep)
(libtool_parse_options): Changing function exit status is not
needed with new options-parser.
* libtoolize.in: Don't func_quote when it is not necessary, don't
set the function return value.
* gl-mod/bootstrap: New git submodule.
* gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
gl/build-aux/funclib.sh, gl/build-aux/inline-source,
gl/build-aux/options-parser, gl/doc/bootstrap.texi,
gl/modules/all-shells-tests, gl/modules/bootstrap,
gl/modules/extract-trace, gl/modules/funclib.sh,
gl/modules/funclib.sh-tests, gl/modules/inline-source
gl/modules/options-parser, gl/modules/options-parser-tests,
gl/tests/test-all-shells.sh, gl/tests/test-funclib-quote.sh
gl/tests/test-option-parser-helper,
gl/tests/test-option-parser.sh: Files removed, those are
automatically pulled from upstream now.
* bootstrap: Sync with upstream.
2016-02-23 07:38:39 +08:00
|
|
|
|
require_local_gl_path=:
|
2013-09-15 14:38:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_macro_dir
|
|
|
|
|
# -----------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that '$macro_dir' is set, and if it doesn't already point to an
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# existing directory, create one.
|
|
|
|
|
require_macro_dir=func_require_macro_dir
|
|
|
|
|
func_require_macro_dir ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Sometimes this is stored in 'configure.ac'.
|
libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api.
* libtoolize.in (func_install_pkgmacro_files): Uee
AC_CONFIG_MACRO_DIRS.
(func_check_macros): Advise using AC_CONFIG_MACRO_DIRS.
(require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS.
(require_macro_dir): Likewise.
* bootstrap: Give priority to AC_CONFIG_MACRO_DIRS.
* configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older
Autotools, that is allow bootstrap with current release versions.
Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR.
* tests/testsuite.at: Source build-aux/extract-trace for access
to func_extract_trace.
(LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument
to pass manually to aclocal for compatibility with old Automake.
Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4
in the test directory.
(LT_AT_AUTORECONF): Likewise.
* tests/cdemo.at, tests/configure-iface.at, tests/darwin.at,
tests/demo.at, tests/depdemo.at, tests/early-libtool.at,
tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at,
tests/nonrecursive.at, tests/old-ltdl-iface.at,
tests/recursive.at, tests/subproject.at, tests/tagdemo.at,
tests/template.at: Likewise.
* doc/libtool.texi: Update.
* NEWS: Update.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-18 21:37:03 +08:00
|
|
|
|
test -n "$macro_dir" || {
|
2012-10-19 17:21:27 +08:00
|
|
|
|
# AC_CONFIG_MACRO_DIRS takes a space delimited list of directories,
|
|
|
|
|
# but we only care about the first one in bootstrap.
|
libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api.
* libtoolize.in (func_install_pkgmacro_files): Uee
AC_CONFIG_MACRO_DIRS.
(func_check_macros): Advise using AC_CONFIG_MACRO_DIRS.
(require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS.
(require_macro_dir): Likewise.
* bootstrap: Give priority to AC_CONFIG_MACRO_DIRS.
* configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older
Autotools, that is allow bootstrap with current release versions.
Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR.
* tests/testsuite.at: Source build-aux/extract-trace for access
to func_extract_trace.
(LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument
to pass manually to aclocal for compatibility with old Automake.
Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4
in the test directory.
(LT_AT_AUTORECONF): Likewise.
* tests/cdemo.at, tests/configure-iface.at, tests/darwin.at,
tests/demo.at, tests/depdemo.at, tests/early-libtool.at,
tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at,
tests/nonrecursive.at, tests/old-ltdl-iface.at,
tests/recursive.at, tests/subproject.at, tests/tagdemo.at,
tests/template.at: Likewise.
* doc/libtool.texi: Update.
* NEWS: Update.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-18 21:37:03 +08:00
|
|
|
|
func_extract_trace_first AC_CONFIG_MACRO_DIRS
|
2012-10-19 17:21:27 +08:00
|
|
|
|
macro_dir=`expr "x$func_extract_trace_first_result" : 'x\([^ ]*\)'`
|
libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api.
* libtoolize.in (func_install_pkgmacro_files): Uee
AC_CONFIG_MACRO_DIRS.
(func_check_macros): Advise using AC_CONFIG_MACRO_DIRS.
(require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS.
(require_macro_dir): Likewise.
* bootstrap: Give priority to AC_CONFIG_MACRO_DIRS.
* configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older
Autotools, that is allow bootstrap with current release versions.
Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR.
* tests/testsuite.at: Source build-aux/extract-trace for access
to func_extract_trace.
(LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument
to pass manually to aclocal for compatibility with old Automake.
Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4
in the test directory.
(LT_AT_AUTORECONF): Likewise.
* tests/cdemo.at, tests/configure-iface.at, tests/darwin.at,
tests/demo.at, tests/depdemo.at, tests/early-libtool.at,
tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at,
tests/nonrecursive.at, tests/old-ltdl-iface.at,
tests/recursive.at, tests/subproject.at, tests/tagdemo.at,
tests/template.at: Likewise.
* doc/libtool.texi: Update.
* NEWS: Update.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-18 21:37:03 +08:00
|
|
|
|
}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$macro_dir" || {
|
2012-10-19 13:23:39 +08:00
|
|
|
|
func_extract_trace_first AC_CONFIG_MACRO_DIR
|
|
|
|
|
macro_dir=$func_extract_trace_first_result
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Otherwise we might find it in 'Makefile.am'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$macro_dir" || {
|
|
|
|
|
$require_aclocal_amflags
|
|
|
|
|
|
2012-10-19 13:09:37 +08:00
|
|
|
|
# Take the argument following the first '-I', if any.
|
|
|
|
|
_G_minus_I_seen=false
|
|
|
|
|
for _G_arg in $aclocal_amflags; do
|
|
|
|
|
case $_G_minus_I_seen,$_G_arg in
|
|
|
|
|
:,*) macro_dir=$_G_arg; break ;;
|
|
|
|
|
*,-I) _G_minus_I_seen=: ;;
|
|
|
|
|
*,-I*) macro_dir=`expr x$_G_arg : 'x-I\(.*\)$'`; break ;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func_verbose "macro_dir='$macro_dir'"
|
|
|
|
|
|
|
|
|
|
func_check_configuration macro_dir \
|
libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api.
* libtoolize.in (func_install_pkgmacro_files): Uee
AC_CONFIG_MACRO_DIRS.
(func_check_macros): Advise using AC_CONFIG_MACRO_DIRS.
(require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS.
(require_macro_dir): Likewise.
* bootstrap: Give priority to AC_CONFIG_MACRO_DIRS.
* configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older
Autotools, that is allow bootstrap with current release versions.
Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR.
* tests/testsuite.at: Source build-aux/extract-trace for access
to func_extract_trace.
(LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument
to pass manually to aclocal for compatibility with old Automake.
Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4
in the test directory.
(LT_AT_AUTORECONF): Likewise.
* tests/cdemo.at, tests/configure-iface.at, tests/darwin.at,
tests/demo.at, tests/depdemo.at, tests/early-libtool.at,
tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at,
tests/nonrecursive.at, tests/old-ltdl-iface.at,
tests/recursive.at, tests/subproject.at, tests/tagdemo.at,
tests/template.at: Likewise.
* doc/libtool.texi: Update.
* NEWS: Update.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-18 21:37:03 +08:00
|
|
|
|
"AC_CONFIG_MACRO_DIRS([name of a directory for configure m4 files])"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
$require_vc_ignore_files
|
|
|
|
|
|
|
|
|
|
# If the macro_dir directory doesn't exist, create it now, and mark it
|
|
|
|
|
# as ignored for the VCS.
|
|
|
|
|
if test ! -d "$macro_dir"; then
|
|
|
|
|
mkdir "$macro_dir" || func_permissions_error "$macro_dir"
|
|
|
|
|
|
|
|
|
|
test -n "$vc_ignore_files" \
|
2013-01-26 13:50:04 +08:00
|
|
|
|
|| func_insert_if_absent "$macro_dir" $vc_ignore_files
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
require_macro_dir=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_makefile_am
|
|
|
|
|
# -------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure there is a 'Makefile.am' in the current directory.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_makefile_am=func_require_makefile_am
|
|
|
|
|
func_require_makefile_am ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$makefile_am" \
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
|| makefile_am=Makefile.am
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
<"$makefile_am"
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_verbose "found '$makefile_am'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
require_makefile_am=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_package
|
|
|
|
|
# ---------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that '$package' contains a sensible default value.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_package=func_require_package
|
|
|
|
|
func_require_package ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$package" || {
|
|
|
|
|
$require_package_name
|
|
|
|
|
|
|
|
|
|
package=`echo "$package_name" \
|
2012-10-25 18:11:33 +08:00
|
|
|
|
|$SED -e 's/GNU //' \
|
|
|
|
|
-e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func_verbose "package='$package'"
|
|
|
|
|
|
|
|
|
|
require_package=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_package_bugreport
|
|
|
|
|
# -------------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that this has a sensible value, extracted from 'configure.ac'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# if appropriate (and possible!).
|
|
|
|
|
require_package_bugreport=func_require_package_bugreport
|
|
|
|
|
func_require_package_bugreport ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_extract_trace AC_INIT
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
save_ifs=$IFS
|
2010-09-25 05:26:00 +08:00
|
|
|
|
IFS=:
|
|
|
|
|
set dummy $func_extract_trace_result
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
IFS=$save_ifs
|
2010-09-25 05:26:00 +08:00
|
|
|
|
shift
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
test -n "$package_bugreport" || package_bugreport=$3
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_check_configuration package_bugreport \
|
|
|
|
|
"AC_INIT([$package_name], [$package_version], [bug-$package@gnu.org])"
|
|
|
|
|
func_verbose "package_bugreport='$package_bugreport'"
|
|
|
|
|
|
|
|
|
|
require_package_bugreport=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_package_name
|
|
|
|
|
# --------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that this has a sensible value, extracted from 'configure.ac'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# if appropriate (and possible!).
|
|
|
|
|
require_package_name=func_require_package_name
|
|
|
|
|
func_require_package_name ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_extract_trace AC_INIT
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
save_ifs=$IFS
|
2010-09-25 05:26:00 +08:00
|
|
|
|
IFS=:
|
|
|
|
|
set dummy $func_extract_trace_result
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
IFS=$save_ifs
|
2010-09-25 05:26:00 +08:00
|
|
|
|
shift
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
test -n "$package_name" || package_name=$1
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_check_configuration package_name \
|
|
|
|
|
"AC_INIT([name of your package], [package version number])"
|
|
|
|
|
func_verbose "package_name='$package_name'"
|
|
|
|
|
|
|
|
|
|
require_package_name=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_package_version
|
|
|
|
|
# -----------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that this has a sensible value, extracted from 'configure.ac'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# if appropriate (and possible!). While we might have set all the
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# parameters extracted from AC_INIT at once, 'package_version' in
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# particular is not necessarily available as early as the others, since
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'git-version-gen' is often involved, and until then we can't rely on
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# getting a correct version number from an AC_INIT extraction.
|
|
|
|
|
require_package_version=func_require_package_version
|
|
|
|
|
func_require_package_version ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_extract_trace AC_INIT
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
save_ifs=$IFS
|
2010-09-25 05:26:00 +08:00
|
|
|
|
IFS=:
|
|
|
|
|
set dummy $func_extract_trace_result
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
IFS=$save_ifs
|
2010-09-25 05:26:00 +08:00
|
|
|
|
shift
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
test -n "$package_version" || package_version=$2
|
2010-09-25 05:26:00 +08:00
|
|
|
|
test -n "$package_version" || {
|
|
|
|
|
# The embedded echo is to squash whitespace before globbing.
|
|
|
|
|
case " "`echo $gnulib_modules`" " in
|
|
|
|
|
*" git-version-gen "*)
|
|
|
|
|
func_fatal_error "\
|
2011-11-03 16:23:45 +08:00
|
|
|
|
cannot \$require_package_version in bootstrap.conf before
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_gnulib_tool has installed the 'git-version-gen' script."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
func_check_configuration package_version \
|
|
|
|
|
"AC_INIT([name of your package], [package version number])"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
func_verbose "package_version='$package_version'"
|
|
|
|
|
|
|
|
|
|
require_package_version=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-08 12:54:40 +08:00
|
|
|
|
# require_patch
|
|
|
|
|
# -------------
|
|
|
|
|
# Find patch, according to the PATCH environment variable, or else
|
|
|
|
|
# searching the user's PATH.
|
|
|
|
|
require_patch=func_require_patch
|
|
|
|
|
func_require_patch ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$PATCH" || {
|
maint: correct many abuses of the word "which".
* HACKING, NEWS, TODO, bootstrap, bootstrap.conf,
build-aux/ltmain.in, cfg.mk, configure.ac, doc/libtool.texi,
doc/notes.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/doc/bootstrap.texi, libltdl/libltdl/lt_system.h,
libltdl/loaders/loadlibrary.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/ltdl.c, libtoolize.in,
m4/libtool.m4, m4/ltdl.m4, m4/ltsugar.m4, m4/lt~obsolete.m4,
tests/exceptions.at, tests/need_lib_prefix.at, tests/static.at:
Use "which" correctly, or replace with "that", "where" or "what"
as appropriate.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2013-08-23 12:12:57 +08:00
|
|
|
|
# Find a patch program, preferring gpatch, which is usually better
|
2011-12-08 12:54:40 +08:00
|
|
|
|
# than the vendor patch.
|
|
|
|
|
func_find_tool PATCH gpatch patch
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-04 21:35:38 +08:00
|
|
|
|
test -n "$PATCH" || func_fatal_error "\
|
|
|
|
|
Please install GNU Patch, or 'export PATCH=/path/to/gnu/patch'."
|
|
|
|
|
|
2011-12-08 12:54:40 +08:00
|
|
|
|
func_verbose "export PATCH='$PATCH'"
|
|
|
|
|
|
|
|
|
|
# Make sure the search result is visible to subshells
|
|
|
|
|
export PATCH
|
|
|
|
|
|
|
|
|
|
require_patch=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# require_source_base
|
|
|
|
|
# -------------------
|
|
|
|
|
# Ensure that source_base has a sensible value, extracted from
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# 'gnulib-cache.m4' if possible.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_source_base=func_require_source_base
|
|
|
|
|
func_require_source_base ()
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
{
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
$require_gnulib_cache
|
|
|
|
|
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test -f "$gnulib_cache" && test -z "$source_base" && {
|
2012-10-19 13:23:39 +08:00
|
|
|
|
func_extract_trace_first "gl_SOURCE_BASE" "$gnulib_cache"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2012-10-19 13:23:39 +08:00
|
|
|
|
source_base=$func_extract_trace_first_result
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_verbose "source_base='$source_base'"
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-26 13:58:35 +08:00
|
|
|
|
require_source_base=:
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# require_vc_ignore_files
|
|
|
|
|
# -----------------------
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Ensure that '$vc_ignore' has been processed to list VCS ignore files
|
|
|
|
|
# in '$vc_ignore_files'
|
2010-09-25 05:26:00 +08:00
|
|
|
|
require_vc_ignore_files=func_require_vc_ignore_files
|
|
|
|
|
func_require_vc_ignore_files ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
test -n "$vc_ignore" || vc_ignore=auto
|
|
|
|
|
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
if test auto = "$vc_ignore" && test -z "$vc_ignore_files"; then
|
2010-09-25 05:26:00 +08:00
|
|
|
|
vc_ignore_files=
|
|
|
|
|
test -d .git && vc_ignore_files=.gitignore
|
|
|
|
|
test -d CVS && vc_ignore_files="$vc_ignore_files .cvsignore"
|
|
|
|
|
else
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
vc_ignore_files=$vc_ignore
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
func_verbose "vc_ignore_files='$vc_ignore_files'"
|
|
|
|
|
|
|
|
|
|
require_vc_ignore_files=:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
2010-09-25 05:26:00 +08:00
|
|
|
|
## Helper functions. ##
|
2014-01-04 09:53:06 +08:00
|
|
|
|
## ----------------- ##
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# This section contains the helper functions used by the rest of 'bootstrap'.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# func_len STRING
|
|
|
|
|
# ---------------
|
|
|
|
|
# STRING may not start with a hyphen.
|
|
|
|
|
if (eval 'x=123; test x${#x} = "x3"') 2>/dev/null
|
|
|
|
|
then
|
|
|
|
|
# This is an XSI compatible shell, allowing a faster implementation...
|
|
|
|
|
eval 'func_len ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_len_result=${#1}
|
|
|
|
|
}'
|
|
|
|
|
else
|
|
|
|
|
# ...otherwise fall back to using expr, which is often a shell builtin.
|
|
|
|
|
func_len ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_len_result=`expr "$1" : ".*" 2>/dev/null || echo 0`
|
|
|
|
|
}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_cmp_s FILE1 FILE2
|
|
|
|
|
# ----------------------
|
|
|
|
|
# Return non-zero exit status unless FILE1 and FILE2 are identical, without
|
|
|
|
|
# any output at all, even error messages.
|
|
|
|
|
func_cmp_s ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# This function relies on non-zero exit status, which will cause the
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# program to exit when running in 'set -e' mode.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$CMP "$@" >/dev/null 2>&1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# func_grep_q EXPRESSION [FILENAME..]
|
|
|
|
|
# -----------------------------------
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Check whether EXPRESSION matches any line of any listed FILENAME,
|
|
|
|
|
# without any output at all, even error messages.
|
|
|
|
|
func_grep_q ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# This function relies on non-zero exit status, which will cause the
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# program to exit when running in 'set -e' mode.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$GREP "$@" >/dev/null 2>&1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_ifcontains LIST MEMBER YES-CMD [NO-CMD]
|
|
|
|
|
# --------------------------------------------
|
|
|
|
|
# If whitespace-separated LIST contains MEMBER then execute YES-CMD,
|
2014-01-02 06:58:35 +08:00
|
|
|
|
# otherwise if NO-CMD was given, execute that.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_ifcontains ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2014-01-02 06:58:35 +08:00
|
|
|
|
_G_wslist=$1
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_member=$2
|
|
|
|
|
_G_yes_cmd=$3
|
|
|
|
|
_G_no_cmd=${4-":"}
|
|
|
|
|
|
2014-01-02 06:58:35 +08:00
|
|
|
|
_G_found=false
|
|
|
|
|
for _G_item in $_G_wslist; do
|
|
|
|
|
test "x$_G_item" = "x$_G_member" && {
|
|
|
|
|
_G_found=:
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
done
|
|
|
|
|
if $_G_found; then
|
|
|
|
|
eval "$_G_yes_cmd"
|
|
|
|
|
_G_status=$?
|
|
|
|
|
else
|
|
|
|
|
eval "$_G_no_cmd"
|
|
|
|
|
_G_status=$?
|
|
|
|
|
fi
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test 0 -eq "$_G_status" || exit $_G_status
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_strpad STR WIDTH CHAR
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Trim STR, or pad with CHAR to force a total length of WIDTH.
|
|
|
|
|
func_strpad ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_width=`expr "$2" - 1`
|
2014-01-03 08:33:38 +08:00
|
|
|
|
func_strpad_result=`$ECHO "$1" |$SED '
|
2010-09-25 05:26:00 +08:00
|
|
|
|
:a
|
2011-11-03 16:23:45 +08:00
|
|
|
|
s|^.\{0,'"$_G_width"'\}$|&'"$3"'|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
ta
|
|
|
|
|
'`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_strrpad STR WIDTH CHAR
|
|
|
|
|
# ---------------------------
|
|
|
|
|
# Trim STR, or right-justify-pad with CHAR to force a total length of
|
|
|
|
|
# WIDTH.
|
|
|
|
|
func_strrpad ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_width=`expr "$2" - 1`
|
2014-01-03 08:33:38 +08:00
|
|
|
|
func_strrpad_result=`$ECHO "$1" |$SED '
|
2010-09-25 05:26:00 +08:00
|
|
|
|
:a
|
2011-11-03 16:23:45 +08:00
|
|
|
|
s|^.\{0,'"$_G_width"'\}$|'"$3"'&|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
ta
|
|
|
|
|
'`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_strrow INDENT FIELD WIDTH [FIELDn WIDTHn]...
|
|
|
|
|
# -------------------------------------------------
|
|
|
|
|
# Return a string containing each FIELD left justified to WIDTH, with
|
|
|
|
|
# the whole thing indented by INDENT spaces. This function is used to
|
|
|
|
|
# render one row of aligned columns for a table by func_strtable().
|
|
|
|
|
func_strrow ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
func_strrow_linelen=$1; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_row=
|
2010-09-25 05:26:00 +08:00
|
|
|
|
while test $# -gt 0; do
|
|
|
|
|
func_strrow_linelen=`expr $func_strrow_linelen + $2`
|
|
|
|
|
func_strpad "$1" $2 " "
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_append _G_row "$func_strpad_result"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
shift; shift
|
|
|
|
|
done
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_strrpad "$_G_row" $func_strrow_linelen " "
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
func_strrow_result=$func_strrpad_result
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_strtable INDENT WIDTH1...WIDTHn HEADER1...HEADERn FIELD1...FIELDn
|
|
|
|
|
# ----------------------------------------------------------------------
|
|
|
|
|
# Generate a string of newline-separated rows arranged in lined-up
|
|
|
|
|
# columns of the given WIDTHs, with the entire table indented by INDENT
|
|
|
|
|
# spaces. The number of columns is determined by the number of integer
|
|
|
|
|
# valued WIDTH arguments following INDENT. The next set (i.e. a number
|
|
|
|
|
# of arguments equal to the number of WIDTH arguments) of fields are
|
|
|
|
|
# treated as the table's column HEADERs, and are separated from the
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# remainder of the table by an indented row of '-' characters. Remaining
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# arguments are each aligned below the next available header, wrapping
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# to a new row as necessary. Finally another row of '-' characters is
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# added to mark the end of the table.
|
2003-11-25 23:48:23 +08:00
|
|
|
|
#
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# For example an unindented 3 column table with 2 rows of data would be
|
|
|
|
|
# generated by this call:
|
2003-11-25 23:48:23 +08:00
|
|
|
|
#
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# func_strtable 3 20 10 25 \
|
|
|
|
|
# Header1 Header2 Header3 \
|
|
|
|
|
# Row1Col1 Row1Col2 Row1Col3 \
|
|
|
|
|
# Row2Col1 Row2Col2 Row2Col3
|
* HACKING (Licensing Rules): Explain the various license texts
used for files distributed with Libtool, and update license text
to match.
* Makefile.am, Makefile.maint README, README.alpha, THANKS, TODO,
bootstrap, clcommit.m4sh, configure.ac, libltdl/Makefile.inc,
libltdl/README, libltdl/argz.c, libltdl/argz_.h,
libltdl/config/general.m4sh, libltdl/config/getopt.m4sh,
libltdl/config/ltmain.m4sh, libltdl/config/mailnotify.m4sh,
libltdl/config/mkstamp, libltdl/configure.ac,
libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h,
libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h,
libltdl/libltdl/lt__strl.h, libltdl/libltdl/lt_dlloader.h,
libltdl/libltdl/lt_error.h, libltdl/libltdl/lt_system.h,
libltdl/libltdl/slist.h, libltdl/loaders/dld_link.c,
libltdl/loaders/dlopen.c, libltdl/loaders/dyld.c,
libltdl/loaders/load_add_on.c, libltdl/loaders/loadlibrary.c,
libltdl/loaders/preopen.c, libltdl/loaders/shl_load.c,
libltdl/lt__alloc.c, libltdl/lt__dirent.c, libltdl/lt__strl.c,
libltdl/lt_dlloader.c, libltdl/lt_error.c, libltdl/ltdl.c,
libltdl/ltdl.h, libltdl/m4/argz.m4, libltdl/m4/libtool.m4,
libltdl/m4/ltdl.m4, libltdl/m4/ltoptions.m4,
libltdl/m4/ltsugar.m4, libltdl/m4/ltversion.in,
Jlibltdl/m4/ltversion.m4, libltdl/m4/lt~obsolete.m4,
libltdl/slist.c, libtoolize.m4sh, tests/am-subdir.at,
tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/cdemo-undef.test,
tests/cdemo/Makefile.am, tests/cdemo/configure.ac,
tests/cdemo/foo.c, tests/cdemo/foo.h, tests/cdemo/main.c,
tests/cmdline_wrap.at, tests/convenience.at, tests/defs.m4sh,
tests/demo-conf.test, tests/demo-deplibs.test,
tests/demo-exec.test, tests/demo-hardcode.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-noinst-link.test,
tests/demo-nopic.test, tests/demo-pic.test,
tests/demo-relink.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/demo/Makefile.am, tests/demo/configure.ac,
tests/demo/dlmain.c, tests/demo/foo.c,
tests/demo/foo.h, tests/demo/hell1.c, tests/demo/hell2.c,
tests/demo/hello.c, tests/demo/main.c,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-relink.test,
tests/depdemo-shared.test, tests/depdemo-static.test,
tests/depdemo-unst.test, tests/depdemo/Makefile.am,
tests/depdemo/configure.ac, tests/depdemo/l1/Makefile.am,
tests/depdemo/l1/l1.c, tests/depdemo/l1/l1.h,
tests/depdemo/l2/Makefile.am, tests/depdemo/l2/l2.c,
tests/depdemo/l2/l2.h, tests/depdemo/l3/Makefile.am,
tests/depdemo/l3/l3.c, tests/depdemo/l3/l3.h,
tests/depdemo/l4/Makefile.am, tests/depdemo/l4/l4.c,
tests/depdemo/l4/l4.h, tests/depdemo/main.c,
tests/depdemo/sysdep.h, tests/deplibs-ident.at,
tests/destdir.at, tests/duplicate_conv.at,
tests/duplicate_deps.at, tests/duplicate_members.at,
tests/early-libtool.at, tests/export.at,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/f77demo/Makefile.am,
tests/f77demo/configure.ac, tests/f77demo/cprogram.c,
tests/f77demo/foo.h, tests/f77demo/fooc.c,
tests/fail.at, tests/fcdemo-conf.test, tests/fcdemo-exec.test,
tests/fcdemo-make.test, tests/fcdemo-shared.test,
tests/fcdemo-static.test, tests/fcdemo/Makefile.am,
tests/fcdemo/configure.ac, tests/fcdemo/cprogram.c,
tests/fcdemo/foo.h, tests/fcdemo/fooc.c,
tests/inherited_flags.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order.at, tests/link-order2.at,
tests/link.test, tests/lt_dlexit.at, tests/mdemo-conf.test,
tests/mdemo-dryrun.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo/Makefile.am,
tests/mdemo/configure.ac, tests/mdemo/foo.h, tests/mdemo/foo1.c,
tests/mdemo/foo2.c, tests/mdemo/main.c, tests/mdemo/mlib.c,
tests/mdemo/sub.c, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test,
tests/mdemo2/Makefile.am, tests/mdemo2/configure.ac,
tests/mdemo2/main.c, tests/nomode.test, tests/nonrecursive.at,
tests/objectlist.test, tests/old-m4-iface.at,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo/Makefile.am, tests/pdemo/configure.ac,
tests/pdemo/foo.h, tests/pdemo/longer_file_name_dlmain.c,
tests/pdemo/longer_file_name_foo.c,
tests/pdemo/longer_file_name_foo2.c,
tests/pdemo/longer_file_name_hell1.c,
tests/pdemo/longer_file_name_hell2.c,
tests/pdemo/longer_file_name_hello.c,
tests/pdemo/longer_file_name_main.c, tests/quote.test,
tests/recursive.at, tests/search-path.at, tests/sh.test,
tests/shlibpath.at, tests/standalone.at, tests/static.at,
tests/stresstest.at, tests/subproject.at, tests/suffix.test,
tests/tagdemo-conf.test, tests/tagdemo-exec.test,
tests/tagdemo-make.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test, tests/tagdemo-undef.test,
tests/tagdemo/Makefile.am, tests/tagdemo/baz.cpp,
tests/tagdemo/baz.h, tests/tagdemo/configure.ac,
tests/tagdemo/conv.cpp, tests/tagdemo/conv.h,
tests/tagdemo/foo.cpp, tests/tagdemo/foo.h,
tests/tagdemo/main.cpp, tests/tagtrace.test,
tests/template.at, tests/testsuite.at: Apply correct license
text according to the new rules set out in HACKING.
2007-03-25 20:12:44 +08:00
|
|
|
|
#
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# returning the following string:
|
2003-11-25 23:48:23 +08:00
|
|
|
|
#
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# " Header1 Header2 Header3
|
|
|
|
|
# -------------------------------------------------------
|
|
|
|
|
# Row1Col1 Row1Col2 Row1Col3
|
|
|
|
|
# Row2Col1 Row2Col2 Row2Col3
|
|
|
|
|
# -------------------------------------------------------"
|
|
|
|
|
func_strtable ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
2005-11-20 17:14:51 +08:00
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Save the indent value, we'll need it for each row we render.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_indent=$1; shift
|
2005-08-29 21:58:07 +08:00
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Collect remaining numeric args into a list for reuse between
|
|
|
|
|
# members of each row when we call func_strrow later.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_widths=$1; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
while test 0 -lt `expr "$1" : '[1-9][0-9]*$'`; do
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_append _G_widths " $1"; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Extract the same number of positional parameters as there are
|
|
|
|
|
# width elements - we'll do the header rows separately so that
|
|
|
|
|
# we can insert a divider line.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_header=$_G_indent
|
2011-11-03 16:23:45 +08:00
|
|
|
|
for _G_width in $_G_widths; do
|
|
|
|
|
func_append _G_header " $1 $_G_width"; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
done
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_strrow $_G_header
|
2001-06-29 06:49:20 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Strip off the indent, and make a divider with '-' chars, then
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# reindent.
|
2014-01-03 08:33:38 +08:00
|
|
|
|
_G_divider=`$ECHO "$func_strrow_result" \
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|$SED 's|[^ ]|-|g
|
|
|
|
|
:a
|
|
|
|
|
s|- |--|g
|
|
|
|
|
ta
|
|
|
|
|
'`
|
|
|
|
|
|
|
|
|
|
# Append the header and divider to the running result.
|
|
|
|
|
func_append func_strtable_result "\
|
|
|
|
|
$func_strrow_result
|
2011-11-03 16:23:45 +08:00
|
|
|
|
$_G_divider
|
2010-09-25 05:26:00 +08:00
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
# The remaining rows are zipped between the width values we
|
|
|
|
|
# unwound earlier just like the header row above.
|
|
|
|
|
while test $# -gt 0; do
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_row=$_G_indent
|
2011-11-03 16:23:45 +08:00
|
|
|
|
for _G_width in $_G_widths; do
|
|
|
|
|
func_append _G_row " $1 $_G_width"; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
done
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_strrow $_G_row
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_append func_strtable_result "\
|
|
|
|
|
$func_strrow_result
|
|
|
|
|
"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Mark the end of the table with a final divider line.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_append func_strtable_result "$_G_divider"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
2004-11-24 22:55:55 +08:00
|
|
|
|
|
2004-10-09 05:56:10 +08:00
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# func_internal_error ARG...
|
|
|
|
|
# --------------------------
|
|
|
|
|
# Echo program name prefixed message to standard error, and exit.
|
|
|
|
|
func_internal_error ()
|
|
|
|
|
{
|
2011-10-26 15:33:45 +08:00
|
|
|
|
func_fatal_error "\
|
|
|
|
|
INTERNAL: " ${1+"$@"} "
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
Please report this bug to 'bug-gnulib@gnu.org'
|
2011-11-03 16:23:45 +08:00
|
|
|
|
in as much detail as possible."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
2004-02-07 01:23:40 +08:00
|
|
|
|
|
2001-06-29 06:49:20 +08:00
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# func_permissions_error FILE-OR-DIRECTORY
|
|
|
|
|
# ----------------------------------------
|
|
|
|
|
# Echo program name prefixed permissions error message to standard
|
|
|
|
|
# error, and exit.
|
|
|
|
|
func_permissions_error ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
func_fatal_error "Failed to create '$1', check permissions."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_show_eval CMD [FAIL_EXP]
|
|
|
|
|
# -----------------------------
|
|
|
|
|
# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
|
|
|
|
|
# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
|
|
|
|
|
# is given, then evaluate it.
|
|
|
|
|
func_show_eval ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2012-10-24 11:17:24 +08:00
|
|
|
|
$require_term_colors
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_cmd=$1
|
|
|
|
|
_G_fail_exp=${2-':'}
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
${opt_silent-'false'} || {
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval $_G_cmd
|
|
|
|
|
eval func_truncate_cmd $func_quote_result
|
2012-10-24 11:17:24 +08:00
|
|
|
|
func_echo "running: $tc_bold$func_truncate_cmd_result$tc_reset"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
${opt_dry_run-'false'} || {
|
2011-11-03 16:23:45 +08:00
|
|
|
|
eval "$_G_cmd"
|
|
|
|
|
_G_status=$?
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test 0 -eq "$_G_status" || eval "(exit $_G_status); $_G_fail_exp"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_truncate_cmd CMD [ARG]...
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# For unreasonably long commands (such as a gnulib-tool invocation with
|
|
|
|
|
# the full module list for import), truncate CMD after the second non-
|
|
|
|
|
# option ARG.
|
|
|
|
|
func_truncate_cmd ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_last_arg_opt_p=false
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_truncate_cmd_result=
|
|
|
|
|
|
|
|
|
|
set dummy "$@"; shift
|
|
|
|
|
|
|
|
|
|
while test $# -gt 0; do
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_opt=$1; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
test -n "$func_truncate_cmd_result" \
|
|
|
|
|
&& func_append func_truncate_cmd_result ' '
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_append func_truncate_cmd_result "$_G_opt"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
func_len "x$func_truncate_cmd_result"
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
case $_G_opt in
|
|
|
|
|
-*) _G_last_arg_opt_p=: ;;
|
|
|
|
|
*) $_G_last_arg_opt_p \
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
|| test "$min_cmd_len" -gt "$func_len_result" \
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|| break
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_last_arg_opt_p=false
|
2010-09-25 05:26:00 +08:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
test $# -gt 0 && func_append func_truncate_cmd_result "..."
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-01-26 13:50:04 +08:00
|
|
|
|
# func_gitignore_entries FILE...
|
|
|
|
|
# ------------------------------
|
|
|
|
|
# Strip blank and comment lines to leave significant entries.
|
|
|
|
|
func_gitignore_entries ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2013-10-30 13:25:44 +08:00
|
|
|
|
$SED -e '/^#/d' -e '/^$/d' "$@"
|
2013-01-26 13:50:04 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_insert_if_absent STR FILE...
|
|
|
|
|
# ---------------------------------
|
|
|
|
|
# If $STR is not already on a line by itself in $FILE, insert it, at the
|
|
|
|
|
# start. Entries are inserted at the start of the ignore list to ensure
|
|
|
|
|
# existing entries starting with ! are not overridden. Such entries
|
|
|
|
|
# support whilelisting exceptions after a more generic blacklist pattern.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# sorting the new contents of the file and replacing $FILE with the result.
|
2013-01-26 13:50:04 +08:00
|
|
|
|
func_insert_if_absent ()
|
2010-09-25 05:26:00 +08:00
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
str=$1
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
|
|
for file
|
|
|
|
|
do
|
2011-11-25 15:39:57 +08:00
|
|
|
|
test -f "$file" || touch "$file"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-01-26 13:50:04 +08:00
|
|
|
|
duplicate_entries=`func_gitignore_entries "$file" |sort |uniq -d`
|
|
|
|
|
test -n "$duplicate_entries" \
|
|
|
|
|
&& func_error "duplicate entries in $file: " $duplicate_entries
|
|
|
|
|
|
2013-01-27 22:07:27 +08:00
|
|
|
|
func_grep_q "^$str\$" "$file" \
|
|
|
|
|
|| func_verbose "inserting '$str' into '$file'"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-01-26 13:50:04 +08:00
|
|
|
|
linesold=`func_gitignore_entries "$file" |wc -l`
|
2014-01-03 08:33:38 +08:00
|
|
|
|
linesnew=`{ $ECHO "$str"; cat "$file"; } \
|
2013-08-23 16:59:46 +08:00
|
|
|
|
|func_gitignore_entries |sort -u |wc -l`
|
2013-01-27 21:13:27 +08:00
|
|
|
|
test "$linesold" -eq "$linesnew" \
|
2013-10-30 13:25:44 +08:00
|
|
|
|
|| { $SED "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|| func_permissions_error "$file"
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_get_version APP
|
|
|
|
|
# --------------------
|
|
|
|
|
# echo the version number (if any) of APP, which is looked up along your
|
|
|
|
|
# PATH.
|
|
|
|
|
func_get_version ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_app=$1
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# Rather than uncomment the sed script in-situ, strip the comments
|
2024-01-17 09:01:00 +08:00
|
|
|
|
# programatically before passing the result to $SED for evaluation.
|
2014-01-03 08:33:38 +08:00
|
|
|
|
sed_get_version=`$ECHO '# extract version within line
|
2010-09-25 05:26:00 +08:00
|
|
|
|
s|.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*|\1|
|
|
|
|
|
t done
|
|
|
|
|
|
|
|
|
|
# extract version at start of line
|
|
|
|
|
s|^\([0-9]\{1,\}\.[.a-z0-9-]*\).*|\1|
|
|
|
|
|
t done
|
|
|
|
|
|
|
|
|
|
d
|
|
|
|
|
|
|
|
|
|
:done
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# the following essentially does s|5.005|5.5|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
s|\.0*\([1-9]\)|.\1|g
|
|
|
|
|
p
|
2011-11-03 16:23:45 +08:00
|
|
|
|
q' \
|
|
|
|
|
|$SED '/^[ ]*#.*$/d'`
|
|
|
|
|
|
|
|
|
|
func_tool_version_output $_G_app >/dev/null
|
|
|
|
|
_G_status=$?
|
|
|
|
|
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test 0 -ne "$_G_status" \
|
2011-11-03 16:23:45 +08:00
|
|
|
|
|| $_G_app --version 2>&1 |$SED -n "$sed_get_version"
|
|
|
|
|
|
|
|
|
|
(exit $_G_status)
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-08-23 18:23:29 +08:00
|
|
|
|
# func_check_tool APP
|
|
|
|
|
# -------------------
|
|
|
|
|
# Search PATH for an executable at APP.
|
|
|
|
|
func_check_tool ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_check_tool_result=
|
|
|
|
|
|
|
|
|
|
case $1 in
|
|
|
|
|
*[\\/]*)
|
|
|
|
|
test -x "$1" && func_check_tool_result=$1
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
save_IFS=$IFS
|
2015-01-21 01:21:37 +08:00
|
|
|
|
IFS=${PATH_SEPARATOR-:}
|
2013-08-23 18:23:29 +08:00
|
|
|
|
for _G_check_tool_path in $PATH; do
|
|
|
|
|
IFS=$save_IFS
|
|
|
|
|
if test -x "$_G_check_tool_path/$1"; then
|
|
|
|
|
func_check_tool_result=$_G_check_tool_path/$1
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
IFS=$save_IFS
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# func_check_versions APP1 VER1 URL1 ...[APPN VERN URLN]
|
|
|
|
|
# ------------------------------------------------------
|
|
|
|
|
func_check_versions ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_check_versions_result=:
|
|
|
|
|
|
|
|
|
|
while test $# -gt 0; do
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_app=$1; shift
|
|
|
|
|
_G_reqver=$1; shift
|
|
|
|
|
_G_url=$1; shift
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-08-23 17:27:31 +08:00
|
|
|
|
# Diagnose bad buildreq formatting.
|
|
|
|
|
case $_G_url in
|
|
|
|
|
[a-z]*://*) ;; # looks like a url
|
|
|
|
|
*) func_fatal_error "\
|
|
|
|
|
'$_G_url' from the buildreq table in
|
|
|
|
|
'bootstrap.conf' does not look like the URL for downloading
|
|
|
|
|
$_G_app. Please ensure that buildreq is a strict newline
|
|
|
|
|
delimited list of triples; 'program min-version url'."
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
|
2024-07-24 22:50:15 +08:00
|
|
|
|
_G_appvar=`echo $_G_app |tr '[a-z-]' '[A-Z_]'`
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test TAR = "$_G_appvar" && _G_appvar=AMTAR
|
2011-11-03 16:23:45 +08:00
|
|
|
|
eval "_G_app=\${$_G_appvar-$_G_app}"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-08-23 18:23:29 +08:00
|
|
|
|
# Fail if no version specified, but the program can't be found.
|
|
|
|
|
if test x- = "x$_G_reqver"; then
|
|
|
|
|
func_check_tool $_G_app
|
|
|
|
|
if test -z "$func_check_tool_result"; then
|
|
|
|
|
func_error "Prerequisite '$_G_app' not not found. Please install it, or
|
|
|
|
|
'export $_G_appvar=/path/to/$_G_app'."
|
|
|
|
|
func_check_versions_result=false
|
|
|
|
|
else
|
|
|
|
|
func_verbose "found '$func_check_tool_result' for $_G_appvar."
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
_G_instver=`func_get_version $_G_app`
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2013-08-23 18:23:29 +08:00
|
|
|
|
# Fail if --version didn't work.
|
|
|
|
|
if test -z "$_G_instver"; then
|
|
|
|
|
func_error "Prerequisite '$_G_app' not found. Please install it, or
|
2012-10-25 17:00:52 +08:00
|
|
|
|
'export $_G_appvar=/path/to/$_G_app'."
|
2010-09-25 05:26:00 +08:00
|
|
|
|
func_check_versions_result=false
|
2013-08-23 18:23:29 +08:00
|
|
|
|
|
|
|
|
|
# Fail if a newer version than what we have is required.
|
|
|
|
|
else
|
2014-01-07 09:16:34 +08:00
|
|
|
|
func_verbose "found '$_G_app' version $_G_instver."
|
|
|
|
|
|
|
|
|
|
case $_G_reqver in
|
|
|
|
|
=*)
|
|
|
|
|
# If $buildreq version starts with '=', version must
|
|
|
|
|
# match the installed program exactly.
|
|
|
|
|
test "x$_G_reqver" = "x=$_G_instver" || {
|
|
|
|
|
func_error "\
|
|
|
|
|
'$_G_app' version == $_G_instver is too old
|
|
|
|
|
'exactly $_G_app-$_G_reqver is required"
|
|
|
|
|
func_check_versions_result=false
|
|
|
|
|
}
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# Otherwise, anything that is not older is a match.
|
|
|
|
|
func_lt_ver "$_G_reqver" "$_G_instver" || {
|
|
|
|
|
func_error "\
|
2013-08-23 18:23:29 +08:00
|
|
|
|
'$_G_app' version == $_G_instver is too old
|
|
|
|
|
'$_G_app' version >= $_G_reqver is required"
|
|
|
|
|
func_check_versions_result=false
|
2014-01-07 09:16:34 +08:00
|
|
|
|
}
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2013-08-23 18:23:29 +08:00
|
|
|
|
fi
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_cleanup_gnulib
|
|
|
|
|
# -------------------
|
|
|
|
|
# Recursively delete everything below the path in the global variable
|
|
|
|
|
# GNULIB_PATH.
|
|
|
|
|
func_cleanup_gnulib ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_status=$?
|
2010-09-25 05:26:00 +08:00
|
|
|
|
$RM -fr "$gnulib_path"
|
2011-11-03 16:23:45 +08:00
|
|
|
|
exit $_G_status
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_download_po_files SUBDIR DOMAIN
|
|
|
|
|
# ------------------------------------
|
|
|
|
|
func_download_po_files ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
func_echo "getting translations into $1 for $2..."
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_cmd=`printf "$po_download_command_format" "$2" "$1"`
|
|
|
|
|
eval "$_G_cmd"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_update_po_files PO_DIR DOMAIN
|
|
|
|
|
# ----------------------------------
|
|
|
|
|
# Mirror .po files to $po_dir/.reference and copy only the new
|
|
|
|
|
# or modified ones into $po_dir. Also update $po_dir/LINGUAS.
|
|
|
|
|
# Note po files that exist locally only are left in $po_dir but will
|
|
|
|
|
# not be included in LINGUAS and hence will not be distributed.
|
|
|
|
|
func_update_po_files ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Directory containing primary .po files.
|
|
|
|
|
# Overwrite them only when we're sure a .po file is new.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_po_dir=$1
|
|
|
|
|
_G_domain=$2
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
# Mirror *.po files into this dir.
|
|
|
|
|
# Usually contains *.s1 checksum files.
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_ref_po_dir=$_G_po_dir/.reference
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
tests: migrate tests/sh.test checks to syntax-checks.
Some modernization of the legacy testsuite.
* tests/sh.test: Remove.
* Makefile.am (COMMON_TESTS): Adjust.
* cfg.mk (sc_libtool_m4_cc_basename, sc_prohibit_bracket_as_test)
(sc_prohibit_nested_quotes, sc_prohibit_set_dummy_without_shift)
(sc_prohibit_set_minus_minus, sc_prohibit_test_binary_operators)
(sc_prohibit_test_dollar, sc_prohibit_test_minus_e)
(sc_prohibit_test_unary_operators, sc_prohibit_test_X)
(sc_prohibit_Xsed_withou_X, sc_require_function_nl_brace):
Functionally identical tests to what used to be performed by
sh.test, only with coverage of all files.
* bootstrap, build-aux/edit-readme-alpha,
build-aux/extract-trace, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, configure.ac, m4/libtool.m4, m4/ltdl.m4,
tests/bindir.at, tests/configure-iface.at, tests/cwrapper.at,
tests/darwin.at, tests/defs.m4sh, tests/demo-hardcode.test,
tests/dlloader-api.at, tests/exceptions.at,
tests/getopt-m4sh.at, tests/lalib-syntax.at, tests/link-2.test,
tests/link-order2.at, tests/loadlibrary.at,
tests/lt_dladvise.at, tests/lt_dlexit.at, tests/lt_dlopen_a.at,
tests/lt_dlopenext.at, tests/need_lib_prefix.at,
tests/nonrecursive.at, tests/recursive.at, tests/resident.at,
tests/standalone.at, tests/static.at, tests/stresstest.at,
tests/subproject.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at: Fix violations of the new syntax checks.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-17 00:21:18 +08:00
|
|
|
|
test -d "$_G_ref_po_dir" || mkdir $_G_ref_po_dir || return
|
2011-11-03 16:23:45 +08:00
|
|
|
|
func_download_po_files $_G_ref_po_dir $_G_domain \
|
|
|
|
|
&& ls "$_G_ref_po_dir"/*.po 2>/dev/null \
|
2012-10-25 18:11:33 +08:00
|
|
|
|
|$SED -e 's|.*/||' -e 's|\.po$||' > "$_G_po_dir/LINGUAS" || return
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6+.
|
2013-08-23 21:17:50 +08:00
|
|
|
|
func_find_tool SHA1SUM sha1sum gsha1sum shasum sha1
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2014-11-04 21:35:38 +08:00
|
|
|
|
test -n "$SHA1SUM" || func_fatal_error "\
|
|
|
|
|
Please install GNU Coreutils, or 'export SHA1SUM=/path/to/sha1sum'."
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
_G_langs=`cd $_G_ref_po_dir && echo *.po|$SED 's|\.po||g'`
|
syntax-check: [REDO] fix violations and implement sc_prohibit_test_const_follows_var.
To safely use a non-literal fist argument to 'test', you must
always prepend a literal non-'-' character, but often the second
operand is a constant that doesn't begin with a '-' already, so
always use 'test a = "$b"' instead of the noisy 'test "X$b" = Xa'.
* cf.mk (sc_prohibit_test_const_follws_var): New syntax-check
rule to ensure we don't reintroduce noisy test operands.
bootstrap, build-aux/extract-trace, build-aux/general.m4sh,
build-aux/ltmain.m4sh, configure.ac, doc/libtool.texi, libtoolize.m4sh,
m4/argz.m4, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at, tests/defs.m4sh,
tests/demo-relink.test, tests/demo/configure.ac,
tests/depdemo-relink.test, tests/destdir.at, tests/duplicate_conv.at,
tests/fail.at, tests/getopt-m4sh.at, tests/help.at, tests/libtoolize.at,
tests/link-2.test, tests/link-order2.at, tests/lt_dlopenext.at,
tests/mdemo/configure.ac, tests/mdemo2/configure.ac,
tests/need_lib_prefix.at, tests/nocase.at, tests/pdemo/configure.ac,
tests/pic_flag.at, tests/search-path.at, tests/shlibpath.at,
tests/static.at, tests/sysroot.at, tests/tagtrace.test,
tests/testsuite.at, tests/with-pic.at: Swap operands to avoid useless
noise.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-02 10:40:40 +08:00
|
|
|
|
test '*' = "$_G_langs" && _G_langs=x
|
2011-11-03 16:23:45 +08:00
|
|
|
|
for _G_po in $_G_langs; do
|
|
|
|
|
case $_G_po in x) continue;; esac
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_new_po=$_G_ref_po_dir/$_G_po.po
|
|
|
|
|
_G_cksum_file=$_G_ref_po_dir/$_G_po.s1
|
2011-11-03 16:23:45 +08:00
|
|
|
|
if ! test -f "$_G_cksum_file" ||
|
|
|
|
|
! test -f "$_G_po_dir/$_G_po.po" ||
|
2013-08-23 21:17:50 +08:00
|
|
|
|
! $SHA1SUM -c "$_G_cksum_file" \
|
2011-11-03 16:23:45 +08:00
|
|
|
|
< "$_G_new_po" > /dev/null; then
|
|
|
|
|
echo "updated $_G_po_dir/$_G_po.po..."
|
|
|
|
|
cp "$_G_new_po" "$_G_po_dir/$_G_po.po" \
|
2013-08-23 21:17:50 +08:00
|
|
|
|
&& $SHA1SUM < "$_G_new_po" > "$_G_cksum_file" || return
|
2010-09-25 05:26:00 +08:00
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
## --------------- ##
|
|
|
|
|
## Option parsing. ##
|
|
|
|
|
## --------------- ##
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# Hook in the functions to make sure our own options are parsed during
|
|
|
|
|
# the option parsing loop.
|
|
|
|
|
|
2011-11-16 13:13:55 +08:00
|
|
|
|
usage='$progpath [OPTION]...'
|
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Short help message in response to '-h'. Add to this in 'bootstrap.conf'
|
2011-11-03 16:23:45 +08:00
|
|
|
|
# if you accept any additional options.
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
usage_message="Common Bootstrap Options:
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
-c, --copy copy files instead of creating symbolic links.
|
|
|
|
|
--debug enable verbose shell tracing
|
|
|
|
|
-n, --dry-run print commands rather than running them
|
|
|
|
|
-f, --force attempt to bootstrap even if the sources seem not
|
|
|
|
|
to have been checked out.
|
|
|
|
|
--gnulib-srcdir=DIRNAME
|
|
|
|
|
specify a local directory where gnulib sources
|
|
|
|
|
reside. Use this if you already have the gnulib
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
sources on your machine, and don't want to waste
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
your bandwidth downloading them again. Defaults to
|
|
|
|
|
\$GNULIB_SRCDIR.
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
--no-warnings equivalent to '-Wnone'
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
--skip-git do not fetch files from remote repositories
|
|
|
|
|
--skip-po do not download po files.
|
|
|
|
|
-v, --verbose verbosely report processing
|
|
|
|
|
--version print version information and exit
|
|
|
|
|
-W, --warnings=CATEGORY
|
|
|
|
|
report the warnings falling in CATEGORY [all]
|
|
|
|
|
-h, --help print short or long help message and exit
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Additional text appended to 'usage_message' in response to '--help'.
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
long_help_message=$long_help_message"
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
'recommend' show warnings about missing recommended packages
|
|
|
|
|
'settings' show warnings about missing '$progname.conf' settings
|
|
|
|
|
'upgrade' show warnings about out-dated files
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
If the file '$progname.conf' exists in the same directory as this
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
script, its contents are read as shell variables to configure the
|
|
|
|
|
bootstrap.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
For build prerequisites, environment variables like \$AUTOCONF and
|
|
|
|
|
\$AMTAR are honored.
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
2011-11-03 16:23:45 +08:00
|
|
|
|
Running without arguments will suffice in most cases.
|
|
|
|
|
"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
# Warning categories used by 'bootstrap', append others if you use them
|
|
|
|
|
# in your 'bootstrap.conf'.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
warning_categories='recommend settings upgrade'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# bootstrap_options_prep [ARG]...
|
|
|
|
|
# -------------------------------
|
|
|
|
|
# Preparation for options parsed by Bootstrap.
|
|
|
|
|
bootstrap_options_prep ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Option defaults:
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
opt_copy=${copy-'false'}
|
2011-11-03 16:23:45 +08:00
|
|
|
|
opt_dry_run=false
|
|
|
|
|
opt_force=false
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
opt_gnulib_srcdir=$GNULIB_SRCDIR
|
2011-11-03 16:23:45 +08:00
|
|
|
|
opt_skip_git=false
|
|
|
|
|
opt_skip_po=false
|
|
|
|
|
|
|
|
|
|
# Pass back the list of options we consumed.
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
bootstrap_options_prep_result=$func_quote_result
|
2011-11-03 16:23:45 +08:00
|
|
|
|
}
|
|
|
|
|
func_add_hook func_options_prep bootstrap_options_prep
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# bootstrap_parse_options [ARG]...
|
|
|
|
|
# --------------------------------
|
2011-11-16 13:43:53 +08:00
|
|
|
|
# Provide handling for Bootstrap specific options.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
bootstrap_parse_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Perform our own loop to consume as many options as possible in
|
|
|
|
|
# each iteration.
|
|
|
|
|
while test $# -gt 0; do
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
_G_opt=$1
|
2011-11-03 16:23:45 +08:00
|
|
|
|
shift
|
|
|
|
|
case $_G_opt in
|
|
|
|
|
--dry-run|--dryrun|-n)
|
|
|
|
|
opt_dry_run=: ;;
|
|
|
|
|
--copy|-c) opt_copy=: ;;
|
|
|
|
|
--force|-f) opt_force=: ;;
|
|
|
|
|
|
|
|
|
|
--gnulib-srcdir)
|
|
|
|
|
test $# = 0 && func_missing_arg $_G_opt && break
|
syntax-check: fix violations and implement sc_useless_quotes_in_assignment.
Contrary to popular belief, Bourne shell does not resplit RHS of
assignments after expansion, so if there are no unquoted shell
metacharacters or whitespace, the quotes are useless.
* cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's
_sc_search_regexp that also allows individual exclusions at the
site of what would otherwise match by adding a comment.
(sc_useless_quotes_in_assignment): New syntax-check rule to
ensure we don't reintroduce useless quoted assignments.
* bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/general.m4sh, build-aux/getopt.m4sh,
build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac,
doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4,
m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh,
tests/lalib-syntax.at, tests/libtoolize.at,
tests/lt_dlopenext.at, tests/mdemo/configure.ac,
tests/mdemo2/configure.ac, tests/need_lib_prefix.at,
tests/no-executables.at, tests/quote.test, tests/suffix.test:
Remove spurious quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2011-11-16 19:59:01 +08:00
|
|
|
|
opt_gnulib_srcdir=$1
|
2011-11-03 16:23:45 +08:00
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
2013-08-23 21:28:25 +08:00
|
|
|
|
--skip-git|--no-git)
|
|
|
|
|
opt_skip_git=:
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
--skip-po|--no-po)
|
|
|
|
|
opt_skip_po=:
|
|
|
|
|
;;
|
2011-11-03 16:23:45 +08:00
|
|
|
|
|
|
|
|
|
# Separate non-argument short options:
|
|
|
|
|
-c*|-f*|-n*)
|
|
|
|
|
func_split_short_opt "$_G_opt"
|
|
|
|
|
set dummy "$func_split_short_opt_name" \
|
|
|
|
|
"-$func_split_short_opt_arg" ${1+"$@"}
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# save modified positional parameters for caller
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
bootstrap_parse_options_result=$func_quote_result
|
2011-11-03 16:23:45 +08:00
|
|
|
|
}
|
|
|
|
|
func_add_hook func_parse_options bootstrap_parse_options
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# bootstrap_validate_options [ARG]...
|
|
|
|
|
# -----------------------------------
|
|
|
|
|
# Perform any sanity checks on option settings and/or unconsumed
|
|
|
|
|
# arguments.
|
|
|
|
|
bootstrap_validate_options ()
|
|
|
|
|
{
|
|
|
|
|
$debug_cmd
|
|
|
|
|
|
|
|
|
|
# Validate options.
|
|
|
|
|
test $# -gt 0 \
|
|
|
|
|
&& func_fatal_help "too many arguments"
|
|
|
|
|
|
maint: factor common shell code into build-aux/funclib.sh.
Moving potentially reusable code into a common file that can
be sourced by clients, and adjusting for impedance mismatch
or necessary renames during integration.
* build-aux/funclib.sh: New file.
* build-aux/options-parser (Shell normalisation)
(User overrideable command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1, func_warn)
(func_error, func_fatal_error, func_quote_for_eval, func_verbose):
Move from here...
* build-aux/funclib.sh (Shell normalisation, User overrideable
command paths, Global variables, func_append)
(require_term_colors, func_echo, func_echo_infix_1)
(func_warn_and_continue, func_error, func_fatal_error)
(func_quote_for_eval, func_verbose): ...to here.
* build-aux/general.m4sh (func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): Move from here...
* build-aux/funclib.sh(func_arith, func_basename)
(func_dirname, func_dirname_and_basename, func_echo_all)
(func_grep, func_len, func_mkdir_p, func_mktempdir)
(func_normal_abspath, func_relative_path, func_quote_for_expand)
(func_stripname, func_show_eval, func_tr_sh): ...to here.
* bootstrap (usage message): Document `-no-warn' option.
(func_append_u, func_warning): Move from here...
* build-aux/funclib.sh (func_append_uniq, func_warning): ...to
here.
* bootstrap, build-aux/extract-trace: Source build-aux/funclib.sh
before build-aux/options-parser.
* build-aux/options-parser (usage, long_help_message): Set
default values to match what is parsed by the unmodified parser.
* build-aux/extract-trace (usage, long_help_message): Only set
from func_main, so that clients sourcing this file can still use
the correct defaults from build-aux/options-parser.
* bootstrap (bootstrap_options_prep, bootstrap_parse_options):
Move warning option parsing from here...
* build-aux/option-parser (func_options_prep)
(func_parse_options): ...to here, where all clients can benefit.
* Makefile.am (funclib_sh): New macro; path to funclib.sh.
(EXTRA_DIST): Add $(funclib_sh).
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-07 19:01:24 +08:00
|
|
|
|
# Pass back the (empty) list of unconsumed options.
|
2015-10-11 20:35:15 +08:00
|
|
|
|
func_quote eval ${1+"$@"}
|
|
|
|
|
bootstrap_validate_options_result=$func_quote_result
|
2011-11-03 16:23:45 +08:00
|
|
|
|
}
|
2012-09-16 12:47:22 +08:00
|
|
|
|
func_add_hook func_validate_options bootstrap_validate_options
|
2010-09-25 05:26:00 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## -------------------------------------------------- ##
|
syntax-check: fix violations and implement sc_old_style_quoting.
Modern GNU ASCII quoting in output and comments is done
'like this'.
* cfg.mk (sc_old_style_quoting): Try to catch most instances
of `old style quoting' so that it is not accidentally re-
introduced to the code.
* HACKING, Makefile.am, NEWS, PORTING, README, TODO, bootstrap,
bootstrap.conf, build-aux/edit-readme-alpha,
build-aux/git-hooks/commit-msg, build-aux/ltmain.in,
doc/libtool.texi, gl/build-aux/bootstrap.in,
gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
gl/build-aux/inline-source, gl/build-aux/options-parser,
libltdl/libltdl/slist.h, libltdl/loaders/loadlibrary.c,
libltdl/ltdl.c, libltdl/slist.c, libtoolize.in, m4/argz.m4,
m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, m4/ltsugar.m4,
tests/cmdline_wrap.at, tests/configure-iface.at, tests/demo.at,
tests/depdemo.at, tests/deplib-in-subdir.at,
tests/deplibs-mingw.at, tests/destdir.at, tests/execute-mode.at,
tests/f77demo.at, tests/fail.at, tests/inherited_flags.at,
tests/libtool.at, tests/libtoolize.at, tests/lt_dladvise.at,
tests/lt_dlexit.at, tests/mdemo.at, tests/need_lib_prefix.at,
tests/old-ltdl-iface.at, tests/old-m4-iface.at, tests/static.at,
tests/stresstest.at, tests/testsuite.at, tests/versioning.at:
Convert to upright quotes.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
2012-10-22 00:41:07 +08:00
|
|
|
|
## Source package customisations in 'bootstrap.conf'. ##
|
2010-09-25 05:26:00 +08:00
|
|
|
|
## -------------------------------------------------- ##
|
|
|
|
|
|
|
|
|
|
# Override the default configuration, if necessary.
|
|
|
|
|
# Make sure that bootstrap.conf is sourced from the current directory
|
|
|
|
|
# if we were invoked as "sh bootstrap".
|
|
|
|
|
case $0 in
|
|
|
|
|
*/*) test -r "$0.conf" && . "$0.conf" ;;
|
|
|
|
|
*) test -r "$0.conf" && . ./"$0.conf" ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
## Actually perform the bootstrap. ##
|
|
|
|
|
## ------------------------------- ##
|
|
|
|
|
|
|
|
|
|
func_bootstrap ${1+"$@"}
|
|
|
|
|
|
|
|
|
|
# The End.
|
2011-11-03 16:23:45 +08:00
|
|
|
|
exit ${exit_status-$EXIT_SUCCESS}
|
2008-11-20 14:13:36 +08:00
|
|
|
|
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# Local variables:
|
|
|
|
|
# mode: shell-script
|
|
|
|
|
# sh-indentation: 2
|
2014-01-03 09:59:24 +08:00
|
|
|
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
|
|
|
|
# time-stamp-pattern: "500/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
2010-09-25 05:26:00 +08:00
|
|
|
|
# time-stamp-time-zone: "UTC"
|
|
|
|
|
# End:
|