Mercurial > hg > octave-nkf > gnulib-hg

annotate gnulib-tool @ 10993:996a5b3859fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnulib-tool: fix sed-based filtering * gnulib-tool (func_filter_filelist): Remove extra backslash in sed_fff_filter definition.
author Jim Meyering <meyering@redhat.com>
date Fri, 02 Jan 2009 19:29:30 +0100
parents 8b11d1d206e0
children d94dc78c3947
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 #
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
3 # Copyright (C) 2002-2009 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
10743
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
103 gnulib-tool --extract-status module
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
104 gnulib-tool --extract-notice module
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
105 gnulib-tool --extract-filelist module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
106 gnulib-tool --extract-dependencies module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
107 gnulib-tool --extract-autoconf-snippet module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
108 gnulib-tool --extract-automake-snippet module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
109 gnulib-tool --extract-include-directive module
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
110 gnulib-tool --extract-link-directive module
5251
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
111 gnulib-tool --extract-license module
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
112 gnulib-tool --extract-maintainer module
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
113 gnulib-tool --extract-tests-module module
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
114
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
115 Operation modes:
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
116 --list print the available module names
6633
5118aa463328 * gnulib-tool (Usage): Fix --import, from
Simon Josefsson <simon@josefsson.org>
parents: 6614
diff changeset
117 --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
118 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
119 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
120 --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
121 from CVS
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
122 --create-testdir create a scratch package with the given modules
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
123 --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
124 one by one and all together
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
125 --test test the combination of the given modules
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
126 (recommended to use CC=\"gcc -Wall\" here)
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
127 --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
128 (recommended to use CC=\"gcc -Wall\" here)
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
129 --extract-description extract the description
10743
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
130 --extract-status extract the status (obsolete or not)
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
131 --extract-notice extract the notice or banner
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
132 --extract-filelist extract the list of files
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
133 --extract-dependencies extract the dependencies
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
134 --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
135 --extract-automake-snippet extract the snippet for library makefile
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
136 --extract-include-directive extract the #include directive
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
137 --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
138 --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
139 under lib/
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
140 --extract-maintainer report the maintainer(s) inside gnulib
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
141 --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
142
7069
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
143 General options:
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
144 --dir=DIRECTORY Specify the target directory.
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
145 For --import, this specifies where your
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
146 configure.ac can be found. Defaults to current
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
147 directory.
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
148 --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
149 up files before looking in gnulib's directory.
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
150 --verbose Increase verbosity. May be repeated.
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
151 --quiet Decrease verbosity. May be repeated.
7069
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
152
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
153 Options for --import:
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
154 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'.
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
155 --source-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
156 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
157 placed (default \"lib\").
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
158 --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
159 placed (default \"m4\").
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
160 --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
161 placed (default \"po\").
7069
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
162 --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
163 placed (default \"doc\").
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
164 --tests-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
165 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
166 placed (default \"tests\").
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
167 --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
168 tools are placed (default \"build-aux\").
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
169 --with-tests Include unit tests for the included modules.
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
170 --with-obsolete Include obsolete modules when they occur among the
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
171 dependencies. By default, dependencies to obsolete
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
172 modules are ignored.
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
173 --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
174 have code that provides equivalent functionality.
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
175 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
176 --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
177 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
178 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
179 the default is currently LGPLv3.
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
180 --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
181 source-base and tests-base directories
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
182 (default \"Makefile.am\").
7069
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
183 --libtool Use libtool rules.
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
184 --no-libtool Don't use libtool rules.
7068
ec1cfcfd352a Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents: 7067
diff changeset
185 --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
186 'gl_INIT'. Default is 'gl'.
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
187 --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
188 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
189 --vc-files Update version control related files.
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
190 --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
191 (.gitignore and/or .cvsignore).
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
192 --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
193
0fb5ef99e00f Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents: 7068
diff changeset
194 Options for --import and --update:
6966
42730fffa002 help message tweaks
Karl Berry <karl@freefriends.org>
parents: 6955
diff changeset
195 --dry-run For --import, only print what would have been done.
42730fffa002 help message tweaks
Karl Berry <karl@freefriends.org>
parents: 6955
diff changeset
196 -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
197 --local-symlink Make symbolic links instead of copying files, only
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
198 for files from the local override directory.
9096
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
199 -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
200 don't replace copyright notices.
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
201
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
202 Report bugs to <bug-gnulib@gnu.org>."
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
203 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
204
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
205 # func_version
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
206 # outputs to stdout the --version message.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
207 func_version ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
208 {
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
209 func_gnulib_dir
9805
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
210 if test -d "$gnulib_dir"/.git \
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
211 && (git --version) >/dev/null 2>/dev/null \
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
212 && (date --version) >/dev/null 2>/dev/null; then
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
213 # gnulib checked out from git.
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
214 sed_extract_first_date='/^Date/{
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
215 s/^Date:[ ]*//p
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
216 q
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
217 }'
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
218 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
219 # 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
220 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
221 date=`echo "$date" | sed -e "$sed_year_before_time"`
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
222 # Use GNU date to compute the time in GMT.
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
223 date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"`
10495
78d1bdfaa67e Make "gnulib-tool --version" work from any directory.
Bruno Haible <bruno@clisp.org>
parents: 10479
diff changeset
224 version=' '`cd "$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
225 else
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
226 if test -d "$gnulib_dir"/CVS \
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
227 && (cvs --version) >/dev/null 2>/dev/null; then
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
228 # gnulib checked out from CVS.
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
229 sed_extract_first_date='/^date: /{
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
230 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
231 q
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
232 }'
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
233 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
234 else
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
235 # gnulib copy without versioning information.
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
236 date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
237 fi
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
238 version=
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
239 fi
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
240 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
241 echo "\
9805
d3af04de9f0b Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents: 9804
diff changeset
242 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
243 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
244 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
245 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
246 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
247
7347
d86464f614f7 * gnulib-tool (func_version): Create output all at once. This
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7335
diff changeset
248 Written by" "Bruno Haible" "and" "Simon Josefsson"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
249 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
250
6777
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
251 # func_emit_copyright_notice
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
252 # 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
253 func_emit_copyright_notice ()
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
254 {
9794
0675687268a7 Bump copyright year in files generated by gnulib-tool.
Eric Blake <ebb9@byu.net>
parents: 9793
diff changeset
255 sed -n '/Copyright/ {
0675687268a7 Bump copyright year in files generated by gnulib-tool.
Eric Blake <ebb9@byu.net>
parents: 9793
diff changeset
256 p
0675687268a7 Bump copyright year in files generated by gnulib-tool.
Eric Blake <ebb9@byu.net>
parents: 9793
diff changeset
257 q
0675687268a7 Bump copyright year in files generated by gnulib-tool.
Eric Blake <ebb9@byu.net>
parents: 9793
diff changeset
258 }' < "$self_abspathname"
6777
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
259 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
260 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
261 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
262 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
263 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
264 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
265 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
266 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
267 }
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
268
7332
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
269 # func_exit STATUS
10453
483ea2002278 Update comment.
Bruno Haible <bruno@clisp.org>
parents: 10401
diff changeset
270 # exits with a given status.
483ea2002278 Update comment.
Bruno Haible <bruno@clisp.org>
parents: 10401
diff changeset
271 # 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
272 # 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
273 func_exit ()
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
274 {
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
275 (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
276 }
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
277
9793
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 # locates the directory where the gnulib repository lives
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
280 # Input:
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
281 # - progname name of this program
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
282 # Sets variables
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
283 # - 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
284 # - 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
285 func_gnulib_dir ()
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
286 {
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
287 case "$progname" in
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
288 /*) self_abspathname="$progname" ;;
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
289 */*) self_abspathname=`pwd`/"$progname" ;;
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
290 *)
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
291 # Look in $PATH.
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
292 # 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
293 # We use IFS=: instead of
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
294 # 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
295 # 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
296 # 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
297 # 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
298 # 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
299 # - /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
300 # 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
301 # - /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
302 # 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
303 # - 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
304 # 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
305 # 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
306 # 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
307 self_abspathname=
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
308 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
309 func_tmpdir
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
310 { 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
311 chmod +x "$tmp"/conf.sh
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
312 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
313 PATH_SEPARATOR=';'
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
314 else
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
315 PATH_SEPARATOR=:
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
316 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
317 rm -rf "$tmp"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
318 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
319 if test "$PATH_SEPARATOR" = ";"; then
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
320 # 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
321 pathx=".;$PATH"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
322 else
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
323 # 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
324 pathx="$PATH"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
325 case :$PATH: in
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
326 *::*)
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
327 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
328 ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
329 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
330 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
331 save_IFS="$IFS"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
332 IFS="$PATH_SEPARATOR"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
333 for d in $pathx; do
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 test -z "$d" && d=.
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
336 if test -x "$d/$progname" && test ! -d "$d/$progname"; then
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
337 self_abspathname="$d/$progname"
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
338 break
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
339 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
340 done
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
341 IFS="$save_IFS"
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
342 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
343 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
344 fi
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
345 ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
346 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
347 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
348 # Resolve symbolic link.
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
349 linkval=`func_readlink "$self_abspathname"`
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
350 test -n "$linkval" || break
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
351 case "$linkval" in
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
352 /* ) self_abspathname="$linkval" ;;
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
353 * ) 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
354 esac
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
355 done
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
356 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
357 }
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
358
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
359 # func_tmpdir
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
360 # creates a temporary directory.
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
361 # Input:
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
362 # - progname name of this program
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
363 # Sets variable
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
364 # - 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
365 func_tmpdir ()
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
366 {
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
367 # 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
368 # 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
369 # /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
370 : ${TMPDIR=/tmp}
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
371 {
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
372 # 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
373 # 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
374 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
375 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
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 # 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
379 # 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
380 # 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
381 # 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
382 # directory.
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
383 tmp=$TMPDIR/gl$$-$RANDOM
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
384 (umask 077 && mkdir "$tmp")
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
385 } ||
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
386 {
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
387 echo "$progname: 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
388 func_exit 1
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
389 }
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
390 }
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
391
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
392 # func_append var value
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
393 # 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
394 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
395 # 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
396 # 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
397 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
398 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
399 eval "$1+=\"\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
400 }
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
401 fast_func_append=true
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
402 else
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
403 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
404 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
405 eval "$1=\"\$$1\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
406 }
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
407 fast_func_append=false
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
408 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
409
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
410 # func_remove_prefix var prefix
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
411 # removes the given prefix from the value of the shell variable var.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
412 # var should be the name of a shell variable.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
413 # Its value should not contain a newline and not start or end with whitespace.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
414 # prefix should not contain the characters "$`\{}|.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
415 if ( foo=bar; eval 'test "${foo#b}" = ar' ) >/dev/null 2>&1; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
416 func_remove_prefix ()
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
417 {
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
418 eval "$1=\${$1#\$2}"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
419 }
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
420 fast_func_remove_prefix=true
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
421 else
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
422 func_remove_prefix ()
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
423 {
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
424 eval "value=\"\$$1\""
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
425 prefix="$2"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
426 value=`echo "$value" | sed -e "s|^${prefix}||"`
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
427 eval "$1=\"\$value\""
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
428 }
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
429 fast_func_remove_prefix=false
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
430 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
431
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
432 # func_remove_suffix var suffix
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
433 # removes the given suffix from the value of the shell variable var.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
434 # var should be the name of a shell variable.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
435 # Its value should not contain a newline and not start or end with whitespace.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
436 # suffix should not contain the characters "$`\{}|.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
437 if ( foo=bar; eval 'test "${foo%r}" = ba' ) >/dev/null 2>&1; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
438 func_remove_suffix ()
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
439 {
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
440 eval "$1=\${$1%\$2}"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
441 }
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
442 fast_func_remove_suffix=true
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
443 else
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
444 func_remove_suffix ()
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
445 {
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
446 eval "value=\"\$$1\""
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
447 suffix="$2"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
448 value=`echo "$value" | sed -e "s|${suffix}\$||"`
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
449 eval "$1=\"\$value\""
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
450 }
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
451 fast_func_remove_suffix=false
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
452 fi
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
453
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
454 # func_fatal_error message
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
455 # outputs to stderr a fatal error message, and terminates the program.
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
456 # Input:
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
457 # - progname name of this program
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
458 func_fatal_error ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
459 {
10501
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
460 echo "$progname: *** $1" 1>&2
4e04aaeb17f9 Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents: 10495
diff changeset
461 echo "$progname: *** 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
462 func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
463 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
464
6248
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
465 # func_readlink SYMLINK
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
466 # outputs the target of the given symlink.
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
467 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
468 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
469 {
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
470 # Use the readlink program from GNU coreutils.
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
471 readlink "$1"
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
472 }
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
473 else
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
474 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
475 {
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
476 # 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
477 # 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
478 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
479 }
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
480 fi
ba937772eda4 Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents: 6247
diff changeset
481
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
482 # func_relativize DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
483 # 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
484 # Input:
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
485 # - 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
486 # - 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
487 # Output:
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
488 # - 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
489 func_relativize ()
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
490 {
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
491 dir0=`pwd`
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
492 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
493 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
494 sed_first='s,^\([^/]*\)/.*$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
495 sed_rest='s,^[^/]*/*,,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
496 sed_last='s,^.*/\([^/]*\)$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
497 sed_butlast='s,/*[^/]*$,,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
498 while test -n "$dir1"; do
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
499 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
500 if test "$first" != "."; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
501 if test "$first" = ".."; then
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
502 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
503 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
504 else
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
505 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
506 if test "$first2" = "$first"; then
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
507 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
508 else
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
509 dir2="../$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
510 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
511 dir0="$dir0"/"$first"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
512 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
513 fi
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
514 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
515 done
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
516 reldir="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
517 }
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
518
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
519 # func_relconcat DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
520 # 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
521 # Input:
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
522 # - 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
523 # - 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
524 # Output:
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
525 # - 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
526 func_relconcat ()
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
527 {
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
528 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
529 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
530 sed_first='s,^\([^/]*\)/.*$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
531 sed_rest='s,^[^/]*/*,,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
532 sed_last='s,^.*/\([^/]*\)$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
533 sed_butlast='s,/*[^/]*$,,'
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
534 while true; do
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
535 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
536 if test "$first" = "."; then
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
537 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
538 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
539 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
540 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
541 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
542 else
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
543 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
544 while test "$last" = "."; do
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
545 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
546 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
547 done
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
548 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
549 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
550 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
551 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
552 if test "$first" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
553 if test "$last" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
554 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
555 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
556 fi
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
557 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
558 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
559 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
560 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
561 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
562 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
563 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
564 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
565 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
566 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
567 else
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
568 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
569 break
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
570 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
571 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
572 done
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
573 }
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
574
7642
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
575 # func_ln SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
576 # 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
577 # 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
578 func_ln ()
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
579 {
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
580 case "$1" in
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
581 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
582 ln -s "$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
583 *) # SRC is relative.
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
584 case "$2" in
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
585 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
586 ln -s "`pwd`/$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
587 *) # DEST is relative too.
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
588 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
589 test -n "$ln_destdir" || ln_destdir="."
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
590 func_relativize "$ln_destdir" "$1"
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
591 ln -s "$reldir" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
592 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
593 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
594 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
595 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
596 }
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
597
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
598 # func_ln_if_changed SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
599 # 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
600 func_ln_if_changed ()
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
601 {
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
602 if test $# -ne 2; then
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
603 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
604 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
605 ln_target=`func_readlink "$2"`
9167
a459223799e0 Use test -h, not test -L.
Bruno Haible <bruno@clisp.org>
parents: 9119
diff changeset
606 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
607 :
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
608 else
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
609 rm -f "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
610 func_ln "$1" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
611 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
612 }
0878abcc59c9 Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents: 7641
diff changeset
613
10379
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
614 # func_reset_sigpipe
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
615 # 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
616 # 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
617 # 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
618 # 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
619 # message.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
620 # 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
621 # 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
622 # 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
623 # 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
624 # 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
625 # descriptor.
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
626 if test -n "$BASH_VERSION"; then
10986
cb4702115eb4 Add comments.
Bruno Haible <bruno@clisp.org>
parents: 10985
diff changeset
627 # The problem has only been reported with bash. Probably it occurs only with
cb4702115eb4 Add comments.
Bruno Haible <bruno@clisp.org>
parents: 10985
diff changeset
628 # bash-3.2. For the reasons, see
cb4702115eb4 Add comments.
Bruno Haible <bruno@clisp.org>
parents: 10985
diff changeset
629 # <http://lists.gnu.org/archive/html/bug-bash/2008-12/msg00050.html>.
10379
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
630 # 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
631 func_reset_sigpipe ()
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
632 {
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
633 trap - SIGPIPE
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
634 }
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
635 else
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
636 func_reset_sigpipe ()
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
637 {
10380
85d962720a4e Oops, fix syntax error in last commit.
Bruno Haible <bruno@clisp.org>
parents: 10379
diff changeset
638 :
10379
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
639 }
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
640 fi
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
641
9003
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
642 # 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
643 # Test cases:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
644 # 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
645 # 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
646 # 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
647 # 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
648 # 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
649 # - 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
650 # 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
651 # 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
652 # - 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
653 # - 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
654 # 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
655 # - 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
656 # We try the following workarounds:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
657 # - 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
658 # - 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
659 # - 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
660 # - 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
661 # - 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
662 # - 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
663 # - 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
664 # - 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
665 # the ksh workaround.
9003
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
666 # - 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
667 # 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
668 # 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
669 have_echo=
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
670 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
671 have_echo=yes # Lucky!
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
672 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
673 # Try the workarounds.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
674 # 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
675 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
676 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
677 && test -n "$CONFIG_SHELL" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
678 && test -f "$CONFIG_SHELL" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
679 && $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
680 exec $CONFIG_SHELL "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
681 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
682 fi
9006
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
683 # 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
684 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
685 && test -n "$BASH_VERSION" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
686 && (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
687 shopt -o xpg_echo
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
688 have_echo=yes
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
689 fi
9006
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
690 # 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
691 # 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
692 # (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
693 if test -z "$have_echo" \
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
694 && test -n "$BASH_VERSION"; then \
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
695 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
696 # '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
697 echo ()
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
698 {
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
699 cat <<EOF
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
700 $*
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
701 EOF
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
702 }
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
703 else
9007
620c0e20f9db Tweak comment.
Bruno Haible <bruno@clisp.org>
parents: 9006
diff changeset
704 # '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
705 echo ()
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
706 {
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
707 printf '%s\n' "$*"
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
708 }
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
709 fi
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
710 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
711 have_echo=yes
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
712 fi
0df4abf0cce4 Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents: 9005
diff changeset
713 fi
9003
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
714 # For zsh: turn sh-emulation on.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
715 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
716 && test -n "$ZSH_VERSION" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
717 && (emulate sh) >/dev/null 2>&1; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
718 emulate sh
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
719 fi
9008
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
720 # 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
721 if test -z "$have_echo" \
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
722 && (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
723 # A 'print' command exists.
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
724 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
725 :
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
726 else
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
727 # 'print' is a shell built-in.
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
728 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
729 # '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
730 alias echo='print -r'
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
731 fi
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
732 fi
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
733 fi
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
734 if test -z "$have_echo" \
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
735 && 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
736 have_echo=yes
78f53a569f31 Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents: 9007
diff changeset
737 fi
9003
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
738 # 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
739 # The ksh manual page says:
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
740 # "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
741 # 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
742 # 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
743 # 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
744 # 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
745 # command.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
746 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
747 bsd_echo ()
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
748 {
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
749 cat <<EOF
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
750 $*
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
751 EOF
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
752 }
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
753 alias echo=bsd_echo 2>/dev/null
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
754 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
755 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
756 && echo '\t' | grep t > /dev/null; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
757 have_echo=yes
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
758 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
759 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
760 unalias echo 2>/dev/null
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
761 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
762 # 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
763 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
764 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
765 && test -f /bin/ksh; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
766 exec /bin/ksh "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
767 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
768 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
769 # Otherwise: respawn using /bin/sh.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
770 if test -z "$have_echo" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
771 && test "X$1" != "X--no-reexec" \
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
772 && test -f /bin/sh; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
773 exec /bin/sh "$0" --no-reexec "$@"
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
774 exit 127
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
775 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
776 if test -z "$have_echo"; then
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
777 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
778 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
779 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
780 : # Works fine now.
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
781 else
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
782 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
783 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
784 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
785 shift
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
786 fi
952d16aa4c29 Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents: 9001
diff changeset
787
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
788 # Command-line option processing.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
789 # Removes the OPTIONS from the arguments. Sets the variables:
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
790 # - mode list or import or create-testdir or create-megatestdir
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
791 # - destdir from --dir
7215
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
792 # - local_gnulib_dir from --local-dir
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
793 # - 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
794 # - libname, supplied_libname from --lib
5198
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
795 # - sourcebase from --source-base
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
796 # - m4base from --m4-base
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
797 # - pobase from --po-base
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
798 # - docbase from --doc-base
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
799 # - testsbase from --tests-base
5798
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
800 # - auxdir from --aux-dir
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
801 # - inctests true if --with-tests was given, blank otherwise
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
802 # - incobsolete true if --with-obsolete was given, blank otherwise
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
803 # - 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
804 # - 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
805 # - makefile_name from --makefile-name
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
806 # - 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
807 # given, blank otherwise
6994
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
808 # - macro_prefix from --macro-prefix
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
809 # - po_domain from --po-domain
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
810 # - 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
811 # given, blank otherwise
6994
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
812 # - autoconf_minversion minimum supported autoconf version
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
813 # - 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
814 # - 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
815 # - 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
816 # otherwise
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
817 # - 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
818 # - 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
819 {
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
820 mode=
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
821 destdir=
7215
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
822 local_gnulib_dir=
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
823 verbose=0
5198
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
824 libname=libgnu
5344
c2f5677fc6ed Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents: 5343
diff changeset
825 supplied_libname=
5202
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
826 sourcebase=
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
827 m4base=
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
828 pobase=
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
829 docbase=
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
830 testsbase=
5798
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
831 auxdir=
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
832 inctests=
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
833 incobsolete=
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
834 avoidlist=
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
835 lgpl=
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
836 makefile_name=
5198
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
837 libtool=
6176
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
838 macro_prefix=
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
839 po_domain=
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
840 vc_files=
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
841 do_changelog=:
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
842 doit=:
5799
ad9eff556694 2005-04-15 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents: 5798
diff changeset
843 symbolic=
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
844 lsymbolic=
9096
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
845 do_copyrights=true
5202
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
846
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
847 supplied_opts="$@"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
848
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
849 while test $# -gt 0; do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
850 case "$1" in
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
851 --list | --lis )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
852 mode=list
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
853 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
854 --import | --impor | --impo | --imp | --im | --i )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
855 mode=import
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
856 shift ;;
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
857 --update | --updat | --upda | --upd | --up | --u )
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
858 mode=update
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
859 shift ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
860 --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
861 mode=create-testdir
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
862 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
863 --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
864 mode=create-megatestdir
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
865 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
866 --test | --tes | --te | --t )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
867 mode=test
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
868 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
869 --megatest | --megates | --megate | --megat | --mega | --meg | --me | --m )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
870 mode=megatest
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
871 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
872 --extract-* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
873 mode=`echo "X$1" | sed -e 's/^X--//'`
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
874 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
875 --dir )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
876 shift
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
877 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
878 func_fatal_error "missing argument for --dir"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
879 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
880 destdir=$1
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
881 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
882 --dir=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
883 destdir=`echo "X$1" | sed -e 's/^X--dir=//'`
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
884 shift ;;
7215
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
885 --local-dir )
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
886 shift
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
887 if test $# = 0; then
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
888 func_fatal_error "missing argument for --local-dir"
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
889 fi
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
890 local_gnulib_dir=$1
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
891 shift ;;
3869ca15e2bb Reorder some statements.
Bruno Haible <bruno@clisp.org>
parents: 7214
diff changeset
892 --local-dir=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
893 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
894 shift ;;
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
895 --verbose | --verbos | --verbo | --verb )
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
896 verbose=`expr $verbose + 1`
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
897 shift ;;
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
898 --quiet | --quie | --qui | --qu | --q )
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
899 verbose=`expr $verbose - 1`
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
900 shift ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
901 --lib )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
902 shift
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
903 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
904 func_fatal_error "missing argument for --lib"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
905 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
906 libname=$1
5343
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
907 supplied_libname=true
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
908 shift ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
909 --lib=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
910 libname=`echo "X$1" | sed -e 's/^X--lib=//'`
5343
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
911 supplied_libname=true
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
912 shift ;;
5198
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
913 --source-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
914 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
915 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
916 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
917 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
918 sourcebase=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
919 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
920 --source-base=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
921 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
922 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
923 --m4-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
924 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
925 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
926 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
927 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
928 m4base=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
929 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
930 --m4-base=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
931 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
932 shift ;;
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
933 --po-base )
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
934 shift
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
935 if test $# = 0; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
936 func_fatal_error "missing argument for --po-base"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
937 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
938 pobase=$1
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
939 shift ;;
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
940 --po-base=* )
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
941 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
942 shift ;;
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
943 --doc-base )
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
944 shift
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
945 if test $# = 0; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
946 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
947 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
948 docbase=$1
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
949 shift ;;
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
950 --doc-base=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
951 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
952 shift ;;
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
953 --tests-base )
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
954 shift
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
955 if test $# = 0; then
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
956 func_fatal_error "missing argument for --tests-base"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
957 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
958 testsbase=$1
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
959 shift ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
960 --tests-base=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
961 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
962 shift ;;
5798
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
963 --aux-dir )
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
964 shift
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
965 if test $# = 0; then
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
966 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
967 fi
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
968 auxdir=$1
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
969 shift ;;
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
970 --aux-dir=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
971 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
972 shift ;;
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
973 --with-tests )
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
974 inctests=true
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
975 shift ;;
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
976 --with-obsolete )
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
977 incobsolete=true
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
978 shift ;;
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
979 --avoid )
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
980 shift
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
981 if test $# = 0; then
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
982 func_fatal_error "missing argument for --avoid"
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
983 fi
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
984 func_append avoidlist " $1"
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
985 shift ;;
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
986 --avoid=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
987 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
988 func_append avoidlist " $arg"
5198
9317c9ebe82c Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4717
diff changeset
989 shift ;;
5262
97ed4b64d853 New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents: 5255
diff changeset
990 --lgpl )
9417
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
991 lgpl=yes
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
992 shift ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
993 --lgpl=* )
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
994 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
995 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
996 2 | 3) ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
997 *) 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
998 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
999 lgpl=$arg
5262
97ed4b64d853 New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents: 5255
diff changeset
1000 shift ;;
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1001 --makefile-name )
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1002 shift
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1003 if test $# = 0; then
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1004 func_fatal_error "missing argument for --makefile-name"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1005 fi
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1006 makefile_name="$1"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1007 shift ;;
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
1008 --makefile-name=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1009 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
1010 shift ;;
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1011 --libtool )
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1012 libtool=true
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1013 shift ;;
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
1014 --no-libtool )
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
1015 libtool=false
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
1016 shift ;;
6176
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1017 --macro-prefix )
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1018 shift
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1019 if test $# = 0; then
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1020 func_fatal_error "missing argument for --macro-prefix"
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1021 fi
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1022 macro_prefix="$1"
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1023 shift ;;
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
1024 --macro-prefix=* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1025 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
1026 shift ;;
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1027 --po-domain )
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1028 shift
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1029 if test $# = 0; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1030 func_fatal_error "missing argument for --po-domain"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1031 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1032 po_domain="$1"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1033 shift ;;
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1034 --po-domain=* )
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1035 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
1036 shift ;;
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1037 --vc-files )
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1038 vc_files=true
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1039 shift ;;
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1040 --no-vc-files )
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1041 vc_files=false
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
1042 shift ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1043 --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
1044 do_changelog=false
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1045 shift ;;
5202
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
1046 --dry-run )
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
1047 doit=false
5202
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
1048 shift ;;
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1049 -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
1050 symbolic=true
5798
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
1051 shift ;;
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
1052 --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
1053 lsymbolic=true
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
1054 shift ;;
9096
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
1055 -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
1056 symbolic=true
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
1057 do_copyrights=
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
1058 shift ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1059 --help | --hel | --he | --h )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1060 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
1061 func_exit $? ;;
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1062 --version | --versio | --versi | --vers )
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1063 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
1064 func_exit $? ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1065 -- )
6264
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1066 # Stop option processing
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1067 shift
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1068 break ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1069 -* )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1070 echo "gnulib-tool: unknown option $1" 1>&2
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1071 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
1072 func_exit 1 ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1073 * )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1074 break ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1075 esac
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1076 done
6264
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1077
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1078 if test "$mode" = update; then
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1079 if test $# != 0; then
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1080 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
1081 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1082 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
1083 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
1084 func_exit 1
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1085 fi
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
1086 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
1087 || 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
1088 || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1089 || test -n "$inctests" || test -n "$incobsolete" \
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1090 || test -n "$avoidlist" || test -n "$lgpl" || test -n "$makefile_name" \
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1091 || test -n "$macro_prefix" || test -n "$po_domain" \
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1092 || test -n "$vc_files"; then
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1093 echo "gnulib-tool: invalid options for 'update' mode" 1>&2
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1094 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1095 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
1096 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
1097 func_exit 1
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1098 fi
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1099 do_changelog=false
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1100 fi
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1101 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
1102 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
1103 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
1104 func_exit 1
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1105 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1106 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
1107 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
1108 fi
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
1109
7071
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1110 # 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
1111 # configure.ac.
6994
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1112 DEFAULT_AUTOCONF_MINVERSION="2.59"
7078
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1113 autoconf_minversion=
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1114 configure_ac=
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1115 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
1116 if test -f "$destdir"/configure.ac; then
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1117 configure_ac="$destdir/configure.ac"
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1118 else
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1119 if test -f "$destdir"/configure.in; then
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1120 configure_ac="$destdir/configure.in"
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1121 fi
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1122 fi
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1123 else
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1124 if test -f configure.ac; then
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1125 configure_ac="configure.ac"
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1126 else
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1127 if test -f configure.in; then
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1128 configure_ac="configure.in"
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1129 fi
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1130 fi
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1131 fi
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1132 if test -n "$configure_ac"; then
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1133 # 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
1134 # 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
1135 # "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
1136 # 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
1137 # autom4te: m4 failed with exit status: 1
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1138 prereqs=
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1139 my_sed_traces='
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1140 s,#.*$,,
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1141 s,^dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1142 s, dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1143 /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
1144 s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,\1,p
7078
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1145 }'
7767
0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7754
diff changeset
1146 prereqs=`sed -n -e "$my_sed_traces" < "$configure_ac"`
7078
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1147 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
1148 autoconf_minversion=`
0339d0fb77b2 * gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7754
diff changeset
1149 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
1150 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
1151 `
7078
a060dfddc867 Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents: 7077
diff changeset
1152 fi
7071
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1153 fi
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1154 if test -z "$autoconf_minversion"; then
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1155 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1156 fi
6994
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1157 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1158 1.* | 2.[0-4]* | 2.5[0-8]*)
7071
71c5caf223fc Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents: 7070
diff changeset
1159 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
1160 esac
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1161
6264
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1162 # 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
1163 # 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
1164 sed_trimtrailingslashes='s,\([^/]\)//*$,\1,'
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
1165 case "$local_gnulib_dir" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1166 */ ) 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
1167 esac
6264
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1168 case "$sourcebase" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1169 */ ) 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
1170 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1171 case "$m4base" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1172 */ ) 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
1173 esac
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1174 case "$pobase" in
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1175 */ ) pobase=`echo "$pobase" | sed -e "$sed_trimtrailingslashes"` ;;
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1176 esac
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
1177 case "$docbase" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1178 */ ) 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
1179 esac
6264
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1180 case "$testsbase" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1181 */ ) 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
1182 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents: 6263
diff changeset
1183 case "$auxdir" in
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1184 */ ) 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
1185 esac
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1186 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1187
9793
f899dba61804 Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents: 9541
diff changeset
1188 func_gnulib_dir
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1189 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
1190 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
1191 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
1192 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
1193 fi
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
1194 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
1195 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
1196 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
1197 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
1198 done
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7327
diff changeset
1199 signal=0
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1200
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1201 # func_lookup_file file
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1202 # 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
1203 # 'patch'.
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1204 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1205 # - 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
1206 # Output:
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1207 # - 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
1208 # - 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
1209 func_lookup_file ()
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1210 {
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1211 lkfile="$1"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1212 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
1213 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
1214 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1215 else
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1216 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
1217 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
1218 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
1219 rm -f "$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1220 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
1221 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
1222 || 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
1223 lookedup_file="$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1224 lookedup_tmp=true
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1225 else
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1226 lookedup_file="$gnulib_dir/$lkfile"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1227 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1228 fi
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1229 else
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1230 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
1231 fi
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1232 fi
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1233 }
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1234
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1235 # func_all_modules
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1236 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1237 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1238 func_all_modules ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1239 {
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1240 # 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
1241 # 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
1242 # --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
1243 {
7805
2ee7433618fe Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
1244 (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
1245 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
1246 (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
1247 fi
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1248 } \
7857
978cf3123a32 Exclude all files inside the CVS directory.
Bruno Haible <bruno@clisp.org>
parents: 7850
diff changeset
1249 | 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
1250 -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
1251 -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
1252 -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
1253 -e '/^TEMPLATE$/d' \
8626
eb080a5d05de TEMPLATE-EXTENDED is not a module.
Bruno Haible <bruno@clisp.org>
parents: 8503
diff changeset
1254 -e '/^TEMPLATE-EXTENDED$/d' \
7805
2ee7433618fe Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
1255 -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
1256 -e '/^\..*/d' \
7805
2ee7433618fe Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents: 7788
diff changeset
1257 -e '/~$/d' \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1258 | sed -e '/-tests$/d' \
7319
1726cc39709b Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents: 7299
diff changeset
1259 | LC_ALL=C sort -u
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1260 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1261
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1262 # func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1263 # verifies a module name
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1264 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1265 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1266 # - module module name argument
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1267 func_verify_module ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1268 {
7168
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1269 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
1270 || { 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
1271 && 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
1272 && test "CVS" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1273 && test "ChangeLog" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1274 && test "COPYING" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1275 && test "README" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1276 && test "TEMPLATE" != "$module" \
8626
eb080a5d05de TEMPLATE-EXTENDED is not a module.
Bruno Haible <bruno@clisp.org>
parents: 8503
diff changeset
1277 && test "TEMPLATE-EXTENDED" != "$module" \
7168
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1278 && test "TEMPLATE-TESTS" != "$module"; then
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1279 # OK, $module is a correct module name.
7212
232ee448d272 Better error handling.
Bruno Haible <bruno@clisp.org>
parents: 7199
diff changeset
1280 # Verify that building the module description with 'patch' succeeds.
232ee448d272 Better error handling.
Bruno Haible <bruno@clisp.org>
parents: 7199
diff changeset
1281 func_lookup_file "modules/$module"
7168
56632b3512af Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 7142
diff changeset
1282 else
4128
1346b5405a74 (func_verify_module): report module name $module
Karl Berry <karl@freefriends.org>
parents: 4126
diff changeset
1283 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
1284 module=
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1285 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1286 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1287
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1288 # func_verify_nontests_module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1289 # verifies a module name, excluding tests modules
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1290 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1291 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1292 # - module module name argument
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1293 func_verify_nontests_module ()
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1294 {
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1295 case "$module" in
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1296 *-tests ) module= ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1297 * ) func_verify_module ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1298 esac
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1299 }
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1300
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1301 # func_verify_tests_module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1302 # 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
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
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1305 # - module module name argument
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1306 func_verify_tests_module ()
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1307 {
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1308 case "$module" in
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1309 *-tests ) func_verify_module ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1310 * ) module= ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1311 esac
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1312 }
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1313
6952
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1314 sed_extract_prog=':[ ]*$/ {
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1315 :a
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1316 n
6952
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1317 s/^Description:[ ]*$//
10743
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1318 s/^Status:[ ]*$//
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1319 s/^Notice:[ ]*$//
6952
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1320 s/^Files:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1321 s/^Depends-on:[ ]*$//
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1322 s/^configure\.ac-early:[ ]*$//
6952
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1323 s/^configure\.ac:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1324 s/^Makefile\.am:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1325 s/^Include:[ ]*$//
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1326 s/^Link:[ ]*$//
6952
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1327 s/^License:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents: 6940
diff changeset
1328 s/^Maintainer:[ ]*$//
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1329 tb
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1330 p
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1331 ba
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1332 :b
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1333 }'
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1334
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1335 # func_get_description module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1336 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1337 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1338 func_get_description ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1339 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1340 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1341 sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1342 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1343
10743
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1344 # func_get_status module
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1345 # Input:
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1346 # - local_gnulib_dir from --local-dir
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1347 func_get_status ()
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1348 {
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1349 func_lookup_file "modules/$1"
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1350 sed -n -e "/^Status$sed_extract_prog" < "$lookedup_file"
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1351 }
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
1352
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1353 # func_get_notice module
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1354 # Input:
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1355 # - local_gnulib_dir from --local-dir
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1356 func_get_notice ()
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1357 {
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1358 func_lookup_file "modules/$1"
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1359 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
1360 }
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1361
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1362 # func_get_filelist module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1363 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1364 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1365 func_get_filelist ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1366 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1367 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1368 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
1369 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
1370 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1371 2.59)
9879
e0ce0891df69 Avoid some more autoconf warnings.
Eric Blake <ebb9@byu.net>
parents: 9875
diff changeset
1372 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
1373 ;;
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
1374 esac
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1375 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1376
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1377 # func_filter_filelist outputvar separator filelist prefix suffix removed_prefix removed_suffix [added_prefix [added_suffix]]
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1378 # stores in outputvar the filtered and processed filelist. Filtering: Only the
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1379 # elements starting with prefix and ending with suffix are considered.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1380 # Processing: removed_prefix and removed_suffix are removed from each element,
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1381 # added_prefix and added_suffix are added to each element.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1382 # removed_prefix, removed_suffix should not contain the characters "$`\{}|.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1383 # added_prefix, added_suffix should not contain the characters \|.
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1384 func_filter_filelist ()
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1385 {
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1386 if test "$2" != "$nl" \
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1387 || { $fast_func_append \
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1388 && { test -z "$6" || $fast_func_remove_prefix; } \
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1389 && { test -z "$7" || $fast_func_remove_suffix; }; \
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1390 }; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1391 ffflist=
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1392 for fff in $3; do
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1393 case "$fff" in
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1394 "$4"*"$5")
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1395 if test -n "$6"; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1396 func_remove_prefix fff "$6"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1397 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1398 if test -n "$7"; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1399 func_remove_suffix fff "$7"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1400 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1401 fff="$8${fff}$9"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1402 if test -z "$ffflist"; then
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1403 ffflist="${fff}"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1404 else
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1405 func_append ffflist "$2${fff}"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1406 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1407 ;;
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1408 esac
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1409 done
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1410 else
10993
996a5b3859fe gnulib-tool: fix sed-based filtering
Jim Meyering <meyering@redhat.com>
parents: 10989
diff changeset
1411 sed_fff_filter="s|^$6\(.*\)$7\$|$8\\1$9|"
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1412 ffflist=`for fff in $3; do
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1413 case "$fff" in
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1414 "$4"*"$5") echo "$fff" ;;
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1415 esac
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1416 done | sed -e "$sed_fff_filter"`
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1417 fi
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1418 eval "$1=\"\$ffflist\""
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1419 }
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1420
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1421 # func_get_dependencies module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1422 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1423 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1424 func_get_dependencies ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1425 {
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1426 # ${module}-tests always implicitly depends on ${module}.
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1427 case "$1" in
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1428 *-tests)
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1429 fgd1="$1"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1430 func_remove_suffix fgd1 '-tests'
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1431 echo "$fgd1"
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1432 ;;
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1433 esac
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1434 # 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
1435 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1436 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
1437 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1438
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1439 # func_get_autoconf_early_snippet module
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1440 # Input:
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1441 # - local_gnulib_dir from --local-dir
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1442 func_get_autoconf_early_snippet ()
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1443 {
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1444 func_lookup_file "modules/$1"
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1445 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
1446 }
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
1447
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1448 # func_get_autoconf_snippet module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1449 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1450 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1451 func_get_autoconf_snippet ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1452 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1453 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1454 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
1455 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1456
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1457 # func_get_automake_snippet module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1458 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1459 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1460 func_get_automake_snippet ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1461 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1462 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1463 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
1464 case "$1" in
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1465 *-tests)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1466 # *-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
1467 # Synthesize an EXTRA_DIST augmentation.
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents: 9275
diff changeset
1468 all_files=`func_get_filelist $1`
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1469 func_filter_filelist tests_files " " "$all_files" 'tests/' '' 'tests/' ''
9284
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents: 9275
diff changeset
1470 extra_files="$tests_files"
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents: 9275
diff changeset
1471 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
1472 echo "EXTRA_DIST +=" $extra_files
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents: 9275
diff changeset
1473 echo
afba4e078ebc Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents: 9275
diff changeset
1474 fi
7497
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1475 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1476 *)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1477 # Synthesize an EXTRA_DIST augmentation.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1478 sed_combine_lines='/\\$/{
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1479 :a
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1480 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
1481 s/\\\n/ /
7497
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1482 s/\\$/\\/
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1483 ta
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1484 }'
7754
ed8105720327 * modules/absolute-header: New module.
Eric Blake <ebb9@byu.net>
parents: 7752
diff changeset
1485 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
1486 already_mentioned_files=` \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1487 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
1488 | sed -e "$sed_combine_lines" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1489 | 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
1490 all_files=`func_get_filelist $1`
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1491 func_filter_filelist lib_files "$nl" "$all_files" 'lib/' '' 'lib/' ''
7497
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1492 # 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
1493 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
1494 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
1495 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
1496 | 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
1497 if test -n "$extra_files"; then
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1498 echo "EXTRA_DIST +=" $extra_files
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1499 echo
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1500 fi
7640
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents: 7638
diff changeset
1501 # Synthesize also an EXTRA_lib_SOURCES augmentation.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents: 7638
diff changeset
1502 # 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
1503 # dependency rules.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents: 7638
diff changeset
1504 # 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
1505 # 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
1506 # (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
1507 # 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
1508 # 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
1509 # 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
1510 # 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
1511 # 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
1512 case "$1" in
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1513 relocatable-prog-wrapper) ;;
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1514 *)
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1515 func_filter_filelist extra_files "$nl" "$extra_files" '' '.c' '' ''
8356
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1516 if test -n "$extra_files"; then
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1517 echo "EXTRA_lib_SOURCES +=" $extra_files
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1518 echo
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1519 fi
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1520 ;;
72f47158c694 Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents: 8079
diff changeset
1521 esac
9107
2878e8c70604 Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents: 9096
diff changeset
1522 # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/.
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1523 func_filter_filelist buildaux_files "$nl" "$all_files" 'build-aux/' '' 'build-aux/' ''
9107
2878e8c70604 Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents: 9096
diff changeset
1524 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
1525 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
1526 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
1527 echo
2878e8c70604 Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents: 9096
diff changeset
1528 fi
9807
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
1529 # Synthesize an EXTRA_DIST augmentation also for the files from top/.
10989
8b11d1d206e0 Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents: 10987
diff changeset
1530 func_filter_filelist top_files "$nl" "$all_files" 'top/' '' 'top/' ''
9807
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
1531 if test -n "$top_files"; then
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
1532 sed_prepend_topdir='s,^,$(top_srcdir)/,'
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
1533 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
1534 echo
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
1535 fi
7497
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1536 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents: 7486
diff changeset
1537 esac
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1538 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1539
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1540 # func_get_include_directive module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1541 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1542 # - local_gnulib_dir from --local-dir
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1543 func_get_include_directive ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1544 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1545 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1546 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
1547 sed -e 's/^\(["<]\)/#include \1/'
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1548 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
1549
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1550 # func_get_link_directive module
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1551 # Input:
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1552 # - local_gnulib_dir from --local-dir
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1553 func_get_link_directive ()
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1554 {
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1555 func_lookup_file "modules/$1"
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1556 sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file"
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1557 }
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
1558
5251
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
1559 # func_get_license module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1560 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1561 # - local_gnulib_dir from --local-dir
5251
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
1562 func_get_license ()
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
1563 {
7896
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
1564 func_lookup_file "modules/$1"
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
1565 { 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
1566 # The default is GPL.
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
1567 echo "GPL"
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
1568 } | sed -e 's,^ *$,,' | sed -e 1q
5251
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
1569 }
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
1570
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
1571 # func_get_maintainer module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1572 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1573 # - local_gnulib_dir from --local-dir
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
1574 func_get_maintainer ()
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
1575 {
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
1576 func_lookup_file "modules/$1"
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1577 sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file"
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
1578 }
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
1579
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1580 # func_get_tests_module module
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1581 # Input:
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1582 # - local_gnulib_dir from --local-dir
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1583 func_get_tests_module ()
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1584 {
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1585 # 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
1586 if test -f "$gnulib_dir/modules/$1"-tests \
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1587 || { 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
1588 && 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
1589 echo "$1"-tests
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1590 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1591 }
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1592
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1593 # func_acceptable module
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1594 # tests whether a module is acceptable.
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1595 # Input:
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1596 # - avoidlist list of modules to avoid
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1597 func_acceptable ()
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1598 {
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1599 for avoid in $avoidlist; do
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1600 if test "$avoid" = "$1"; then
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1601 return 1
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1602 fi
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1603 done
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1604 return 0
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1605 }
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1606
5347
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
1607 # func_modules_transitive_closure
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
1608 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1609 # - 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
1610 # - modules list of specified modules
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1611 # - inctests true if tests should be included, blank otherwise
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1612 # - incobsolete true if obsolete modules among dependencies should be
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1613 # included, blank otherwise
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1614 # - avoidlist list of modules to avoid
7320
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1615 # - 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
1616 # Output:
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
1617 # - 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
1618 func_modules_transitive_closure ()
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
1619 {
7320
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1620 # 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
1621 # 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
1622 # 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
1623 # 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
1624 # to process it again.
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1625 handledmodules=
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1626 inmodules="$modules"
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1627 outmodules=
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1628 while test -n "$inmodules"; do
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1629 inmodules_this_round="$inmodules"
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1630 inmodules= # Accumulator, queue for next round
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1631 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
1632 func_verify_module
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
1633 if test -n "$module"; then
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1634 if func_acceptable $module; then
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
1635 func_append outmodules " $module"
7320
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1636 deps=`func_get_dependencies $module`
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1637 # 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
1638 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
1639 if test -n "$duplicated_deps"; then
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1640 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
1641 fi
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1642 for dep in $deps; do
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1643 if test -n "$incobsolete" \
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1644 || { status=`func_get_status $dep`; test "$status" != obsolete; }; then
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1645 func_append inmodules " $dep"
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1646 fi
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
1647 done
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1648 if test -n "$inctests"; then
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1649 testsmodule=`func_get_tests_module $module`
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1650 if test -n "$testsmodule"; then
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
1651 func_append inmodules " $testsmodule"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1652 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
1653 fi
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
1654 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
1655 fi
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
1656 done
7320
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1657 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
1658 # Remove $handledmodules from $inmodules.
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1659 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
1660 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
1661 done
7320
9349ee4e633c Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents: 7319
diff changeset
1662 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
1663 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
1664 }
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
1665
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1666 # func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1667 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1668 # - 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
1669 # - 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
1670 # Output:
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1671 # - 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
1672 func_modules_add_dummy ()
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1673 {
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1674 # Determine whether any module provides a lib_SOURCES augmentation.
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1675 have_lib_SOURCES=
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1676 sed_remove_backslash_newline=':a
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1677 /\\$/{
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1678 s/\\$//
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1679 N
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1680 s/\n//
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1681 ba
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1682 }'
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1683 for module in $modules; do
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1684 func_verify_nontests_module
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1685 if test -n "$module"; then
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1686 # 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
1687 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
1688 # 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
1689 case "$file" in
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1690 *.h) ;;
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1691 *)
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1692 have_lib_SOURCES=yes
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1693 break 2
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1694 ;;
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1695 esac
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1696 done
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1697 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1698 done
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1699 # 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
1700 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
1701 if func_acceptable "dummy"; then
9c0fa5819ce3 2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 8626
diff changeset
1702 func_append modules " dummy"
9c0fa5819ce3 2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 8626
diff changeset
1703 fi
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1704 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1705 }
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
1706
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1707 # func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1708 # Input:
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1709 # - local_gnulib_dir from --local-dir
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1710 # - 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
1711 # - modules list of modules, including dependencies
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1712 func_modules_notice ()
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1713 {
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1714 if test $verbose -ge -1; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1715 for module in $modules; do
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1716 func_verify_module
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1717 if test -n "$module"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1718 msg=`func_get_notice $module`
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1719 if test -n "$msg"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1720 echo "Notice from module $module:"
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1721 echo "$msg" | sed -e 's/^/ /'
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1722 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1723 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1724 done
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1725 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1726 }
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
1727
5348
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1728 # func_modules_to_filelist
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1729 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1730 # - 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
1731 # - 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
1732 # Output:
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1733 # - files list of files
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1734 func_modules_to_filelist ()
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1735 {
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1736 files=
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1737 for module in $modules; do
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1738 func_verify_module
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1739 if test -n "$module"; then
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
1740 fs=`func_get_filelist $module`
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
1741 func_append files " $fs"
5348
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1742 fi
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1743 done
7319
1726cc39709b Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents: 7299
diff changeset
1744 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
1745 }
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
1746
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1747 # func_execute_command command [args...]
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1748 # Executes a command.
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1749 # Uses also the variables
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1750 # - verbose integer, default 0, inc/decremented by --verbose/--quiet
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1751 func_execute_command ()
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1752 {
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1753 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1754 echo "executing $*"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1755 "$@"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1756 else
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
1757 # 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
1758 # Turn this output off if the command succeeds.
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1759 "$@" > "$tmp"/cmdout 2>&1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1760 cmdret=$?
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1761 if test $cmdret = 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1762 rm -f "$tmp"/cmdout
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1763 else
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1764 echo "executing $*"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1765 cat "$tmp"/cmdout 1>&2
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1766 rm -f "$tmp"/cmdout
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1767 (exit $cmdret)
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1768 fi
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1769 fi
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1770 }
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
1771
5351
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1772 # 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
1773 # 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
1774 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
1775 # - 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
1776 # - 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
1777 # - libname library name
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1778 # - 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
1779 # - 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
1780 # - makefile_name from --makefile-name
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
1781 # - 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
1782 # - 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
1783 # - 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
1784 # - 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
1785 # - 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
1786 # - 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
1787 # 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
1788 # - 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
1789 # 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
1790 # Output:
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1791 # - 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
1792 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
1793 {
7240
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1794 # 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
1795 # += instead of assigning them.
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1796 if test -n "$makefile_name"; then
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1797 assign='+='
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1798 else
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1799 assign='='
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1800 fi
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
1801 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
1802 libext=la
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1803 perhapsLT=LT
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
1804 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
1805 else
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1806 libext=a
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1807 perhapsLT=
7335
6a496bee90ff * gnulib-tool: Avoid space-tab.
Eric Blake <ebb9@byu.net>
parents: 7332
diff changeset
1808 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
1809 fi
7981
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
1810 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
1811 # 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
1812 # 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
1813 # "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
1814 # 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
1815 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
1816 else
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
1817 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
1818 fi
7421
8bace4b08db5 Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents: 7391
diff changeset
1819 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
1820 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
1821 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
1822 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
1823 echo "# Reproduce by: $actioncmd"
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1824 fi
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1825 echo
7641
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1826 uses_subdirs=
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1827 {
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
1828 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
1829 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
1830 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
1831 {
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents: 7168
diff changeset
1832 func_get_automake_snippet "$module" |
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1833 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
1834 -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
1835 -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
1836 -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
1837 -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
1838 -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
1839 -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
1840 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
1841 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
1842 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
1843 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
1844 } > amsnippet.tmp
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
1845 # 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
1846 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
1847 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
1848 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
1849 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
1850 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
1851 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
1852 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
1853 rm -f amsnippet.tmp
7641
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1854 # 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
1855 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
1856 case $f in
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1857 lib/*/*.c)
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1858 uses_subdirs=yes
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1859 break
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
1860 ;;
7641
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1861 esac
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1862 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
1863 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
1864 done
7641
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1865 } > allsnippets.tmp
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1866 if test -z "$makefile_name"; then
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1867 # 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
1868 # 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
1869 subdir_options=
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1870 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1871 subdir_options=' subdir-objects'
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1872 fi
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1873 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
1874 fi
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
1875 echo
7246
4a748ab30907 * gnulib-tool (func_emit_lib_Makefile_am): Fix typos in
Paul Eggert <eggert@cs.ucla.edu>
parents: 7245
diff changeset
1876 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
1877 echo "SUBDIRS ="
7240
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1878 echo "noinst_HEADERS ="
7701
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1879 echo "noinst_LIBRARIES ="
7691
33b654c2cba8 Initialize also noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7660
diff changeset
1880 echo "noinst_LTLIBRARIES ="
7270
3d4ebfd658b2 A comment about automake-1.9b.
Bruno Haible <bruno@clisp.org>
parents: 7264
diff changeset
1881 # 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
1882 # 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
1883 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
1884 echo "pkgdata_DATA ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1885 fi
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1886 echo "EXTRA_DIST ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1887 echo "BUILT_SOURCES ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1888 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
1889 fi
7240
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1890 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
1891 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
1892 echo "MOSTLYCLEANDIRS ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1893 echo "CLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1894 echo "DISTCLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1895 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
1896 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
1897 # 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
1898 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
1899 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
1900 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
1901 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
1902 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
1903 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
1904 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
1905 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
1906 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
1907 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
1908 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
1909 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
1910 done
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
1911 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
1912 echo
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1913 echo "AM_CPPFLAGS ="
e9d3ace50303 Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7239
diff changeset
1914 fi
6750
608add4e5b80 Support for packages that use "gettextize --intl". From Claudio Fontana.
Bruno Haible <bruno@clisp.org>
parents: 6745
diff changeset
1915 echo
10255
a945eb5a83fe Recognize 'foo_LIBRARIES += libgnu.a'.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10252
diff changeset
1916 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
1917 # 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
1918 # 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
1919 :
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1920 else
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1921 # 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
1922 echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1923 fi
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1924 echo
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1925 echo "${libname}_${libext}_SOURCES ="
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1926 # 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
1927 # 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
1928 echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1929 echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1930 echo "EXTRA_${libname}_${libext}_SOURCES ="
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1931 if test "$libtool" = true; then
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1932 echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)"
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1933 fi
c59b96cb52c7 Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents: 7691
diff changeset
1934 echo
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1935 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1936 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
1937 echo
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1938 fi
7644
3c0ece164bab Replace build-aux/ also in the Makefile snippet.
Bruno Haible <bruno@clisp.org>
parents: 7643
diff changeset
1939 cat allsnippets.tmp \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
1940 | 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
1941 echo
7086
ba6d3c85213f Fix for "make -j 3".
Bruno Haible <bruno@clisp.org>
parents: 7079
diff changeset
1942 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
1943 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
1944 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
1945 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
1946 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
1947 echo " done; \\"
03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents: 9009
diff changeset
1948 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
1949 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
1950 }
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents: 5350
diff changeset
1951
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1952 # func_emit_po_Makevars
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
1953 # 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
1954 # Input:
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1955 # - local_gnulib_dir from --local-dir
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1956 # - 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
1957 # - 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
1958 # - 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
1959 func_emit_po_Makevars ()
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1960 {
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1961 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1962 func_emit_copyright_notice
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1963 echo
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1964 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
1965 echo "# But here it has a '-gnulib' suffix."
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1966 echo "DOMAIN = ${po_domain}-gnulib"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1967 echo
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1968 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
1969 echo "subdir = ${pobase}"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1970 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
1971 echo
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1972 cat <<\EOF
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1973 # These options get passed to xgettext.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1974 XGETTEXT_OPTIONS = \
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1975 --keyword=_ --flag=_:1:pass-c-format \
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1976 --keyword=N_ --flag=N_:1:pass-c-format \
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1977 --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
1978 --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
1979 --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
1980
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1981 # 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
1982 # $(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
1983 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1984
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1985 # 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
1986 # bugs in the untranslated strings:
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1987 # - 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
1988 # in the GNU gettext documentation, section 'Preparing Strings'.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1989 # - 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
1990 # understood.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1991 # - 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
1992 # money.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1993 # - Pluralisation problems.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1994 # - Incorrect English spelling.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1995 # - Incorrect formatting.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1996 # 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
1997 # 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
1998 # which the translators can contact you.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
1999 MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2000
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2001 # 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
2002 # 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
2003 EXTRA_LOCALE_CATEGORIES =
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2004
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2005 # 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
2006 # 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
2007 # 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
2008 # 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
2009 USE_MSGCTXT = no
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2010 EOF
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2011 }
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2012
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2013 # func_emit_po_POTFILES_in
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2014 # 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
2015 # Input:
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2016 # - local_gnulib_dir from --local-dir
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2017 # - 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
2018 # - files list of new files
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2019 func_emit_po_POTFILES_in ()
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2020 {
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2021 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2022 func_emit_copyright_notice
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2023 echo
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2024 echo "# List of files which contain translatable strings."
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2025 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
2026 }
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2027
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2028 # 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
2029 # 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
2030 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
2031 # - local_gnulib_dir from --local-dir
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2032 # - modules list of modules, including dependencies
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2033 # - 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
2034 # - 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
2035 # - makefile_name from --makefile-name
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
2036 # - 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
2037 # - sourcebase relative directory containing lib source code
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2038 # - m4base relative directory containing autoconf macros
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2039 # - 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
2040 # - 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
2041 # - 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
2042 # - 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
2043 # - 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
2044 # 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
2045 # - 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
2046 # 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
2047 # Output:
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2048 # - 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
2049 func_emit_tests_Makefile_am ()
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2050 {
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
2051 if test "$libtool" = true; then
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2052 libext=la
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
2053 sed_eliminate_LDFLAGS="$sed_noop"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2054 else
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2055 libext=a
7335
6a496bee90ff * gnulib-tool: Avoid space-tab.
Eric Blake <ebb9@byu.net>
parents: 7332
diff changeset
2056 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2057 fi
7981
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
2058 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
2059 # 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
2060 # 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
2061 # "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
2062 # 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
2063 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
2064 else
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
2065 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
2066 fi
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2067 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
2068 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2069 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
2070 func_emit_copyright_notice
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 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
2073 (
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents: 7168
diff changeset
2074 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
2075 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
2076 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
2077 else
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2078 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
2079 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
2080 if test -n "$module"; then
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2081 {
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2082 func_get_automake_snippet "$module" |
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2083 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
2084 -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
2085 -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
2086 -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
2087 -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
2088 -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
2089 -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
2090 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
2091 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
2092 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
2093 fi
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
2094 } > amsnippet.tmp
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
2095 # 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
2096 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
2097 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
2098 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
2099 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
2100 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
2101 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
2102 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
2103 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
2104 # 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
2105 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
2106 case $f in
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2107 lib/*/*.c | tests/*/*.c)
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2108 uses_subdirs=yes
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2109 break
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2110 ;;
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2111 esac
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2112 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
2113 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
2114 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
2115 ) > 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
2116 # 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
2117 # 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
2118 # 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
2119 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
2120 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
2121 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
2122 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2123 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
2124 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2125 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
2126 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
2127 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2128 fi
6533
6bc4290ca85f Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents: 6512
diff changeset
2129 # 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
2130 # 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
2131 # "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
2132 echo "SUBDIRS ="
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2133 echo "TESTS ="
10732
a97c57b9b48e argp: Use standard gnulib idiom for EXEEXT.
Simon Josefsson <simon@josefsson.org>
parents: 10729
diff changeset
2134 echo "TESTS_ENVIRONMENT ="
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2135 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
2136 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
2137 echo "check_PROGRAMS ="
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
2138 fi
6548
060487c0b13c Initialize also noinst_HEADERS to empty.
Bruno Haible <bruno@clisp.org>
parents: 6547
diff changeset
2139 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
2140 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
2141 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
2142 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
2143 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
2144 else
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2145 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
2146 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2147 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2148 # 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
2149 # 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
2150 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
2151 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
2152 fi
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2153 echo "EXTRA_DIST ="
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2154 echo "BUILT_SOURCES ="
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2155 echo "SUFFIXES ="
7079
ecd48b98b094 Clean core dumps.
Bruno Haible <bruno@clisp.org>
parents: 7078
diff changeset
2156 echo "MOSTLYCLEANFILES = core *.stackdump"
6862
ba1b5722df42 Invent MOSTLYCLEANDIRS.
Bruno Haible <bruno@clisp.org>
parents: 6777
diff changeset
2157 echo "MOSTLYCLEANDIRS ="
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2158 echo "CLEANFILES ="
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2159 echo "DISTCLEANFILES ="
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2160 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
2161 # 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
2162 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
2163 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
2164 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
2165 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
2166 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
2167 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
2168 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
2169 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
2170 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
2171 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
2172 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
2173 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
2174 done
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2175 echo
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2176 echo "AM_CPPFLAGS = \\"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2177 echo " -I. -I\$(srcdir) \\"
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2178 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\"
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2179 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
2180 echo
9540
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2181 local_ldadd_before=''
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2182 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
2183 if $use_libtests; then
9540
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2184 # 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
2185 # 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
2186 # 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
2187 # 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
2188 # 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
2189 # module whose dependency to 'progname' is voluntarily omitted).
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2190 # 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
2191 # not matter.
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2192 local_ldadd_before=' libtests.a'
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2193 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
2194 fi
9540
56fe79dce87d Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents: 9523
diff changeset
2195 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
2196 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
2197 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
2198 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
2199 # 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
2200 # 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
2201 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
2202 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
2203 echo "EXTRA_libtests_a_SOURCES ="
9523
49f7561fc2d3 Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents: 9520
diff changeset
2204 # The circular dependency in LDADD requires this.
49f7561fc2d3 Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents: 9520
diff changeset
2205 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
2206 echo
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2207 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
2208 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
2209 | 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
2210 echo "# Clean up after Solaris cc."
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2211 echo "clean-local:"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2212 echo " rm -rf SunWS_cache"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2213 echo
7086
ba6d3c85213f Fix for "make -j 3".
Bruno Haible <bruno@clisp.org>
parents: 7079
diff changeset
2214 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
2215 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
2216 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
2217 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
2218 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
2219 echo " done; \\"
03602a916a9a Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents: 9009
diff changeset
2220 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
2221 rm -f allsnippets.tmp
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2222 }
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
2223
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2224 # 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
2225 # 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
2226 # - 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
2227 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
2228 {
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2229 macro_prefix_arg="$1"
7646
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents: 7644
diff changeset
2230 # 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
2231 # 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
2232 # 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
2233 # 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
2234 # flexibility.)
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents: 7644
diff changeset
2235 # 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
2236 # 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
2237 # 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
2238 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
2239 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
2240 # 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
2241 # 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
2242 # 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
2243 # 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
2244 # 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
2245 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
2246 # 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
2247 # 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
2248 # 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
2249 # 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
2250 # 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
2251 # in which to expect them.
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2252 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
2253 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
2254 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
2255 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2256
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2257 # 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
2258 # 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
2259 # - 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
2260 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
2261 {
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2262 macro_prefix_arg="$1"
10066
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2263 # 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
2264 # 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
2265 # 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
2266 # check is skipped.
10067
40a8c0b4f5e0 Oops, fix small mistake in last commit.
Bruno Haible <bruno@clisp.org>
parents: 10066
diff changeset
2267 echo " m4_ifval(${macro_prefix_arg}_LIBSOURCES_LIST, ["
10261
eb86b5a38e84 Work with tar's bootstrap.
Eric Blake <ebb9@byu.net>
parents: 10255
diff changeset
2268 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
2269 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
2270 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
2271 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
2272 echo " exit 1"
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2273 echo " fi"
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2274 echo " done])dnl"
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2275 echo " m4_if(m4_sysval, [0], [],"
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2276 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
2277 echo " ])"
9a2a9c43db65 Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents: 10065
diff changeset
2278 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
2279 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
2280 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
2281 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
2282 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
2283 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
2284 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
2285 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
2286 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
2287 echo " # Remove the extension."
472795eea368 Remove duplicates from the gl_LIBOBJS list.
Bruno Haible <bruno@clisp.org>
parents: 7497
diff changeset
2288 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
2289 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
2290 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
2291 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
2292 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
2293 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
2294 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
2295 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
2296 echo " ])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2297 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2298
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2299 # 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
2300 # 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
2301 # - 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
2302 # - 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
2303 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
2304 {
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2305 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
2306 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
2307 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2308 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
2309 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
2310 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
2311 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
2312 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
2313 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
2314 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2315 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
2316 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
2317 echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], ["
9237
aeb8e2d99afa m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents: 9232
diff changeset
2318 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
2319 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
2320 echo "])"
7646
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents: 7644
diff changeset
2321 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
2322 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
2323 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
2324 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
2325 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
2326 echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], ["
9237
aeb8e2d99afa m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents: 9232
diff changeset
2327 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
2328 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
2329 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
2330 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
2331 echo " ])"
9237
aeb8e2d99afa m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents: 9232
diff changeset
2332 echo " ])"
aeb8e2d99afa m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents: 9232
diff changeset
2333 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
2334 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents: 7485
diff changeset
2335
5347
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2336 # func_import modules
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2337 # Uses also the variables
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2338 # - destdir target directory
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
2339 # - local_gnulib_dir from --local-dir
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2340 # - 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
2341 # - libname library name
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2342 # - 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
2343 # - 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
2344 # - 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
2345 # - 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
2346 # - 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
2347 # - 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
2348 # - inctests true if --with-tests was given, blank otherwise
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2349 # - incobsolete true if --with-obsolete was given, blank otherwise
5981
09850e201e79 New option --avoid.
Bruno Haible <bruno@clisp.org>
parents: 5963
diff changeset
2350 # - 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
2351 # - 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
2352 # blank otherwise
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2353 # - makefile_name from --makefile-name
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
2354 # - 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
2355 # given, blank otherwise
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
2356 # - 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
2357 # - 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
2358 # - 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
2359 # - 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
2360 # given, blank otherwise
6994
3484a8772427 Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents: 6993
diff changeset
2361 # - autoconf_minversion minimum supported autoconf version
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2362 # - 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
2363 # - symbolic true if files should be symlinked, copied otherwise
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2364 # - 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
2365 # copied otherwise
9096
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
2366 # - 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
2367 # blank otherwise
5347
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2368 func_import ()
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2369 {
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2370 # Get the cached settings.
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2371 cached_local_gnulib_dir=
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2372 cached_specified_modules=
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2373 cached_incobsolete=
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2374 cached_avoidlist=
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2375 cached_sourcebase=
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2376 cached_m4base=
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2377 cached_pobase=
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2378 cached_docbase=
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2379 cached_testsbase=
8890
576d3e4f31c2 Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents: 8672
diff changeset
2380 cached_inctests=
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2381 cached_libname=
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2382 cached_lgpl=
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2383 cached_makefile_name=
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2384 cached_libtool=
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2385 cached_macro_prefix=
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2386 cached_po_domain=
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
2387 cached_vc_files=
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2388 cached_files=
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2389 if test -f "$destdir"/$m4base/gnulib-cache.m4; then
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
2390 cached_libtool=false
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2391 my_sed_traces='
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2392 s,#.*$,,
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2393 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2394 s, dnl .*$,,
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2395 /gl_LOCAL_DIR(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2396 s,^.*gl_LOCAL_DIR([[ ]*\([^]"$`\\)]*\).*$,cached_local_gnulib_dir="\1",p
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2397 }
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2398 /gl_MODULES(/ {
10293
3c624b3d1039 Make a sed program more robust.
Bruno Haible <bruno@clisp.org>
parents: 10261
diff changeset
2399 ta
10246
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2400 :a
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2401 s/)/)/
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2402 tb
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2403 N
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2404 ba
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
2405 :b
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2406 s,^.*gl_MODULES([[ ]*\([^]"$`\\)]*\).*$,cached_specified_modules="\1",p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2407 }
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2408 /gl_WITH_OBSOLETE/ {
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2409 s,^.*$,cached_incobsolete=true,p
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2410 }
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2411 /gl_AVOID(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2412 s,^.*gl_AVOID([[ ]*\([^]"$`\\)]*\).*$,cached_avoidlist="\1",p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2413 }
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2414 /gl_SOURCE_BASE(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2415 s,^.*gl_SOURCE_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_sourcebase="\1",p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2416 }
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2417 /gl_M4_BASE(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2418 s,^.*gl_M4_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_m4base="\1",p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2419 }
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2420 /gl_PO_BASE(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2421 s,^.*gl_PO_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_pobase="\1",p
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2422 }
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2423 /gl_DOC_BASE(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2424 s,^.*gl_DOC_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_docbase="\1",p
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2425 }
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2426 /gl_TESTS_BASE(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2427 s,^.*gl_TESTS_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_testsbase="\1",p
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2428 }
8890
576d3e4f31c2 Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents: 8672
diff changeset
2429 /gl_WITH_TESTS/ {
576d3e4f31c2 Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents: 8672
diff changeset
2430 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
2431 }
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2432 /gl_LIB(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2433 s,^.*gl_LIB([[ ]*\([^]"$`\\)]*\).*$,cached_libname="\1",p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2434 }
9417
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2435 /gl_LGPL(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2436 s,^.*gl_LGPL([[ ]*\([^]"$`\\)]*\).*$,cached_lgpl="\1",p
9417
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2437 }
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2438 /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
2439 s,^.*$,cached_lgpl=yes,p
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2440 }
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2441 /gl_MAKEFILE_NAME(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2442 s,^.*gl_MAKEFILE_NAME([[ ]*\([^]"$`\\)]*\).*$,cached_makefile_name="\1",p
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2443 }
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2444 /gl_LIBTOOL/ {
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2445 s,^.*$,cached_libtool=true,p
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2446 }
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2447 /gl_MACRO_PREFIX(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2448 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
2449 }
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2450 /gl_PO_DOMAIN(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2451 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
2452 }
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
2453 /gl_VC_FILES(/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2454 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
2455 }'
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2456 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
2457 if test -f "$destdir"/$m4base/gnulib-comp.m4; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2458 my_sed_traces='
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2459 s,#.*$,,
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2460 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2461 s, dnl .*$,,
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2462 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ {
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2463 s,^.*$,cached_files=",p
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2464 n
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2465 ta
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2466 :a
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2467 s,^\]).*$,",
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2468 tb
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
2469 s,["$`\\],,g
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2470 p
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2471 n
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2472 ba
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2473 :b
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2474 p
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2475 }'
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2476 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
2477 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2478 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2479
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2480 # Merge the cached settings with the specified ones.
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2481 # 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
2482 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
2483 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
2484 fi
7213
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2485 # 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
2486 # 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
2487 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
2488 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
2489 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2490 /*)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2491 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
2492 *)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2493 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
2494 /*)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2495 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
2496 *)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2497 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
2498 local_gnulib_dir="$relconcat" ;;
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2499 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2500 esac
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2501 fi
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
2502 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2503 # 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
2504 # "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
2505 specified_modules="$cached_specified_modules $1"
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2506 # Included obsolete modules among the dependencies if specified either way.
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2507 if test -z "$incobsolete"; then
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2508 incobsolete="$cached_incobsolete"
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
2509 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2510 # 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
2511 # 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
2512 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
2513 avoidlist=`echo $avoidlist`
110e60d88fad (func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents: 9025
diff changeset
2514
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2515 # The sourcebase defaults to the cached one.
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2516 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2517 sourcebase="$cached_sourcebase"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2518 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2519 func_fatal_error "missing --source-base option"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2520 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2521 fi
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2522 # The pobase defaults to the cached one.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2523 if test -z "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2524 pobase="$cached_pobase"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2525 fi
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2526 # 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
2527 if test -z "$docbase"; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2528 docbase="$cached_docbase"
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2529 if test -z "$docbase"; then
7076
0e471c8eb020 Tweak error message about missing --doc-base.
Bruno Haible <bruno@clisp.org>
parents: 7073
diff changeset
2530 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
2531 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2532 fi
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2533 # The testsbase defaults to the cached one.
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2534 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2535 testsbase="$cached_testsbase"
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2536 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2537 func_fatal_error "missing --tests-base option"
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2538 fi
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2539 fi
8890
576d3e4f31c2 Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents: 8672
diff changeset
2540 # 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
2541 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
2542 inctests="$cached_inctests"
576d3e4f31c2 Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents: 8672
diff changeset
2543 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2544 # 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
2545 if test -z "$supplied_libname"; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2546 libname="$cached_libname"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2547 if test -z "$libname"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2548 func_fatal_error "missing --lib option"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2549 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2550 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2551 # Require LGPL if specified either way.
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2552 if test -z "$lgpl"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2553 lgpl="$cached_lgpl"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2554 fi
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2555 # The makefile_name defaults to the cached one.
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2556 if test -z "$makefile_name"; then
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2557 makefile_name="$cached_makefile_name"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
2558 fi
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2559 # 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
2560 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
2561 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
2562 libtool="$cached_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2563 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2564 libtool="$guessed_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2565 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2566 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2567 # The macro_prefix defaults to the cached one.
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2568 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2569 macro_prefix="$cached_macro_prefix"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2570 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2571 func_fatal_error "missing --macro-prefix option"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2572 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2573 fi
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2574 # The po_domain defaults to the cached one.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2575 if test -z "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2576 po_domain="$cached_po_domain"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2577 fi
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
2578 # 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
2579 if test -z "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
2580 vc_files="$cached_vc_files"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
2581 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2582
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2583 # Canonicalize the list of specified modules.
7319
1726cc39709b Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents: 7299
diff changeset
2584 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
2585
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2586 # Determine final module list.
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2587 modules="$specified_modules"
5347
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
2588 func_modules_transitive_closure
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2589 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2590 echo "Module list with included dependencies:"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2591 echo "$modules" | sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2592 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
2593 final_modules="$modules"
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2594
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2595 # 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
2596 # 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
2597 # 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
2598 # 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
2599 # 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
2600 # 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
2601 # 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
2602 # $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
2603 # 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
2604 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
2605 inctests=""
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2606 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
2607 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
2608 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
2609 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
2610 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
2611 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
2612 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
2613 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2614 # 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
2615 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
2616 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
2617 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
2618 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
2619 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
2620 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2621
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2622 # 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
2623 modules="$main_modules"
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
2624 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
2625 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
2626
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2627 # 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
2628 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
2629 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
2630 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
2631 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
2632 all_files=`func_get_filelist $module`
10985
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2633 # Test whether some file in $all_files lies in lib/.
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2634 for f in $all_files; do
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2635 case $f in
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2636 lib/*)
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2637 use_libtests=true
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2638 break 2
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2639 ;;
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2640 esac
32537aa6364d Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents: 10981
diff changeset
2641 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
2642 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2643 done
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2644
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2645 # 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
2646 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
2647 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
2648 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
2649 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
2650 fi
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
2651
7235
3dbbe645b976 * MODULES.html.sh (Support for building documentation): Add gpl, lgpl.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7222
diff changeset
2652 # 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
2653 if test -n "$lgpl"; then
10479
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2654 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
2655 for module in $main_modules; do
5346
40f5d74050d5 Use func_get_license.
Bruno Haible <bruno@clisp.org>
parents: 5345
diff changeset
2656 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
2657 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
2658 'GPLed build tool') ;;
7245
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2659 '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
2660 *)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2661 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
2662 yes | 3)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2663 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
2664 LGPL | LGPLv2+) ;;
10479
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2665 *) 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
2666 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2667 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2668 2)
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2669 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
2670 LGPLv2+) ;;
10479
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2671 *) 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
2672 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2673 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2674 *) 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
2675 esac
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2676 ;;
5963
6fb8c48c4dcd * gnulib-tool (func_import): Add support for 'public domain' license.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
2677 esac
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2678 done
10479
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2679 if test -n "$license_incompatibilities"; then
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2680 # Format the license incompatibilities as a table.
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2681 sed_expand_column1_width50_indent17='s,^\([^ ]*\) ,\1 ,
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2682 s,^\(.................................................[^ ]*\) *, \1 ,'
74885eaea206 Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents: 10478
diff changeset
2683 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
2684 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
2685 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2686 fi
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2687
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
2688 # 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
2689 modules="$main_modules"
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
2690 func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
2691
7199
85ef7b18536b New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents: 7195
diff changeset
2692 # 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
2693 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
2694 for module in $main_modules; do
7245
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2695 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
2696 # 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
2697 sed_transform_lib_file=$sed_transform_lib_file'
7245
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2698 s/^#ifdef[ ]*HAVE_CONFIG_H[ ]*$/#if 1/
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2699 '
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2700 break
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2701 fi
138333fc7a90 Improve maintainability.
Bruno Haible <bruno@clisp.org>
parents: 7241
diff changeset
2702 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
2703 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
2704 if test -n "$do_copyrights"; then
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
2705 if test -n "$lgpl"; then
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
2706 # 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
2707 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
2708 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
2709 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
2710 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
2711 '
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2712 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2713 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
2714 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
2715 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
2716 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
2717 '
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2718 ;;
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
2719 *) 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
2720 esac
9424
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9417
diff changeset
2721 else
d852c1c185e4 If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9417
diff changeset
2722 # 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
2723 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
2724 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
2725 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
2726 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
2727 '
9096
7f1880b27b89 New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents: 9090
diff changeset
2728 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
2729 fi
85ef7b18536b New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents: 7195
diff changeset
2730
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2731 # 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
2732 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
2733 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
2734 # 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
2735 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
2736 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
2737 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
2738 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
2739 '
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2740 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2741
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2742 # 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
2743 # 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
2744 # $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
2745 # 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
2746 # 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
2747 # 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
2748 modules="$main_modules"
5348
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
2749 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
2750 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
2751 # 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
2752 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
2753 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
2754 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
2755 # 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
2756 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
2757 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
2758 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2759 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
2760 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
2761 echo "$files" | sed -e "$sed_prettyprint_files" -e 's/^/ /'
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
2762 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2763
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2764 test -n "$files" \
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2765 || 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
2766
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2767 # 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
2768 new_files="$files m4/gnulib-tool.m4"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2769 old_files="$cached_files"
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2770 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
2771 func_append old_files " m4/gnulib-tool.m4"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2772 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2773
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2774 sed_rewrite_old_files="\
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2775 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2776 s,^doc/,$cached_docbase/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2777 s,^lib/,$cached_sourcebase/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2778 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
2779 s,^tests/,$cached_testsbase/,
9807
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
2780 s,^tests=lib/,$cached_testsbase/,
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
2781 s,^top/,,"
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2782 sed_rewrite_new_files="\
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2783 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2784 s,^doc/,$docbase/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2785 s,^lib/,$sourcebase/,
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2786 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
2787 s,^tests/,$testsbase/,
9807
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
2788 s,^tests=lib/,$testsbase/,
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
2789 s,^top/,,"
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2790
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2791 # Create directories.
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2792 { echo "$sourcebase"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2793 echo "$m4base"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2794 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2795 echo "$pobase"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2796 fi
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2797 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
2798 if test -n "$docfiles"; then
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2799 echo "$docbase"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2800 fi
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2801 if test -n "$inctests"; then
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2802 echo "$testsbase"
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
2803 fi
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2804 echo "$auxdir"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2805 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
2806 | sed -e "$sed_rewrite_new_files" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2807 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2808 | LC_ALL=C sort -u
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2809 } > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2810 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2811 # 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
2812 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2813 while read d; do
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2814 if test ! -d "$destdir/$d"; then
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2815 if $doit; then
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2816 echo "Creating directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2817 mkdir -p "$destdir/$d" || func_fatal_error "failed"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2818 else
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2819 echo "Create directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2820 fi
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
2821 fi
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2822 done
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2823 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
2824 }
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
2825
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
2826 # 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
2827 # 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
2828 # 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
2829 # - 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
2830 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
2831 {
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents: 6633
diff changeset
2832 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
2833 # 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
2834 # 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
2835 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
2836 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
2837 # 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
2838 # (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
2839 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
2840 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
2841 }
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents: 6633
diff changeset
2842
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents: 6633
diff changeset
2843 # 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
2844 added_files=''
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
2845 removed_files=''
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2846 delimiter=' '
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2847 # 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
2848 # 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
2849 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
2850 | 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
2851 | LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2852 > "$tmp"/old-files
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2853 # 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
2854 # representing the files after this gnulib-tool invocation.
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2855 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
2856 | 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
2857 | LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2858 > "$tmp"/new-files
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2859 # 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
2860 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
2861 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
2862 # 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
2863 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
2864 if $doit; then
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2865 echo "Removing file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2866 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
2867 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2868 echo "Remove file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2869 fi
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
2870 func_append removed_files "$g$nl"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2871 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2872 done
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2873 # 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
2874 # Uses parameters
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2875 # - f the original file name
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2876 # - g the rewritten file name
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2877 # - 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
2878 func_add_or_update ()
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2879 {
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2880 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
2881 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
2882 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
2883 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
2884 func_dest_tmpfilename "$g"
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
2885 func_lookup_file "$f"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
2886 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
2887 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
2888 case "$of" in
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2889 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
2890 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
2891 < "$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
2892 ;;
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2893 esac
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2894 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
2895 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
2896 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
2897 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
2898 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
2899 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2900 ;;
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2901 esac
5798
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents: 5685
diff changeset
2902 fi
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2903 if test -f "$destdir/$g"; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2904 # 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
2905 if cmp "$destdir/$g" "$tmpfile" > /dev/null; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2906 : # The file has not changed.
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2907 else
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2908 # Replace the file.
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2909 if $doit; then
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2910 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2911 echo "Updating file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2912 else
9875
44146d346042 gnulib-tool (func_add_or_update): s/backuped/backed up/ in diagnostic
Jim Meyering <meyering@redhat.com>
parents: 9810
diff changeset
2913 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
2914 fi
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2915 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
2916 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2917 || { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2918 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2919 && test -z "$lookedup_tmp" \
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
2920 && 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
2921 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
2922 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
2923 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
2924 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2925 else
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2926 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2927 echo "Update file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2928 else
9875
44146d346042 gnulib-tool (func_add_or_update): s/backuped/backed up/ in diagnostic
Jim Meyering <meyering@redhat.com>
parents: 9810
diff changeset
2929 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
2930 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2931 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2932 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2933 else
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2934 # Install the file.
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2935 # 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
2936 # 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
2937 if $doit; then
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2938 echo "Copying file $g"
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2939 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2940 || { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2941 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
2942 && test -z "$lookedup_tmp" \
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
2943 && 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
2944 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
2945 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
2946 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
2947 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2948 else
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
2949 echo "Copy file $g"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2950 fi
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
2951 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
2952 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
2953 rm -f "$tmpfile"
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2954 }
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2955 # 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
2956 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
2957 already_present=
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2958 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
2959 | sed -e "$sed_take_last_column" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2960 | 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
2961 { # 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
2962 # 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
2963 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
2964 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2965 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2966 done
7373
330a972d58f0 Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents: 7368
diff changeset
2967 exec 0<&5 5<&-
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2968 }
6245
07b16a28510d Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents: 6213
diff changeset
2969 # 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
2970 already_present=true
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
2971 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
2972 | sed -e "$sed_take_last_column" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
2973 | 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
2974 { # 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
2975 # 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
2976 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
2977 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2978 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2979 done
7373
330a972d58f0 Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents: 7368
diff changeset
2980 exec 0<&5 5<&-
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
2981 }
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
2982
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
2983 # 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
2984 actioncmd="gnulib-tool --import"
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2985 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
2986 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
2987 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
2988 fi
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2989 func_append actioncmd " --lib=$libname"
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2990 func_append actioncmd " --source-base=$sourcebase"
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2991 func_append actioncmd " --m4-base=$m4base"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2992 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2993 func_append actioncmd " --po-base=$pobase"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
2994 fi
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2995 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
2996 func_append actioncmd " --tests-base=$testsbase"
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
2997 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
2998 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
2999 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
3000 fi
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
3001 if test -n "$incobsolete"; then
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
3002 func_append actioncmd " --with-obsolete"
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
3003 fi
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3004 for module in $avoidlist; do
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3005 func_append actioncmd " --avoid=$module"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3006 done
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3007 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
3008 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
3009 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
3010 else
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
3011 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
3012 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3013 fi
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3014 if test -n "$makefile_name"; then
7600
42c51a6fef88 Fix typo in actioncmd. From Charles WIlson.
Bruno Haible <bruno@clisp.org>
parents: 7599
diff changeset
3015 func_append actioncmd " --makefile-name=$makefile_name"
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3016 fi
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3017 if test "$libtool" = true; then
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3018 func_append actioncmd " --libtool"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3019 else
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3020 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
3021 fi
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3022 func_append actioncmd " --macro-prefix=$macro_prefix"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3023 if test -n "$po_domain"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3024 func_append actioncmd " --po-domain=$po_domain"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3025 fi
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3026 if test -n "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3027 if test "$vc_files" = true; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3028 func_append actioncmd " --vc-files"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3029 else
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3030 func_append actioncmd " --no-vc-files"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3031 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3032 fi
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3033 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
3034
7222
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents: 7216
diff changeset
3035 # 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
3036 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
3037 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
3038 else
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents: 7216
diff changeset
3039 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
3040 fi
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents: 7216
diff changeset
3041
7981
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
3042 # 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
3043 for_test=false
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
3044
10476
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3045 # 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
3046 # 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
3047 # 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
3048 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
3049 # 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
3050 # 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
3051 # ${value}.
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3052 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
3053 {
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3054 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
3055 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
3056 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
3057 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
3058 }
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3059 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
3060 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
3061 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
3062 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
3063 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3064 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
3065 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
3066 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
3067 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
3068 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3069 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
3070 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
3071 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
3072 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
3073 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
3074 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3075 fi
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3076 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
3077 {
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
3078 # 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
3079 # 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
3080 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
3081 s,//*$,/,'
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3082 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
3083 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
3084 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
3085 && ! { 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
3086 || 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
3087 || 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
3088 || { 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
3089 && { 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
3090 || 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
3091 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
3092 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
3093 done
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3094 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
3095 }
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3096
7222
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents: 7216
diff changeset
3097 # Create library makefile.
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3098 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
3099 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
3100 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
3101 func_emit_lib_Makefile_am > "$tmpfile"
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3102 if test -f "$destdir"/$sourcebase/$makefile_am; then
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3103 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
3104 rm -f "$tmpfile"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3105 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3106 if $doit; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3107 echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3108 mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3109 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3110 else
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3111 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
3112 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3113 fi
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3114 fi
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3115 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3116 if $doit; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3117 echo "Creating $sourcebase/$makefile_am"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3118 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3119 else
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3120 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
3121 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3122 fi
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3123 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
3124 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3125
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3126 # Create po/ directory.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3127 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3128 # Create po makefile and auxiliary files.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3129 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
3130 func_dest_tmpfilename $pobase/$file
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3131 func_lookup_file build-aux/po/$file
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3132 cat "$lookedup_file" > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3133 if test -f "$destdir"/$pobase/$file; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3134 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
3135 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3136 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3137 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3138 echo "Updating $pobase/$file (backup in $pobase/$file~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3139 mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3140 mv -f "$tmpfile" "$destdir"/$pobase/$file
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3141 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3142 echo "Update $pobase/$file (backup in $pobase/$file~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3143 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3144 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3145 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3146 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3147 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3148 echo "Creating $pobase/$file"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3149 mv -f "$tmpfile" "$destdir"/$pobase/$file
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3150 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3151 echo "Create $pobase/$file"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3152 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3153 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3154 func_append added_files "$pobase/$file$nl"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3155 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3156 done
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
3157 # Create po makefile parameterization, part 1.
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3158 func_dest_tmpfilename $pobase/Makevars
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3159 func_emit_po_Makevars > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3160 if test -f "$destdir"/$pobase/Makevars; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3161 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
3162 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3163 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3164 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3165 echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3166 mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3167 mv -f "$tmpfile" "$destdir"/$pobase/Makevars
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3168 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3169 echo "Update $pobase/Makevars (backup in $pobase/Makevars~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3170 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3171 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3172 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3173 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3174 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3175 echo "Creating $pobase/Makevars"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3176 mv -f "$tmpfile" "$destdir"/$pobase/Makevars
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3177 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3178 echo "Create $pobase/Makevars"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3179 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3180 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3181 func_append added_files "$pobase/Makevars$nl"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3182 fi
10065
e1449fcc7ecb * gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents: 9887
diff changeset
3183 # Create po makefile parameterization, part 2.
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3184 func_dest_tmpfilename $pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3185 func_emit_po_POTFILES_in > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3186 if test -f "$destdir"/$pobase/POTFILES.in; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3187 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
3188 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3189 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3190 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3191 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
3192 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
3193 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3194 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3195 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
3196 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3197 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3198 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3199 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3200 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3201 echo "Creating $pobase/POTFILES.in"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3202 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3203 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3204 echo "Create $pobase/POTFILES.in"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3205 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3206 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3207 func_append added_files "$pobase/POTFILES.in$nl"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3208 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3209 # Fetch PO files.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3210 TP_URL="http://translationproject.org/latest/"
9187
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3211 TP_RSYNC_URI="translationproject.org::tp/latest/"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3212 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3213 echo "Fetching gnulib PO files from $TP_URL"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3214 (cd "$destdir"/$pobase \
9187
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3215 && { # 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
3216 # less network bandwidth, due to compression.
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3217 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
3218 rsync -Lrtz "${TP_RSYNC_URI}gnulib/" .
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3219 else
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3220 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
3221 fi
9d2d1cd46644 Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents: 9168
diff changeset
3222 }
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3223 )
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3224 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3225 echo "Fetch gnulib PO files from $TP_URL"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3226 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3227 # Create po/LINGUAS.
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3228 if $doit; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3229 func_dest_tmpfilename $pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3230 (cd "$destdir"/$pobase \
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3231 && { echo '# Set of available languages.'
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3232 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
3233 }
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3234 ) > "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3235 if test -f "$destdir"/$pobase/LINGUAS; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3236 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
3237 rm -f "$tmpfile"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3238 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3239 echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3240 mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3241 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3242 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3243 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3244 echo "Creating $pobase/LINGUAS"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3245 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3246 func_append added_files "$pobase/LINGUAS$nl"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3247 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3248 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3249 if test -f "$destdir"/$pobase/LINGUAS; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3250 echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3251 else
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3252 echo "Create $pobase/LINGUAS"
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3253 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3254 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3255 fi
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3256
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3257 # 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
3258 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
3259 (
6777
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents: 6765
diff changeset
3260 func_emit_copyright_notice
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3261 echo "#"
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3262 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
3263 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
3264 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
3265 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
3266 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3267 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3268 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
3269 echo "# $actioncmd"
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3270 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3271 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
3272 # 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
3273 case "$local_gnulib_dir" in
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3274 "" | /*)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3275 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
3276 * )
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3277 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3278 /*) 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
3279 *)
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3280 # 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
3281 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
3282 relative_local_gnulib_dir="$reldir" ;;
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3283 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3284 esac
0f2957c42e86 Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents: 7212
diff changeset
3285 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
3286 echo "gl_MODULES(["
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
3287 echo "$specified_modules" | sed 's/^/ /g'
50a9076d476d Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents: 10157
diff changeset
3288 echo "])"
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
3289 test -z "$incobsolete" || echo "gl_WITH_OBSOLETE"
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3290 echo "gl_AVOID([$avoidlist])"
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3291 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
3292 echo "gl_M4_BASE([$m4base])"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3293 echo "gl_PO_BASE([$pobase])"
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
3294 echo "gl_DOC_BASE([$docbase])"
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3295 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
3296 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
3297 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
3298 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
3299 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
3300 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
3301 else
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
3302 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
3303 fi
95cbd64f5138 Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents: 9377
diff changeset
3304 fi
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3305 echo "gl_MAKEFILE_NAME([$makefile_name])"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3306 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3307 echo "gl_LIBTOOL"
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3308 fi
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3309 echo "gl_MACRO_PREFIX([$macro_prefix])"
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3310 echo "gl_PO_DOMAIN([$po_domain])"
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3311 if test -n "$vc_files"; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3312 echo "gl_VC_FILES([$vc_files])"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3313 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
3314 ) > "$tmpfile"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3315 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
3316 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
3317 rm -f "$tmpfile"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3318 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3319 if $doit; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3320 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
3321 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
3322 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
3323 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3324 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
3325 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
3326 cat "$tmpfile"
6249
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3327 echo
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3328 echo "# gnulib-cache.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3329 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
3330 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3331 fi
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3332 fi
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3333 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3334 if $doit; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3335 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
3336 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
3337 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3338 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
3339 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
3340 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3341 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3342 fi
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3343
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3344 # 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
3345 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
3346 (
7421
8bace4b08db5 Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents: 7391
diff changeset
3347 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
3348 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
3349 echo "#"
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3350 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
3351 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
3352 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
3353 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
3354 echo
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3355 echo
6160
2fb771c0af6b Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents: 6159
diff changeset
3356 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
3357 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
3358 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
3359 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
3360 echo "["
7105
641bac73140c * gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents: 7090
diff changeset
3361 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
3362 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
3363 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
3364 echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
6512
f8abe8d41137 RANLIB is needed.
Bruno Haible <bruno@clisp.org>
parents: 6464
diff changeset
3365 echo " AC_REQUIRE([AC_PROG_RANLIB])"
7641
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
3366 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
3367 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
3368 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
3369 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
3370 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
3371 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
3372 for module in $final_modules; do
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3373 func_verify_module
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3374 if test -n "$module"; then
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3375 func_get_autoconf_early_snippet "$module"
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3376 fi
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3377 done \
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3378 | 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
3379 echo "])"
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3380 echo
6160
2fb771c0af6b Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents: 6159
diff changeset
3381 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
3382 echo "# \"Check for header files, types and library functions\"."
6176
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
3383 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
3384 echo "["
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3385 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3386 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3387 echo " gl_cond_libtool=true"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3388 else
6512
f8abe8d41137 RANLIB is needed.
Bruno Haible <bruno@clisp.org>
parents: 6464
diff changeset
3389 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3390 echo " gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3391 echo " gl_libdeps="
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3392 echo " gl_ltlibdeps="
6414
46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents: 6389
diff changeset
3393 fi
6556
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3394 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3395 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3396 :a
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3397 /AC_CONFIG_FILES(.*:build-aux\/.*)/{
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3398 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
3399 ba
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3400 }'
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3401 else
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
3402 sed_replace_build_aux="$sed_noop"
6556
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
3403 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
3404 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
3405 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
3406 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
3407 func_verify_module
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3408 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
3409 func_get_autoconf_snippet "$module" \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3410 | sed -e '/^$/d;' -e 's/^/ /' \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3411 -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
3412 -e "$sed_replace_build_aux"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3413 if test "$module" = 'alloca' && test "$libtool" = true; then
5356
144b29bba7b7 Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents: 5353
diff changeset
3414 echo 'changequote(,)dnl'
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3415 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
3416 echo 'changequote([, ])dnl'
6106
66bd85c8a9cd Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents: 6039
diff changeset
3417 echo 'AC_SUBST([LTALLOCA])'
5356
144b29bba7b7 Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents: 5353
diff changeset
3418 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3419 fi
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3420 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
3421 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
3422 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
3423 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
3424 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
3425 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
3426 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
3427 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
3428 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
3429 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
3430 | 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
3431 -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
3432 -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
3433 -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
3434 -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
3435 -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
3436 fi
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
3437 done
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
3438 func_emit_initmacro_end ${macro_prefix}tests
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3439 # _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
3440 # 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
3441 if test "$libtool" != true; then
9086
110e60d88fad (func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents: 9025
diff changeset
3442 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
3443 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3444 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3445 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3446 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3447 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
3448 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
3449 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
3450 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
3451 fi
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3452 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
3453 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
3454 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
3455 echo
6180
a0904de304e5 Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents: 6179
diff changeset
3456 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
3457 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
3458 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
3459 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
3460 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
3461 ) > "$tmpfile"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3462 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
3463 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
3464 rm -f "$tmpfile"
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3465 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3466 if $doit; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3467 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
3468 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
3469 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
3470 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3471 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
3472 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
3473 cat "$tmpfile"
6249
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3474 echo
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3475 echo "# gnulib-comp.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents: 6248
diff changeset
3476 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
3477 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3478 fi
6246
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3479 fi
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3480 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3481 if $doit; then
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3482 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
3483 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
3484 else
7c089b3b2200 Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents: 6245
diff changeset
3485 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
3486 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
3487 rm -f "$tmpfile"
6181
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3488 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3489 fi
95b89dc3f638 Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents: 6180
diff changeset
3490
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3491 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
3492 # Create tests makefile.
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3493 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
3494 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
3495 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
3496 func_emit_tests_Makefile_am > "$tmpfile"
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3497 if test -f "$destdir"/$testsbase/$makefile_am; then
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3498 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
3499 rm -f "$tmpfile"
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3500 else
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3501 if $doit; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3502 echo "Updating $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3503 mv -f "$destdir"/$testsbase/$makefile_am "$destdir"/$testsbase/$makefile_am~
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3504 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3505 else
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3506 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
3507 rm -f "$tmpfile"
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3508 fi
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3509 fi
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3510 else
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3511 if $doit; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3512 echo "Creating $testsbase/$makefile_am"
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3513 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3514 else
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3515 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
3516 rm -f "$tmpfile"
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3517 fi
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3518 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
3519 fi
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3520 fi
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3521
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3522 if test "$vc_files" != false; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3523 # Update the .cvsignore and .gitignore files.
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3524 { 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
3525 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
3526 # 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
3527 echo "$m4base/|A|gnulib-comp.m4"
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3528 } | 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
3529 { # Rearrange file descriptors. Needed because "while ... done < ..."
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3530 # 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
3531 exec 5<&0 < "$tmp"/fileset-changes
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3532 func_update_ignorelist ()
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3533 {
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3534 ignore="$1"
10298
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3535 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
3536 # 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
3537 # 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
3538 anchor='/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3539 escaped_anchor='\/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3540 doubly_escaped_anchor='\\/'
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3541 else
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3542 anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3543 escaped_anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3544 doubly_escaped_anchor=''
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3545 fi
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3546 if test -f "$destdir/$dir$ignore"; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3547 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
3548 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
3549 (func_reset_sigpipe
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
3550 echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \
10980
d54e63808f25 work around Solaris 8 'join' bug
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10969
diff changeset
3551 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added
10379
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
3552 echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \
10980
d54e63808f25 work around Solaris 8 'join' bug
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10969
diff changeset
3553 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed
10379
a4e295b67e54 Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents: 10298
diff changeset
3554 )
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3555 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
3556 if $doit; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3557 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
3558 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~
10981
78dea9790e0f Fix small bug in update of .cvsignore or .gitignore.
Bruno Haible <bruno@clisp.org>
parents: 10980
diff changeset
3559 { sed -e 's,/,\\/,g' -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed
78dea9790e0f Fix small bug in update of .cvsignore or .gitignore.
Bruno Haible <bruno@clisp.org>
parents: 10980
diff changeset
3560 if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi
10298
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3561 } > "$tmp"/sed-ignore-removed
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3562 { cat "$destdir/$dir$ignore"~
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3563 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
3564 } | sed -f "$tmp"/sed-ignore-removed \
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3565 > "$destdir/$dir$ignore"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3566 else
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3567 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
3568 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3569 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3570 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3571 else
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3572 if test -n "$dir_added"; then
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3573 if $doit; then
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3574 echo "Creating $destdir/$dir$ignore"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3575 {
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3576 if test "$ignore" = .cvsignore; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3577 echo ".deps"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3578 # 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
3579 echo ".dirstamp"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3580 fi
10298
9b0ceb24a573 Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents: 10293
diff changeset
3581 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
3582 } > "$destdir/$dir$ignore"
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3583 else
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3584 echo "Create $destdir/$dir$ignore"
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3585 fi
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3586 fi
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3587 fi
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3588 }
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3589 func_done_dir ()
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3590 {
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3591 dir="$1"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3592 dir_added="$2"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3593 dir_removed="$3"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3594 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
3595 func_update_ignorelist .cvsignore
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3596 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3597 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
3598 func_update_ignorelist .gitignore
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3599 fi
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3600 }
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3601 last_dir=
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3602 last_dir_added=
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3603 last_dir_removed=
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3604 while read line; do
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3605 # 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
3606 next_dir=`echo "$line" | sed -e 's,|.*,,'`
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3607 op=`echo "$line" | sed -e 's,^[^|]*|\([^|]*\)|.*$,\1,'`
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3608 file=`echo "$line" | sed -e 's,^[^|]*|[^|]*|,,'`
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3609 if test "$next_dir" != "$last_dir"; then
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3610 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
3611 last_dir="$next_dir"
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3612 last_dir_added=
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3613 last_dir_removed=
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3614 fi
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3615 case $op in
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3616 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
3617 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
3618 esac
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3619 done
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3620 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
3621 exec 0<&5 5<&-
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3622 }
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3623 fi
8451
ba5ed28cb276 Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents: 8432
diff changeset
3624
5345
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3625 echo "Finished."
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3626 echo
5572
54000928a33d Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents: 5527
diff changeset
3627 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
3628 # 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
3629 # (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
3630 # - 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
3631 # $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
3632 # 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
3633 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
3634 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
3635 # 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
3636 # 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
3637 # 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
3638 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
3639 include_directive=`func_get_include_directive "$module"`
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3640 case "$nl$include_directive" in
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3641 *"$nl#if"*)
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3642 echo "$include_directive" 1>&5
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3643 ;;
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3644 *)
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3645 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
3646 echo "$include_directive" | grep 'include "' 1>&7
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3647 ;;
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3648 esac
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3649 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
3650 (
7322
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3651 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
3652 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
3653 cat "$tmp"/include-if
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3654 ) | sed -e '/^$/d' -e 's/^/ /'
7322
46d98b687a87 Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents: 7321
diff changeset
3655 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
3656
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
3657 for module in $main_modules; do
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3658 func_get_link_directive "$module"
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3659 done \
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3660 | 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
3661 if test `wc -l < "$tmp"/link` != 0; then
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3662 echo
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3663 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
3664 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
3665 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
3666 cat "$tmp"/link
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3667 fi
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3668 rm -f "$tmp"/link
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
3669
5572
54000928a33d Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents: 5527
diff changeset
3670 echo
6160
2fb771c0af6b Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents: 6159
diff changeset
3671 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
3672 if test "$makefile_am" = Makefile.am; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3673 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
3674 else
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3675 echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\","
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3676 fi
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3677 if test -n "$pobase"; then
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3678 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
3679 fi
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3680 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
3681 if test "$makefile_am" = Makefile.am; then
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3682 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
3683 else
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3684 echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\","
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3685 fi
6250
2c772fe1e1d0 Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents: 6249
diff changeset
3686 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
3687 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
3688 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
3689 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
3690 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
3691 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
3692 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
3693 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
3694 echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am,"
7216
91df49e70c77 New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents: 7215
diff changeset
3695 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
3696 done
6176
1a1e2f878f04 New option --macro-prefix.
Bruno Haible <bruno@clisp.org>
parents: 6175
diff changeset
3697 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
3698 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
3699 }
8394c9bf619f Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents: 5344
diff changeset
3700
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3701 # func_create_testdir testdir modules
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
3702 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
3703 # - local_gnulib_dir from --local-dir
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
3704 # - 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
3705 func_create_testdir ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3706 {
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3707 testdir="$1"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3708 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
3709 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
3710 # 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
3711 # 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
3712 # 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
3713 # 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
3714 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
3715 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
3716 fi
7319
1726cc39709b Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents: 7299
diff changeset
3717 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
3718
7660
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3719 # 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
3720 # its dependencies.
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3721 saved_modules="$modules"
7896
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
3722 saved_inctests="$inctests"
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
3723 # 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
3724 # $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
3725 # 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
3726 inctests=""
7660
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3727 for requested_module in $saved_modules; do
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3728 requested_license=`func_get_license "$requested_module"`
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3729 if test "$requested_license" != GPL; then
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3730 # 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
3731 # 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
3732 # 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
3733 # on a GPL module.
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3734 modules="$requested_module"
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3735 func_modules_transitive_closure
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3736 for module in $modules; do
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3737 license=`func_get_license "$module"`
9090
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3738 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3739 'GPLed build tool') ;;
7660
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3740 'public domain' | 'unlimited' | 'unmodifiable license text') ;;
9090
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3741 *)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3742 case "$requested_license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3743 GPLv2+)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3744 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3745 GPLv2+ | LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3746 *) 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
3747 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3748 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3749 LGPL)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3750 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3751 LGPL | LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3752 *) 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
3753 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3754 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3755 LGPLv2+)
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3756 case "$license" in
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3757 LGPLv2+) ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3758 *) 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
3759 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3760 ;;
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3761 esac
b1835d4a5e2a Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents: 9086
diff changeset
3762 ;;
7660
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3763 esac
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3764 done
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3765 fi
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3766 done
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3767 modules="$saved_modules"
7896
cd3ed2fae0bf Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents: 7872
diff changeset
3768 inctests="$saved_inctests"
7660
7aa6fbd6b3b7 Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7647
diff changeset
3769
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3770 # Subdirectory names.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3771 sourcebase=gllib
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3772 m4base=glm4
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3773 pobase=
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3774 docbase=gldoc
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3775 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
3776 macro_prefix=gl
9108
33eb494700d6 New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents: 9107
diff changeset
3777 po_domain=
9810
f805ab5f1771 New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents: 9807
diff changeset
3778 vc_files=
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3779
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3780 # Determine final module list.
5347
0318c37925dc Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents: 5346
diff changeset
3781 func_modules_transitive_closure
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3782 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3783 echo "Module list with included dependencies:"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3784 echo "$modules" | sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3785 fi
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3786
6550
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
3787 # 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
3788 func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents: 6549
diff changeset
3789
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
3790 # Show banner notice of every module.
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
3791 func_modules_notice
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
3792
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3793 # Determine final file list.
5348
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents: 5347
diff changeset
3794 func_modules_to_filelist
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3795 if test $verbose -ge 0; then
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3796 echo "File list:"
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3797 echo "$files" | sed -e 's/^/ /'
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
3798 fi
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3799
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3800 sed_rewrite_files="\
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3801 s,^build-aux/,$auxdir/,
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3802 s,^doc/,$docbase/,
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3803 s,^lib/,$sourcebase/,
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3804 s,^m4/,$m4base/,
9807
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
3805 s,^tests/,$testsbase/,
24b7b77b3295 Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents: 9806
diff changeset
3806 s,^top/,,"
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3807
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3808 # Create directories.
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3809 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
3810 | sed -e "$sed_rewrite_files" \
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3811 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \
7605
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3812 | LC_ALL=C sort -u \
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3813 > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3814 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3815 # 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
3816 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3817 while read d; do
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3818 mkdir -p "$testdir/$d"
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3819 done
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3820 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3821 }
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3822
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3823 # Copy files or make symbolic links.
ae17dea0254d Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7600
diff changeset
3824 delimiter=' '
7321
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3825 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
3826 | 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
3827 | LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents: 7320
diff changeset
3828 > "$tmp"/files
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3829 { # 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
3830 # 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
3831 exec 5<&0 < "$tmp"/files
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3832 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3833 func_lookup_file "$f"
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3834 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
3835 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
3836 else
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3837 ln "$lookedup_file" "$testdir/$g" 2>/dev/null ||
7643
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
3838 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
3839 || { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
3840 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; }; then
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
3841 func_ln "$lookedup_file" "$testdir/$g"
d67f9dc6019d New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents: 7642
diff changeset
3842 else
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3843 cp -p "$lookedup_file" "$testdir/$g"
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3844 fi
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
3845 fi
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3846 done
7373
330a972d58f0 Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents: 7368
diff changeset
3847 exec 0<&5 5<&-
7326
1ca1035630dd Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents: 7323
diff changeset
3848 }
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3849
7981
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
3850 # 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
3851 for_test=true
41421349e26b In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents: 7911
diff changeset
3852
10476
429cc7a6da60 Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents: 10475
diff changeset
3853 # 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
3854 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
3855
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3856 # Create $sourcebase/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3857 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
3858 destfile="$sourcebase/Makefile.am"
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3859 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
3860 any_uses_subdirs="$uses_subdirs"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3861
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3862 # Create $m4base/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3863 mkdir -p "$testdir/$m4base"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3864 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3865 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3866 echo "EXTRA_DIST ="
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3867 for f in $files; do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3868 case "$f" in
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3869 m4/* )
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3870 echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3871 esac
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3872 done
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3873 ) > "$testdir/$m4base/Makefile.am"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3874
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3875 subdirs="$sourcebase $m4base"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3876 subdirs_with_configure_ac=""
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3877
7485
0194db3ad154 Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7484
diff changeset
3878 if false && test -f "$testdir"/$m4base/gettext.m4; then
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3879 # Avoid stupid error message from automake:
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3880 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3881 mkdir -p "$testdir/po"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3882 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3883 ) > "$testdir/po/Makefile.am"
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
3884 func_append subdirs " po"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3885 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
3886
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3887 if test -n "$inctests"; then
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3888 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
3889 # 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
3890 saved_auxdir="$auxdir"
aad8160fa3ef Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents: 9540
diff changeset
3891 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
3892 # 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
3893 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
3894 destfile="$testsbase/Makefile.am"
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3895 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
3896 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
3897 # Create $testsbase/configure.ac.
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3898 (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
3899 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
3900 echo "AC_CONFIG_AUX_DIR([$auxdir])"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3901 echo "AM_INIT_AUTOMAKE"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3902 echo
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3903 echo "AM_CONFIG_HEADER([config.h])"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3904 echo
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3905 echo "AC_PROG_CC"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3906 echo "AC_PROG_INSTALL"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3907 echo "AC_PROG_MAKE_SET"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3908 echo "AC_PROG_RANLIB"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3909 echo
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3910 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
3911 echo "AC_GNU_SOURCE"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3912 echo
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3913 fi
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3914 for module in $modules; do
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3915 func_verify_module
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3916 if test -n "$module"; then
10854
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3917 case $module in
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3918 gnumakefile | maintainer-makefile)
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3919 # These modules are meant to be used only in the top-level directory.
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3920 ;;
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3921 *)
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3922 func_get_autoconf_early_snippet "$module"
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3923 ;;
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3924 esac
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3925 fi
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3926 done \
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
3927 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3928 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3929 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3930 echo "gl_cond_libtool=true"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
3931 else
6418
e0a8b9b05999 Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents: 6414
diff changeset
3932 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3933 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3934 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3935 echo "gl_ltlibdeps="
6414
46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents: 6389
diff changeset
3936 fi
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
3937 # 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
3938 # 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
3939 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
3940 # 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
3941 # 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
3942 # 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
3943 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
3944 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
3945 sed_replace_build_aux='
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
3946 :a
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
3947 /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
3948 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
9009
749a1b6b111d Untabify.
Bruno Haible <bruno@clisp.org>
parents: 9008
diff changeset
3949 ba
7638
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
3950 }'
9516
020ae1c236a0 Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents: 9515
diff changeset
3951 func_emit_initmacro_start $macro_prefix
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3952 # 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
3953 # 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
3954 # those of the tests.
7647
c26d75cebcfa Fix --create-testdir --with-tests.
Bruno Haible <bruno@clisp.org>
parents: 7646
diff changeset
3955 echo "gl_source_base='../$sourcebase'"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3956 for module in $modules; do
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3957 func_verify_nontests_module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3958 if test -n "$module"; then
10854
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3959 case $module in
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3960 gnumakefile | maintainer-makefile)
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3961 # These modules are meant to be used only in the top-level directory.
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3962 ;;
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3963 *)
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3964 func_get_autoconf_snippet "$module" \
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3965 | sed -e "$sed_replace_build_aux"
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3966 ;;
4e7233d13083 Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 10744
diff changeset
3967 esac
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3968 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3969 done
7647
c26d75cebcfa Fix --create-testdir --with-tests.
Bruno Haible <bruno@clisp.org>
parents: 7646
diff changeset
3970 echo "gl_source_base='.'"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3971 for module in $modules; do
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3972 func_verify_tests_module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3973 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
3974 func_get_autoconf_snippet "$module" \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
3975 | sed -e "$sed_replace_build_aux"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3976 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3977 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
3978 func_emit_initmacro_end $macro_prefix
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3979 # _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
3980 # 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
3981 if test "$libtool" != true; then
9086
110e60d88fad (func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents: 9025
diff changeset
3982 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
3983 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3984 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3985 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3986 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
3987 fi
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
3988 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
3989 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
3990 echo
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
3991 echo "gl_INIT"
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3992 echo
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3993 # 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
3994 # 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
3995 echo "AH_TOP([#include \"../config.h\"])"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3996 echo
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
3997 echo "AC_OUTPUT([Makefile])"
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
3998 ) > "$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
3999 auxdir="$saved_auxdir"
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
4000 func_append subdirs " $testsbase"
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
4001 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
4002 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4003
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4004 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4005 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4006 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4007 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4008 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4009 echo "SUBDIRS = $subdirs"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4010 echo
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
4011 echo "ACLOCAL_AMFLAGS = -I $m4base"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4012 ) > "$testdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4013
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4014 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4015 (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
4016 echo "AC_INIT([dummy], [0])"
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4017 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4018 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4019 fi
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4020 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4021 echo
6106
66bd85c8a9cd Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents: 6039
diff changeset
4022 echo "AM_CONFIG_HEADER([config.h])"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4023 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4024 echo "AC_PROG_CC"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4025 echo "AC_PROG_INSTALL"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4026 echo "AC_PROG_MAKE_SET"
7106
b9fff044578d Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7105
diff changeset
4027 echo
7777
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 7771
diff changeset
4028 echo "# For autobuild."
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 7771
diff changeset
4029 echo "AC_CANONICAL_BUILD"
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 7771
diff changeset
4030 echo "AC_CANONICAL_HOST"
b33956fbd953 2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 7771
diff changeset
4031 echo
7106
b9fff044578d Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents: 7105
diff changeset
4032 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
4033 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
4034 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
4035 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
4036 echo
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4037 echo "AC_PROG_RANLIB"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4038 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
4039 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
4040 echo "AM_PROG_CC_C_O"
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
4041 echo
d6fbdb213b01 Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents: 7640
diff changeset
4042 fi
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
4043 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
4044 echo "AC_GNU_SOURCE"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4045 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4046 fi
8079
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4047 for module in $modules; do
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4048 func_verify_nontests_module
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4049 if test -n "$module"; then
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4050 func_get_autoconf_early_snippet "$module"
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4051 fi
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4052 done \
0951beec5b89 New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents: 8055
diff changeset
4053 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
4054 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
4055 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4056 echo "gl_cond_libtool=true"
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
4057 else
6418
e0a8b9b05999 Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents: 6414
diff changeset
4058 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4059 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4060 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4061 echo "gl_ltlibdeps="
6414
46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents: 6389
diff changeset
4062 fi
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
4063 # 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
4064 # 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
4065 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
4066 # 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
4067 # 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
4068 # 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
4069 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
4070 echo "AC_DEFUN([gl_INIT], ["
6556
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4071 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4072 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4073 :a
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4074 /AC_CONFIG_FILES(.*:build-aux\/.*)/{
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4075 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
4076 ba
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4077 }'
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4078 else
10400
817f1418bbde Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 10380
diff changeset
4079 sed_replace_build_aux="$sed_noop"
6556
85c3c00fcec1 Fix sed_replace_auxdir.
Bruno Haible <bruno@clisp.org>
parents: 6551
diff changeset
4080 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
4081 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
4082 echo "gl_source_base='$sourcebase'"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4083 for module in $modules; do
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4084 func_verify_nontests_module
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4085 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
4086 func_get_autoconf_snippet "$module" \
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
4087 | sed -e "$sed_replace_build_aux"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4088 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4089 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
4090 func_emit_initmacro_end $macro_prefix
7286
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4091 # _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
4092 # 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
4093 if test "$libtool" != true; then
9086
110e60d88fad (func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents: 9025
diff changeset
4094 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
4095 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4096 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4097 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4098 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents: 7270
diff changeset
4099 fi
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
4100 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
4101 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
4102 echo
7090
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents: 7089
diff changeset
4103 echo "gl_INIT"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4104 echo
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4105 if test -n "$subdirs_with_configure_ac"; then
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4106 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4107 fi
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4108 makefiles="Makefile"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4109 for d in $subdirs; do
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4110 # 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
4111 # 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
4112 case " $subdirs_with_configure_ac " in
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4113 *" $d "*) ;;
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
4114 *) func_append makefiles " $d/Makefile" ;;
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4115 esac
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4116 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4117 echo "AC_OUTPUT([$makefiles])"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4118 ) > "$testdir/configure.ac"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4119
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4120 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4121 (cd "$testdir"
7485
0194db3ad154 Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7484
diff changeset
4122 # 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
4123 # 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
4124 if test -f $m4base/gettext.m4; then
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4125 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
4126 for f in $m4base/*.m4~; do
10969
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4127 if test -f $f; then
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4128 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4129 fi
7485
0194db3ad154 Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7484
diff changeset
4130 done
0194db3ad154 Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7484
diff changeset
4131 fi
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4132 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
4133 if ! test -d build-aux; then
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4134 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
4135 fi
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4136 func_execute_command ${AUTOCONF} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4137 func_execute_command ${AUTOHEADER} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4138 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
4139 ) || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4140 if test -n "$inctests"; then
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4141 # Create autogenerated files.
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4142 (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
4143 # 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
4144 # 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
4145 if test -f ../$m4base/gettext.m4; then
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4146 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
4147 for f in ../$m4base/*.m4~; do
10969
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4148 if test -f $f; then
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4149 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
4c304a656b87 Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents: 10854
diff changeset
4150 fi
7638
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4151 done
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4152 fi
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4153 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
4154 if ! test -d ../build-aux; then
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4155 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
4156 fi
9188
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4157 func_execute_command ${AUTOCONF} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4158 func_execute_command ${AUTOHEADER} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4159 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
4160 ) || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4161 fi
7866
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4162 # 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
4163 # 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
4164 # 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
4165 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
4166 | 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
4167 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
4168 # 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
4169 # 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
4170 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
4171 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
4172 | 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
4173 | sed -e "$sed_remove_make_variables"`
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4174 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
4175 case "$cleaned_files" in
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4176 *" "$file" "*) ;;
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4177 *) echo $file ;;
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4178 esac;
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4179 done`
58d9bcb3d6c4 Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents: 7858
diff changeset
4180 if test -n "$distributed_built_sources"; then
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4181 (cd "$testdir"
7638
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4182 ./configure || func_exit 1
7195
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents: 7187
diff changeset
4183 cd "$sourcebase"
6389
c1766dccfd4f Simplification, from Stepan Kasal.
Bruno Haible <bruno@clisp.org>
parents: 6380
diff changeset
4184 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
4185 make built_sources || func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4186 cd ..
7638
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4187 make distclean || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4188 ) || func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4189 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4190 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4191
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4192 # func_create_megatestdir megatestdir allmodules
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4193 # Input:
7214
eb43edab28c3 Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents: 7213
diff changeset
4194 # - local_gnulib_dir from --local-dir
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4195 # - 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
4196 func_create_megatestdir ()
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4197 {
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4198 megatestdir="$1"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4199 allmodules="$2"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4200 if test -z "$allmodules"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4201 allmodules=`func_all_modules`
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4202 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4203
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4204 megasubdirs=
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4205 # First, all modules one by one.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4206 for onemodule in $allmodules; do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4207 func_create_testdir "$megatestdir/$onemodule" $onemodule
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
4208 func_append megasubdirs "$onemodule "
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4209 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4210 # 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
4211 # 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
4212 # 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
4213 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
4214 func_create_testdir "$megatestdir/ALL" "$allmodules"
7323
7ca0e325d5db Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents: 7322
diff changeset
4215 func_append megasubdirs "ALL"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4216
8416
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4217 # Create autobuild.
9377
ca27c3808c95 Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents: 9355
diff changeset
4218 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
4219 vc_witness="$gnulib_dir/CVS/Entries"; \
ca27c3808c95 Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents: 9355
diff changeset
4220 else \
ca27c3808c95 Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents: 9355
diff changeset
4221 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
4222 fi; \
ca27c3808c95 Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents: 9355
diff changeset
4223 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
4224 | sed -e 's,January,01,' -e 's,Jan,01,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4225 -e 's,February,02,' -e 's,Feb,02,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4226 -e 's,March,03,' -e 's,Mar,03,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4227 -e 's,April,04,' -e 's,Apr,04,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4228 -e 's,May,05,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4229 -e 's,June,06,' -e 's,Jun,06,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4230 -e 's,July,07,' -e 's,Jul,07,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4231 -e 's,August,08,' -e 's,Aug,08,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4232 -e 's,September,09,' -e 's,Sep,09,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4233 -e 's,October,10,' -e 's,Oct,10,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4234 -e 's,November,11,' -e 's,Nov,11,' \
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4235 -e 's,December,12,' -e 's,Dec,12,' \
9022
44509698ba9d * gnulib-tool: Fix indentation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 9010
diff changeset
4236 -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
4237 -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
4238 (echo '#!/bin/sh'
6840759b4ce2 Start the autobuild script with /bin/sh.
Bruno Haible <bruno@clisp.org>
parents: 8416
diff changeset
4239 echo "CVSDATE=$cvsdate"
8416
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4240 echo "test -d logs || mkdir logs"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4241 echo "for module in $megasubdirs; do"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4242 echo " echo \"Working on module \$module...\""
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4243 echo " safemodule=\`echo \$module | sed -e 's|/|-|g'\`"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4244 echo " (echo \"To: gnulib@autobuild.josefsson.org\""
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4245 echo " echo"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4246 echo " set -x"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4247 echo " : autobuild project... \$module"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4248 echo " : autobuild revision... cvs-\$CVSDATE-000000"
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4249 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
4250 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
4251 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
4252 echo " echo rc=\$?"
8419
d5e85ac6458c Avoid using sed -e "", not supported by AIX sed.
Bruno Haible <bruno@clisp.org>
parents: 8418
diff changeset
4253 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
4254 echo "done"
8672
c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 8668
diff changeset
4255 ) > "$megatestdir/do-autobuild"
c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 8668
diff changeset
4256 chmod a+x "$megatestdir/do-autobuild"
8416
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4257
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4258 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4259 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4260 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4261 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4262 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4263 echo "SUBDIRS = $megasubdirs"
8416
0bf5cb89a6b9 Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents: 8410
diff changeset
4264 echo
8672
c00e30e9aba4 2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents: 8668
diff changeset
4265 echo "EXTRA_DIST = do-autobuild"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4266 ) > "$megatestdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4267
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4268 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4269 (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
4270 echo "AC_INIT([dummy], [0])"
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4271 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4272 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4273 fi
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4274 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4275 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4276 echo "AC_PROG_MAKE_SET"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4277 echo
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4278 echo "AC_CONFIG_SUBDIRS([$megasubdirs])"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4279 echo "AC_OUTPUT([Makefile])"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4280 ) > "$megatestdir/configure.ac"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4281
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4282 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4283 (cd "$megatestdir"
6547
1a65fb7ddbbb Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents: 6546
diff changeset
4284 # 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
4285 # 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
4286 # 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
4287 func_execute_command ${ACLOCAL} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4288 func_execute_command mkdir build-aux
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4289 func_execute_command ${AUTOCONF} || func_exit 1
7bf3aff81ae2 New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents: 9187
diff changeset
4290 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
4291 ) || func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4292 }
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4293
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4294 case $mode in
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 func_fatal_error "no mode specified" ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4297
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4298 list )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4299 func_all_modules
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4300 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4301
6443
1a35941d29ab Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents: 6425
diff changeset
4302 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
4303
5343
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4304 # Where to import.
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4305 if test -z "$destdir"; then
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4306 destdir=.
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4307 fi
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4308 test -d "$destdir" \
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4309 || 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
4310
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4311 # 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
4312 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
4313 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
4314 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4315 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
4316 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
4317 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4318 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
4319 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4320 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4321
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4322 # Analyze configure.ac.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4323 guessed_auxdir="."
7077
c2122624e8ed New option --no-libtool.
Bruno Haible <bruno@clisp.org>
parents: 7076
diff changeset
4324 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
4325 my_sed_traces='
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4326 s,#.*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4327 s,^dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4328 s, dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4329 /AC_CONFIG_AUX_DIR/ {
10987
06ce5e3302ba Fix a security bug.
Bruno Haible <bruno@clisp.org>
parents: 10986
diff changeset
4330 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
4331 }
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4332 /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
4333 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
4334 }'
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
4335 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
4336
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4337 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
4338 auxdir="$guessed_auxdir"
5343
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4339 fi
5202
64446bf39961 Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents: 5198
diff changeset
4340
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4341 # 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
4342 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
4343 # 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
4344 # Any number of additional modules can be given.
6204
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4345 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4346 # First use of gnulib in the given m4base.
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4347 test -n "$supplied_libname" || supplied_libname=true
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4348 test -n "$sourcebase" || sourcebase="lib"
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
4349 test -n "$docbase" || docbase="doc"
6262
bef30dac846f Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents: 6250
diff changeset
4350 test -n "$testsbase" || testsbase="tests"
6204
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4351 test -n "$macro_prefix" || macro_prefix="gl"
104bcb14d247 Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents: 6199
diff changeset
4352 fi
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4353 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4354 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4355 # 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
4356 # 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
4357 # 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
4358 # "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
4359 m4dirs=
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4360 m4dirs_count=0
7072
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4361 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
4362 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
4363 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4364 for arg in $aclocal_amflags; do
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4365 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
4366 # 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
4367 case "$arg" in
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4368 /*) ;;
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4369 *)
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4370 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
4371 func_append m4dirs " $arg"
7072
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4372 m4dirs_count=`expr $m4dirs_count + 1`
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4373 fi
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4374 ;;
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4375 esac
8040
3905dae579b6 * gnulib-tool (func_emit_lib_Makefile_am, func_add_or_update)
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7981
diff changeset
4376 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
4377 else
7072
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4378 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
4379 m4dir_is_next=yes
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4380 else
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4381 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4382 fi
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4383 fi
7072
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4384 done
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4385 else
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4386 # 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
4387 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
4388 sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p'
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4389 sedexpr2='s,^[^/]*$,.,'
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4390 sedexpr3='s,/[^/]*$,,'
7752
fc2ff707c74b * gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents: 7737
diff changeset
4391 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
4392 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
4393 fi
7072
a1e9235fc6ff Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents: 7071
diff changeset
4394 fi
6183
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4395 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
4396 # 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
4397 # 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
4398 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
4399 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
4400 m4base="m4"
6955
7715890c929a * gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents: 6952
diff changeset
4401 test -n "$docbase" || docbase="doc"
6262
bef30dac846f Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents: 6250
diff changeset
4402 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
4403 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
4404 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4405 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4406 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
4407 # 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
4408 # 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
4409 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
4410 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4411 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4412 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4413 # 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
4414 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
4415 # 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
4416 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
4417 # 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
4418 # such as
10744
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
4419 # local_gnulib_dir, incobsolete, avoidlist, sourcebase, m4base,
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
4420 # pobase, docbase, testsbase, inctests, libname, lgpl,
7fb7b37150b3 New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents: 10743
diff changeset
4421 # makefile_name, 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
4422 # 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
4423 (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
4424 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4425 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4426 # Really ambiguous.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4427 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
4428 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4429 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents: 6182
diff changeset
4430 fi
6178
3830993b4c7a Rename some variables.
Bruno Haible <bruno@clisp.org>
parents: 6177
diff changeset
4431 fi
5343
eae956a8e0ec Untabify.
Bruno Haible <bruno@clisp.org>
parents: 5312
diff changeset
4432 ;;
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4433
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4434 create-testdir )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4435 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4436 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4437 fi
4126
e8caa337b4e1 (create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents: 4124
diff changeset
4438 mkdir "$destdir"
e8caa337b4e1 (create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents: 4124
diff changeset
4439 test -d "$destdir" \
e8caa337b4e1 (create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents: 4124
diff changeset
4440 || func_fatal_error "could not create destination directory"
6109
a52f596fdf00 Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents: 6108
diff changeset
4441 test -n "$auxdir" || auxdir="build-aux"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4442 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4443 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4444
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4445 create-megatestdir )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4446 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4447 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4448 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4449 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
4450 test -n "$auxdir" || auxdir="build-aux"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4451 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4452 ;;
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 test )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4455 test -n "$destdir" || destdir=testdir$$
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4456 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
4457 test -n "$auxdir" || auxdir="build-aux"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4458 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4459 cd "$destdir"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4460 mkdir build
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4461 cd build
7638
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4462 ../configure || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4463 make || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4464 make check || func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents: 7605
diff changeset
4465 make distclean || func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4466 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4467 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4468 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4469 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
4470 func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4471 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4472 cd ..
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4473 cd ..
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4474 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4475 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4476
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4477 megatest )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4478 test -n "$destdir" || destdir=testdir$$
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4479 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
4480 test -n "$auxdir" || auxdir="build-aux"
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4481 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4482 cd "$destdir"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4483 mkdir build
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4484 cd build
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4485 ../configure
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4486 make
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4487 make check
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4488 make distclean
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4489 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4490 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4491 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4492 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
4493 func_exit 1
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4494 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4495 cd ..
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4496 cd ..
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4497 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4498 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4499
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4500 extract-description )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4501 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4502 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4503 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4504 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4505 func_get_description "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4506 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4507 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4508 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4509
10743
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4510 extract-status )
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4511 for module
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4512 do
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4513 func_verify_module
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4514 if test -n "$module"; then
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4515 func_get_status "$module"
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4516 fi
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4517 done
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4518 ;;
ec39330cb04e Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents: 10732
diff changeset
4519
9189
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4520 extract-notice )
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4521 for module
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4522 do
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4523 func_verify_module
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4524 if test -n "$module"; then
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4525 func_get_notice "$module"
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4526 fi
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4527 done
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4528 ;;
1d7d9694f1e2 Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents: 9188
diff changeset
4529
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4530 extract-filelist )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4531 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4532 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4533 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4534 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4535 func_get_filelist "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4536 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4537 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4538 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4539
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4540 extract-dependencies )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4541 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4542 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4543 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4544 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4545 func_get_dependencies "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4546 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4547 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4548 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4549
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4550 extract-autoconf-snippet )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4551 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4552 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4553 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4554 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4555 func_get_autoconf_snippet "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4556 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4557 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4558 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4559
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4560 extract-automake-snippet )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4561 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4562 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4563 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4564 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4565 func_get_automake_snippet "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4566 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4567 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4568 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4569
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4570 extract-include-directive )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4571 for module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4572 do
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4573 func_verify_module
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4574 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4575 func_get_include_directive "$module"
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4576 fi
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4577 done
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4578 ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4579
8055
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4580 extract-link-directive )
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4581 for module
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4582 do
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4583 func_verify_module
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4584 if test -n "$module"; then
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4585 func_get_link_directive "$module"
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4586 fi
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4587 done
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4588 ;;
5c79d44f739d New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents: 8040
diff changeset
4589
5251
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4590 extract-license )
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4591 for module
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4592 do
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4593 func_verify_module
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4594 if test -n "$module"; then
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4595 func_get_license "$module"
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4596 fi
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4597 done
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4598 ;;
42b53a22aee5 Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents: 5250
diff changeset
4599
4197
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4600 extract-maintainer )
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4601 for module
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4602 do
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4603 func_verify_module
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4604 if test -n "$module"; then
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4605 func_get_maintainer "$module"
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4606 fi
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4607 done
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4608 ;;
3ccc6d0d52bb Add a Maintainer.
Bruno Haible <bruno@clisp.org>
parents: 4175
diff changeset
4609
6113
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4610 extract-tests-module )
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4611 for module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4612 do
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4613 func_verify_module
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4614 if test -n "$module"; then
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4615 func_get_tests_module "$module"
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4616 fi
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4617 done
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4618 ;;
dac0e048bd40 Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents: 6111
diff changeset
4619
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4620 * )
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4621 func_fatal_error "unknown operation mode --$mode" ;;
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4622 esac
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4623
7073
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
4624 rm -rf "$tmp"
eb23418a908e Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents: 7072
diff changeset
4625 # 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
4626 # 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
4627 # 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
4628 # 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
4629 # 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
4630 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
4631 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
4632
4112
98e795b64056 Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
4633 exit 0
7241
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents: 7240
diff changeset
4634
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents: 7240
diff changeset
4635 # Local Variables:
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents: 7240
diff changeset
4636 # indent-tabs-mode: nil
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents: 7240
diff changeset
4637 # 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
4638 # End: