gnulib: gnulib-tool annotate

annotate gnulib-tool @ 10479:74885eaea206

Report all license incompatibilities during --import.

author	Bruno Haible <bruno@clisp.org>
date	Thu, 25 Sep 2008 20:33:12 +0200
parents	569d6cd01c90
children	78d1bdfaa67e

rev	line source
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1 #! /bin/sh
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2 #
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	3 # Copyright (C) 2002-2008 Free Software Foundation, Inc.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4 #
9309 bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9284 diff changeset	5 # This program is free software: you can redistribute it and/or modify
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	6 # it under the terms of the GNU General Public License as published by
9309 bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9284 diff changeset	7 # the Free Software Foundation; either version 3 of the License, or
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9284 diff changeset	8 # (at your option) any later version.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	9 #
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	10 # This program is distributed in the hope that it will be useful,
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	13 # GNU General Public License for more details.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	14 #
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	15 # You should have received a copy of the GNU General Public License
9309 bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9284 diff changeset	16 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	17 #
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	18
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	19 # This program is meant for authors or maintainers which want to import
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	20 # modules from gnulib into their packages.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	21
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	22 progname=$0
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	23 package=gnulib
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	24 nl='
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	25 '
9005 e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	26 IFS=" "" $nl"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	27
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	28 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	29 AUTOCONFPATH=
5250 46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	30 #case $USER in
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	31 # bruno )
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	32 # AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	33 # AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH "
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	34 # ;;
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	35 #esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	36
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	37 # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	38 AUTOMAKEPATH=
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	39
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	40 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	41 GETTEXTPATH=
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	42
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	43 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	44 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	45 if test -z "${AUTOCONF}" \|\| test -n "${AUTOCONFPATH}"; then
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	46 AUTOCONF="${AUTOCONFPATH}autoconf"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	47 fi
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	48 if test -z "${AUTOHEADER}" \|\| test -n "${AUTOCONFPATH}"; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	49 AUTOHEADER="${AUTOCONFPATH}autoheader"
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	50 fi
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	51 if test -z "${ACLOCAL}" \|\| test -n "${AUTOMAKEPATH}"; then
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	52 ACLOCAL="${AUTOMAKEPATH}aclocal"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	53 fi
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	54 if test -z "${AUTOMAKE}" \|\| test -n "${AUTOMAKEPATH}"; then
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	55 AUTOMAKE="${AUTOMAKEPATH}automake"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	56 fi
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	57 if test -z "${AUTORECONF}" \|\| test -n "${AUTOCONFPATH}"; then
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	58 AUTORECONF="${AUTOCONFPATH}autoreconf"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	59 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	60
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	61 # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	62 if test -z "${AUTOPOINT}" \|\| test -n "${GETTEXTPATH}"; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	63 AUTOPOINT="${GETTEXTPATH}autopoint"
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	64 fi
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	65
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	66 # When using GNU sed, turn off as many GNU extensions as possible,
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	67 # to minimize the risk of accidentally using non-portable features.
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	68 # However, do this only for gnulib-tool itself, not for the code that
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	69 # gnulib-tool generates, since we don't want "sed --posix" to leak
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	70 # into makefiles.
7911 548a756cade0 Fix test whether sed is GNU sed supporting --posix. Bruno Haible <bruno@clisp.org> parents: 7896 diff changeset	71 if (alias) > /dev/null 2>&1 && echo \| sed --posix -e d >/dev/null 2>&1; then
9213 6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	72 # Define sed as an alias.
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	73 # It is not always possible to use aliases. Aliases are guaranteed to work
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	74 # if the executing shell is bash and either it is invoked as /bin/sh or
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	75 # is a version >= 2.0, supporting shopt. This is the common case.
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	76 # Two other approaches (use of a variable $sed or of a function func_sed
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	77 # instead of an alias) require massive, fragile code changes.
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	78 # An other approach (use of function sed) requires `which sed` - but 'which'
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	79 # is hard to emulate, due to missing "test -x" on some platforms.
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	80 if test -n "$BASH_VERSION"; then
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	81 shopt -s expand_aliases >/dev/null 2>&1
6c916785c03e Try harder to enable the alias for 'sed'. Bruno Haible <bruno@clisp.org> parents: 9189 diff changeset	82 fi
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	83 alias sed='sed --posix'
7737 19ff03763d73 Use "sed --posix" instead of "sed" when possible. Bruno Haible <bruno@clisp.org> parents: 7722 diff changeset	84 fi
19ff03763d73 Use "sed --posix" instead of "sed" when possible. Bruno Haible <bruno@clisp.org> parents: 7722 diff changeset	85
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	86 # sed_noop is a sed expression that does nothing.
10401 4881ac7042cf Oops, typo in comment. Bruno Haible <bruno@clisp.org> parents: 10400 diff changeset	87 # An empty expression does not work with the native 'sed' on AIX 6.1.
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	88 sed_noop='s,x,x,'
817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	89
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	90 # func_usage
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	91 # outputs to stdout the --help usage message.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	92 func_usage ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	93 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	94 echo "\
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	95 Usage: gnulib-tool --list
5344 c2f5677fc6ed Initialize supplied_libname. Tweak usage message. Bruno Haible <bruno@clisp.org> parents: 5343 diff changeset	96 gnulib-tool --import [module1 ... moduleN]
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	97 gnulib-tool --update
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	98 gnulib-tool --create-testdir --dir=directory [module1 ... moduleN]
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	99 gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN]
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	100 gnulib-tool --test --dir=directory module1 ... moduleN
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	101 gnulib-tool --megatest --dir=directory [module1 ... moduleN]
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	102 gnulib-tool --extract-description module
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	103 gnulib-tool --extract-notice module
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	104 gnulib-tool --extract-filelist module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	105 gnulib-tool --extract-dependencies module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	106 gnulib-tool --extract-autoconf-snippet module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	107 gnulib-tool --extract-automake-snippet module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	108 gnulib-tool --extract-include-directive module
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	109 gnulib-tool --extract-link-directive module
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	110 gnulib-tool --extract-license module
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	111 gnulib-tool --extract-maintainer module
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	112 gnulib-tool --extract-tests-module module
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	113
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	114 Operation modes:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	115 --list print the available module names
6633 5118aa463328 * gnulib-tool (Usage): Fix --import, from Simon Josefsson <simon@josefsson.org> parents: 6614 diff changeset	116 --import import the given modules into the current package;
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	117 if no modules are specified, update the current
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	118 package from the current gnulib
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	119 --update update the current package, restore files omitted
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	120 from CVS
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	121 --create-testdir create a scratch package with the given modules
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	122 --create-megatestdir create a mega scratch package with the given modules
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	123 one by one and all together
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	124 --test test the combination of the given modules
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	125 (recommended to use CC=\"gcc -Wall\" here)
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	126 --megatest test the given modules one by one and all together
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	127 (recommended to use CC=\"gcc -Wall\" here)
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	128 --extract-description extract the description
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	129 --extract-notice extract the notice or banner
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	130 --extract-filelist extract the list of files
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	131 --extract-dependencies extract the dependencies
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	132 --extract-autoconf-snippet extract the snippet for configure.ac
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	133 --extract-automake-snippet extract the snippet for library makefile
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	134 --extract-include-directive extract the #include directive
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	135 --extract-link-directive extract the linker directive
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	136 --extract-license report the license terms of the source files
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	137 under lib/
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	138 --extract-maintainer report the maintainer(s) inside gnulib
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	139 --extract-tests-module report the unit test module, if it exists
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	140
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	141 General options:
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	142 --dir=DIRECTORY Specify the target directory.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	143 For --import, this specifies where your
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	144 configure.ac can be found. Defaults to current
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	145 directory.
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	146 --local-dir=DIRECTORY Specify a local override directory where to look
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	147 up files before looking in gnulib's directory.
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	148 --verbose Increase verbosity. May be repeated.
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	149 --quiet Decrease verbosity. May be repeated.
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	150
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	151 Options for --import:
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	152 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	153 --source-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	154 Directory relative to --dir where source code is
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	155 placed (default \"lib\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	156 --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	157 placed (default \"m4\").
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	158 --po-base=DIRECTORY Directory relative to --dir where *.po files are
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	159 placed (default \"po\").
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	160 --doc-base=DIRECTORY Directory relative to --dir where doc files are
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	161 placed (default \"doc\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	162 --tests-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	163 Directory relative to --dir where unit tests are
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	164 placed (default \"tests\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	165 --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	166 tools are placed (default \"build-aux\").
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	167 --with-tests Include unit tests for the included modules.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	168 --avoid=MODULE Avoid including the given MODULE. Useful if you
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	169 have code that provides equivalent functionality.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	170 This option can be repeated.
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	171 --lgpl[=2\|=3] Abort if modules aren't available under the LGPL.
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	172 Also modify license template from GPL to LGPL.
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	173 The version number of the LGPL can be specified;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	174 the default is currently LGPLv3.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	175 --makefile-name=NAME Name of makefile in automake syntax in the
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	176 source-base and tests-base directories
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	177 (default \"Makefile.am\").
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	178 --libtool Use libtool rules.
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	179 --no-libtool Don't use libtool rules.
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	180 --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	181 'gl_INIT'. Default is 'gl'.
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	182 --po-domain=NAME Specify the prefix of the i18n domain. Usually use
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	183 the package name. A suffix '-gnulib' is appended.
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	184 --vc-files Update version control related files.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	185 --no-vc-files Don't update version control related files
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	186 (.gitignore and/or .cvsignore).
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	187 --no-changelog Don't update or create ChangeLog files.
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	188
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	189 Options for --import and --update:
6966 42730fffa002 help message tweaks Karl Berry <karl@freefriends.org> parents: 6955 diff changeset	190 --dry-run For --import, only print what would have been done.
42730fffa002 help message tweaks Karl Berry <karl@freefriends.org> parents: 6955 diff changeset	191 -s, --symbolic, --symlink Make symbolic links instead of copying files.
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	192 --local-symlink Make symbolic links instead of copying files, only
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	193 for files from the local override directory.
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	194 -S, --more-symlinks Make symbolic links instead of copying files, and
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	195 don't replace copyright notices.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	196
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	197 Report bugs to <bug-gnulib@gnu.org>."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	198 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	199
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	200 # func_version
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	201 # outputs to stdout the --version message.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	202 func_version ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	203 {
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	204 func_gnulib_dir
9805 d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	205 if test -d "$gnulib_dir"/.git \
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	206 && (git --version) >/dev/null 2>/dev/null \
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	207 && (date --version) >/dev/null 2>/dev/null; then
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	208 # gnulib checked out from git.
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	209 sed_extract_first_date='/^Date/{
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	210 s/^Date:[ ]*//p
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	211 q
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	212 }'
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	213 date=`cd "$gnulib_dir" && git log ChangeLog \| sed -n -e "$sed_extract_first_date"`
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	214 # Turn "Fri Mar 21 07:16:51 2008 -0600" into "Mar 21 2008 07:16:51 -0600".
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	215 sed_year_before_time='s/^[^ ]* $[^ ]$ $[0-9]$ $[0-9:]$ $[0-9]$ /\1 \2 \4 \3 /'
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	216 date=`echo "$date" \| sed -e "$sed_year_before_time"`
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	217 # Use GNU date to compute the time in GMT.
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	218 date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"`
9806 88f73fbd046d Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9805 diff changeset	219 version=' '`"$gnulib_dir"/build-aux/git-version-gen /dev/null \| sed -e 's/-dirty/-modified/'`
9805 d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	220 else
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	221 if test -d "$gnulib_dir"/CVS \
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	222 && (cvs --version) >/dev/null 2>/dev/null; then
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	223 # gnulib checked out from CVS.
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	224 sed_extract_first_date='/^date: /{
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	225 s/^date: $[0-9][0-9][0-9][0-9]$.$[0-9][0-9]$.$[0-9][0-9]$ $[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$.*/\1-\2-\3 \4/p
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	226 q
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	227 }'
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	228 date=`cd "$gnulib_dir" && cvs log -N ChangeLog 2>/dev/null \| sed -n -e "$sed_extract_first_date"`
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	229 else
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	230 # gnulib copy without versioning information.
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	231 date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	232 fi
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	233 version=
d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	234 fi
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	235 year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" \| sed 's,^.* ,,'`
7347 d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	236 echo "\
9805 d3af04de9f0b Tweak "gnulib --version" output. Bruno Haible <bruno@clisp.org> parents: 9804 diff changeset	237 gnulib-tool (GNU $package $date)$version
7347 d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	238 Copyright (C) $year Free Software Foundation, Inc.
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	239 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	240 This is free software: you are free to change and redistribute it.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	241 There is NO WARRANTY, to the extent permitted by law.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	242
7347 d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	243 Written by" "Bruno Haible" "and" "Simon Josefsson"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	244 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	245
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	246 # func_emit_copyright_notice
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	247 # outputs to stdout a header for a generated file.
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	248 func_emit_copyright_notice ()
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	249 {
9794 0675687268a7 Bump copyright year in files generated by gnulib-tool. Eric Blake <ebb9@byu.net> parents: 9793 diff changeset	250 sed -n '/Copyright/ {
0675687268a7 Bump copyright year in files generated by gnulib-tool. Eric Blake <ebb9@byu.net> parents: 9793 diff changeset	251 p
0675687268a7 Bump copyright year in files generated by gnulib-tool. Eric Blake <ebb9@byu.net> parents: 9793 diff changeset	252 q
0675687268a7 Bump copyright year in files generated by gnulib-tool. Eric Blake <ebb9@byu.net> parents: 9793 diff changeset	253 }' < "$self_abspathname"
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	254 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	255 echo "# This file is free software, distributed under the terms of the GNU"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	256 echo "# General Public License. As a special exception to the GNU General"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	257 echo "# Public License, this file may be distributed as part of a program"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	258 echo "# that contains a configuration script generated by Autoconf, under"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	259 echo "# the same distribution terms as the rest of that program."
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	260 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	261 echo "# Generated by gnulib-tool."
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	262 }
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	263
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	264 # func_exit STATUS
10453 483ea2002278 Update comment. Bruno Haible <bruno@clisp.org> parents: 10401 diff changeset	265 # exits with a given status.
483ea2002278 Update comment. Bruno Haible <bruno@clisp.org> parents: 10401 diff changeset	266 # This function needs to be used, rather than 'exit', when a 'trap' handler is
483ea2002278 Update comment. Bruno Haible <bruno@clisp.org> parents: 10401 diff changeset	267 # in effect that refers to $?.
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	268 func_exit ()
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	269 {
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	270 (exit $1); exit $1
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	271 }
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	272
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	273 # func_gnulib_dir
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	274 # locates the directory where the gnulib repository lives
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	275 # Sets variables
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	276 # - self_abspathname absolute pathname of gnulib-tool
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	277 # - gnulib_dir absolute pathname of gnulib repository
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	278 func_gnulib_dir ()
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	279 {
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	280 case "$0" in
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	281 /*) self_abspathname="$0" ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	282 /) self_abspathname=`pwd`/"$0" ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	283 *)
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	284 # Look in $PATH.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	285 # Iterate through the elements of $PATH.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	286 # We use IFS=: instead of
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	287 # for d in `echo ":$PATH:" \| sed -e 's/:::*/:.:/g' \| sed -e 's/:/ /g'`
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	288 # because the latter does not work when some PATH element contains spaces.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	289 # We use a canonicalized $pathx instead of $PATH, because empty PATH
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	290 # elements are by definition equivalent to '.', however field splitting
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	291 # according to IFS=: loses empty fields in many shells:
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	292 # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	293 # beginning, at the end, and in the middle),
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	294 # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	295 # at the beginning and at the end,
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	296 # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	297 # Solaris lose empty fields at the end.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	298 # The 'case' statement is an optimization, to avoid evaluating the
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	299 # explicit canonicalization command when $PATH contains no empty fields.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	300 self_abspathname=
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	301 if test "${PATH_SEPARATOR+set}" != set; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	302 func_tmpdir
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	303 { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	304 chmod +x "$tmp"/conf.sh
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	305 if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	306 PATH_SEPARATOR=';'
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	307 else
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	308 PATH_SEPARATOR=:
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	309 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	310 rm -rf "$tmp"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	311 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	312 if test "$PATH_SEPARATOR" = ";"; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	313 # On Windows, programs are searched in "." before $PATH.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	314 pathx=".;$PATH"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	315 else
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	316 # On Unix, we have to convert empty PATH elements to ".".
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	317 pathx="$PATH"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	318 case :$PATH: in
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	319 ::)
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	320 pathx=`echo ":$PATH:" \| sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'`
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	321 ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	322 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	323 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	324 save_IFS="$IFS"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	325 IFS="$PATH_SEPARATOR"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	326 for d in $pathx; do
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	327 IFS="$save_IFS"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	328 test -z "$d" && d=.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	329 if test -x "$d/$0" && test ! -d "$d/$0"; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	330 self_abspathname="$d/$0"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	331 break
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	332 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	333 done
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	334 IFS="$save_IFS"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	335 if test -z "$self_abspathname"; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	336 func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?"
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	337 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	338 ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	339 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	340 while test -h "$self_abspathname"; do
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	341 # Resolve symbolic link.
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	342 linkval=`func_readlink "$self_abspathname"`
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	343 test -n "$linkval" \|\| break
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	344 case "$linkval" in
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	345 /* ) self_abspathname="$linkval" ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	346 * ) self_abspathname=`echo "$self_abspathname" \| sed -e 's,/[^/]*$,,'`/"$linkval" ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	347 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	348 done
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	349 gnulib_dir=`echo "$self_abspathname" \| sed -e 's,/[^/]*$,,'`
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	350 }
f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	351
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	352 # func_tmpdir
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	353 # creates a temporary directory.
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	354 # Sets variable
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	355 # - tmp pathname of freshly created temporary directory
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	356 func_tmpdir ()
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	357 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	358 # Use the environment variable TMPDIR, falling back to /tmp. This allows
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	359 # users to specify a different temporary directory, for example, if their
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	360 # /tmp is filled up or too small.
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	361 : ${TMPDIR=/tmp}
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	362 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	363 # Use the mktemp program if available. If not available, hide the error
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	364 # message.
6581 bc61a0c9a750 * gnulib-tool, build-aux/csharpcomp.sh.in: Do not pass `-q' to mktemp. Paul Eggert <eggert@cs.ucla.edu> parents: 6570 diff changeset	365 tmp=`(umask 077 && mktemp -d "$TMPDIR/glXXXXXX") 2>/dev/null` &&
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	366 test -n "$tmp" && test -d "$tmp"
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	367 } \|\|
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	368 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	369 # Use a simple mkdir command. It is guaranteed to fail if the directory
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	370 # already exists. $RANDOM is bash specific and expands to empty in shells
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	371 # other than bash, ksh and zsh. Its use does not increase security;
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	372 # rather, it minimizes the probability of failure in a very cluttered /tmp
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	373 # directory.
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	374 tmp=$TMPDIR/gl$$-$RANDOM
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	375 (umask 077 && mkdir "$tmp")
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	376 } \|\|
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	377 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	378 echo "$0: cannot create a temporary directory in $TMPDIR" >&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	379 func_exit 1
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	380 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	381 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	382
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	383 # func_append var value
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	384 # appends the given value to the shell variable var.
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	385 if ( foo=bar; foo+=baz && test "$foo" = barbaz ) >/dev/null 2>&1; then
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	386 # Use bash's += operator. It reduces complexity of appending repeatedly to
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	387 # a single variable from O(n^2) to O(n).
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	388 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	389 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	390 eval "$1+=\"\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	391 }
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	392 else
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	393 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	394 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	395 eval "$1=\"\$$1\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	396 }
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	397 fi
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	398
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	399 # func_fatal_error message
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	400 # outputs to stderr a fatal error message, and terminates the program.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	401 func_fatal_error ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	402 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	403 echo "gnulib-tool: *** $1" 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	404 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	405 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	406 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	407
6248 ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	408 # func_readlink SYMLINK
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	409 # outputs the target of the given symlink.
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	410 if (type -p readlink) > /dev/null 2>&1; then
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	411 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	412 {
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	413 # Use the readlink program from GNU coreutils.
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	414 readlink "$1"
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	415 }
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	416 else
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	417 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	418 {
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	419 # Use two sed invocations. A single sed -n -e 's,^.* -> $.*$$,\1,p'
6263 9750529a8cf5 Sort in a locale-independent way. Bruno Haible <bruno@clisp.org> parents: 6262 diff changeset	420 # would do the wrong thing if the link target contains " -> ".
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	421 LC_ALL=C ls -l "$1" \| sed -e 's, -> ,#%%#,' \| sed -n -e 's,^.#%%#$.$$,\1,p'
6248 ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	422 }
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	423 fi
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	424
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	425 # func_relativize DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	426 # computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	427 # Input:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	428 # - DIR1 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	429 # - DIR2 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	430 # Output:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	431 # - reldir relative pathname of DIR2, relative to DIR1
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	432 func_relativize ()
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	433 {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	434 dir0=`pwd`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	435 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	436 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	437 sed_first='s,^$[^/]$/.$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	438 sed_rest='s,^[^/]/,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	439 sed_last='s,^./$[^/]$$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	440 sed_butlast='s,/[^/]$,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	441 while test -n "$dir1"; do
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	442 first=`echo "$dir1" \| sed -e "$sed_first"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	443 if test "$first" != "."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	444 if test "$first" = ".."; then
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	445 dir2=`echo "$dir0" \| sed -e "$sed_last"`/"$dir2"
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	446 dir0=`echo "$dir0" \| sed -e "$sed_butlast"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	447 else
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	448 first2=`echo "$dir2" \| sed -e "$sed_first"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	449 if test "$first2" = "$first"; then
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	450 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	451 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	452 dir2="../$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	453 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	454 dir0="$dir0"/"$first"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	455 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	456 fi
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	457 dir1=`echo "$dir1" \| sed -e "$sed_rest"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	458 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	459 reldir="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	460 }
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	461
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	462 # func_relconcat DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	463 # computes a relative pathname DIR1/DIR2, with obvious simplifications.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	464 # Input:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	465 # - DIR1 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	466 # - DIR2 relative pathname, relative to DIR1
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	467 # Output:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	468 # - relconcat DIR1/DIR2, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	469 func_relconcat ()
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	470 {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	471 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	472 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	473 sed_first='s,^$[^/]$/.$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	474 sed_rest='s,^[^/]/,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	475 sed_last='s,^./$[^/]$$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	476 sed_butlast='s,/[^/]$,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	477 while true; do
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	478 first=`echo "$dir2" \| sed -e "$sed_first"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	479 if test "$first" = "."; then
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	480 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	481 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	482 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	483 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	484 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	485 else
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	486 last=`echo "$dir1" \| sed -e "$sed_last"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	487 while test "$last" = "."; do
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	488 dir1=`echo "$dir1" \| sed -e "$sed_butlast"`
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	489 last=`echo "$dir1" \| sed -e "$sed_last"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	490 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	491 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	492 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	493 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	494 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	495 if test "$first" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	496 if test "$last" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	497 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	498 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	499 fi
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	500 dir1=`echo "$dir1" \| sed -e "$sed_butlast"`
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	501 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	502 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	503 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	504 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	505 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	506 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	507 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	508 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	509 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	510 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	511 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	512 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	513 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	514 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	515 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	516 }
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	517
7642 0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	518 # func_ln SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	519 # Like ln -s, except that SRC is given relative to the current directory (or
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	520 # absolute), not given relative to the directory of DEST.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	521 func_ln ()
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	522 {
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	523 case "$1" in
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	524 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	525 ln -s "$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	526 *) # SRC is relative.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	527 case "$2" in
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	528 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	529 ln -s "`pwd`/$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	530 *) # DEST is relative too.
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	531 ln_destdir=`echo "$2" \| sed -e 's,[^/]*$,,'`
7642 0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	532 test -n "$ln_destdir" \|\| ln_destdir="."
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	533 func_relativize "$ln_destdir" "$1"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	534 ln -s "$reldir" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	535 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	536 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	537 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	538 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	539 }
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	540
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	541 # func_ln_if_changed SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	542 # Like func_ln, but avoids munging timestamps if the link is correct.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	543 func_ln_if_changed ()
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	544 {
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	545 if test $# -ne 2; then
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	546 echo "usage: func_ln_if_changed SRC DEST" >&2
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	547 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	548 ln_target=`func_readlink "$2"`
9167 a459223799e0 Use test -h, not test -L. Bruno Haible <bruno@clisp.org> parents: 9119 diff changeset	549 if test -h "$2" && test "$1" = "$ln_target"; then
7642 0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	550 :
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	551 else
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	552 rm -f "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	553 func_ln "$1" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	554 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	555 }
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	556
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	557 # func_reset_sigpipe
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	558 # Resets SIGPIPE to its default behaviour. SIGPIPE is signalled when a process
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	559 # writes into a pipe with no readers, i.e. a pipe where all readers have
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	560 # already closed their file descriptor that read from it or exited entirely.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	561 # The default behaviour is to terminate the current process without an error
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	562 # message.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	563 # When "trap '' SIGPIPE" is in effect, the behaviour (at least with bash) is to
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	564 # terminate the current process with an error message.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	565 # This function should be called at the beginning of a command that only
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	566 # produces output to stdout (i.e. no side effects!), when the command that
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	567 # will read from this pipe might prematurely exit or close its standard input
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	568 # descriptor.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	569 if test -n "$BASH_VERSION"; then
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	570 # The problem has only been reported with bash.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	571 # Note that Solaris sh does not understand "trap - SIGPIPE".
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	572 func_reset_sigpipe ()
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	573 {
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	574 trap - SIGPIPE
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	575 }
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	576 else
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	577 func_reset_sigpipe ()
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	578 {
10380 85d962720a4e Oops, fix syntax error in last commit. Bruno Haible <bruno@clisp.org> parents: 10379 diff changeset	579 :
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	580 }
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	581 fi
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	582
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	583 # Ensure an 'echo' command that does not interpret backslashes.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	584 # Test cases:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	585 # echo '\n' \| wc -l prints 1 when OK, 2 when KO
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	586 # echo '\t' \| grep t > /dev/null has return code 0 when OK, 1 when KO
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	587 # This problem is a weird heritage from SVR4. BSD got it right (except that
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	588 # BSD echo interprets '-n' as an option, which is also not desirable).
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	589 # Nowadays the problem occurs in 4 situations:
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	590 # - in bash, when the shell option xpg_echo is set (bash >= 2.04)
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	591 # or when it was built with --enable-usg-echo-default (bash >= 2.0)
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	592 # or when it was built with DEFAULT_ECHO_TO_USG (bash < 2.0),
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	593 # - in zsh, when sh-emulation is not set,
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	594 # - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances,
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	595 # and HP-UX /bin/sh and IRIX /bin/sh behave similarly),
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	596 # - in Solaris /bin/sh and OSF/1 /bin/sh.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	597 # We try the following workarounds:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	598 # - for all: respawn using $CONFIG_SHELL if that is set and works.
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	599 # - for bash >= 2.04: unset the shell option xpg_echo.
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	600 # - for bash >= 2.0: define echo to a function that uses the printf built-in.
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	601 # - for bash < 2.0: define echo to a function that uses cat of a here document.
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	602 # - for zsh: turn sh-emulation on.
9008 78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	603 # - for ksh: alias echo to 'print -r'.
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	604 # - for ksh: alias echo to a function that uses cat of a here document.
9008 78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	605 # - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	606 # the ksh workaround.
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	607 # - otherwise: respawn using /bin/sh and rely on the workarounds.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	608 # When respawning, we pass --no-reexec as first argument, so as to avoid
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	609 # turning this script into a fork bomb in unlucky situations.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	610 have_echo=
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	611 if echo '\t' \| grep t > /dev/null; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	612 have_echo=yes # Lucky!
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	613 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	614 # Try the workarounds.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	615 # Respawn using $CONFIG_SHELL if that is set and works.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	616 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	617 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	618 && test -n "$CONFIG_SHELL" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	619 && test -f "$CONFIG_SHELL" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	620 && $CONFIG_SHELL -c 'echo '\t' \| grep t > /dev/null'; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	621 exec $CONFIG_SHELL "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	622 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	623 fi
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	624 # For bash >= 2.04: unset the shell option xpg_echo.
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	625 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	626 && test -n "$BASH_VERSION" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	627 && (shopt -o xpg_echo; echo '\t' \| grep t > /dev/null) 2>/dev/null; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	628 shopt -o xpg_echo
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	629 have_echo=yes
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	630 fi
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	631 # For bash >= 2.0: define echo to a function that uses the printf built-in.
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	632 # For bash < 2.0: define echo to a function that uses cat of a here document.
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	633 # (There is no win in using 'printf' over 'cat' if it is not a shell built-in.)
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	634 if test -z "$have_echo" \
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	635 && test -n "$BASH_VERSION"; then \
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	636 if type printf 2>/dev/null \| grep / > /dev/null; then
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	637 # 'printf' is not a shell built-in.
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	638 echo ()
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	639 {
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	640 cat <<EOF
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	641 $*
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	642 EOF
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	643 }
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	644 else
9007 620c0e20f9db Tweak comment. Bruno Haible <bruno@clisp.org> parents: 9006 diff changeset	645 # 'printf' is a shell built-in.
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	646 echo ()
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	647 {
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	648 printf '%s\n' "$*"
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	649 }
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	650 fi
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	651 if echo '\t' \| grep t > /dev/null; then
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	652 have_echo=yes
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	653 fi
0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	654 fi
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	655 # For zsh: turn sh-emulation on.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	656 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	657 && test -n "$ZSH_VERSION" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	658 && (emulate sh) >/dev/null 2>&1; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	659 emulate sh
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	660 fi
9008 78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	661 # For ksh: alias echo to 'print -r'.
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	662 if test -z "$have_echo" \
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	663 && (type print) >/dev/null 2>&1; then
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	664 # A 'print' command exists.
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	665 if type print 2>/dev/null \| grep / > /dev/null; then
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	666 :
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	667 else
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	668 # 'print' is a shell built-in.
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	669 if (print -r '\told' \| grep told > /dev/null) 2>/dev/null; then
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	670 # 'print' is the ksh shell built-in.
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	671 alias echo='print -r'
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	672 fi
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	673 fi
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	674 fi
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	675 if test -z "$have_echo" \
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	676 && echo '\t' \| grep t > /dev/null; then
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	677 have_echo=yes
78f53a569f31 Make use of ksh's 'print' built-in. Bruno Haible <bruno@clisp.org> parents: 9007 diff changeset	678 fi
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	679 # For ksh: alias echo to a function that uses cat of a here document.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	680 # The ksh manual page says:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	681 # "Aliasing is performed when scripts are read, not while they are executed.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	682 # Therefore, for an alias to take effect, the alias definition command has
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	683 # to be executed before the command which references the alias is read."
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	684 # Because of this, we have to play strange tricks with have_echo, to ensure
9006 0df4abf0cce4 Add better support for bash versions < 2.04. Bruno Haible <bruno@clisp.org> parents: 9005 diff changeset	685 # that the top-level statement containing the test starts after the 'alias'
9003 952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	686 # command.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	687 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	688 bsd_echo ()
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	689 {
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	690 cat <<EOF
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	691 $*
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	692 EOF
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	693 }
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	694 alias echo=bsd_echo 2>/dev/null
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	695 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	696 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	697 && echo '\t' \| grep t > /dev/null; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	698 have_echo=yes
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	699 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	700 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	701 unalias echo 2>/dev/null
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	702 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	703 # For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	704 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	705 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	706 && test -f /bin/ksh; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	707 exec /bin/ksh "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	708 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	709 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	710 # Otherwise: respawn using /bin/sh.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	711 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	712 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	713 && test -f /bin/sh; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	714 exec /bin/sh "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	715 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	716 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	717 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	718 func_fatal_error "Shell does not support 'echo' correctly. Please install GNU bash and set the environment variable CONFIG_SHELL to point to it."
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	719 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	720 if echo '\t' \| grep t > /dev/null; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	721 : # Works fine now.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	722 else
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	723 func_fatal_error "Shell does not support 'echo' correctly. Workaround does not work. Please report this as a bug to bug-gnulib@gnu.org."
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	724 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	725 if test "X$1" = "X--no-reexec"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	726 shift
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	727 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command. Bruno Haible <bruno@clisp.org> parents: 9001 diff changeset	728
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	729 # Command-line option processing.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	730 # Removes the OPTIONS from the arguments. Sets the variables:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	731 # - mode list or import or create-testdir or create-megatestdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	732 # - destdir from --dir
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	733 # - local_gnulib_dir from --local-dir
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	734 # - verbose integer, default 0, inc/decremented by --verbose/--quiet
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	735 # - libname, supplied_libname from --lib
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	736 # - sourcebase from --source-base
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	737 # - m4base from --m4-base
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	738 # - pobase from --po-base
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	739 # - docbase from --doc-base
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	740 # - testsbase from --tests-base
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	741 # - auxdir from --aux-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	742 # - inctests true if --with-tests was given, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	743 # - avoidlist list of modules to avoid, from --avoid
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	744 # - lgpl yes or a number if --lgpl was given, blank otherwise
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	745 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	746 # - libtool true if --libtool was given, false if --no-libtool was
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	747 # given, blank otherwise
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	748 # - macro_prefix from --macro-prefix
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	749 # - po_domain from --po-domain
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	750 # - vc_files true if --vc-files was given, false if --no-vc-files was
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	751 # given, blank otherwise
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	752 # - autoconf_minversion minimum supported autoconf version
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	753 # - do_changelog false if --no-changelog was given, : otherwise
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	754 # - doit : if actions shall be executed, false if only to be printed
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	755 # - symbolic true if --symlink or --more-symlinks was given, blank
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	756 # otherwise
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	757 # - lsymbolic true if --local-symlink was given, blank otherwise
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	758 # - do_copyrights blank if --more-symlinks was given, true otherwise
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	759 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	760 mode=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	761 destdir=
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	762 local_gnulib_dir=
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	763 verbose=0
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	764 libname=libgnu
5344 c2f5677fc6ed Initialize supplied_libname. Tweak usage message. Bruno Haible <bruno@clisp.org> parents: 5343 diff changeset	765 supplied_libname=
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	766 sourcebase=
64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	767 m4base=
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	768 pobase=
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	769 docbase=
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	770 testsbase=
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	771 auxdir=
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	772 inctests=
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	773 avoidlist=
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	774 lgpl=
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	775 makefile_name=
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	776 libtool=
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	777 macro_prefix=
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	778 po_domain=
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	779 vc_files=
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	780 do_changelog=:
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	781 doit=:
5799 ad9eff556694 2005-04-15 Simon Josefsson <jas@extundo.com> Simon Josefsson <simon@josefsson.org> parents: 5798 diff changeset	782 symbolic=
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	783 lsymbolic=
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	784 do_copyrights=true
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	785
64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	786 supplied_opts="$@"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	787
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	788 while test $# -gt 0; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	789 case "$1" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	790 --list \| --lis )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	791 mode=list
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	792 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	793 --import \| --impor \| --impo \| --imp \| --im \| --i )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	794 mode=import
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	795 shift ;;
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	796 --update \| --updat \| --upda \| --upd \| --up \| --u )
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	797 mode=update
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	798 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	799 --create-testdir \| --create-testdi \| --create-testd \| --create-test \| --create-tes \| --create-te \| --create-t )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	800 mode=create-testdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	801 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	802 --create-megatestdir \| --create-megatestdi \| --create-megatestd \| --create-megatest \| --create-megates \| --create-megate \| --create-megat \| --create-mega \| --create-meg \| --create-me \| --create-m )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	803 mode=create-megatestdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	804 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	805 --test \| --tes \| --te \| --t )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	806 mode=test
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	807 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	808 --megatest \| --megates \| --megate \| --megat \| --mega \| --meg \| --me \| --m )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	809 mode=megatest
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	810 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	811 --extract-* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	812 mode=`echo "X$1" \| sed -e 's/^X--//'`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	813 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	814 --dir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	815 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	816 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	817 func_fatal_error "missing argument for --dir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	818 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	819 destdir=$1
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	820 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	821 --dir=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	822 destdir=`echo "X$1" \| sed -e 's/^X--dir=//'`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	823 shift ;;
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	824 --local-dir )
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	825 shift
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	826 if test $# = 0; then
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	827 func_fatal_error "missing argument for --local-dir"
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	828 fi
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	829 local_gnulib_dir=$1
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	830 shift ;;
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	831 --local-dir=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	832 local_gnulib_dir=`echo "X$1" \| sed -e 's/^X--local-dir=//'`
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	833 shift ;;
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	834 --verbose \| --verbos \| --verbo \| --verb )
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	835 verbose=`expr $verbose + 1`
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	836 shift ;;
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	837 --quiet \| --quie \| --qui \| --qu \| --q )
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	838 verbose=`expr $verbose - 1`
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	839 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	840 --lib )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	841 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	842 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	843 func_fatal_error "missing argument for --lib"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	844 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	845 libname=$1
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	846 supplied_libname=true
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	847 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	848 --lib=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	849 libname=`echo "X$1" \| sed -e 's/^X--lib=//'`
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	850 supplied_libname=true
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	851 shift ;;
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	852 --source-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	853 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	854 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	855 func_fatal_error "missing argument for --source-base"
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	856 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	857 sourcebase=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	858 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	859 --source-base=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	860 sourcebase=`echo "X$1" \| sed -e 's/^X--source-base=//'`
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	861 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	862 --m4-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	863 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	864 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	865 func_fatal_error "missing argument for --m4-base"
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	866 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	867 m4base=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	868 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	869 --m4-base=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	870 m4base=`echo "X$1" \| sed -e 's/^X--m4-base=//'`
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	871 shift ;;
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	872 --po-base )
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	873 shift
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	874 if test $# = 0; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	875 func_fatal_error "missing argument for --po-base"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	876 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	877 pobase=$1
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	878 shift ;;
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	879 --po-base=* )
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	880 pobase=`echo "X$1" \| sed -e 's/^X--po-base=//'`
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	881 shift ;;
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	882 --doc-base )
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	883 shift
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	884 if test $# = 0; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	885 func_fatal_error "missing argument for --doc-base"
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	886 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	887 docbase=$1
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	888 shift ;;
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	889 --doc-base=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	890 docbase=`echo "X$1" \| sed -e 's/^X--doc-base=//'`
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	891 shift ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	892 --tests-base )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	893 shift
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	894 if test $# = 0; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	895 func_fatal_error "missing argument for --tests-base"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	896 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	897 testsbase=$1
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	898 shift ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	899 --tests-base=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	900 testsbase=`echo "X$1" \| sed -e 's/^X--tests-base=//'`
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	901 shift ;;
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	902 --aux-dir )
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	903 shift
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	904 if test $# = 0; then
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	905 func_fatal_error "missing argument for --aux-dir"
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	906 fi
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	907 auxdir=$1
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	908 shift ;;
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	909 --aux-dir=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	910 auxdir=`echo "X$1" \| sed -e 's/^X--aux-dir=//'`
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	911 shift ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	912 --with-tests )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	913 inctests=true
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	914 shift ;;
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	915 --avoid )
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	916 shift
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	917 if test $# = 0; then
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	918 func_fatal_error "missing argument for --avoid"
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	919 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	920 func_append avoidlist " $1"
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	921 shift ;;
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	922 --avoid=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	923 arg=`echo "X$1" \| sed -e 's/^X--avoid=//'`
7327 6db875979695 * gnulib-tool (avoidlist): Fix typo that broke options like Paul Eggert <eggert@cs.ucla.edu> parents: 7326 diff changeset	924 func_append avoidlist " $arg"
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	925 shift ;;
5262 97ed4b64d853 New parameter --lgpl, to asseert that modules are Paul Eggert <eggert@cs.ucla.edu> parents: 5255 diff changeset	926 --lgpl )
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	927 lgpl=yes
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	928 shift ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	929 --lgpl=* )
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	930 arg=`echo "X$1" \| sed -e 's/^X--lgpl=//'`
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	931 case "$arg" in
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	932 2 \| 3) ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	933 *) func_fatal_error "invalid LGPL version number for --lgpl" ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	934 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	935 lgpl=$arg
5262 97ed4b64d853 New parameter --lgpl, to asseert that modules are Paul Eggert <eggert@cs.ucla.edu> parents: 5255 diff changeset	936 shift ;;
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	937 --makefile-name )
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	938 shift
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	939 if test $# = 0; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	940 func_fatal_error "missing argument for --makefile-name"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	941 fi
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	942 makefile_name="$1"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	943 shift ;;
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	944 --makefile-name=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	945 makefile_name=`echo "X$1" \| sed -e 's/^X--makefile-name=//'`
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	946 shift ;;
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	947 --libtool )
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	948 libtool=true
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	949 shift ;;
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	950 --no-libtool )
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	951 libtool=false
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	952 shift ;;
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	953 --macro-prefix )
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	954 shift
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	955 if test $# = 0; then
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	956 func_fatal_error "missing argument for --macro-prefix"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	957 fi
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	958 macro_prefix="$1"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	959 shift ;;
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	960 --macro-prefix=* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	961 macro_prefix=`echo "X$1" \| sed -e 's/^X--macro-prefix=//'`
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	962 shift ;;
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	963 --po-domain )
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	964 shift
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	965 if test $# = 0; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	966 func_fatal_error "missing argument for --po-domain"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	967 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	968 po_domain="$1"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	969 shift ;;
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	970 --po-domain=* )
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	971 po_domain=`echo "X$1" \| sed -e 's/^X--po-domain=//'`
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	972 shift ;;
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	973 --vc-files )
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	974 vc_files=true
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	975 shift ;;
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	976 --no-vc-files )
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	977 vc_files=false
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	978 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	979 --no-changelog \| --no-changelo \| --no-changel \| --no-change \| --no-chang \| --no-chan \| --no-cha \| --no-ch \| --no-c )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	980 do_changelog=false
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	981 shift ;;
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	982 --dry-run )
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	983 doit=false
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	984 shift ;;
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	985 -s \| --symbolic \| --symboli \| --symbol \| --symbo \| --symb \| --symlink \| --symlin \| --symli \| --syml \| --sym \| --sy )
5799 ad9eff556694 2005-04-15 Simon Josefsson <jas@extundo.com> Simon Josefsson <simon@josefsson.org> parents: 5798 diff changeset	986 symbolic=true
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	987 shift ;;
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	988 --local-symlink \| --local-symlin \| --local-symli \| --local-syml \| --local-sym \| --local-sy \| --local-s )
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	989 lsymbolic=true
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	990 shift ;;
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	991 -S \| --more-symlinks \| --more-symlink \| --more-symlin \| --more-symli \| --more-syml \| --more-sym \| --more-sy \| --more-s \| --more- \| --more \| --mor \| --mo )
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	992 symbolic=true
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	993 do_copyrights=
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	994 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	995 --help \| --hel \| --he \| --h )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	996 func_usage
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	997 func_exit $? ;;
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	998 --version \| --versio \| --versi \| --vers )
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	999 func_version
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1000 func_exit $? ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1001 -- )
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1002 # Stop option processing
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1003 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1004 break ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1005 -* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1006 echo "gnulib-tool: unknown option $1" 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1007 echo "Try 'gnulib-tool --help' for more information." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1008 func_exit 1 ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1009 * )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1010 break ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1011 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1012 done
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1013
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1014 if test "$mode" = update; then
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1015 if test $# != 0; then
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1016 echo "gnulib-tool: too many arguments in 'update' mode" 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1017 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1018 echo "If you really want to modify the gnulib configuration of your project," 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1019 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1020 func_exit 1
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1021 fi
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1022 if test -n "$local_gnulib_dir" \|\| test -n "$supplied_libname" \
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1023 \|\| test -n "$sourcebase" \|\| test -n "$m4base" \|\| test -n "$pobase" \
6993 dc8f2a1ff75f Reorder tests in doc-base patch. Bruno Haible <bruno@clisp.org> parents: 6966 diff changeset	1024 \|\| test -n "$docbase" \|\| test -n "$testsbase" \|\| test -n "$auxdir" \
dc8f2a1ff75f Reorder tests in doc-base patch. Bruno Haible <bruno@clisp.org> parents: 6966 diff changeset	1025 \|\| test -n "$inctests" \|\| test -n "$avoidlist" \|\| test -n "$lgpl" \
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1026 \|\| test -n "$makefile_name" \|\| test -n "$macro_prefix" \
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	1027 \|\| test -n "$po_domain" \|\| test -n "$vc_files"; then
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1028 echo "gnulib-tool: invalid options for 'update' mode" 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1029 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1030 echo "If you really want to modify the gnulib configuration of your project," 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1031 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1032 func_exit 1
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1033 fi
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1034 do_changelog=false
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1035 fi
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1036 if test -n "$pobase" && test -z "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1037 echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1038 echo "Try 'gnulib-tool --help' for more information." 1>&2
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1039 func_exit 1
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1040 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1041 if test -z "$pobase" && test -n "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1042 echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1043 fi
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	1044
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1045 # Determine the minimum supported autoconf version from the project's
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1046 # configure.ac.
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1047 DEFAULT_AUTOCONF_MINVERSION="2.59"
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1048 autoconf_minversion=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1049 configure_ac=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1050 if { test "$mode" = import \|\| test "$mode" = update; } && test -n "$destdir"; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1051 if test -f "$destdir"/configure.ac; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1052 configure_ac="$destdir/configure.ac"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1053 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1054 if test -f "$destdir"/configure.in; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1055 configure_ac="$destdir/configure.in"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1056 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1057 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1058 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1059 if test -f configure.ac; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1060 configure_ac="configure.ac"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1061 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1062 if test -f configure.in; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1063 configure_ac="configure.in"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1064 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1065 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1066 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1067 if test -n "$configure_ac"; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1068 # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1069 # because when some m4 files are omitted from a CVS repository,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1070 # "autoconf --trace=AC_PREREQ" fails with an error message like this:
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1071 # m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1072 # autom4te: m4 failed with exit status: 1
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1073 prereqs=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1074 my_sed_traces='
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1075 s,#.*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1076 s,^dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1077 s, dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1078 /AC_PREREQ/ {
7767 0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort. Paul Eggert <eggert@cs.ucla.edu> parents: 7754 diff changeset	1079 s,^.AC_PREREQ([[ ]$[^])]$.$,\1,p
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1080 }'
7767 0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort. Paul Eggert <eggert@cs.ucla.edu> parents: 7754 diff changeset	1081 prereqs=`sed -n -e "$my_sed_traces" < "$configure_ac"`
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1082 if test -n "$prereqs"; then
7767 0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort. Paul Eggert <eggert@cs.ucla.edu> parents: 7754 diff changeset	1083 autoconf_minversion=`
0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort. Paul Eggert <eggert@cs.ucla.edu> parents: 7754 diff changeset	1084 for version in $prereqs; do echo $version; done \|
7781 b13928e41580 * gnulib-tool (autoconf_minversion): Take the maximum version number Paul Eggert <eggert@cs.ucla.edu> parents: 7777 diff changeset	1085 LC_ALL=C sort -nru \| sed 1q
7767 0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort. Paul Eggert <eggert@cs.ucla.edu> parents: 7754 diff changeset	1086 `
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	1087 fi
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1088 fi
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1089 if test -z "$autoconf_minversion"; then
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1090 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1091 fi
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1092 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1093 1.* \| 2.[0-4]* \| 2.5[0-8]*)
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	1094 func_fatal_error "minimum supported autoconf version is 2.59. Try adding AC_PREREQ([$DEFAULT_AUTOCONF_MINVERSION]) to your configure.ac." ;;
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1095 esac
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1096
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1097 # Remove trailing slashes from the directory names. This is necessary for
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1098 # m4base (to avoid an error in func_import) and optional for the others.
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1099 sed_trimtrailingslashes='s,$[^/]$//*$,\1,'
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1100 case "$local_gnulib_dir" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1101 */ ) local_gnulib_dir=`echo "$local_gnulib_dir" \| sed -e "$sed_trimtrailingslashes"` ;;
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1102 esac
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1103 case "$sourcebase" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1104 */ ) sourcebase=`echo "$sourcebase" \| sed -e "$sed_trimtrailingslashes"` ;;
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1105 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1106 case "$m4base" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1107 */ ) m4base=`echo "$m4base" \| sed -e "$sed_trimtrailingslashes"` ;;
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1108 esac
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1109 case "$pobase" in
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1110 */ ) pobase=`echo "$pobase" \| sed -e "$sed_trimtrailingslashes"` ;;
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1111 esac
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1112 case "$docbase" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1113 */ ) docbase=`echo "$docbase" \| sed -e "$sed_trimtrailingslashes"` ;;
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1114 esac
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1115 case "$testsbase" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1116 */ ) testsbase=`echo "$testsbase" \| sed -e "$sed_trimtrailingslashes"` ;;
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1117 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1118 case "$auxdir" in
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1119 */ ) auxdir=`echo "$auxdir" \| sed -e "$sed_trimtrailingslashes"` ;;
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	1120 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1121 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1122
9793 f899dba61804 Fix 'gnulib-tool --version' output to work with git. Eric Blake <ebb9@byu.net> parents: 9541 diff changeset	1123 func_gnulib_dir
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1124 func_tmpdir
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1125 trap 'exit_status=$?
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1126 if test "$signal" != 0; then
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1127 echo "caught signal $signal" >&2
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1128 fi
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1129 rm -rf "$tmp"
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1130 exit $exit_status' 0
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1131 for signal in 1 2 3 13 15; do
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1132 trap '{ signal='$signal'; func_exit 1; }' $signal
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1133 done
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	1134 signal=0
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1135
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1136 # func_lookup_file file
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1137 # looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1138 # 'patch'.
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1139 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1140 # - local_gnulib_dir from --local-dir
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1141 # Output:
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1142 # - lookedup_file name of the merged (combined) file
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1143 # - lookedup_tmp true if it is located in the tmp directory, blank otherwise
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1144 func_lookup_file ()
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1145 {
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1146 lkfile="$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1147 if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile"; then
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1148 lookedup_file="$local_gnulib_dir/$lkfile"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1149 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1150 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1151 if test -f "$gnulib_dir/$lkfile"; then
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1152 if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile.diff"; then
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1153 lkbase=`echo "$lkfile" \| sed -e 's,^.*/,,'`
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1154 rm -f "$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1155 cp "$gnulib_dir/$lkfile" "$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1156 patch -s "$tmp/$lkbase" < "$local_gnulib_dir/$lkfile.diff" \
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1157 \|\| func_fatal_error "patch file $local_gnulib_dir/$lkfile.diff didn't apply cleanly"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1158 lookedup_file="$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1159 lookedup_tmp=true
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1160 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1161 lookedup_file="$gnulib_dir/$lkfile"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1162 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1163 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1164 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1165 func_fatal_error "file $gnulib_dir/$lkfile not found"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1166 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1167 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1168 }
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1169
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1170 # func_all_modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1171 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1172 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1173 func_all_modules ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1174 {
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1175 # Filter out metainformation files like README, which are not modules.
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1176 # Filter out unit test modules; they can be retrieved through
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1177 # --extract-tests-module if desired.
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1178 {
7805 2ee7433618fe Add support for subdirectories of the 'modules/' directory. Bruno Haible <bruno@clisp.org> parents: 7788 diff changeset	1179 (cd "$gnulib_dir" && find modules -type f -print \| sed -e 's,^modules/,,')
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1180 if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then
7805 2ee7433618fe Add support for subdirectories of the 'modules/' directory. Bruno Haible <bruno@clisp.org> parents: 7788 diff changeset	1181 (cd "$local_gnulib_dir" && find modules -type f -print \| sed -e 's,^modules/,,' -e 's,\.diff$,,')
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1182 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1183 } \
7857 978cf3123a32 Exclude all files inside the CVS directory. Bruno Haible <bruno@clisp.org> parents: 7850 diff changeset	1184 \| sed -e '/^CVS\//d' -e '/\/CVS\//d' \
7850 4c8e2f42f969 * gnulib-tool (func_all_modules): Use POSIX conforming escaping Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7805 diff changeset	1185 -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \
4c8e2f42f969 * gnulib-tool (func_all_modules): Use POSIX conforming escaping Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7805 diff changeset	1186 -e '/^COPYING$/d' -e '/\/COPYING$/d' \
4c8e2f42f969 * gnulib-tool (func_all_modules): Use POSIX conforming escaping Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7805 diff changeset	1187 -e '/^README$/d' -e '/\/README$/d' \
7805 2ee7433618fe Add support for subdirectories of the 'modules/' directory. Bruno Haible <bruno@clisp.org> parents: 7788 diff changeset	1188 -e '/^TEMPLATE$/d' \
8626 eb080a5d05de TEMPLATE-EXTENDED is not a module. Bruno Haible <bruno@clisp.org> parents: 8503 diff changeset	1189 -e '/^TEMPLATE-EXTENDED$/d' \
7805 2ee7433618fe Add support for subdirectories of the 'modules/' directory. Bruno Haible <bruno@clisp.org> parents: 7788 diff changeset	1190 -e '/^TEMPLATE-TESTS$/d' \
7858 08609b22ffd5 (func_all_modules): Exclude all .* files (e.g., Emacs .#* auto-save files). Simon Josefsson <simon@josefsson.org> parents: 7857 diff changeset	1191 -e '/^\..*/d' \
7805 2ee7433618fe Add support for subdirectories of the 'modules/' directory. Bruno Haible <bruno@clisp.org> parents: 7788 diff changeset	1192 -e '/~$/d' \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1193 \| sed -e '/-tests$/d' \
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	1194 \| LC_ALL=C sort -u
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1195 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1196
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1197 # func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1198 # verifies a module name
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1199 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1200 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1201 # - module module name argument
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1202 func_verify_module ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1203 {
7168 56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1204 if { test -f "$gnulib_dir/modules/$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1205 \|\| { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1206 && test -f "$local_gnulib_dir/modules/$module"; }; } \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1207 && test "CVS" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1208 && test "ChangeLog" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1209 && test "COPYING" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1210 && test "README" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1211 && test "TEMPLATE" != "$module" \
8626 eb080a5d05de TEMPLATE-EXTENDED is not a module. Bruno Haible <bruno@clisp.org> parents: 8503 diff changeset	1212 && test "TEMPLATE-EXTENDED" != "$module" \
7168 56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1213 && test "TEMPLATE-TESTS" != "$module"; then
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1214 # OK, $module is a correct module name.
7212 232ee448d272 Better error handling. Bruno Haible <bruno@clisp.org> parents: 7199 diff changeset	1215 # Verify that building the module description with 'patch' succeeds.
232ee448d272 Better error handling. Bruno Haible <bruno@clisp.org> parents: 7199 diff changeset	1216 func_lookup_file "modules/$module"
7168 56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	1217 else
4128 1346b5405a74 (func_verify_module): report module name $module Karl Berry <karl@freefriends.org> parents: 4126 diff changeset	1218 echo "gnulib-tool: module $module doesn't exist" 1>&2
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1219 module=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1220 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1221 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1222
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1223 # func_verify_nontests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1224 # verifies a module name, excluding tests modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1225 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1226 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1227 # - module module name argument
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1228 func_verify_nontests_module ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1229 {
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1230 case "$module" in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1231 *-tests ) module= ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1232 * ) func_verify_module ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1233 esac
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1234 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1235
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1236 # func_verify_tests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1237 # verifies a module name, considering only tests modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1238 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1239 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1240 # - module module name argument
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1241 func_verify_tests_module ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1242 {
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1243 case "$module" in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1244 *-tests ) func_verify_module ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1245 * ) module= ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1246 esac
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1247 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1248
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1249 sed_extract_prog=':[ ]*$/ {
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1250 :a
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1251 n
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1252 s/^Description:[ ]*$//
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1253 s/^Notice:[ ]*$//
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1254 s/^Files:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1255 s/^Depends-on:[ ]*$//
8079 0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1256 s/^configure\.ac-early:[ ]*$//
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1257 s/^configure\.ac:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1258 s/^Makefile\.am:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1259 s/^Include:[ ]*$//
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1260 s/^Link:[ ]*$//
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1261 s/^License:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	1262 s/^Maintainer:[ ]*$//
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1263 tb
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1264 p
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1265 ba
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1266 :b
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1267 }'
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1268
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1269 # func_get_description module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1270 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1271 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1272 func_get_description ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1273 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1274 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1275 sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1276 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1277
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1278 # func_get_notice module
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1279 # Input:
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1280 # - local_gnulib_dir from --local-dir
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1281 func_get_notice ()
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1282 {
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1283 func_lookup_file "modules/$1"
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1284 sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file"
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1285 }
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1286
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1287 # func_get_filelist module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1288 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1289 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1290 func_get_filelist ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1291 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1292 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1293 sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file"
7788 e3424061171f Back from an automatic module-indicator macro to a module-indicator macro Bruno Haible <bruno@clisp.org> parents: 7781 diff changeset	1294 echo m4/gnulib-common.m4
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1295 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1296 2.59)
9879 e0ce0891df69 Avoid some more autoconf warnings. Eric Blake <ebb9@byu.net> parents: 9875 diff changeset	1297 echo m4/onceonly.m4
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1298 ;;
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	1299 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1300 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1301
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1302 # func_get_dependencies module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1303 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1304 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1305 func_get_dependencies ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1306 {
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1307 # ${module}-tests always implicitly depends on ${module}.
9355 0697c925151a * gnulib-tool (func_get_dependencies): Fix sed script to match only tests. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9309 diff changeset	1308 echo "$1" \| sed -n -e 's/-tests$//p'
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1309 # Then the explicit dependencies listed in the module description.
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1310 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1311 sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1312 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1313
8079 0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1314 # func_get_autoconf_early_snippet module
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1315 # Input:
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1316 # - local_gnulib_dir from --local-dir
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1317 func_get_autoconf_early_snippet ()
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1318 {
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1319 func_lookup_file "modules/$1"
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1320 sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file"
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1321 }
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	1322
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1323 # func_get_autoconf_snippet module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1324 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1325 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1326 func_get_autoconf_snippet ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1327 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1328 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1329 sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1330 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1331
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1332 # func_get_automake_snippet module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1333 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1334 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1335 func_get_automake_snippet ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1336 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1337 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1338 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file"
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1339 case "$1" in
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1340 *-tests)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1341 # *-tests module live in tests/, not lib/.
9284 afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1342 # Synthesize an EXTRA_DIST augmentation.
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1343 all_files=`func_get_filelist $1`
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1344 tests_files=`for f in $all_files; do \
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1345 case $f in \
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1346 tests/*) echo $f ;; \
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1347 esac; \
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1348 done \| sed -e 's,^tests/,,'`
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1349 extra_files="$tests_files"
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1350 if test -n "$extra_files"; then
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1351 echo "EXTRA_DIST +=" $extra_files
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1352 echo
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules. Bruno Haible <bruno@clisp.org> parents: 9275 diff changeset	1353 fi
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1354 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1355 *)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1356 # Synthesize an EXTRA_DIST augmentation.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1357 sed_combine_lines='/\\$/{
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1358 :a
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1359 N
7599 352da45c182e Interpret a backslash-newline sequence in the Makefile.am snippet as a space. Bruno Haible <bruno@clisp.org> parents: 7591 diff changeset	1360 s/\\\n/ /
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1361 s/\\$/\\/
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1362 ta
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1363 }'
7754 ed8105720327 * modules/absolute-header: New module. Eric Blake <ebb9@byu.net> parents: 7752 diff changeset	1364 sed_extract_mentioned_files='s/^lib_SOURCES[ ]+=[ ]//p'
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1365 already_mentioned_files=` \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1366 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1367 \| sed -e "$sed_combine_lines" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1368 \| sed -n -e "$sed_extract_mentioned_files" \| sed -e 's/#.*//'`
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1369 all_files=`func_get_filelist $1`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1370 lib_files=`for f in $all_files; do \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1371 case $f in \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1372 lib/*) echo $f ;; \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1373 esac; \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1374 done \| sed -e 's,^lib/,,'`
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1375 # Remove $already_mentioned_files from $lib_files.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1376 echo "$lib_files" \| LC_ALL=C sort -u > "$tmp"/lib-files
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	1377 extra_files=`func_reset_sigpipe; \
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	1378 for f in $already_mentioned_files; do echo $f; done \
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1379 \| LC_ALL=C sort -u \| LC_ALL=C join -v 2 - "$tmp"/lib-files`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1380 if test -n "$extra_files"; then
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1381 echo "EXTRA_DIST +=" $extra_files
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1382 echo
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1383 fi
7640 a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1384 # Synthesize also an EXTRA_lib_SOURCES augmentation.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1385 # This is necessary so that automake can generate the right list of
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1386 # dependency rules.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1387 # A possible approach would be to use autom4te --trace of the redefined
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1388 # AC_LIBOBJ and AC_REPLACE_FUNCS macros when creating the Makefile.am
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1389 # (use autom4te --trace, not just grep, so that AC_LIBOBJ invocations
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1390 # inside autoconf's built-in macros are not missed).
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1391 # But it's simpler and more robust to do it here, based on the file list.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1392 # If some .c file exists and is not used with AC_LIBOBJ - for example,
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1393 # a .c file is preprocessed into another .c file for BUILT_SOURCES -,
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1394 # automake will generate a useless dependency; this is harmless.
8356 72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1395 case "$1" in
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1396 relocatable-prog-wrapper) ;;
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1397 *)
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1398 sed_extract_c_files='/\.c$/p'
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1399 extra_files=`echo "$extra_files" \| sed -n -e "$sed_extract_c_files"`
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1400 if test -n "$extra_files"; then
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1401 echo "EXTRA_lib_SOURCES +=" $extra_files
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1402 echo
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1403 fi
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1404 ;;
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module. Bruno Haible <bruno@clisp.org> parents: 8079 diff changeset	1405 esac
9107 2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1406 # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/.
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1407 buildaux_files=`for f in $all_files; do \
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1408 case $f in \
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1409 build-aux/*) echo $f ;; \
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1410 esac; \
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1411 done \| sed -e 's,^build-aux/,,'`
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1412 if test -n "$buildaux_files"; then
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1413 sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,'
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1414 echo "EXTRA_DIST += "`echo "$buildaux_files" \| sed -e "$sed_prepend_auxdir"`
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1415 echo
2878e8c70604 Ensure that also files under build-aux/ are distributed. Bruno Haible <bruno@clisp.org> parents: 9096 diff changeset	1416 fi
9807 24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1417 # Synthesize an EXTRA_DIST augmentation also for the files from top/.
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1418 top_files=`for f in $all_files; do \
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1419 case $f in \
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1420 top/*) echo $f ;; \
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1421 esac; \
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1422 done \| sed -e 's,^top/,,'`
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1423 if test -n "$top_files"; then
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1424 sed_prepend_topdir='s,^,$(top_srcdir)/,'
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1425 echo "EXTRA_DIST += "`echo "$top_files" \| sed -e "$sed_prepend_topdir"`
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1426 echo
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	1427 fi
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1428 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	1429 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1430 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1431
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1432 # func_get_include_directive module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1433 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1434 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1435 func_get_include_directive ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1436 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1437 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1438 sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" \| \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1439 sed -e 's/^$["<]$/#include \1/'
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1440 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1441
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1442 # func_get_link_directive module
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1443 # Input:
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1444 # - local_gnulib_dir from --local-dir
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1445 func_get_link_directive ()
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1446 {
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1447 func_lookup_file "modules/$1"
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1448 sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file"
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1449 }
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	1450
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1451 # func_get_license module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1452 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1453 # - local_gnulib_dir from --local-dir
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1454 func_get_license ()
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1455 {
7896 cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	1456 func_lookup_file "modules/$1"
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	1457 { sed -n -e "/^License$sed_extract_prog" < "$lookedup_file"
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	1458 # The default is GPL.
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	1459 echo "GPL"
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	1460 } \| sed -e 's,^ *$,,' \| sed -e 1q
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1461 }
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1462
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1463 # func_get_maintainer module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1464 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1465 # - local_gnulib_dir from --local-dir
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1466 func_get_maintainer ()
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1467 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1468 func_lookup_file "modules/$1"
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1469 sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file"
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1470 }
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1471
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1472 # func_get_tests_module module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1473 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1474 # - local_gnulib_dir from --local-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1475 func_get_tests_module ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1476 {
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1477 # The naming convention for tests modules is hardwired: ${module}-tests.
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1478 if test -f "$gnulib_dir/modules/$1"-tests \
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1479 \|\| { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1480 && test -f "$local_gnulib_dir/modules/$1"-tests; }; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1481 echo "$1"-tests
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1482 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1483 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1484
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1485 # func_acceptable module
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1486 # tests whether a module is acceptable.
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1487 # Input:
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1488 # - avoidlist list of modules to avoid
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1489 func_acceptable ()
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1490 {
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1491 for avoid in $avoidlist; do
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1492 if test "$avoid" = "$1"; then
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1493 return 1
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1494 fi
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1495 done
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1496 return 0
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1497 }
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1498
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1499 # func_modules_transitive_closure
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1500 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1501 # - local_gnulib_dir from --local-dir
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1502 # - modules list of specified modules
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1503 # - inctests true if tests should be included, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1504 # - avoidlist list of modules to avoid
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1505 # - tmp pathname of a temporary directory
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1506 # Output:
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1507 # - modules list of modules, including dependencies
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1508 func_modules_transitive_closure ()
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1509 {
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1510 # In order to process every module only once (for speed), process an "input
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1511 # list" of modules, producing an "output list" of modules. During each round,
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1512 # more modules can be queued in the input list. Once a module on the input
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1513 # list has been processed, it is added to the "handled list", so we can avoid
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1514 # to process it again.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1515 handledmodules=
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1516 inmodules="$modules"
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1517 outmodules=
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1518 while test -n "$inmodules"; do
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1519 inmodules_this_round="$inmodules"
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1520 inmodules= # Accumulator, queue for next round
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1521 for module in $inmodules_this_round; do
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1522 func_verify_module
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1523 if test -n "$module"; then
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1524 if func_acceptable $module; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1525 func_append outmodules " $module"
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1526 deps=`func_get_dependencies $module`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1527 # Duplicate dependencies are harmless, but Jim wants a warning.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1528 duplicated_deps=`echo "$deps" \| LC_ALL=C sort \| LC_ALL=C uniq -d`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1529 if test -n "$duplicated_deps"; then
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1530 echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1531 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1532 func_append inmodules " $deps"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1533 if test -n "$inctests"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1534 testsmodule=`func_get_tests_module $module`
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1535 if test -n "$testsmodule"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1536 func_append inmodules " $testsmodule"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1537 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1538 fi
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1539 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1540 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1541 done
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1542 handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done \| LC_ALL=C sort -u`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1543 # Remove $handledmodules from $inmodules.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1544 for m in $inmodules; do echo $m; done \| LC_ALL=C sort -u > "$tmp"/queued-modules
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	1545 inmodules=`func_reset_sigpipe; echo "$handledmodules" \| LC_ALL=C join -v 2 - "$tmp"/queued-modules`
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1546 done
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1547 modules=`for m in $outmodules; do echo $m; done \| LC_ALL=C sort -u`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1548 rm -f "$tmp"/queued-modules
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1549 }
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1550
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1551 # func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1552 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1553 # - local_gnulib_dir from --local-dir
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1554 # - modules list of modules, including dependencies
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1555 # Output:
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1556 # - modules list of modules, including 'dummy' if needed
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1557 func_modules_add_dummy ()
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1558 {
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1559 have_lib_SOURCES=
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1560 sed_remove_backslash_newline=':a
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1561 /\\$/{
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1562 s/\\$//
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1563 N
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1564 s/\n//
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1565 ba
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1566 }'
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1567 for module in $modules; do
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1568 func_verify_nontests_module
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1569 if test -n "$module"; then
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1570 # Extract the value of "lib_SOURCES += ...".
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1571 for file in `func_get_automake_snippet "$module" \| sed -e "$sed_remove_backslash_newline" \| sed -n -e 's,^lib_SOURCES[ ]+=$[^#]$.*$,\1,p'`; do
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1572 # Ignore .h files since they are not compiled.
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1573 case "$file" in
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1574 *.h) ;;
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1575 *) have_lib_SOURCES=yes ;;
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1576 esac
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1577 done
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1578 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1579 done
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1580 # Add the dummy module, to make sure the library will be non-empty.
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1581 if test -z "$have_lib_SOURCES"; then
8668 9c0fa5819ce3 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8626 diff changeset	1582 if func_acceptable "dummy"; then
9c0fa5819ce3 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8626 diff changeset	1583 func_append modules " dummy"
9c0fa5819ce3 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8626 diff changeset	1584 fi
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1585 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1586 }
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1587
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1588 # func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1589 # Input:
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1590 # - local_gnulib_dir from --local-dir
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1591 # - verbose integer, default 0, inc/decremented by --verbose/--quiet
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1592 # - modules list of modules, including dependencies
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1593 func_modules_notice ()
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1594 {
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1595 if test $verbose -ge -1; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1596 for module in $modules; do
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1597 func_verify_module
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1598 if test -n "$module"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1599 msg=`func_get_notice $module`
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1600 if test -n "$msg"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1601 echo "Notice from module $module:"
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1602 echo "$msg" \| sed -e 's/^/ /'
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1603 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1604 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1605 done
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1606 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1607 }
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	1608
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1609 # func_modules_to_filelist
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1610 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1611 # - local_gnulib_dir from --local-dir
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1612 # - modules list of modules, including dependencies
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1613 # Output:
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1614 # - files list of files
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1615 func_modules_to_filelist ()
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1616 {
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1617 files=
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1618 for module in $modules; do
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1619 func_verify_module
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1620 if test -n "$module"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1621 fs=`func_get_filelist $module`
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1622 func_append files " $fs"
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1623 fi
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1624 done
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	1625 files=`for f in $files; do echo $f; done \| LC_ALL=C sort -u`
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1626 }
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1627
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1628 # func_execute_command command [args...]
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1629 # Executes a command.
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1630 # Uses also the variables
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1631 # - verbose integer, default 0, inc/decremented by --verbose/--quiet
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1632 func_execute_command ()
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1633 {
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1634 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1635 echo "executing $*"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1636 "$@"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1637 else
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	1638 # Commands like automake produce output to stderr even when they succeed.
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1639 # Turn this output off if the command succeeds.
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1640 "$@" > "$tmp"/cmdout 2>&1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1641 cmdret=$?
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1642 if test $cmdret = 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1643 rm -f "$tmp"/cmdout
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1644 else
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1645 echo "executing $*"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1646 cat "$tmp"/cmdout 1>&2
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1647 rm -f "$tmp"/cmdout
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1648 (exit $cmdret)
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1649 fi
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1650 fi
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1651 }
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	1652
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1653 # func_emit_lib_Makefile_am
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1654 # emits the contents of library makefile to standard output.
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1655 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1656 # - local_gnulib_dir from --local-dir
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1657 # - modules list of modules, including dependencies
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1658 # - libname library name
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1659 # - pobase directory relative to destdir where to place *.po files
7644 3c0ece164bab Replace build-aux/ also in the Makefile snippet. Bruno Haible <bruno@clisp.org> parents: 7643 diff changeset	1660 # - auxdir directory relative to destdir where to place build aux files
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1661 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1662 # - libtool true if libtool will be used, false or blank otherwise
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1663 # - macro_prefix prefix of gl_LIBOBJS macros to use
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1664 # - po_domain prefix of i18n domain to use (without -gnulib suffix)
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1665 # - actioncmd (optional) command that will reproduce this invocation
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1666 # - for_test true if creating a package for testing, false otherwise
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1667 # - destfile filename relative to destdir of makefile being generated
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1668 # Input/Output:
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1669 # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1670 # list of edits to be done to Makefile.am variables
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1671 # Output:
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1672 # - uses_subdirs nonempty if object files in subdirs exist
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1673 func_emit_lib_Makefile_am ()
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1674 {
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1675 # When creating an includable Makefile.am snippet, augment variables with
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1676 # += instead of assigning them.
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1677 if test -n "$makefile_name"; then
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1678 assign='+='
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1679 else
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1680 assign='='
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1681 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1682 if test "$libtool" = true; then
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1683 libext=la
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1684 perhapsLT=LT
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	1685 sed_eliminate_LDFLAGS="$sed_noop"
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1686 else
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1687 libext=a
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1688 perhapsLT=
7335 6a496bee90ff * gnulib-tool: Avoid space-tab. Eric Blake <ebb9@byu.net> parents: 7332 diff changeset	1689 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1690 fi
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1691 if $for_test; then
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1692 # When creating a package for testing: Attempt to provoke failures,
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1693 # especially link errors, already during "make" rather than during
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1694 # "make check", because "make check" is not possible in a cross-compiling
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1695 # situation. Turn check_PROGRAMS into noinst_PROGRAMS.
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1696 sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g'
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1697 else
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	1698 sed_transform_check_PROGRAMS="$sed_noop"
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1699 fi
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	1700 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1701 echo "## Process this file with automake to produce Makefile.in."
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	1702 func_emit_copyright_notice
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1703 if test -n "$actioncmd"; then
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1704 echo "# Reproduce by: $actioncmd"
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1705 fi
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1706 echo
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1707 uses_subdirs=
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1708 {
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1709 for module in $modules; do
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1710 func_verify_nontests_module
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1711 if test -n "$module"; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1712 {
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1713 func_get_automake_snippet "$module" \|
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1714 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
9005 e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1715 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1716 -e "$sed_eliminate_LDFLAGS" \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1717 -e 's,lib_$[A-Z][A-Z]*$,'"${libname}_${libext}"'_\1,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1718 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1719 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1720 -e "$sed_transform_check_PROGRAMS"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1721 if test "$module" = 'alloca'; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1722 echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1723 echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1724 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1725 } > amsnippet.tmp
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	1726 # Skip the contents if it's entirely empty.
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1727 if grep '[^ ]' amsnippet.tmp > /dev/null ; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1728 echo "## begin gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1729 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1730 cat amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1731 echo "## end gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1732 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1733 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1734 rm -f amsnippet.tmp
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1735 # Test whether there are some source files in subdirectories.
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1736 for f in `func_get_filelist "$module"`; do
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1737 case $f in
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1738 lib//.c) uses_subdirs=yes ;;
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1739 esac
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1740 done
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1741 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1742 done
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1743 } > allsnippets.tmp
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1744 if test -z "$makefile_name"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1745 # If there are source files in subdirectories, prevent collision of the
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1746 # object files (example: hash.c and libxml/hash.c).
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1747 subdir_options=
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1748 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1749 subdir_options=' subdir-objects'
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1750 fi
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1751 echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1752 fi
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1753 echo
7246 4a748ab30907 * gnulib-tool (func_emit_lib_Makefile_am): Fix typos in Paul Eggert <eggert@cs.ucla.edu> parents: 7245 diff changeset	1754 if test -z "$makefile_name"; then
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1755 echo "SUBDIRS ="
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1756 echo "noinst_HEADERS ="
7701 c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1757 echo "noinst_LIBRARIES ="
7691 33b654c2cba8 Initialize also noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7660 diff changeset	1758 echo "noinst_LTLIBRARIES ="
7270 3d4ebfd658b2 A comment about automake-1.9b. Bruno Haible <bruno@clisp.org> parents: 7264 diff changeset	1759 # Automake versions < 1.9b create an empty pkgdatadir at installation time
3d4ebfd658b2 A comment about automake-1.9b. Bruno Haible <bruno@clisp.org> parents: 7264 diff changeset	1760 # if you specify pkgdata_DATA to empty. This is a workaround.
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1761 if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1762 echo "pkgdata_DATA ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1763 fi
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1764 echo "EXTRA_DIST ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1765 echo "BUILT_SOURCES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1766 echo "SUFFIXES ="
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1767 fi
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1768 echo "MOSTLYCLEANFILES $assign core *.stackdump"
7246 4a748ab30907 * gnulib-tool (func_emit_lib_Makefile_am): Fix typos in Paul Eggert <eggert@cs.ucla.edu> parents: 7245 diff changeset	1769 if test -z "$makefile_name"; then
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1770 echo "MOSTLYCLEANDIRS ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1771 echo "CLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1772 echo "DISTCLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1773 echo "MAINTAINERCLEANFILES ="
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1774 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1775 # Execute edits that apply to the Makefile.am being generated.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1776 edit=0
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1777 while test $edit != $makefile_am_edits; do
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1778 edit=`expr $edit + 1`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1779 eval dir=\"\$makefile_am_edit${edit}_dir\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1780 eval var=\"\$makefile_am_edit${edit}_var\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1781 eval val=\"\$makefile_am_edit${edit}_val\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1782 if test -n "$var"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1783 if test "${dir}Makefile.am" = "$destfile" \|\| test "./${dir}Makefile.am" = "$destfile"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1784 echo "${var} += ${val}"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1785 eval "makefile_am_edit${edit}_var="
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1786 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1787 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1788 done
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1789 if test -z "$makefile_name"; then
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1790 echo
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1791 echo "AM_CPPFLAGS ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1792 fi
6750 608add4e5b80 Support for packages that use "gettextize --intl". From Claudio Fontana. Bruno Haible <bruno@clisp.org> parents: 6745 diff changeset	1793 echo
10255 a945eb5a83fe Recognize 'foo_LIBRARIES += libgnu.a'. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10252 diff changeset	1794 if LC_ALL=C grep "^[a-zA-Z0-9_]_${perhapsLT}LIBRARIES +\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then
7701 c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1795 # One of the snippets already specifies an installation location for the
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1796 # library. Don't confuse automake by saying it should not be installed.
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1797 :
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1798 else
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1799 # By default, the generated library should not be installed.
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1800 echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1801 fi
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1802 echo
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1803 echo "${libname}_${libext}_SOURCES ="
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1804 # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However,
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	1805 # automake during its analysis looks for $(LIBOBJS), not for @LIBOBJS@.
7701 c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1806 echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1807 echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1808 echo "EXTRA_${libname}_${libext}_SOURCES ="
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1809 if test "$libtool" = true; then
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1810 echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1811 fi
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES. Bruno Haible <bruno@clisp.org> parents: 7691 diff changeset	1812 echo
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1813 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1814 echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\""
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1815 echo
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1816 fi
7644 3c0ece164bab Replace build-aux/ also in the Makefile snippet. Bruno Haible <bruno@clisp.org> parents: 7643 diff changeset	1817 cat allsnippets.tmp \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1818 \| sed -e 's\|\$(top_srcdir)/build-aux/\|$(top_srcdir)/'"$auxdir"'/\|g'
5357 8bce169f70cc Fix comments. Fix parse problem. Simon Josefsson <simon@josefsson.org> parents: 5356 diff changeset	1819 echo
7086 ba6d3c85213f Fix for "make -j 3". Bruno Haible <bruno@clisp.org> parents: 7079 diff changeset	1820 echo "mostlyclean-local: mostlyclean-generic"
7545 fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1821 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1822 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1823 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1824 echo " fi; \\"
9010 03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory. Bruno Haible <bruno@clisp.org> parents: 9009 diff changeset	1825 echo " done; \\"
03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory. Bruno Haible <bruno@clisp.org> parents: 9009 diff changeset	1826 echo " :"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1827 rm -f allsnippets.tmp
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1828 }
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1829
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1830 # func_emit_po_Makevars
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	1831 # emits the contents of po/ makefile parameterization to standard output.
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1832 # Input:
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1833 # - local_gnulib_dir from --local-dir
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1834 # - sourcebase directory relative to destdir where to place source code
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1835 # - pobase directory relative to destdir where to place *.po files
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1836 # - po_domain prefix of i18n domain to use (without -gnulib suffix)
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1837 func_emit_po_Makevars ()
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1838 {
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1839 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1840 func_emit_copyright_notice
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1841 echo
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1842 echo "# Usually the message domain is the same as the package name."
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1843 echo "# But here it has a '-gnulib' suffix."
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1844 echo "DOMAIN = ${po_domain}-gnulib"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1845 echo
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1846 echo "# These two variables depend on the location of this directory."
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1847 echo "subdir = ${pobase}"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1848 echo "top_builddir = "`echo "$pobase" \| sed -e 's,//,/,g' -e 's,[^/][^/],..,g'`
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1849 echo
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1850 cat <<\EOF
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1851 # These options get passed to xgettext.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1852 XGETTEXT_OPTIONS = \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1853 --keyword=_ --flag=_:1:pass-c-format \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1854 --keyword=N_ --flag=N_:1:pass-c-format \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1855 --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1856 --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1857 --flag=error:3:c-format --flag=error_at_line:5:c-format
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1858
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1859 # This is the copyright holder that gets inserted into the header of the
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1860 # $(DOMAIN).pot file. gnulib is copyrighted by the FSF.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1861 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1862
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1863 # This is the email address or URL to which the translators shall report
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1864 # bugs in the untranslated strings:
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1865 # - Strings which are not entire sentences, see the maintainer guidelines
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1866 # in the GNU gettext documentation, section 'Preparing Strings'.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1867 # - Strings which use unclear terms or require additional context to be
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1868 # understood.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1869 # - Strings which make invalid assumptions about notation of date, time or
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1870 # money.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1871 # - Pluralisation problems.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1872 # - Incorrect English spelling.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1873 # - Incorrect formatting.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1874 # It can be your email address, or a mailing list address where translators
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1875 # can write to without being subscribed, or the URL of a web page through
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1876 # which the translators can contact you.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1877 MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1878
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1879 # This is the list of locale categories, beyond LC_MESSAGES, for which the
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1880 # message catalogs shall be used. It is usually empty.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1881 EXTRA_LOCALE_CATEGORIES =
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1882
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1883 # This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1884 # context. Possible values are "yes" and "no". Set this to yes if the
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1885 # package uses functions taking also a message context, like pgettext(), or
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1886 # if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1887 USE_MSGCTXT = no
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1888 EOF
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1889 }
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1890
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1891 # func_emit_po_POTFILES_in
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1892 # emits the file list to be passed to xgettext to standard output.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1893 # Input:
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1894 # - local_gnulib_dir from --local-dir
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1895 # - sourcebase directory relative to destdir where to place source code
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1896 # - files list of new files
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1897 func_emit_po_POTFILES_in ()
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1898 {
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1899 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1900 func_emit_copyright_notice
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1901 echo
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1902 echo "# List of files which contain translatable strings."
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1903 echo "$files" \| sed -n -e "s,^lib/,$sourcebase/,p"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1904 }
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	1905
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1906 # func_emit_tests_Makefile_am
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1907 # emits the contents of tests makefile to standard output.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1908 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1909 # - local_gnulib_dir from --local-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1910 # - modules list of modules, including dependencies
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1911 # - libname library name
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1912 # - auxdir directory relative to destdir where to place build aux files
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1913 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1914 # - libtool true if libtool will be used, false or blank otherwise
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1915 # - sourcebase relative directory containing lib source code
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1916 # - m4base relative directory containing autoconf macros
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1917 # - testsbase relative directory containing unit test code
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1918 # - macro_prefix prefix of gl_LIBOBJS macros to use
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1919 # - for_test true if creating a package for testing, false otherwise
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1920 # - use_libtests true if a libtests.a should be built, false otherwise
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1921 # - destfile filename relative to destdir of makefile being generated
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1922 # Input/Output:
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1923 # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val}
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	1924 # list of edits to be done to Makefile.am variables
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1925 # Output:
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1926 # - uses_subdirs nonempty if object files in subdirs exist
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1927 func_emit_tests_Makefile_am ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1928 {
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1929 if test "$libtool" = true; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1930 libext=la
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	1931 sed_eliminate_LDFLAGS="$sed_noop"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1932 else
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1933 libext=a
7335 6a496bee90ff * gnulib-tool: Avoid space-tab. Eric Blake <ebb9@byu.net> parents: 7332 diff changeset	1934 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1935 fi
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1936 if $for_test; then
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1937 # When creating a package for testing: Attempt to provoke failures,
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1938 # especially link errors, already during "make" rather than during
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1939 # "make check", because "make check" is not possible in a cross-compiling
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1940 # situation. Turn check_PROGRAMS into noinst_PROGRAMS.
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1941 sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g'
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1942 else
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	1943 sed_transform_check_PROGRAMS="$sed_noop"
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	1944 fi
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1945 testsbase_inverse=`echo "$testsbase" \| sed -e 's,/$,,' \| sed -e 's,[^/][^/]*,..,g'`
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	1946 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1947 echo "## Process this file with automake to produce Makefile.in."
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	1948 func_emit_copyright_notice
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1949 echo
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1950 uses_subdirs=
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1951 (
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1952 for module in $modules; do
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1953 if $for_test; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1954 func_verify_tests_module
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1955 else
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1956 func_verify_module
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1957 fi
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1958 if test -n "$module"; then
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1959 {
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1960 func_get_automake_snippet "$module" \|
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	1961 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
9005 e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1962 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1963 -e "$sed_eliminate_LDFLAGS" \
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1964 -e 's,lib_$[A-Z][A-Z]*$,libtests_a_\1,g' \
9005 e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1965 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1966 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	1967 -e "$sed_transform_check_PROGRAMS"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1968 if $use_libtests && test "$module" = 'alloca'; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1969 echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1970 echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1971 fi
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1972 } > amsnippet.tmp
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	1973 # Skip the contents if it's entirely empty.
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1974 if grep '[^ ]' amsnippet.tmp > /dev/null ; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1975 echo "## begin gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1976 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1977 cat amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1978 echo "## end gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1979 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1980 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1981 rm -f amsnippet.tmp
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1982 # Test whether there are some source files in subdirectories.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1983 for f in `func_get_filelist "$module"`; do
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1984 case $f in
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1985 lib//.c \| tests//.c) uses_subdirs=yes ;;
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1986 esac
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1987 done
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1988 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1989 done
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1990 ) > allsnippets.tmp
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1991 # Generate dependencies here, since it eases the debugging of test failures.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1992 # If there are source files in subdirectories, prevent collision of the
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1993 # object files (example: hash.c and libxml/hash.c).
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1994 subdir_options=
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1995 if test -n "$uses_subdirs"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1996 subdir_options=' subdir-objects'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1997 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1998 echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	1999 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2000 if $for_test; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2001 echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2002 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2003 fi
6533 6bc4290ca85f Avoid an automake error regarding the 'gettext' module. Bruno Haible <bruno@clisp.org> parents: 6512 diff changeset	2004 # Nothing is being added to SUBDIRS; nevertheless the existence of this
6bc4290ca85f Avoid an automake error regarding the 'gettext' module. Bruno Haible <bruno@clisp.org> parents: 6512 diff changeset	2005 # variable is needed to avoid an error from automake:
6bc4290ca85f Avoid an automake error regarding the 'gettext' module. Bruno Haible <bruno@clisp.org> parents: 6512 diff changeset	2006 # "AM_GNU_GETTEXT used but SUBDIRS not defined"
6bc4290ca85f Avoid an automake error regarding the 'gettext' module. Bruno Haible <bruno@clisp.org> parents: 6512 diff changeset	2007 echo "SUBDIRS ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2008 echo "TESTS ="
6380 9bc99115d4d6 Small tweaks. Bruno Haible <bruno@clisp.org> parents: 6264 diff changeset	2009 echo "TESTS_ENVIRONMENT ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2010 echo "noinst_PROGRAMS ="
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2011 if ! $for_test; then
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2012 echo "check_PROGRAMS ="
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2013 fi
6548 060487c0b13c Initialize also noinst_HEADERS to empty. Bruno Haible <bruno@clisp.org> parents: 6547 diff changeset	2014 echo "noinst_HEADERS ="
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2015 echo "noinst_LIBRARIES ="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2016 if $use_libtests; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2017 if $for_test; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2018 echo "noinst_LIBRARIES += libtests.a"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2019 else
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2020 echo "check_LIBRARIES = libtests.a"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2021 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2022 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2023 # Automake versions < 1.9b create an empty pkgdatadir at installation time
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2024 # if you specify pkgdata_DATA to empty. This is a workaround.
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	2025 if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	2026 echo "pkgdata_DATA ="
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	2027 fi
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2028 echo "EXTRA_DIST ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2029 echo "BUILT_SOURCES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2030 echo "SUFFIXES ="
7079 ecd48b98b094 Clean core dumps. Bruno Haible <bruno@clisp.org> parents: 7078 diff changeset	2031 echo "MOSTLYCLEANFILES = core *.stackdump"
6862 ba1b5722df42 Invent MOSTLYCLEANDIRS. Bruno Haible <bruno@clisp.org> parents: 6777 diff changeset	2032 echo "MOSTLYCLEANDIRS ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2033 echo "CLEANFILES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2034 echo "DISTCLEANFILES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2035 echo "MAINTAINERCLEANFILES ="
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2036 # Execute edits that apply to the Makefile.am being generated.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2037 edit=0
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2038 while test $edit != $makefile_am_edits; do
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2039 edit=`expr $edit + 1`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2040 eval dir=\"\$makefile_am_edit${edit}_dir\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2041 eval var=\"\$makefile_am_edit${edit}_var\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2042 eval val=\"\$makefile_am_edit${edit}_val\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2043 if test -n "$var"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2044 if test "${dir}Makefile.am" = "$destfile" \|\| test "./${dir}Makefile.am" = "$destfile"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2045 echo "${var} += ${val}"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2046 eval "makefile_am_edit${edit}_var="
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2047 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2048 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2049 done
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2050 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2051 echo "AM_CPPFLAGS = \\"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2052 echo " -I. -I\$(srcdir) \\"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2053 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2054 echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2055 echo
9540 56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2056 local_ldadd_before=''
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2057 local_ldadd_after=''
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2058 if $use_libtests; then
9540 56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2059 # All test programs need to be linked with libtests.a.
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2060 # It needs to be passed to the linker before ${libname}.${libext}, since
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2061 # the tests-related modules depend on the main modules.
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2062 # It also needs to be passed to the linker after ${libname}.${libext}
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2063 # because the latter might contain incomplete modules (such as the 'error'
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2064 # module whose dependency to 'progname' is voluntarily omitted).
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2065 # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it does
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2066 # not matter.
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2067 local_ldadd_before=' libtests.a'
56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2068 local_ldadd_after=' libtests.a $(LIBTESTS_LIBDEPS)'
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2069 fi
9540 56fe79dce87d Remove unnecessary -l options from LDFLAGS. Bruno Haible <bruno@clisp.org> parents: 9523 diff changeset	2070 echo "LDADD =${local_ldadd_before} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd_after}"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2071 echo
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2072 if $use_libtests; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2073 echo "libtests_a_SOURCES ="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2074 # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However,
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	2075 # automake during its analysis looks for $(LIBOBJS), not for @LIBOBJS@.
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2076 echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2077 echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2078 echo "EXTRA_libtests_a_SOURCES ="
9523 49f7561fc2d3 Allow circular dependency of separate libtests.a Eric Blake <ebb9@byu.net> parents: 9520 diff changeset	2079 # The circular dependency in LDADD requires this.
49f7561fc2d3 Allow circular dependency of separate libtests.a Eric Blake <ebb9@byu.net> parents: 9520 diff changeset	2080 echo "AM_LIBTOOLFLAGS = --preserve-dup-deps"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2081 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2082 fi
9515 b0f1495adfd8 Fix references to the build-aux directory in the generated tests/Makefile.am. Bruno Haible <bruno@clisp.org> parents: 9514 diff changeset	2083 cat allsnippets.tmp \
b0f1495adfd8 Fix references to the build-aux directory in the generated tests/Makefile.am. Bruno Haible <bruno@clisp.org> parents: 9514 diff changeset	2084 \| sed -e 's\|\$(top_srcdir)/build-aux/\|$(top_srcdir)/'"$auxdir"'/\|g'
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2085 echo "# Clean up after Solaris cc."
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2086 echo "clean-local:"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2087 echo " rm -rf SunWS_cache"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2088 echo
7086 ba6d3c85213f Fix for "make -j 3". Bruno Haible <bruno@clisp.org> parents: 7079 diff changeset	2089 echo "mostlyclean-local: mostlyclean-generic"
7545 fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	2090 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	2091 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	2092 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	2093 echo " fi; \\"
9010 03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory. Bruno Haible <bruno@clisp.org> parents: 9009 diff changeset	2094 echo " done; \\"
03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory. Bruno Haible <bruno@clisp.org> parents: 9009 diff changeset	2095 echo " :"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	2096 rm -f allsnippets.tmp
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2097 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2098
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2099 # func_emit_initmacro_start macro_prefix
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2100 # emits the first few statements of the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2101 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2102 func_emit_initmacro_start ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2103 {
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2104 macro_prefix_arg="$1"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2105 # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2106 # platform-dependent object files in ${macro_prefix_arg}_LIBOBJS instead of
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2107 # LIBOBJS. The purpose is to allow several gnulib instantiations under
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2108 # a single configure.ac file. (AC_CONFIG_LIBOBJ_DIR does not allow this
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2109 # flexibility.)
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2110 # Furthermore it avoids an automake error like this when a Makefile.am
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2111 # that uses pieces of gnulib also uses $(LIBOBJ):
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2112 # automatically discovered file `error.c' should not be explicitly mentioned
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2113 echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix_arg}_LIBOBJ]))"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2114 echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix_arg}_REPLACE_FUNCS]))"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2115 # Overriding AC_LIBSOURCES has the same purpose of avoiding the automake
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2116 # error when a Makefile.am that uses pieces of gnulib also uses $(LIBOBJ):
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2117 # automatically discovered file `error.c' should not be explicitly mentioned
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2118 # We let automake know about the files to be distributed through the
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2119 # EXTRA_lib_SOURCES variable.
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2120 echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix_arg}_LIBSOURCES]))"
10066 9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2121 # Create data variables for checking the presence of files that are mentioned
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2122 # as AC_LIBSOURCES arguments. These are m4 variables, not shell variables,
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2123 # because we want the check to happen when the configure file is created,
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2124 # not when it is run. ${macro_prefix_arg}_LIBSOURCES_LIST is the list of
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2125 # files to check for. ${macro_prefix_arg}_LIBSOURCES_DIR is the subdirectory
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2126 # in which to expect them.
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2127 echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_LIST], [])"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2128 echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_DIR], [])"
9887 f2408973947f Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5. Bruno Haible <bruno@clisp.org> parents: 9879 diff changeset	2129 echo " gl_COMMON"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2130 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2131
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2132 # func_emit_initmacro_end macro_prefix
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2133 # emits the last few statements of the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2134 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2135 func_emit_initmacro_end ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2136 {
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2137 macro_prefix_arg="$1"
10066 9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2138 # Check the presence of files that are mentioned as AC_LIBSOURCES arguments.
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2139 # The check is performed only when autoconf is run from the directory where
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2140 # the configure.ac resides; if it is run from a different directory, the
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2141 # check is skipped.
10067 40a8c0b4f5e0 Oops, fix small mistake in last commit. Bruno Haible <bruno@clisp.org> parents: 10066 diff changeset	2142 echo " m4_ifval(${macro_prefix_arg}_LIBSOURCES_LIST, ["
10261 eb86b5a38e84 Work with tar's bootstrap. Eric Blake <ebb9@byu.net> parents: 10255 diff changeset	2143 echo " m4_syscmd([test ! -d ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[ \|\|"
10066 9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2144 echo " for gl_file in ]${macro_prefix_arg}_LIBSOURCES_LIST[ ; do"
10261 eb86b5a38e84 Work with tar's bootstrap. Eric Blake <ebb9@byu.net> parents: 10255 diff changeset	2145 echo " if test ! -r ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file ; then"
eb86b5a38e84 Work with tar's bootstrap. Eric Blake <ebb9@byu.net> parents: 10255 diff changeset	2146 echo " echo \"missing file ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file\" >&2"
10066 9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2147 echo " exit 1"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2148 echo " fi"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2149 echo " done])dnl"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2150 echo " m4_if(m4_sysval, [0], [],"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2151 echo " [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2152 echo " ])"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2153 echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_DIR])"
9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2154 echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_LIST])"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2155 echo " m4_popdef([AC_LIBSOURCES])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2156 echo " m4_popdef([AC_REPLACE_FUNCS])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2157 echo " m4_popdef([AC_LIBOBJ])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2158 echo " AC_CONFIG_COMMANDS_PRE(["
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2159 echo " ${macro_prefix_arg}_libobjs="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2160 echo " ${macro_prefix_arg}_ltlibobjs="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2161 echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then"
7528 472795eea368 Remove duplicates from the gl_LIBOBJS list. Bruno Haible <bruno@clisp.org> parents: 7497 diff changeset	2162 echo " # Remove the extension."
472795eea368 Remove duplicates from the gl_LIBOBJS list. Bruno Haible <bruno@clisp.org> parents: 7497 diff changeset	2163 echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2164 echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done \| sed \"\$sed_drop_objext\" \| sort \| uniq\`; do"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2165 echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\""
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2166 echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\""
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2167 echo " done"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2168 echo " fi"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2169 echo " AC_SUBST([${macro_prefix_arg}_LIBOBJS], [\$${macro_prefix_arg}_libobjs])"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2170 echo " AC_SUBST([${macro_prefix_arg}_LTLIBOBJS], [\$${macro_prefix_arg}_ltlibobjs])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2171 echo " ])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2172 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2173
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2174 # func_emit_initmacro_done macro_prefix sourcebase
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2175 # emits a few statements after the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2176 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
9232 01d4e199e19f Enforce that AC_REPLACE_FUNCS files exist. Eric Blake <ebb9@byu.net> parents: 9215 diff changeset	2177 # - sourcebase directory relative to destdir where to place source code
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2178 func_emit_initmacro_done ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2179 {
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2180 macro_prefix_arg="$1"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2181 sourcebase_arg="$2"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2182 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2183 echo "# Like AC_LIBOBJ, except that the module name goes"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2184 echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS."
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2185 echo "AC_DEFUN([${macro_prefix_arg}_LIBOBJ], ["
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2186 echo " AS_LITERAL_IF([\$1], [${macro_prefix_arg}_LIBSOURCES([\$1.c])])dnl"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2187 echo " ${macro_prefix_arg}_LIBOBJS=\"\$${macro_prefix_arg}_LIBOBJS \$1.\$ac_objext\""
9237 aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2188 echo "])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2189 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2190 echo "# Like AC_REPLACE_FUNCS, except that the module name goes"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2191 echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS."
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2192 echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], ["
9237 aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2193 echo " m4_foreach_w([gl_NAME], [\$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2194 echo " AC_CHECK_FUNCS([\$1], , [${macro_prefix_arg}_LIBOBJ(\$ac_func)])"
9237 aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2195 echo "])"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	2196 echo
9275 1c749136a76e AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt' Bruno Haible <bruno@clisp.org> parents: 9237 diff changeset	2197 echo "# Like AC_LIBSOURCES, except the directory where the source file is"
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	2198 echo "# expected is derived from the gnulib-tool parameterization,"
9275 1c749136a76e AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt' Bruno Haible <bruno@clisp.org> parents: 9237 diff changeset	2199 echo "# and alloca is special cased (for the alloca-opt module)."
1c749136a76e AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt' Bruno Haible <bruno@clisp.org> parents: 9237 diff changeset	2200 echo "# We could also entirely rely on EXTRA_lib..._SOURCES."
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2201 echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], ["
9237 aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2202 echo " m4_foreach([_gl_NAME], [\$1], ["
9275 1c749136a76e AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt' Bruno Haible <bruno@clisp.org> parents: 9237 diff changeset	2203 echo " m4_if(_gl_NAME, [alloca.c], [], ["
10066 9a2a9c43db65 Reduce number of forks required during autoconf. Eric Blake <ebb9@byu.net> parents: 10065 diff changeset	2204 echo " m4_define([${macro_prefix_arg}_LIBSOURCES_DIR], [$sourcebase_arg])"
10070 61be13abdf14 Avoid quadratic growth in gl_LIBSOURCES. Eric Blake <ebb9@byu.net> parents: 10067 diff changeset	2205 echo " m4_append([${macro_prefix_arg}_LIBSOURCES_LIST], _gl_NAME, [ ])"
9275 1c749136a76e AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt' Bruno Haible <bruno@clisp.org> parents: 9237 diff changeset	2206 echo " ])"
9237 aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2207 echo " ])"
aeb8e2d99afa m4 macro indentation. Bruno Haible <bruno@linuix.haible.de> parents: 9232 diff changeset	2208 echo "])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2209 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2210
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2211 # func_import modules
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2212 # Uses also the variables
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2213 # - destdir target directory
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	2214 # - local_gnulib_dir from --local-dir
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2215 # - verbose integer, default 0, inc/decremented by --verbose/--quiet
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2216 # - libname library name
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2217 # - sourcebase directory relative to destdir where to place source code
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2218 # - m4base directory relative to destdir where to place *.m4 macros
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2219 # - pobase directory relative to destdir where to place *.po files
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2220 # - docbase directory relative to destdir where to place doc files
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2221 # - testsbase directory relative to destdir where to place unit test code
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2222 # - auxdir directory relative to destdir where to place build aux files
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2223 # - inctests true if --with-tests was given, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	2224 # - avoidlist list of modules to avoid, from --avoid
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2225 # - lgpl yes or a number if library's license shall be LGPL,
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2226 # blank otherwise
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2227 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2228 # - libtool true if --libtool was given, false if --no-libtool was
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2229 # given, blank otherwise
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2230 # - guessed_libtool true if the configure.ac file uses libtool, false otherwise
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	2231 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2232 # - po_domain prefix of i18n domain to use (without -gnulib suffix)
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2233 # - vc_files true if --vc-files was given, false if --no-vc-files was
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2234 # given, blank otherwise
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	2235 # - autoconf_minversion minimum supported autoconf version
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2236 # - doit : if actions shall be executed, false if only to be printed
5799 ad9eff556694 2005-04-15 Simon Josefsson <jas@extundo.com> Simon Josefsson <simon@josefsson.org> parents: 5798 diff changeset	2237 # - symbolic true if files should be symlinked, copied otherwise
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2238 # - lsymbolic true if files from local_gnulib_dir should be symlinked,
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2239 # copied otherwise
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2240 # - do_copyrights true if copyright notices in files should be replaced,
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2241 # blank otherwise
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2242 func_import ()
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2243 {
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2244 # Get the cached settings.
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2245 cached_local_gnulib_dir=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2246 cached_specified_modules=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2247 cached_avoidlist=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2248 cached_sourcebase=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2249 cached_m4base=
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2250 cached_pobase=
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2251 cached_docbase=
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2252 cached_testsbase=
8890 576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2253 cached_inctests=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2254 cached_libname=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2255 cached_lgpl=
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2256 cached_makefile_name=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2257 cached_libtool=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2258 cached_macro_prefix=
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2259 cached_po_domain=
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2260 cached_vc_files=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2261 cached_files=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2262 if test -f "$destdir"/$m4base/gnulib-cache.m4; then
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2263 cached_libtool=false
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2264 my_sed_traces='
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2265 s,#.*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2266 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2267 s, dnl .*$,,
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2268 /gl_LOCAL_DIR(/ {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2269 s,^.gl_LOCAL_DIR([[ ]$[^])]$.$,cached_local_gnulib_dir="\1",p
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2270 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2271 /gl_MODULES(/ {
10293 3c624b3d1039 Make a sed program more robust. Bruno Haible <bruno@clisp.org> parents: 10261 diff changeset	2272 ta
10246 50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2273 :a
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2274 s/)/)/
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2275 tb
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2276 N
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2277 ba
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	2278 :b
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2279 s,^.gl_MODULES([[ ]$[^])]$.$,cached_specified_modules="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2280 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2281 /gl_AVOID(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2282 s,^.gl_AVOID([[ ]$[^])]$.$,cached_avoidlist="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2283 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2284 /gl_SOURCE_BASE(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2285 s,^.gl_SOURCE_BASE([[ ]$[^])]$.$,cached_sourcebase="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2286 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2287 /gl_M4_BASE(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2288 s,^.gl_M4_BASE([[ ]$[^])]$.$,cached_m4base="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2289 }
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2290 /gl_PO_BASE(/ {
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2291 s,^.gl_PO_BASE([[ ]$[^])]$.$,cached_pobase="\1",p
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2292 }
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2293 /gl_DOC_BASE(/ {
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2294 s,^.gl_DOC_BASE([[ ]$[^])]$.$,cached_docbase="\1",p
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2295 }
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2296 /gl_TESTS_BASE(/ {
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2297 s,^.gl_TESTS_BASE([[ ]$[^])]$.$,cached_testsbase="\1",p
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2298 }
8890 576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2299 /gl_WITH_TESTS/ {
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2300 s,^.*$,cached_inctests=true,p
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2301 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2302 /gl_LIB(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2303 s,^.gl_LIB([[ ]$[^])]$.$,cached_libname="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2304 }
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2305 /gl_LGPL(/ {
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2306 s,^.gl_LGPL([[ ]$[^])]$.$,cached_lgpl="\1",p
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2307 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2308 /gl_LGPL/ {
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2309 s,^.*$,cached_lgpl=yes,p
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2310 }
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2311 /gl_MAKEFILE_NAME(/ {
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2312 s,^.gl_MAKEFILE_NAME([[ ]$[^])]$.$,cached_makefile_name="\1",p
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2313 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2314 /gl_LIBTOOL/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2315 s,^.*$,cached_libtool=true,p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2316 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2317 /gl_MACRO_PREFIX(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2318 s,^.gl_MACRO_PREFIX([[ ]$[^])]$.$,cached_macro_prefix="\1",p
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2319 }
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2320 /gl_PO_DOMAIN(/ {
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2321 s,^.gl_PO_DOMAIN([[ ]$[^])]$.$,cached_po_domain="\1",p
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2322 }
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2323 /gl_VC_FILES(/ {
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2324 s,^.gl_VC_FILES([[ ]$[^])]$.$,cached_vc_files="\1",p
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2325 }'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2326 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4`
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2327 if test -f "$destdir"/$m4base/gnulib-comp.m4; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2328 my_sed_traces='
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2329 s,#.*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2330 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2331 s, dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2332 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2333 s,^.*$,cached_files=",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2334 n
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2335 ta
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2336 :a
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2337 s,^\]).*$,",
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2338 tb
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2339 p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2340 n
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2341 ba
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2342 :b
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2343 p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2344 }'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2345 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-comp.m4`
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2346 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2347 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2348
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2349 # Merge the cached settings with the specified ones.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2350 # The m4base must be the same as expected from the pathname.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2351 if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2352 func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2353 fi
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2354 # The local_gnulib_dir defaults to the cached one. Recall that the cached one
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2355 # is relative to $destdir, whereas the one we use is relative to . or absolute.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2356 if test -z "$local_gnulib_dir"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2357 if test -n "$cached_local_gnulib_dir"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2358 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2359 /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2360 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2361 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2362 case "$cached_local_gnulib_dir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2363 /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2364 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2365 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2366 func_relconcat "$destdir" "$cached_local_gnulib_dir"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2367 local_gnulib_dir="$relconcat" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2368 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2369 esac
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2370 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2371 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2372 # Append the cached and the specified module names. So that
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2373 # "gnulib-tool --import foo" means to add the module foo.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2374 specified_modules="$cached_specified_modules $1"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2375 # Append the cached and the specified avoidlist. This is probably better
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2376 # than dropping the cached one when --avoid is specified at least once.
9086 110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	2377 avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done \| LC_ALL=C sort -u`
110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	2378 avoidlist=`echo $avoidlist`
110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	2379
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2380 # The sourcebase defaults to the cached one.
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2381 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2382 sourcebase="$cached_sourcebase"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2383 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2384 func_fatal_error "missing --source-base option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2385 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2386 fi
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2387 # The pobase defaults to the cached one.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2388 if test -z "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2389 pobase="$cached_pobase"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2390 fi
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2391 # The docbase defaults to the cached one.
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2392 if test -z "$docbase"; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2393 docbase="$cached_docbase"
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2394 if test -z "$docbase"; then
7076 0e471c8eb020 Tweak error message about missing --doc-base. Bruno Haible <bruno@clisp.org> parents: 7073 diff changeset	2395 func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --import' is before that date, you need to run 'gnulib-tool --import' once, with a --doc-base option."
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2396 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2397 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2398 # The testsbase defaults to the cached one.
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2399 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2400 testsbase="$cached_testsbase"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2401 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2402 func_fatal_error "missing --tests-base option"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2403 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2404 fi
8890 576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2405 # Require the tests if specified either way.
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2406 if test -z "$inctests"; then
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2407 inctests="$cached_inctests"
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2408 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2409 # The libname defaults to the cached one.
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2410 if test -z "$supplied_libname"; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2411 libname="$cached_libname"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2412 if test -z "$libname"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2413 func_fatal_error "missing --lib option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2414 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2415 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2416 # Require LGPL if specified either way.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2417 if test -z "$lgpl"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2418 lgpl="$cached_lgpl"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2419 fi
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2420 # The makefile_name defaults to the cached one.
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2421 if test -z "$makefile_name"; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2422 makefile_name="$cached_makefile_name"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2423 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2424 # Use libtool if specified either way, or if guessed.
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2425 if test -z "$libtool"; then
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2426 if test -n "$cached_m4base"; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2427 libtool="$cached_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2428 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2429 libtool="$guessed_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2430 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2431 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2432 # The macro_prefix defaults to the cached one.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2433 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2434 macro_prefix="$cached_macro_prefix"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2435 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2436 func_fatal_error "missing --macro-prefix option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2437 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2438 fi
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2439 # The po_domain defaults to the cached one.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2440 if test -z "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2441 po_domain="$cached_po_domain"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2442 fi
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2443 # The vc_files defaults to the cached one.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2444 if test -z "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2445 vc_files="$cached_vc_files"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2446 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2447
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2448 # Canonicalize the list of specified modules.
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	2449 specified_modules=`for m in $specified_modules; do echo $m; done \| LC_ALL=C sort -u`
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2450
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2451 # Determine final module list.
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2452 modules="$specified_modules"
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2453 func_modules_transitive_closure
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2454 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2455 echo "Module list with included dependencies:"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2456 echo "$modules" \| sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2457 fi
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2458 final_modules="$modules"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2459
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2460 # Determine main module list and tests-related module list separately.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2461 # The main module list is the transitive closure of the specified modules,
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2462 # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2463 # is specified, it will consist only of LGPLed source.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2464 # The tests-related module list is the transitive closure of the specified
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2465 # modules, including tests modules, minus the main module list. Its lib/*
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2466 # sources (brought in through dependencies of *-tests modules) go into
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2467 # $testsbase/. It may contain GPLed source, even if --lgpl is specified.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2468 # Determine main module list.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2469 saved_inctests="$inctests"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2470 inctests=""
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2471 modules="$specified_modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2472 func_modules_transitive_closure
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2473 main_modules="$modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2474 inctests="$saved_inctests"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2475 if test $verbose -ge 1; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2476 echo "Main module list:"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2477 echo "$main_modules" \| sed -e 's/^/ /'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2478 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2479 # Determine tests-related module list.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2480 echo "$final_modules" \| LC_ALL=C sort -u > "$tmp"/final-modules
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	2481 testsrelated_modules=`func_reset_sigpipe; echo "$main_modules" \| LC_ALL=C sort -u \| LC_ALL=C join -v 2 - "$tmp"/final-modules`
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2482 if test $verbose -ge 1; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2483 echo "Tests-related module list:"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2484 echo "$testsrelated_modules" \| sed -e 's/^/ /'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2485 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2486
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2487 # Add the dummy module to the main module list if needed.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2488 modules="$main_modules"
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	2489 func_modules_add_dummy
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2490 main_modules="$modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2491
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2492 # Determine whether a $testsbase/libtests.a is needed.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2493 use_libtests=false
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2494 for module in $testsrelated_modules; do
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2495 func_verify_nontests_module
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2496 if test -n "$module"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2497 all_files=`func_get_filelist $module`
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2498 lib_files=`for f in $all_files; do \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2499 case $f in \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2500 lib/*) echo $f ;; \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2501 esac; \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2502 done \| sed -e 's,^lib/,,'`
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2503 if test -n "$lib_files"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2504 use_libtests=true
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2505 break
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2506 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2507 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2508 done
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2509
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2510 # Add the dummy module to the tests-related module list if needed.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2511 if $use_libtests; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2512 modules="$testsrelated_modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2513 func_modules_add_dummy
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2514 testsrelated_modules="$modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2515 fi
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	2516
7235 3dbbe645b976 * MODULES.html.sh (Support for building documentation): Add gpl, lgpl. Paul Eggert <eggert@cs.ucla.edu> parents: 7222 diff changeset	2517 # If --lgpl, verify that the licenses of modules are compatible.
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2518 if test -n "$lgpl"; then
10479 74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2519 license_incompatibilities=
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2520 for module in $main_modules; do
5346 40f5d74050d5 Use func_get_license. Bruno Haible <bruno@clisp.org> parents: 5345 diff changeset	2521 license=`func_get_license $module`
5963 6fb8c48c4dcd * gnulib-tool (func_import): Add support for 'public domain' license. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	2522 case $license in
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2523 'GPLed build tool') ;;
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2524 'public domain' \| 'unlimited' \| 'unmodifiable license text') ;;
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2525 *)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2526 case "$lgpl" in
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2527 yes \| 3)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2528 case $license in
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2529 LGPL \| LGPLv2+) ;;
10479 74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2530 *) func_append license_incompatibilities "$module $license$nl" ;;
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2531 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2532 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2533 2)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2534 case $license in
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2535 LGPLv2+) ;;
10479 74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2536 *) func_append license_incompatibilities "$module $license$nl" ;;
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2537 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2538 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2539 *) func_fatal_error "invalid value lgpl=$lgpl" ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2540 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2541 ;;
5963 6fb8c48c4dcd * gnulib-tool (func_import): Add support for 'public domain' license. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	2542 esac
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2543 done
10479 74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2544 if test -n "$license_incompatibilities"; then
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2545 # Format the license incompatibilities as a table.
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2546 sed_expand_column1_width50_indent17='s,^$[^ ]*$ ,\1 ,
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2547 s,^$.................................................[^ ]$ , \1 ,'
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2548 license_incompatibilities=`echo "$license_incompatibilities" \| sed -e "$sed_expand_column1_width50_indent17"`
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2549 func_fatal_error "incompatible license on modules:$nl$license_incompatibilities"
74885eaea206 Report all license incompatibilities during --import. Bruno Haible <bruno@clisp.org> parents: 10478 diff changeset	2550 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2551 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2552
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	2553 # Show banner notice of every module.
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2554 modules="$main_modules"
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	2555 func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	2556
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2557 # Determine script to apply to imported library files.
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2558 sed_transform_lib_file=
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2559 for module in $main_modules; do
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2560 if test $module = config-h; then
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2561 # Assume config.h exists, and that -DHAVE_CONFIG_H is omitted.
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2562 sed_transform_lib_file=$sed_transform_lib_file'
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2563 s/^#ifdef[ ]HAVE_CONFIG_H[ ]$/#if 1/
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2564 '
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2565 break
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2566 fi
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	2567 done
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2568 sed_transform_main_lib_file="$sed_transform_lib_file"
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2569 if test -n "$do_copyrights"; then
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2570 if test -n "$lgpl"; then
7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2571 # Update license.
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2572 case "$lgpl" in
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2573 yes \| 3)
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2574 sed_transform_main_lib_file=$sed_transform_main_lib_file'
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2575 s/GNU General/GNU Lesser General/g
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2576 '
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2577 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2578 2)
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2579 sed_transform_main_lib_file=$sed_transform_main_lib_file'
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2580 s/GNU General/GNU Lesser General/g
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2581 s/version [23]$[ ,]$/version 2.1\1/g
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2582 '
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2583 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2584 *) func_fatal_error "invalid value lgpl=$lgpl" ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2585 esac
9424 d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2586 else
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2587 # Update license.
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2588 sed_transform_main_lib_file=$sed_transform_main_lib_file'
9424 d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2589 s/GNU Lesser General/GNU General/g
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2590 s/GNU Library General/GNU General/g
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2591 s/version $2\\|2\.1$$[ ,]$/version 3\2/g
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+. Bruno Haible <bruno@clisp.org> parents: 9417 diff changeset	2592 '
9096 7f1880b27b89 New gnulib-tool option --more-symlinks. Bruno Haible <bruno@clisp.org> parents: 9090 diff changeset	2593 fi
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2594 fi
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	2595
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2596 # Determine script to apply to library files that go into $testsbase/.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2597 sed_transform_testsrelated_lib_file="$sed_transform_lib_file"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2598 if test -n "$do_copyrights"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2599 # Update license.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2600 sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2601 s/GNU Lesser General/GNU General/g
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2602 s/GNU Library General/GNU General/g
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2603 s/version $2\\|2\.1$$[ ,]$/version 3\2/g
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2604 '
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2605 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2606
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2607 # Determine the final file lists.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2608 # They must be computed separately, because files in lib/* go into
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2609 # $sourcebase/ if they are in the main file list but into $testsbase/
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2610 # if they are in the tests-related file list. Furthermore lib/dummy.c
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2611 # can be in both.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2612 # Determine final main file list.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2613 modules="$main_modules"
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	2614 func_modules_to_filelist
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2615 main_files="$files"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2616 # Determine final tests-related file list.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2617 modules="$testsrelated_modules"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2618 func_modules_to_filelist
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2619 testsrelated_files=`echo "$files" \| sed -e 's,^lib/,tests=lib/,'`
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2620 # Merge both file lists.
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2621 sed_remove_empty_lines='/^$/d'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2622 files=`{ echo "$main_files"; echo "$testsrelated_files"; } \| sed -e "$sed_remove_empty_lines" \| LC_ALL=C sort -u`
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2623 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2624 echo "File list:"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2625 sed_prettyprint_files='s,^tests=lib/$.*$$,lib/\1 -> tests/\1,'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2626 echo "$files" \| sed -e "$sed_prettyprint_files" -e 's/^/ /'
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	2627 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2628
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2629 test -n "$files" \
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2630 \|\| func_fatal_error "refusing to do nothing"
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2631
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2632 # Add m4/gnulib-tool.m4 to the file list. It is not part of any module.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2633 new_files="$files m4/gnulib-tool.m4"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2634 old_files="$cached_files"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2635 if test -f "$destdir"/$m4base/gnulib-tool.m4; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2636 func_append old_files " m4/gnulib-tool.m4"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2637 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2638
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2639 sed_rewrite_old_files="\
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2640 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2641 s,^doc/,$cached_docbase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2642 s,^lib/,$cached_sourcebase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2643 s,^m4/,$cached_m4base/,
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2644 s,^tests/,$cached_testsbase/,
9807 24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	2645 s,^tests=lib/,$cached_testsbase/,
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	2646 s,^top/,,"
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2647 sed_rewrite_new_files="\
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2648 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2649 s,^doc/,$docbase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2650 s,^lib/,$sourcebase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2651 s,^m4/,$m4base/,
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2652 s,^tests/,$testsbase/,
9807 24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	2653 s,^tests=lib/,$testsbase/,
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	2654 s,^top/,,"
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2655
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2656 # Create directories.
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2657 { echo "$sourcebase"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2658 echo "$m4base"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2659 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2660 echo "$pobase"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2661 fi
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2662 docfiles=`echo "$files" \| sed -n -e 's,^doc/,,p'`
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2663 if test -n "$docfiles"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2664 echo "$docbase"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2665 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2666 if test -n "$inctests"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2667 echo "$testsbase"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2668 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2669 echo "$auxdir"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2670 for f in $files; do echo $f; done \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2671 \| sed -e "$sed_rewrite_new_files" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2672 \| sed -n -e 's,^$.$/[^/],\1,p' \
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2673 \| LC_ALL=C sort -u
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2674 } > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2675 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2676 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2677 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2678 while read d; do
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2679 if test ! -d "$destdir/$d"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2680 if $doit; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2681 echo "Creating directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2682 mkdir -p "$destdir/$d" \|\| func_fatal_error "failed"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2683 else
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2684 echo "Create directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2685 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2686 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2687 done
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2688 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2689 }
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2690
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2691 # func_dest_tmpfilename file
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2692 # determines the name of a temporary file (file is relative to destdir).
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2693 # Sets variable:
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2694 # - tmpfile absolute filename of the temporary file
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2695 func_dest_tmpfilename ()
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2696 {
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2697 if $doit; then
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2698 # Put the new contents of $file in a file in the same directory (needed
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2699 # to guarantee that an 'mv' to "$destdir/$file" works).
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2700 tmpfile="$destdir/$1.tmp"
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2701 else
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2702 # Put the new contents of $file in a file in a temporary directory
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2703 # (because the directory of "$file" might not exist).
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2704 tmpfile="$tmp"/`basename "$1"`.tmp
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2705 fi
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2706 }
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2707
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2708 # Copy files or make symbolic links. Remove obsolete files.
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	2709 added_files=''
ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	2710 removed_files=''
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2711 delimiter=' '
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2712 # Construct a table with 2 columns: rewritten-file-name original-file-name,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2713 # representing the files according to the last gnulib-tool invocation.
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2714 for f in $old_files; do echo $f; done \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2715 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_old_files" \
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2716 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2717 > "$tmp"/old-files
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2718 # Construct a table with 2 columns: rewritten-file-name original-file-name,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2719 # representing the files after this gnulib-tool invocation.
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2720 for f in $new_files; do echo $f; done \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2721 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" \
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2722 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2723 > "$tmp"/new-files
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2724 # First the files that are in old-files, but not in new-files:
6595 0c67f1400c5b Fix portability problem to Solaris 9 sh. Bruno Haible <bruno@clisp.org> parents: 6581 diff changeset	2725 sed_take_first_column='s,'"$delimiter"'.*,,'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2726 for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files \| sed -e "$sed_take_first_column"`; do
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2727 # Remove the file. Do nothing if the user already removed it.
9168 9b8032e2af0c Care about dangling symbolic links. Bruno Haible <bruno@clisp.org> parents: 9167 diff changeset	2728 if test -f "$destdir/$g" \|\| test -h "$destdir/$g"; then
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2729 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2730 echo "Removing file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2731 mv -f "$destdir/$g" "$destdir/${g}~" \|\| func_fatal_error "failed"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2732 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2733 echo "Remove file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2734 fi
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	2735 func_append removed_files "$g$nl"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2736 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2737 done
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2738 # func_add_or_update handles a file that ought to be present afterwards.
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2739 # Uses parameters
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2740 # - f the original file name
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2741 # - g the rewritten file name
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2742 # - already_present nonempty if the file already exists, empty otherwise
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2743 func_add_or_update ()
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2744 {
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2745 of="$f"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2746 case "$f" in
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2747 tests=lib/*) f=`echo "$f" \| sed -e 's,^tests=lib/,lib/,'` ;;
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2748 esac
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2749 func_dest_tmpfilename "$g"
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2750 func_lookup_file "$f"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2751 cp "$lookedup_file" "$tmpfile" \|\| func_fatal_error "failed"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2752 if test -n "$sed_transform_main_lib_file"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2753 case "$of" in
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2754 lib/*)
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2755 sed -e "$sed_transform_main_lib_file" \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2756 < "$lookedup_file" > "$tmpfile" \|\| func_fatal_error "failed"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2757 ;;
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2758 esac
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2759 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2760 if test -n "$sed_transform_testsrelated_lib_file"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2761 case "$of" in
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2762 tests=lib/*)
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2763 sed -e "$sed_transform_testsrelated_lib_file" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2764 < "$lookedup_file" > "$tmpfile" \|\| func_fatal_error "failed"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2765 ;;
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2766 esac
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	2767 fi
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2768 if test -f "$destdir/$g"; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2769 # The file already exists.
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2770 if cmp "$destdir/$g" "$tmpfile" > /dev/null; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2771 : # The file has not changed.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2772 else
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2773 # Replace the file.
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2774 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2775 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2776 echo "Updating file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2777 else
9875 44146d346042 gnulib-tool (func_add_or_update): s/backuped/backed up/ in diagnostic Jim Meyering <meyering@redhat.com> parents: 9810 diff changeset	2778 echo "Replacing file $g (non-gnulib code backed up in ${g}~) !!"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2779 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2780 mv -f "$destdir/$g" "$destdir/${g}~" \|\| func_fatal_error "failed"
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2781 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2782 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2783 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2784 && test -z "$lookedup_tmp" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2785 && cmp "$lookedup_file" "$tmpfile" > /dev/null; then
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2786 func_ln_if_changed "$lookedup_file" "$destdir/$g"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2787 else
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2788 mv -f "$tmpfile" "$destdir/${g}" \|\| func_fatal_error "failed"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2789 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2790 else
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2791 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2792 echo "Update file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2793 else
9875 44146d346042 gnulib-tool (func_add_or_update): s/backuped/backed up/ in diagnostic Jim Meyering <meyering@redhat.com> parents: 9810 diff changeset	2794 echo "Replace file $g (non-gnulib code backed up in ${g}~) !!"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2795 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2796 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2797 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2798 else
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2799 # Install the file.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2800 # Don't protest if the file should be there but isn't: it happens
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2801 # frequently that developers don't put autogenerated files into CVS.
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2802 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2803 echo "Copying file $g"
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2804 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2805 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2806 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2807 && test -z "$lookedup_tmp" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2808 && cmp "$lookedup_file" "$tmpfile" > /dev/null; then
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2809 func_ln_if_changed "$lookedup_file" "$destdir/$g"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2810 else
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2811 mv -f "$tmpfile" "$destdir/${g}" \|\| func_fatal_error "failed"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2812 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2813 else
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2814 echo "Copy file $g"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2815 fi
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	2816 func_append added_files "$g$nl"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2817 fi
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2818 rm -f "$tmpfile"
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2819 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2820 # Then the files that are in new-files, but not in old-files:
6595 0c67f1400c5b Fix portability problem to Solaris 9 sh. Bruno Haible <bruno@clisp.org> parents: 6581 diff changeset	2821 sed_take_last_column='s,^.*'"$delimiter"',,'
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2822 already_present=
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2823 LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2824 \| sed -e "$sed_take_last_column" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2825 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/added-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2826 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2827 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	2828 exec 5<&0 < "$tmp"/added-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2829 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2830 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2831 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	2832 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2833 }
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2834 # Then the files that are in new-files and in old-files:
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	2835 already_present=true
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2836 LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2837 \| sed -e "$sed_take_last_column" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	2838 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/kept-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2839 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2840 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	2841 exec 5<&0 < "$tmp"/kept-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2842 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2843 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2844 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	2845 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2846 }
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2847
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2848 # Command-line invocation printed in a comment in generated gnulib-cache.m4.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2849 actioncmd="gnulib-tool --import"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2850 func_append actioncmd " --dir=$destdir"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2851 if test -n "$local_gnulib_dir"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2852 func_append actioncmd " --local-dir=$local_gnulib_dir"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	2853 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2854 func_append actioncmd " --lib=$libname"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2855 func_append actioncmd " --source-base=$sourcebase"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2856 func_append actioncmd " --m4-base=$m4base"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2857 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2858 func_append actioncmd " --po-base=$pobase"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2859 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2860 func_append actioncmd " --doc-base=$docbase"
10475 b80084824a77 Store the --tests-base option in the comment in gnulib-cache.m4. Yoann Vandoorselaere <yoann.v@prelude-ids.com> parents: 10453 diff changeset	2861 func_append actioncmd " --tests-base=$testsbase"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2862 func_append actioncmd " --aux-dir=$auxdir"
8890 576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2863 if test -n "$inctests"; then
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2864 func_append actioncmd " --with-tests"
576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	2865 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2866 for module in $avoidlist; do
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2867 func_append actioncmd " --avoid=$module"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2868 done
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2869 if test -n "$lgpl"; then
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2870 if test "$lgpl" = yes; then
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2871 func_append actioncmd " --lgpl"
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2872 else
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2873 func_append actioncmd " --lgpl=$lgpl"
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	2874 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2875 fi
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2876 if test -n "$makefile_name"; then
7600 42c51a6fef88 Fix typo in actioncmd. From Charles WIlson. Bruno Haible <bruno@clisp.org> parents: 7599 diff changeset	2877 func_append actioncmd " --makefile-name=$makefile_name"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2878 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2879 if test "$libtool" = true; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2880 func_append actioncmd " --libtool"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2881 else
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2882 func_append actioncmd " --no-libtool"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2883 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2884 func_append actioncmd " --macro-prefix=$macro_prefix"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2885 if test -n "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2886 func_append actioncmd " --po-domain=$po_domain"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2887 fi
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2888 if test -n "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2889 if test "$vc_files" = true; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2890 func_append actioncmd " --vc-files"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2891 else
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2892 func_append actioncmd " --no-vc-files"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2893 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	2894 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2895 func_append actioncmd " `echo $specified_modules`"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2896
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2897 # Default the makefile name to Makefile.am.
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2898 if test -n "$makefile_name"; then
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2899 makefile_am=$makefile_name
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2900 else
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2901 makefile_am=Makefile.am
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2902 fi
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2903
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2904 # Create normal Makefile.ams.
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2905 for_test=false
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	2906
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2907 # Setup list of Makefile.am edits that are to be performed afterwards.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2908 # Some of these edits apply to files that we will generate; others are
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2909 # under the responsibility of the developer.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2910 makefile_am_edits=0
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2911 # func_note_Makefile_am_edit dir var value
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2912 # remembers that ${dir}Makefile.am needs to be edited to that ${var} mentions
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2913 # ${value}.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2914 func_note_Makefile_am_edit ()
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2915 {
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2916 makefile_am_edits=`expr $makefile_am_edits + 1`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2917 eval makefile_am_edit${makefile_am_edits}_dir=\"\$1\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2918 eval makefile_am_edit${makefile_am_edits}_var=\"\$2\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2919 eval makefile_am_edit${makefile_am_edits}_val=\"\$3\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2920 }
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2921 if test "$makefile_am" = Makefile.am; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2922 sourcebase_dir=`echo "$sourcebase" \| sed -n -e 's,/[^/]*$,/,p'`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2923 sourcebase_base=`basename "$sourcebase"`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2924 func_note_Makefile_am_edit "$sourcebase_dir" SUBDIRS "$sourcebase_base"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2925 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2926 if test -n "$pobase"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2927 pobase_dir=`echo "$pobase" \| sed -n -e 's,/[^/]*$,/,p'`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2928 pobase_base=`basename "$pobase"`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2929 func_note_Makefile_am_edit "$pobase_dir" SUBDIRS "$pobase_base"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2930 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2931 if test -n "$inctests"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2932 if test "$makefile_am" = Makefile.am; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2933 testsbase_dir=`echo "$testsbase" \| sed -n -e 's,/[^/]*$,/,p'`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2934 testsbase_base=`basename "$testsbase"`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2935 func_note_Makefile_am_edit "$testsbase_dir" SUBDIRS "$testsbase_base"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2936 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2937 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2938 func_note_Makefile_am_edit "" ACLOCAL_AMFLAGS "-I ${m4base}"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2939 {
10478 569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2940 # Find the first parent directory of $m4base that contains or will contain
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2941 # a Makefile.am.
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2942 sed_last='s,^./$[^/][^/]$//*$,\1/,
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2943 s,//*$,/,'
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2944 sed_butlast='s,[^/][^/]//$,,'
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2945 dir1="${m4base}/"; dir2=""
10478 569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2946 while test -n "$dir1" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2947 && ! { test -f "${destdir}/${dir1}Makefile.am" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2948 \|\| test "${dir1}Makefile.am" = "$sourcebase/$makefile_am" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2949 \|\| test "./${dir1}Makefile.am" = "$sourcebase/$makefile_am" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2950 \|\| { test -n "$inctests" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2951 && { test "${dir1}Makefile.am" = "$testsbase/$makefile_am" \
569d6cd01c90 Oops, tweak last commit so that it also works in the first gnulib-tool run. Bruno Haible <bruno@clisp.org> parents: 10476 diff changeset	2952 \|\| test "./${dir1}Makefile.am" = "$testsbase/$makefile_am"; }; }; }; do
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2953 dir2=`echo "$dir1" \| sed -e "$sed_last"`"$dir2"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2954 dir1=`echo "$dir1" \| sed -e "$sed_butlast"`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2955 done
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2956 func_note_Makefile_am_edit "$dir1" EXTRA_DIST "${dir2}gnulib-cache.m4"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2957 }
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2958
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2959 # Create library makefile.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2960 func_dest_tmpfilename $sourcebase/$makefile_am
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	2961 destfile="$sourcebase/$makefile_am"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	2962 modules="$main_modules"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2963 func_emit_lib_Makefile_am > "$tmpfile"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2964 if test -f "$destdir"/$sourcebase/$makefile_am; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2965 if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2966 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2967 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2968 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2969 echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2970 mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2971 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2972 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2973 echo "Update $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2974 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2975 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2976 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2977 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2978 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2979 echo "Creating $sourcebase/$makefile_am"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2980 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2981 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2982 echo "Create $sourcebase/$makefile_am"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2983 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2984 fi
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	2985 func_append added_files "$sourcebase/$makefile_am$nl"
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	2986 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2987
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2988 # Create po/ directory.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2989 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2990 # Create po makefile and auxiliary files.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2991 for file in Makefile.in.in remove-potcdate.sin; do
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2992 func_dest_tmpfilename $pobase/$file
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2993 func_lookup_file build-aux/po/$file
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2994 cat "$lookedup_file" > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2995 if test -f "$destdir"/$pobase/$file; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2996 if cmp "$destdir"/$pobase/$file "$tmpfile" > /dev/null; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2997 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2998 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	2999 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3000 echo "Updating $pobase/$file (backup in $pobase/$file~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3001 mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3002 mv -f "$tmpfile" "$destdir"/$pobase/$file
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3003 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3004 echo "Update $pobase/$file (backup in $pobase/$file~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3005 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3006 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3007 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3008 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3009 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3010 echo "Creating $pobase/$file"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3011 mv -f "$tmpfile" "$destdir"/$pobase/$file
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3012 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3013 echo "Create $pobase/$file"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3014 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3015 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3016 func_append added_files "$pobase/$file$nl"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3017 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3018 done
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	3019 # Create po makefile parameterization, part 1.
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3020 func_dest_tmpfilename $pobase/Makevars
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3021 func_emit_po_Makevars > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3022 if test -f "$destdir"/$pobase/Makevars; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3023 if cmp "$destdir"/$pobase/Makevars "$tmpfile" > /dev/null; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3024 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3025 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3026 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3027 echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3028 mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3029 mv -f "$tmpfile" "$destdir"/$pobase/Makevars
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3030 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3031 echo "Update $pobase/Makevars (backup in $pobase/Makevars~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3032 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3033 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3034 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3035 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3036 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3037 echo "Creating $pobase/Makevars"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3038 mv -f "$tmpfile" "$destdir"/$pobase/Makevars
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3039 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3040 echo "Create $pobase/Makevars"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3041 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3042 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3043 func_append added_files "$pobase/Makevars$nl"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3044 fi
10065 e1449fcc7ecb * gnulib-tool: Fix various comment typos. Eric Blake <ebb9@byu.net> parents: 9887 diff changeset	3045 # Create po makefile parameterization, part 2.
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3046 func_dest_tmpfilename $pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3047 func_emit_po_POTFILES_in > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3048 if test -f "$destdir"/$pobase/POTFILES.in; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3049 if cmp "$destdir"/$pobase/POTFILES.in "$tmpfile" > /dev/null; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3050 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3051 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3052 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3053 echo "Updating $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3054 mv -f "$destdir"/$pobase/POTFILES.in "$destdir"/$pobase/POTFILES.in~
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3055 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3056 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3057 echo "Update $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3058 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3059 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3060 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3061 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3062 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3063 echo "Creating $pobase/POTFILES.in"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3064 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3065 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3066 echo "Create $pobase/POTFILES.in"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3067 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3068 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3069 func_append added_files "$pobase/POTFILES.in$nl"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3070 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3071 # Fetch PO files.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3072 TP_URL="http://translationproject.org/latest/"
9187 9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3073 TP_RSYNC_URI="translationproject.org::tp/latest/"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3074 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3075 echo "Fetching gnulib PO files from $TP_URL"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3076 (cd "$destdir"/$pobase \
9187 9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3077 && { # Prefer rsync over wget if it is available, since it consumes
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3078 # less network bandwidth, due to compression.
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3079 if type rsync 2>/dev/null \| grep / > /dev/null; then
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3080 rsync -Lrtz "${TP_RSYNC_URI}gnulib/" .
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3081 else
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3082 wget --quiet -r -l1 -nd -np -A.po "${TP_URL}gnulib"
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3083 fi
9d2d1cd46644 Prefer rsync over wget when available. Bruno Haible <bruno@clisp.org> parents: 9168 diff changeset	3084 }
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3085 )
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3086 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3087 echo "Fetch gnulib PO files from $TP_URL"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3088 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3089 # Create po/LINGUAS.
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3090 if $doit; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3091 func_dest_tmpfilename $pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3092 (cd "$destdir"/$pobase \
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3093 && { echo '# Set of available languages.'
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3094 LC_ALL=C ls -1 *.po \| sed -e 's,\.po$,,'
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3095 }
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3096 ) > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3097 if test -f "$destdir"/$pobase/LINGUAS; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3098 if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3099 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3100 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3101 echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3102 mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3103 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3104 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3105 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3106 echo "Creating $pobase/LINGUAS"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3107 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3108 func_append added_files "$pobase/LINGUAS$nl"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3109 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3110 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3111 if test -f "$destdir"/$pobase/LINGUAS; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3112 echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3113 else
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3114 echo "Create $pobase/LINGUAS"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3115 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3116 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3117 fi
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3118
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3119 # Create m4/gnulib-cache.m4.
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3120 func_dest_tmpfilename $m4base/gnulib-cache.m4
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3121 (
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	3122 func_emit_copyright_notice
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3123 echo "#"
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3124 echo "# This file represents the specification of how gnulib-tool is used."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3125 echo "# It acts as a cache: It is written and read by gnulib-tool."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3126 echo "# In projects using CVS, this file is meant to be stored in CVS,"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3127 echo "# like the configure.ac and various Makefile.am files."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3128 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3129 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3130 echo "# Specification in the form of a command-line invocation:"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3131 echo "# $actioncmd"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3132 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3133 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3134 # Store the local_gnulib_dir relative to destdir.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3135 case "$local_gnulib_dir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3136 "" \| /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3137 relative_local_gnulib_dir="$local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3138 * )
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3139 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3140 /*) relative_local_gnulib_dir="$local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3141 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3142 # destdir, local_gnulib_dir are both relative.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3143 func_relativize "$destdir" "$local_gnulib_dir"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3144 relative_local_gnulib_dir="$reldir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3145 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3146 esac
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	3147 echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])"
10246 50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	3148 echo "gl_MODULES(["
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	3149 echo "$specified_modules" \| sed 's/^/ /g'
50a9076d476d Make gnulib-cache.m4 easier to diff. Eric Blake <ebb9@byu.net> parents: 10157 diff changeset	3150 echo "])"
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3151 echo "gl_AVOID([$avoidlist])"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3152 echo "gl_SOURCE_BASE([$sourcebase])"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3153 echo "gl_M4_BASE([$m4base])"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3154 echo "gl_PO_BASE([$pobase])"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	3155 echo "gl_DOC_BASE([$docbase])"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3156 echo "gl_TESTS_BASE([$testsbase])"
8890 576d3e4f31c2 Remember the presence of the --with-tests command-line option through Bruno Haible <bruno@clisp.org> parents: 8672 diff changeset	3157 test -z "$inctests" \|\| echo "gl_WITH_TESTS"
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3158 echo "gl_LIB([$libname])"
9417 95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3159 if test -n "$lgpl"; then
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3160 if test "$lgpl" = yes; then
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3161 echo "gl_LGPL"
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3162 else
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3163 echo "gl_LGPL([$lgpl])"
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3164 fi
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3. Bruno Haible <bruno@clisp.org> parents: 9377 diff changeset	3165 fi
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3166 echo "gl_MAKEFILE_NAME([$makefile_name])"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3167 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3168 echo "gl_LIBTOOL"
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3169 fi
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3170 echo "gl_MACRO_PREFIX([$macro_prefix])"
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3171 echo "gl_PO_DOMAIN([$po_domain])"
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3172 if test -n "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3173 echo "gl_VC_FILES([$vc_files])"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3174 fi
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3175 ) > "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3176 if test -f "$destdir"/$m4base/gnulib-cache.m4; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3177 if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3178 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3179 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3180 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3181 echo "Updating $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3182 mv -f "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4~
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3183 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3184 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3185 echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3186 if false; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3187 cat "$tmpfile"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3188 echo
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3189 echo "# gnulib-cache.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3190 fi
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3191 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3192 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3193 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3194 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3195 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3196 echo "Creating $m4base/gnulib-cache.m4"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3197 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3198 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3199 echo "Create $m4base/gnulib-cache.m4"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3200 cat "$tmpfile"
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3201 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3202 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3203 fi
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3204
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3205 # Create m4/gnulib-comp.m4.
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3206 func_dest_tmpfilename $m4base/gnulib-comp.m4
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3207 (
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	3208 echo "# DO NOT EDIT! GENERATED AUTOMATICALLY!"
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	3209 func_emit_copyright_notice
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3210 echo "#"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3211 echo "# This file represents the compiled summary of the specification in"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3212 echo "# gnulib-cache.m4. It lists the computed macro invocations that need"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3213 echo "# to be invoked from configure.ac."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3214 echo "# In projects using CVS, this file can be treated like other built files."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3215 echo
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3216 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3217 echo "# This macro should be invoked from $configure_ac, in the section"
2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3218 echo "# \"Checks for programs\", right after AC_PROG_CC, and certainly before"
2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3219 echo "# any checks for libraries, header files, types and library functions."
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	3220 echo "AC_DEFUN([${macro_prefix}_EARLY],"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3221 echo "["
7105 641bac73140c * gnulib-tool (func_import): Detect unexpanded macros in gnulib Eric Blake <ebb9@byu.net> parents: 7090 diff changeset	3222 echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3223 echo " m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3224 echo " m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3225 echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
6512 f8abe8d41137 RANLIB is needed. Bruno Haible <bruno@clisp.org> parents: 6464 diff changeset	3226 echo " AC_REQUIRE([AC_PROG_RANLIB])"
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3227 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3228 echo " AC_REQUIRE([AM_PROG_CC_C_O])"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3229 fi
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3230 if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
6179 76e367ba26d3 Avoid multiple copies of AC_GNU_SOURCE in the configure file. Bruno Haible <bruno@clisp.org> parents: 6178 diff changeset	3231 echo " AC_REQUIRE([AC_GNU_SOURCE])"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3232 fi
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3233 for module in $final_modules; do
8079 0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3234 func_verify_module
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3235 if test -n "$module"; then
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3236 func_get_autoconf_early_snippet "$module"
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3237 fi
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3238 done \
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3239 \| sed -e '/^$/d;' -e 's/^/ /'
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3240 echo "])"
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3241 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3242 echo "# This macro should be invoked from $configure_ac, in the section"
2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3243 echo "# \"Check for header files, types and library functions\"."
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	3244 echo "AC_DEFUN([${macro_prefix}_INIT],"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3245 echo "["
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3246 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3247 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3248 echo " gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3249 else
6512 f8abe8d41137 RANLIB is needed. Bruno Haible <bruno@clisp.org> parents: 6464 diff changeset	3250 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3251 echo " gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3252 echo " gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3253 echo " gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	3254 fi
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3255 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3256 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3257 :a
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3258 /AC_CONFIG_FILES(.:build-aux\/.)/{
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3259 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)\|
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3260 ba
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3261 }'
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3262 else
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	3263 sed_replace_build_aux="$sed_noop"
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3264 fi
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3265 func_emit_initmacro_start $macro_prefix
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3266 echo " gl_source_base='$sourcebase'"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3267 for module in $main_modules; do
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3268 func_verify_module
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3269 if test -n "$module"; then
6546 b32846b4d88d Replace build-aux when it occurs in the autoconf snippet. Bruno Haible <bruno@clisp.org> parents: 6533 diff changeset	3270 func_get_autoconf_snippet "$module" \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3271 \| sed -e '/^$/d;' -e 's/^/ /' \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3272 -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3273 -e "$sed_replace_build_aux"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3274 if test "$module" = 'alloca' && test "$libtool" = true; then
5356 144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	3275 echo 'changequote(,)dnl'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3276 echo 'LTALLOCA=`echo "$ALLOCA" \| sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
5356 144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	3277 echo 'changequote([, ])dnl'
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	3278 echo 'AC_SUBST([LTALLOCA])'
5356 144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	3279 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3280 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3281 done
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3282 func_emit_initmacro_end $macro_prefix
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3283 echo " gltests_libdeps="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3284 echo " gltests_ltlibdeps="
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3285 func_emit_initmacro_start ${macro_prefix}tests
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3286 echo " gl_source_base='$testsbase'"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3287 for module in $testsrelated_modules; do
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3288 func_verify_module
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3289 if test -n "$module"; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3290 func_get_autoconf_snippet "$module" \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3291 \| sed -e '/^$/d;' -e 's/^/ /' \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3292 -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3293 -e "$sed_replace_build_aux" \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3294 -e 's/\$gl_cond_libtool/false/g' \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3295 -e 's/gl_libdeps/gltests_libdeps/g' \
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3296 -e 's/gl_ltlibdeps/gltests_ltlibdeps/g'
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3297 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3298 done
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3299 func_emit_initmacro_end ${macro_prefix}tests
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3300 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3301 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3302 if test "$libtool" != true; then
9086 110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	3303 libname_upper=`echo "$libname" \| LC_ALL=C tr 'a-z-' 'A-Z_'`
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3304 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3305 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3306 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3307 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3308 fi
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3309 if $use_libtests; then
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3310 echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\""
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3311 echo " AC_SUBST([LIBTESTS_LIBDEPS])"
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3312 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3313 echo "])"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3314 func_emit_initmacro_done $macro_prefix $sourcebase
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3315 func_emit_initmacro_done ${macro_prefix}tests $testsbase
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3316 echo
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3317 echo "# This macro records the list of files which have been installed by"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3318 echo "# gnulib-tool and may be removed by future gnulib-tool invocations."
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3319 echo "AC_DEFUN([${macro_prefix}_FILE_LIST], ["
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3320 echo "$files" \| sed -e 's,^, ,'
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	3321 echo "])"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3322 ) > "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3323 if test -f "$destdir"/$m4base/gnulib-comp.m4; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3324 if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3325 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3326 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3327 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3328 echo "Updating $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3329 mv -f "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4~
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3330 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3331 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3332 echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3333 if false; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3334 cat "$tmpfile"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3335 echo
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3336 echo "# gnulib-comp.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	3337 fi
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3338 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3339 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3340 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3341 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3342 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3343 echo "Creating $m4base/gnulib-comp.m4"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3344 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3345 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	3346 echo "Create $m4base/gnulib-comp.m4"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3347 cat "$tmpfile"
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3348 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3349 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3350 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	3351
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3352 if test -n "$inctests"; then
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	3353 # Create tests makefile.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3354 func_dest_tmpfilename $testsbase/$makefile_am
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3355 destfile="$testsbase/$makefile_am"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3356 modules="$testsrelated_modules"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3357 func_emit_tests_Makefile_am > "$tmpfile"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3358 if test -f "$destdir"/$testsbase/$makefile_am; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3359 if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3360 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3361 else
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3362 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3363 echo "Updating $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3364 mv -f "$destdir"/$testsbase/$makefile_am "$destdir"/$testsbase/$makefile_am~
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3365 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3366 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3367 echo "Update $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3368 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3369 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3370 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3371 else
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3372 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3373 echo "Creating $testsbase/$makefile_am"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3374 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3375 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3376 echo "Create $testsbase/$makefile_am"
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	3377 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3378 fi
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3379 func_append added_files "$testsbase/$makefile_am$nl"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3380 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3381 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3382
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3383 if test "$vc_files" != false; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3384 # Update the .cvsignore and .gitignore files.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3385 { echo "$added_files" \| sed -e '/^$/d' -e 's,$[^/]*$$,\|A\|\1,'
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3386 echo "$removed_files" \| sed -e '/^$/d' -e 's,$[^/]*$$,\|R\|\1,'
10252 66f4295bd26d Put gnulib-comp.m4 into .cvsignore or .gitignore. Bruno Haible <bruno@clisp.org> parents: 10250 diff changeset	3387 # Treat gnulib-comp.m4 like an added file, even if it already existed.
66f4295bd26d Put gnulib-comp.m4 into .cvsignore or .gitignore. Bruno Haible <bruno@clisp.org> parents: 10250 diff changeset	3388 echo "$m4base/\|A\|gnulib-comp.m4"
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3389 } \| LC_ALL=C sort -t'\|' -k1,1 > "$tmp"/fileset-changes
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3390 { # Rearrange file descriptors. Needed because "while ... done < ..."
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3391 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3392 exec 5<&0 < "$tmp"/fileset-changes
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3393 func_update_ignorelist ()
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3394 {
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3395 ignore="$1"
10298 9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3396 if test "$ignore" = .gitignore; then
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3397 # In a .gitignore file, "foo" applies to the current directory and all
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3398 # subdirectories, whereas "/foo" applies to the current directory only.
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3399 anchor='/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3400 escaped_anchor='\/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3401 doubly_escaped_anchor='\\/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3402 else
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3403 anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3404 escaped_anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3405 doubly_escaped_anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3406 fi
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3407 if test -f "$destdir/$dir$ignore"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3408 if test -n "$dir_added" \|\| test -n "$dir_removed"; then
10298 9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3409 sed -e "s\|^$anchor\|\|" < "$destdir/$dir$ignore" \| LC_ALL=C sort > "$tmp"/ignore
10379 a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3410 (func_reset_sigpipe
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3411 echo "$dir_added" \| sed -e '/^$/d' \| LC_ALL=C sort -u \
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3412 \| LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-added
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3413 echo "$dir_removed" \| sed -e '/^$/d' \| LC_ALL=C sort -u \
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3414 \| LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-removed
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe". Bruno Haible <bruno@clisp.org> parents: 10298 diff changeset	3415 )
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3416 if test -s "$tmp"/ignore-added \|\| test -s "$tmp"/ignore-removed; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3417 if $doit; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3418 echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3419 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~
10298 9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3420 { sed -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3421 if test -n "$anchor"; then sed -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3422 } > "$tmp"/sed-ignore-removed
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3423 { cat "$destdir/$dir$ignore"~
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3424 sed -e "s\|^\|$anchor\|" < "$tmp"/ignore-added
9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3425 } \| sed -f "$tmp"/sed-ignore-removed \
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3426 > "$destdir/$dir$ignore"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3427 else
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3428 echo "Update $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3429 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3430 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3431 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3432 else
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3433 if test -n "$dir_added"; then
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3434 if $doit; then
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3435 echo "Creating $destdir/$dir$ignore"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3436 {
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3437 if test "$ignore" = .cvsignore; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3438 echo ".deps"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3439 # Automake generates Makefile rules that create .dirstamp files.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3440 echo ".dirstamp"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3441 fi
10298 9b0ceb24a573 Prepend each added line in .gitignore files with a slash. Bruno Haible <bruno@clisp.org> parents: 10293 diff changeset	3442 echo "$dir_added" \| sed -e '/^$/d' -e "s\|^\|$anchor\|" \| LC_ALL=C sort -u
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3443 } > "$destdir/$dir$ignore"
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3444 else
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3445 echo "Create $destdir/$dir$ignore"
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3446 fi
ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3447 fi
ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3448 fi
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3449 }
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3450 func_done_dir ()
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3451 {
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3452 dir="$1"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3453 dir_added="$2"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3454 dir_removed="$3"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3455 if test -d "$destdir/CVS" \|\| test -d "$destdir/${dir}CVS" \|\| test -f "$destdir/${dir}.cvsignore"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3456 func_update_ignorelist .cvsignore
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3457 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3458 if test -d "$destdir/.git" \|\| test -f "$destdir/${dir}.gitignore"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3459 func_update_ignorelist .gitignore
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3460 fi
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3461 }
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3462 last_dir=
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3463 last_dir_added=
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3464 last_dir_removed=
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3465 while read line; do
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3466 # Why not ''read next_dir op file'' ? Because the dir column can be empty.
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3467 next_dir=`echo "$line" \| sed -e 's,\|.*,,'`
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3468 op=`echo "$line" \| sed -e 's,^[^\|]\|$[^\|]$\|.*$,\1,'`
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3469 file=`echo "$line" \| sed -e 's,^[^\|]\|[^\|]\|,,'`
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3470 if test "$next_dir" != "$last_dir"; then
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3471 func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3472 last_dir="$next_dir"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3473 last_dir_added=
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3474 last_dir_removed=
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3475 fi
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3476 case $op in
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3477 A) func_append last_dir_added "$file$nl";;
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3478 R) func_append last_dir_removed "$file$nl";;
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3479 esac
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3480 done
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3481 func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed"
f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3482 exec 0<&5 5<&-
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3483 }
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3484 fi
8451 ba5ed28cb276 Update .cvsignore and .gitignore files. Bruno Haible <bruno@clisp.org> parents: 8432 diff changeset	3485
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3486 echo "Finished."
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3487 echo
5572 54000928a33d Print #include directives when --import'ing. Simon Josefsson <simon@josefsson.org> parents: 5527 diff changeset	3488 echo "You may need to add #include directives for the following .h files."
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3489 # Intersect $specified_modules and $main_modules
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3490 # (since $specified_modules is not necessarily of subset of $main_modules
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3491 # - some may have been skipped through --avoid, and since the elements of
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3492 # $main_modules but not in $specified_modules can go away without explicit
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3493 # notice - through changes in the module dependencies).
7721 ef2654457d79 Don't show the includes for modules that were not explicitly specified. Bruno Haible <bruno@clisp.org> parents: 7701 diff changeset	3494 echo "$specified_modules" > "$tmp"/modules1 # a sorted list, one module per line
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3495 echo "$main_modules" > "$tmp"/modules2 # also a sorted list, one module per line
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3496 # First the #include <...> directives without #ifs, sorted for convenience,
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3497 # then the #include "..." directives without #ifs, sorted for convenience,
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3498 # then the #include directives that are surrounded by #ifs. Not sorted.
7722 504e81510ee5 Fix 'join' invocation. Bruno Haible <bruno@clisp.org> parents: 7721 diff changeset	3499 for module in `LC_ALL=C join "$tmp"/modules1 "$tmp"/modules2`; do
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3500 include_directive=`func_get_include_directive "$module"`
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3501 case "$nl$include_directive" in
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3502 "$nl#if")
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3503 echo "$include_directive" 1>&5
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3504 ;;
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3505 *)
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3506 echo "$include_directive" \| grep -v 'include "' 1>&6
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3507 echo "$include_directive" \| grep 'include "' 1>&7
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3508 ;;
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3509 esac
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3510 done 5> "$tmp"/include-if 6> "$tmp"/include-angles 7> "$tmp"/include-quotes
6756 4d481eff340f Sort the #include directives more carefully. Bruno Haible <bruno@clisp.org> parents: 6750 diff changeset	3511 (
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3512 LC_ALL=C sort -u "$tmp"/include-angles
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3513 LC_ALL=C sort -u "$tmp"/include-quotes
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3514 cat "$tmp"/include-if
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3515 ) \| sed -e '/^$/d' -e 's/^/ /'
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3516 rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	3517
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3518 for module in $main_modules; do
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3519 func_get_link_directive "$module"
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3520 done \
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3521 \| LC_ALL=C sort -u \| sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3522 if test `wc -l < "$tmp"/link` != 0; then
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3523 echo
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3524 echo "You may need to use the following Makefile variables when linking."
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3525 echo "Use them in <program>_LDADD when linking a program, or"
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3526 echo "in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library."
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3527 cat "$tmp"/link
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3528 fi
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3529 rm -f "$tmp"/link
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	3530
5572 54000928a33d Print #include directives when --import'ing. Simon Josefsson <simon@josefsson.org> parents: 5527 diff changeset	3531 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	3532 echo "Don't forget to"
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	3533 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3534 echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3535 else
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3536 echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\","
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3537 fi
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3538 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3539 echo " - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac,"
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3540 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3541 if test -n "$inctests"; then
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	3542 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3543 echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3544 else
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3545 echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\","
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3546 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	3547 fi
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3548 edit=0
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3549 while test $edit != $makefile_am_edits; do
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3550 edit=`expr $edit + 1`
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3551 eval dir=\"\$makefile_am_edit${edit}_dir\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3552 eval var=\"\$makefile_am_edit${edit}_var\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3553 eval val=\"\$makefile_am_edit${edit}_val\"
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3554 if test -n "$var"; then
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3555 echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am,"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	3556 fi
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3557 done
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	3558 echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC,"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	3559 echo " - invoke ${macro_prefix}_INIT in $configure_ac."
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3560 }
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	3561
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3562 # func_create_testdir testdir modules
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	3563 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	3564 # - local_gnulib_dir from --local-dir
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	3565 # - auxdir directory relative to destdir where to place build aux files
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3566 func_create_testdir ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3567 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3568 testdir="$1"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3569 modules="$2"
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3570 if test -z "$modules"; then
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3571 # All modules together.
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3572 # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3573 # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
7533 029a26ecb19a Don't include ftruncate and mountlist by default. Bruno Haible <bruno@clisp.org> parents: 7530 diff changeset	3574 # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME.
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3575 modules=`func_all_modules`
10157 0c183af9efd5 Undo last commit, as it does not solve the problem entirely. Bruno Haible <bruno@clisp.org> parents: 10156 diff changeset	3576 modules=`for m in $modules; do case $m in config-h \| fnmatch-posix \| ftruncate \| mountlist) ;; *) echo $m;; esac; done`
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	3577 fi
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	3578 modules=`for m in $modules; do echo $m; done \| LC_ALL=C sort -u`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3579
7660 7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3580 # Check that the license of every module is consistent with the license of
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3581 # its dependencies.
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3582 saved_modules="$modules"
7896 cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3583 saved_inctests="$inctests"
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3584 # When computing transitive closures, don't consider $module to depend on
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3585 # $module-tests. Need this becauses tests are implicitly GPL and may depend
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3586 # on GPL modules - therefore we don't want a warning in this case.
cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3587 inctests=""
7660 7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3588 for requested_module in $saved_modules; do
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3589 requested_license=`func_get_license "$requested_module"`
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3590 if test "$requested_license" != GPL; then
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3591 # Here we use func_modules_transitive_closure, not just
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3592 # func_get_dependencies, so that we also detect weird situations like
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3593 # an LGPL module which depends on a GPLed build tool module which depends
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3594 # on a GPL module.
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3595 modules="$requested_module"
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3596 func_modules_transitive_closure
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3597 for module in $modules; do
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3598 license=`func_get_license "$module"`
9090 b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3599 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3600 'GPLed build tool') ;;
7660 7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3601 'public domain' \| 'unlimited' \| 'unmodifiable license text') ;;
9090 b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3602 *)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3603 case "$requested_license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3604 GPLv2+)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3605 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3606 GPLv2+ \| LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3607 *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3608 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3609 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3610 LGPL)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3611 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3612 LGPL \| LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3613 *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3614 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3615 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3616 LGPLv2+)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3617 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3618 LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3619 *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3620 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3621 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3622 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+". Bruno Haible <bruno@clisp.org> parents: 9086 diff changeset	3623 ;;
7660 7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3624 esac
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3625 done
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3626 fi
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3627 done
7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3628 modules="$saved_modules"
7896 cd3ed2fae0bf Tests modules are under GPL now. Bruno Haible <bruno@clisp.org> parents: 7872 diff changeset	3629 inctests="$saved_inctests"
7660 7aa6fbd6b3b7 Add license compatibility check in --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7647 diff changeset	3630
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3631 # Subdirectory names.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3632 sourcebase=gllib
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3633 m4base=glm4
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3634 pobase=
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3635 docbase=gldoc
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3636 testsbase=gltests
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3637 macro_prefix=gl
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	3638 po_domain=
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	3639 vc_files=
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3640
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3641 # Determine final module list.
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	3642 func_modules_transitive_closure
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3643 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3644 echo "Module list with included dependencies:"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3645 echo "$modules" \| sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3646 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3647
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	3648 # Add the dummy module if needed.
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	3649 func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	3650
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	3651 # Show banner notice of every module.
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	3652 func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	3653
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3654 # Determine final file list.
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	3655 func_modules_to_filelist
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3656 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3657 echo "File list:"
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3658 echo "$files" \| sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3659 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3660
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3661 sed_rewrite_files="\
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3662 s,^build-aux/,$auxdir/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3663 s,^doc/,$docbase/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3664 s,^lib/,$sourcebase/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3665 s,^m4/,$m4base/,
9807 24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	3666 s,^tests/,$testsbase/,
24b7b77b3295 Install files from top/ in the destination directory. Bruno Haible <bruno@clisp.org> parents: 9806 diff changeset	3667 s,^top/,,"
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3668
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3669 # Create directories.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3670 for f in $files; do echo $f; done \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3671 \| sed -e "$sed_rewrite_files" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3672 \| sed -n -e 's,^$.$/[^/],\1,p' \
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3673 \| LC_ALL=C sort -u \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3674 > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3675 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3676 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3677 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3678 while read d; do
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3679 mkdir -p "$testdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3680 done
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3681 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3682 }
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3683
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3684 # Copy files or make symbolic links.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	3685 delimiter=' '
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3686 for f in $files; do echo $f; done \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3687 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_files" \
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3688 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	3689 > "$tmp"/files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3690 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3691 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	3692 exec 5<&0 < "$tmp"/files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3693 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3694 func_lookup_file "$f"
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3695 if test -n "$lookedup_tmp"; then
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	3696 cp -p "$lookedup_file" "$testdir/$g"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	3697 else
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3698 ln "$lookedup_file" "$testdir/$g" 2>/dev/null \|\|
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	3699 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	3700 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	3701 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; }; then
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	3702 func_ln "$lookedup_file" "$testdir/$g"
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	3703 else
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3704 cp -p "$lookedup_file" "$testdir/$g"
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3705 fi
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	3706 fi
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3707 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	3708 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	3709 }
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3710
7981 41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	3711 # Create Makefile.ams that are for testing.
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	3712 for_test=true
41421349e26b In testing directories, link the test programs already during "make", not Bruno Haible <bruno@clisp.org> parents: 7911 diff changeset	3713
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3714 # No special edits are needed.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3715 makefile_am_edits=0
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3716
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3717 # Create $sourcebase/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3718 mkdir -p "$testdir/$sourcebase"
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3719 destfile="$sourcebase/Makefile.am"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3720 func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3721 any_uses_subdirs="$uses_subdirs"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3722
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3723 # Create $m4base/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3724 mkdir -p "$testdir/$m4base"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3725 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3726 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3727 echo "EXTRA_DIST ="
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3728 for f in $files; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3729 case "$f" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3730 m4/* )
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3731 echo "EXTRA_DIST += "`echo "$f" \| sed -e 's,^m4/,,'` ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3732 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3733 done
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3734 ) > "$testdir/$m4base/Makefile.am"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3735
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3736 subdirs="$sourcebase $m4base"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3737 subdirs_with_configure_ac=""
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3738
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3739 if false && test -f "$testdir"/$m4base/gettext.m4; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3740 # Avoid stupid error message from automake:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3741 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3742 mkdir -p "$testdir/po"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3743 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3744 ) > "$testdir/po/Makefile.am"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	3745 func_append subdirs " po"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3746 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3747
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3748 if test -n "$inctests"; then
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3749 test -d "$testdir/$testsbase" \|\| mkdir "$testdir/$testsbase"
9541 aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3750 # Viewed from the $testsbase subdirectory, $auxdir is different.
aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3751 saved_auxdir="$auxdir"
aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3752 auxdir=`echo "$testsbase/"\|sed 's%[^/][^/]//%../%g'`"$auxdir"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3753 # Create $testsbase/Makefile.am.
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3754 use_libtests=false
10476 429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams. Bruno Haible <bruno@clisp.org> parents: 10475 diff changeset	3755 destfile="$testsbase/Makefile.am"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3756 func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3757 any_uses_subdirs="$any_uses_subdirs$uses_subdirs"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3758 # Create $testsbase/configure.ac.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3759 (echo "# Process this file with autoconf to produce a configure script."
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3760 echo "AC_INIT([dummy], [0])"
9541 aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3761 echo "AC_CONFIG_AUX_DIR([$auxdir])"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3762 echo "AM_INIT_AUTOMAKE"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3763 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3764 echo "AM_CONFIG_HEADER([config.h])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3765 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3766 echo "AC_PROG_CC"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3767 echo "AC_PROG_INSTALL"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3768 echo "AC_PROG_MAKE_SET"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3769 echo "AC_PROG_RANLIB"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3770 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3771 if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3772 echo "AC_GNU_SOURCE"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3773 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3774 fi
8079 0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3775 for module in $modules; do
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3776 func_verify_module
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3777 if test -n "$module"; then
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3778 func_get_autoconf_early_snippet "$module"
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3779 fi
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3780 done \
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3781 \| sed -e '/^$/d;' -e 's/AC_REQUIRE(\[$[^()]*$\])/\1/'
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3782 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3783 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3784 echo "gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3785 else
6418 e0a8b9b05999 Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6414 diff changeset	3786 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3787 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3788 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3789 echo "gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	3790 fi
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3791 # Wrap the set of autoconf snippets into an autoconf macro that is then
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3792 # invoked. This is needed because autoconf does not support AC_REQUIRE
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3793 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3794 # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3795 # but we want the AC_REQUIRE to have its normal meaning (provide one
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3796 # expansion of the required macro before the current point, and only one
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3797 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3798 echo "AC_DEFUN([gl_INIT], ["
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3799 sed_replace_build_aux='
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3800 :a
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3801 /AC_CONFIG_FILES(.:build-aux\/.)/{
9541 aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3802 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)\|
9009 749a1b6b111d Untabify. Bruno Haible <bruno@clisp.org> parents: 9008 diff changeset	3803 ba
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3804 }'
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3805 func_emit_initmacro_start $macro_prefix
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3806 # We don't have explicit ordering constraints between the various
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3807 # autoconf snippets. It's cleanest to put those of the library before
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3808 # those of the tests.
7647 c26d75cebcfa Fix --create-testdir --with-tests. Bruno Haible <bruno@clisp.org> parents: 7646 diff changeset	3809 echo "gl_source_base='../$sourcebase'"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3810 for module in $modules; do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3811 func_verify_nontests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3812 if test -n "$module"; then
6546 b32846b4d88d Replace build-aux when it occurs in the autoconf snippet. Bruno Haible <bruno@clisp.org> parents: 6533 diff changeset	3813 func_get_autoconf_snippet "$module" \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3814 \| sed -e "$sed_replace_build_aux"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3815 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3816 done
7647 c26d75cebcfa Fix --create-testdir --with-tests. Bruno Haible <bruno@clisp.org> parents: 7646 diff changeset	3817 echo "gl_source_base='.'"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3818 for module in $modules; do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3819 func_verify_tests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3820 if test -n "$module"; then
6546 b32846b4d88d Replace build-aux when it occurs in the autoconf snippet. Bruno Haible <bruno@clisp.org> parents: 6533 diff changeset	3821 func_get_autoconf_snippet "$module" \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3822 \| sed -e "$sed_replace_build_aux"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3823 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3824 done
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3825 func_emit_initmacro_end $macro_prefix
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3826 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3827 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3828 if test "$libtool" != true; then
9086 110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	3829 libname_upper=`echo "$libname" \| LC_ALL=C tr 'a-z-' 'A-Z_'`
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3830 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3831 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3832 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3833 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3834 fi
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3835 echo "])"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3836 func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase?
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3837 echo
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3838 echo "gl_INIT"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3839 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3840 # Usually $testsbase/config.h will be a superset of config.h. Verify this
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3841 # by "merging" config.h into $testsbase/config.h; look out for gcc warnings.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3842 echo "AH_TOP([#include \"../config.h\"])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3843 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3844 echo "AC_OUTPUT([Makefile])"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3845 ) > "$testdir/$testsbase/configure.ac"
9541 aad8160fa3ef Fix the value of $auxdir used when generating the tests directory. Bruno Haible <bruno@clisp.org> parents: 9540 diff changeset	3846 auxdir="$saved_auxdir"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	3847 func_append subdirs " $testsbase"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3848 subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3849 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3850
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3851 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3852 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3853 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3854 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3855 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3856 echo "SUBDIRS = $subdirs"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3857 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3858 echo "ACLOCAL_AMFLAGS = -I $m4base"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3859 ) > "$testdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3860
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3861 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3862 (echo "# Process this file with autoconf to produce a configure script."
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	3863 echo "AC_INIT([dummy], [0])"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	3864 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	3865 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	3866 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3867 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3868 echo
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	3869 echo "AM_CONFIG_HEADER([config.h])"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3870 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3871 echo "AC_PROG_CC"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3872 echo "AC_PROG_INSTALL"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3873 echo "AC_PROG_MAKE_SET"
7106 b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	3874 echo
7777 b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 7771 diff changeset	3875 echo "# For autobuild."
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 7771 diff changeset	3876 echo "AC_CANONICAL_BUILD"
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 7771 diff changeset	3877 echo "AC_CANONICAL_HOST"
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 7771 diff changeset	3878 echo
7106 b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	3879 echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3880 echo "m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3881 echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3882 echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
7106 b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	3883 echo
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3884 echo "AC_PROG_RANLIB"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3885 echo
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3886 if test -n "$any_uses_subdirs"; then
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3887 echo "AM_PROG_CC_C_O"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3888 echo
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	3889 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	3890 if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3891 echo "AC_GNU_SOURCE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3892 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3893 fi
8079 0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3894 for module in $modules; do
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3895 func_verify_nontests_module
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3896 if test -n "$module"; then
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3897 func_get_autoconf_early_snippet "$module"
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3898 fi
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3899 done \
0951beec5b89 New module description section 'configure.ac-early'. Bruno Haible <bruno@clisp.org> parents: 8055 diff changeset	3900 \| sed -e '/^$/d;' -e 's/AC_REQUIRE(\[$[^()]*$\])/\1/'
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3901 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3902 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3903 echo "gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	3904 else
6418 e0a8b9b05999 Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6414 diff changeset	3905 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3906 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3907 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3908 echo "gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	3909 fi
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3910 # Wrap the set of autoconf snippets into an autoconf macro that is then
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3911 # invoked. This is needed because autoconf does not support AC_REQUIRE
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3912 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3913 # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3914 # but we want the AC_REQUIRE to have its normal meaning (provide one
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3915 # expansion of the required macro before the current point, and only one
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3916 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3917 echo "AC_DEFUN([gl_INIT], ["
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3918 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3919 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3920 :a
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3921 /AC_CONFIG_FILES(.:build-aux\/.)/{
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3922 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)\|
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3923 ba
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3924 }'
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3925 else
10400 817f1418bbde Make gnulib-tool work with native 'sed' on AIX. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 10380 diff changeset	3926 sed_replace_build_aux="$sed_noop"
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	3927 fi
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3928 func_emit_initmacro_start $macro_prefix
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3929 echo "gl_source_base='$sourcebase'"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3930 for module in $modules; do
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3931 func_verify_nontests_module
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3932 if test -n "$module"; then
6546 b32846b4d88d Replace build-aux when it occurs in the autoconf snippet. Bruno Haible <bruno@clisp.org> parents: 6533 diff changeset	3933 func_get_autoconf_snippet "$module" \
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3934 \| sed -e "$sed_replace_build_aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3935 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3936 done
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3937 func_emit_initmacro_end $macro_prefix
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3938 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3939 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3940 if test "$libtool" != true; then
9086 110e60d88fad (func_import): Avoid duplication of --avoid statements Sergey Poznyakoff <gray@gnu.org.ua> parents: 9025 diff changeset	3941 libname_upper=`echo "$libname" \| LC_ALL=C tr 'a-z-' 'A-Z_'`
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3942 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3943 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3944 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3945 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	3946 fi
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3947 echo "])"
9516 020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a. Bruno Haible <bruno@clisp.org> parents: 9515 diff changeset	3948 func_emit_initmacro_done $macro_prefix $sourcebase
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	3949 echo
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	3950 echo "gl_INIT"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3951 echo
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3952 if test -n "$subdirs_with_configure_ac"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3953 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3954 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3955 makefiles="Makefile"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3956 for d in $subdirs; do
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3957 # For subdirs that have a configure.ac by their own, it's the subdir's
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3958 # configure.ac which creates the subdir's Makefile.am, not this one.
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3959 case " $subdirs_with_configure_ac " in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3960 " $d ") ;;
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	3961 *) func_append makefiles " $d/Makefile" ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	3962 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3963 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3964 echo "AC_OUTPUT([$makefiles])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3965 ) > "$testdir/configure.ac"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3966
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3967 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	3968 (cd "$testdir"
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3969 # Do not use "${AUTORECONF} --force --install", because it may invoke
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3970 # autopoint, which brings in older versions of some of our .m4 files.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3971 if test -f $m4base/gettext.m4; then
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3972 func_execute_command ${AUTOPOINT} --force \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3973 for f in $m4base/*.m4~; do
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	3974 mv -f $f `echo $f \| sed -e 's,~$,,'` \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3975 done
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3976 fi
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3977 func_execute_command ${ACLOCAL} -I $m4base \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3978 if ! test -d build-aux; then
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3979 func_execute_command mkdir build-aux \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	3980 fi
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3981 func_execute_command ${AUTOCONF} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3982 func_execute_command ${AUTOHEADER} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3983 func_execute_command ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3984 ) \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3985 if test -n "$inctests"; then
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3986 # Create autogenerated files.
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3987 (cd "$testdir/$testsbase" \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3988 # Do not use "${AUTORECONF} --force --install", because it may invoke
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3989 # autopoint, which brings in older versions of some of our .m4 files.
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3990 if test -f ../$m4base/gettext.m4; then
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3991 func_execute_command ${AUTOPOINT} --force \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3992 for f in ../$m4base/*.m4~; do
9009 749a1b6b111d Untabify. Bruno Haible <bruno@clisp.org> parents: 9008 diff changeset	3993 mv -f $f `echo $f \| sed -e 's,~$,,'` \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3994 done
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3995 fi
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3996 func_execute_command ${ACLOCAL} -I ../$m4base \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3997 if ! test -d ../build-aux; then
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	3998 func_execute_command mkdir ../build-aux
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	3999 fi
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4000 func_execute_command ${AUTOCONF} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4001 func_execute_command ${AUTOHEADER} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4002 func_execute_command ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4003 ) \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4004 fi
7866 58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4005 # Need to run configure and make once, to create built files that are to be
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4006 # distributed (such as getdate.c).
8410 bf7fdc3211a4 Avoiding the "./configure && make && make distclean" did not work most of the Bruno Haible <bruno@clisp.org> parents: 8356 diff changeset	4007 # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...".
7866 58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4008 cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
8503 7c0e7f4f1ac1 * gnulib-tool: Rearrange space-tab sequences, since some editors Eric Blake <ebb9@byu.net> parents: 8451 diff changeset	4009 \| sed -n -e 's,^CLEANFILES[ ]+=$[^#]$.$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]+=$[^#]$.$,\1,p'`
8410 bf7fdc3211a4 Avoiding the "./configure && make && make distclean" did not work most of the Bruno Haible <bruno@clisp.org> parents: 8356 diff changeset	4010 cleaned_files=`for file in $cleaned_files; do echo " $file "; done`
7866 58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4011 # Extract the value of "BUILT_SOURCES += ...". Remove variable references
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4012 # such $(FOO_H) because they don't refer to distributed files.
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4013 sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g'
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4014 built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \
8503 7c0e7f4f1ac1 * gnulib-tool: Rearrange space-tab sequences, since some editors Eric Blake <ebb9@byu.net> parents: 8451 diff changeset	4015 \| sed -n -e 's,^BUILT_SOURCES[ ]+=$[^#]$.*$,\1,p' \
7866 58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4016 \| sed -e "$sed_remove_make_variables"`
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4017 distributed_built_sources=`for file in $built_sources; do
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4018 case "$cleaned_files" in
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4019 " "$file" ") ;;
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4020 *) echo $file ;;
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4021 esac;
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4022 done`
58d9bcb3d6c4 Don't unnecessarily run configure and make. Bruno Haible <bruno@clisp.org> parents: 7858 diff changeset	4023 if test -n "$distributed_built_sources"; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4024 (cd "$testdir"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4025 ./configure \|\| func_exit 1
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	4026 cd "$sourcebase"
6389 c1766dccfd4f Simplification, from Stepan Kasal. Bruno Haible <bruno@clisp.org> parents: 6380 diff changeset	4027 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4028 make built_sources \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4029 cd ..
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4030 make distclean \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4031 ) \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4032 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4033 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4034
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4035 # func_create_megatestdir megatestdir allmodules
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4036 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	4037 # - local_gnulib_dir from --local-dir
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4038 # - auxdir directory relative to destdir where to place build aux files
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4039 func_create_megatestdir ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4040 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4041 megatestdir="$1"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4042 allmodules="$2"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4043 if test -z "$allmodules"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4044 allmodules=`func_all_modules`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4045 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4046
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4047 megasubdirs=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4048 # First, all modules one by one.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4049 for onemodule in $allmodules; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4050 func_create_testdir "$megatestdir/$onemodule" $onemodule
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	4051 func_append megasubdirs "$onemodule "
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4052 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4053 # Then, all modules all together.
7350 6c5c8c8b93a3 Don't include the config-h module in megatestdir. Bruno Haible <bruno@clisp.org> parents: 7348 diff changeset	4054 # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4055 # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
10157 0c183af9efd5 Undo last commit, as it does not solve the problem entirely. Bruno Haible <bruno@clisp.org> parents: 10156 diff changeset	4056 allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4057 func_create_testdir "$megatestdir/ALL" "$allmodules"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	4058 func_append megasubdirs "ALL"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4059
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4060 # Create autobuild.
9377 ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4061 cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \
ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4062 vc_witness="$gnulib_dir/CVS/Entries"; \
ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4063 else \
ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4064 vc_witness="$gnulib_dir/.git/refs/heads/master"; \
ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4065 fi; \
ca27c3808c95 Update after move from cvs to git. Bruno Haible <bruno@clisp.org> parents: 9355 diff changeset	4066 sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4067 \| sed -e 's,January,01,' -e 's,Jan,01,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4068 -e 's,February,02,' -e 's,Feb,02,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4069 -e 's,March,03,' -e 's,Mar,03,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4070 -e 's,April,04,' -e 's,Apr,04,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4071 -e 's,May,05,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4072 -e 's,June,06,' -e 's,Jun,06,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4073 -e 's,July,07,' -e 's,Jul,07,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4074 -e 's,August,08,' -e 's,Aug,08,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4075 -e 's,September,09,' -e 's,Sep,09,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4076 -e 's,October,10,' -e 's,Oct,10,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4077 -e 's,November,11,' -e 's,Nov,11,' \
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4078 -e 's,December,12,' -e 's,Dec,12,' \
9022 44509698ba9d * gnulib-tool: Fix indentation. Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9010 diff changeset	4079 -e 's,^,00,' -e 's,^[0-9]*$[0-9][0-9] $,\1,' \
9005 e04f36b292ad * gnulib-tool (IFS): Initialize early, so we don't set it to Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 9003 diff changeset	4080 -e 's,^$[0-9]$ $[0-9]$ $[0-9]*$,\3\2\1,'`
8418 6840759b4ce2 Start the autobuild script with /bin/sh. Bruno Haible <bruno@clisp.org> parents: 8416 diff changeset	4081 (echo '#!/bin/sh'
6840759b4ce2 Start the autobuild script with /bin/sh. Bruno Haible <bruno@clisp.org> parents: 8416 diff changeset	4082 echo "CVSDATE=$cvsdate"
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4083 echo "test -d logs \|\| mkdir logs"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4084 echo "for module in $megasubdirs; do"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4085 echo " echo \"Working on module \$module...\""
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4086 echo " safemodule=\`echo \$module \| sed -e 's\|/\|-\|g'\`"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4087 echo " (echo \"To: gnulib@autobuild.josefsson.org\""
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4088 echo " echo"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4089 echo " set -x"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4090 echo " : autobuild project... \$module"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4091 echo " : autobuild revision... cvs-\$CVSDATE-000000"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4092 echo " : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`"
0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4093 echo " : autobuild hostname... \`hostname\`"
8432 2c533460124b Request a "make distclean" after successful "make check", to save disk space. Bruno Haible <bruno@clisp.org> parents: 8419 diff changeset	4094 echo " cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check && make distclean"
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4095 echo " echo rc=\$?"
8419 d5e85ac6458c Avoid using sed -e "", not supported by AIX sed. Bruno Haible <bruno@clisp.org> parents: 8418 diff changeset	4096 echo " ) 2>&1 \| { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule"
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4097 echo "done"
8672 c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8668 diff changeset	4098 ) > "$megatestdir/do-autobuild"
c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8668 diff changeset	4099 chmod a+x "$megatestdir/do-autobuild"
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4100
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4101 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4102 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4103 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4104 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4105 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4106 echo "SUBDIRS = $megasubdirs"
8416 0bf5cb89a6b9 Create also an autobuild script. Bruno Haible <bruno@clisp.org> parents: 8410 diff changeset	4107 echo
8672 c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org> Simon Josefsson <simon@josefsson.org> parents: 8668 diff changeset	4108 echo "EXTRA_DIST = do-autobuild"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4109 ) > "$megatestdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4110
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4111 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4112 (echo "# Process this file with autoconf to produce a configure script."
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	4113 echo "AC_INIT([dummy], [0])"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4114 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4115 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4116 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4117 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4118 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4119 echo "AC_PROG_MAKE_SET"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4120 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4121 echo "AC_CONFIG_SUBDIRS([$megasubdirs])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4122 echo "AC_OUTPUT([Makefile])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4123 ) > "$megatestdir/configure.ac"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4124
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4125 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4126 (cd "$megatestdir"
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	4127 # Do not use "${AUTORECONF} --install", because autoreconf operates
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	4128 # recursively, but the subdirectories are already finished, therefore
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	4129 # calling autoreconf here would only waste lots of CPU time.
9188 7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4130 func_execute_command ${ACLOCAL} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4131 func_execute_command mkdir build-aux
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4132 func_execute_command ${AUTOCONF} \|\| func_exit 1
7bf3aff81ae2 New options --verbose, --quiet. Bruno Haible <bruno@clisp.org> parents: 9187 diff changeset	4133 func_execute_command ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4134 ) \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4135 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4136
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4137 case $mode in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4138 "" )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4139 func_fatal_error "no mode specified" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4140
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4141 list )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4142 func_all_modules
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4143 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4144
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	4145 import \| update )
6940 ca8592ba8eba * gnulib-tool (func_get_filelist): Don't echo m4/onceonly_2_57.m4, Paul Eggert <eggert@cs.ucla.edu> parents: 6862 diff changeset	4146
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4147 # Where to import.
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4148 if test -z "$destdir"; then
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4149 destdir=.
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4150 fi
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4151 test -d "$destdir" \
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4152 \|\| func_fatal_error "destination directory does not exist: $destdir"
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	4153
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4154 # Prefer configure.ac to configure.in.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4155 if test -f "$destdir"/configure.ac; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4156 configure_ac="$destdir/configure.ac"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4157 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4158 if test -f "$destdir"/configure.in; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4159 configure_ac="$destdir/configure.in"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4160 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4161 func_fatal_error "cannot find $destdir/configure.ac"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4162 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4163 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4164
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4165 # Analyze configure.ac.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4166 guessed_auxdir="."
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	4167 guessed_libtool=false
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4168 my_sed_traces='
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4169 s,#.*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4170 s,^dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4171 s, dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4172 /AC_CONFIG_AUX_DIR/ {
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4173 s,^.AC_CONFIG_AUX_DIR([[ ]$[^])]$.$,guessed_auxdir="\1",p
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	4174 }
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4175 /A[CM]_PROG_LIBTOOL/ {
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4176 s,^.*$,guessed_libtool=true,p
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4177 }'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	4178 eval `sed -n -e "$my_sed_traces" < "$configure_ac"`
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	4179
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4180 if test -z "$auxdir"; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4181 auxdir="$guessed_auxdir"
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4182 fi
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	4183
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4184 # Determine where to apply func_import.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4185 if test -n "$m4base"; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4186 # Apply func_import to a particular gnulib directory.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4187 # Any number of additional modules can be given.
6204 104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4188 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4189 # First use of gnulib in the given m4base.
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4190 test -n "$supplied_libname" \|\| supplied_libname=true
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4191 test -n "$sourcebase" \|\| sourcebase="lib"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	4192 test -n "$docbase" \|\| docbase="doc"
6262 bef30dac846f Provide a default for --tests-base. Bruno Haible <bruno@clisp.org> parents: 6250 diff changeset	4193 test -n "$testsbase" \|\| testsbase="tests"
6204 104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4194 test -n "$macro_prefix" \|\| macro_prefix="gl"
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	4195 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4196 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4197 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4198 # Apply func_import to all gnulib directories.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4199 # To get this list of directories, look at Makefile.am. (Not at
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4200 # configure, because it may be omitted from CVS. Also, don't run
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4201 # "find $destdir -name gnulib-cache.m4", as it might be too expensive.)
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4202 m4dirs=
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4203 m4dirs_count=0
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4204 if test -f "$destdir"/Makefile.am; then
8040 3905dae579b6 * gnulib-tool (func_emit_lib_Makefile_am, func_add_or_update) Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7981 diff changeset	4205 aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]=$.$$/\1/p' "$destdir"/Makefile.am`
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4206 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4207 for arg in $aclocal_amflags; do
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4208 if test -n "$m4dir_is_next"; then
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4209 # Ignore absolute directory pathnames, like /usr/local/share/aclocal.
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4210 case "$arg" in
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4211 /*) ;;
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4212 *)
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4213 if test -f "$destdir/$arg"/gnulib-cache.m4; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	4214 func_append m4dirs " $arg"
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4215 m4dirs_count=`expr $m4dirs_count + 1`
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4216 fi
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4217 ;;
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4218 esac
8040 3905dae579b6 * gnulib-tool (func_emit_lib_Makefile_am, func_add_or_update) Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7981 diff changeset	4219 m4dir_is_next=
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4220 else
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4221 if test "X$arg" = "X-I"; then
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4222 m4dir_is_next=yes
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4223 else
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4224 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4225 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4226 fi
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4227 done
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4228 else
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4229 # No Makefile.am! Oh well. Look at the last generated aclocal.m4.
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4230 if test -f "$destdir"/aclocal.m4; then
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4231 sedexpr1='s,^m4_include(\[$.*$])$,\1,p'
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4232 sedexpr2='s,^[^/]*$,.,'
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4233 sedexpr3='s,/[^/]*$,,'
7752 fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change. Paul Eggert <eggert@cs.ucla.edu> parents: 7737 diff changeset	4234 m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 \| sed -e "$sedexpr2" -e "$sedexpr3" \| LC_ALL=C sort -u`
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4235 m4dirs_count=`echo "$m4dirs" \| wc -l`
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4236 fi
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	4237 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4238 if test $m4dirs_count = 0; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4239 # First use of gnulib in a package.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4240 # Any number of additional modules can be given.
6190 605b7cac11f2 Don't complain about missing options in the first-use case. Bruno Haible <bruno@clisp.org> parents: 6189 diff changeset	4241 test -n "$supplied_libname" \|\| supplied_libname=true
605b7cac11f2 Don't complain about missing options in the first-use case. Bruno Haible <bruno@clisp.org> parents: 6189 diff changeset	4242 test -n "$sourcebase" \|\| sourcebase="lib"
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4243 m4base="m4"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	4244 test -n "$docbase" \|\| docbase="doc"
6262 bef30dac846f Provide a default for --tests-base. Bruno Haible <bruno@clisp.org> parents: 6250 diff changeset	4245 test -n "$testsbase" \|\| testsbase="tests"
6190 605b7cac11f2 Don't complain about missing options in the first-use case. Bruno Haible <bruno@clisp.org> parents: 6189 diff changeset	4246 test -n "$macro_prefix" \|\| macro_prefix="gl"
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4247 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4248 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4249 if test $m4dirs_count = 1; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4250 # There's only one use of gnulib here. Assume the user means it.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4251 # Any number of additional modules can be given.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4252 for m4base in $m4dirs; do
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4253 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4254 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4255 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4256 # Ambiguous - guess what the user meant.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4257 if test $# = 0; then
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4258 # No further arguments. Guess the user wants to update all of them.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4259 for m4base in $m4dirs; do
7239 e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	4260 # Perform func_import in a subshell, so that variable values
e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	4261 # such as
9108 33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	4262 # local_gnulib_dir, avoidlist, sourcebase, m4base, pobase,
33eb494700d6 New options --po-base, --po-domain. Bruno Haible <bruno@clisp.org> parents: 9107 diff changeset	4263 # docbase, testsbase, inctests, libname, lgpl, makefile_name,
9810 f805ab5f1771 New options --vc-files, --no-vc-files. Bruno Haible <bruno@clisp.org> parents: 9807 diff changeset	4264 # libtool, macro_prefix, po_domain, vc_files
7239 e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	4265 # don't propagate from one directory to another.
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	4266 (func_import) \|\| func_exit 1
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4267 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4268 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4269 # Really ambiguous.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4270 func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..."
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4271 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4272 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	4273 fi
6178 3830993b4c7a Rename some variables. Bruno Haible <bruno@clisp.org> parents: 6177 diff changeset	4274 fi
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	4275 ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4276
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4277 create-testdir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4278 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4279 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4280 fi
4126 e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	4281 mkdir "$destdir"
e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	4282 test -d "$destdir" \
e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	4283 \|\| func_fatal_error "could not create destination directory"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4284 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4285 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4286 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4287
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4288 create-megatestdir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4289 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4290 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4291 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4292 mkdir "$destdir" \|\| func_fatal_error "could not create destination directory"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4293 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4294 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4295 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4296
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4297 test )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4298 test -n "$destdir" \|\| destdir=testdir$$
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4299 mkdir "$destdir" \|\| func_fatal_error "could not create destination directory"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4300 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4301 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4302 cd "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4303 mkdir build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4304 cd build
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4305 ../configure \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4306 make \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4307 make check \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	4308 make distclean \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4309 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4310 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4311 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4312 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	4313 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4314 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4315 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4316 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4317 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4318 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4319
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4320 megatest )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4321 test -n "$destdir" \|\| destdir=testdir$$
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4322 mkdir "$destdir" \|\| func_fatal_error "could not create destination directory"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	4323 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4324 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4325 cd "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4326 mkdir build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4327 cd build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4328 ../configure
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4329 make
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4330 make check
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4331 make distclean
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4332 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4333 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4334 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4335 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	4336 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4337 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4338 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4339 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4340 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4341 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4342
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4343 extract-description )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4344 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4345 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4346 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4347 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4348 func_get_description "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4349 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4350 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4351 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4352
9189 1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4353 extract-notice )
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4354 for module
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4355 do
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4356 func_verify_module
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4357 if test -n "$module"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4358 func_get_notice "$module"
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4359 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4360 done
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4361 ;;
1d7d9694f1e2 Allow for modules to show an arbitrary notice. Bruno Haible <bruno@clisp.org> parents: 9188 diff changeset	4362
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4363 extract-filelist )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4364 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4365 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4366 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4367 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4368 func_get_filelist "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4369 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4370 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4371 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4372
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4373 extract-dependencies )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4374 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4375 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4376 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4377 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4378 func_get_dependencies "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4379 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4380 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4381 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4382
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4383 extract-autoconf-snippet )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4384 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4385 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4386 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4387 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4388 func_get_autoconf_snippet "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4389 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4390 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4391 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4392
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4393 extract-automake-snippet )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4394 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4395 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4396 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4397 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4398 func_get_automake_snippet "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4399 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4400 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4401 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4402
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4403 extract-include-directive )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4404 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4405 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4406 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4407 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4408 func_get_include_directive "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4409 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4410 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4411 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4412
8055 5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4413 extract-link-directive )
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4414 for module
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4415 do
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4416 func_verify_module
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4417 if test -n "$module"; then
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4418 func_get_link_directive "$module"
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4419 fi
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4420 done
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4421 ;;
5c79d44f739d New module description field 'Link'. Bruno Haible <bruno@clisp.org> parents: 8040 diff changeset	4422
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4423 extract-license )
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4424 for module
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4425 do
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4426 func_verify_module
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4427 if test -n "$module"; then
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4428 func_get_license "$module"
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4429 fi
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4430 done
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4431 ;;
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	4432
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4433 extract-maintainer )
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4434 for module
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4435 do
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4436 func_verify_module
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4437 if test -n "$module"; then
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4438 func_get_maintainer "$module"
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4439 fi
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4440 done
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4441 ;;
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	4442
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4443 extract-tests-module )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4444 for module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4445 do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4446 func_verify_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4447 if test -n "$module"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4448 func_get_tests_module "$module"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4449 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4450 done
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4451 ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	4452
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4453 * )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4454 func_fatal_error "unknown operation mode --$mode" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4455 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4456
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4457 rm -rf "$tmp"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4458 # Undo the effect of the previous 'trap' command. Some shellology:
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	4459 # We cannot use "trap - 0 1 2 3 13 15", because Solaris sh would attempt to
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4460 # execute the command "-". "trap '' ..." is fine only for signal 0 (= normal
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4461 # exit); for the others we need to call 'exit' explicitly. The value of $? is
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4462 # 128 + signal number and is set before the trap-registered command is run.
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4463 trap '' 0
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	4464 trap 'func_exit $?' 1 2 3 13 15
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	4465
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	4466 exit 0
7241 aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	4467
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	4468 # Local Variables:
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	4469 # indent-tabs-mode: nil
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	4470 # whitespace-check-buffer-indent: nil
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	4471 # End:

Mercurial > gnulib

annotate gnulib-tool @ 10479:74885eaea206