Mercurial > hg > octave-nkf > gnulib-hg
annotate gnulib-tool @ 7105:641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
namespace.
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Thu, 10 Aug 2006 14:22:53 +0000 |
parents | dfc92f94c781 |
children | b9fff044578d |
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 # |
6512 | 3 # Copyright (C) 2002-2006 Free Software Foundation, Inc. |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4 # |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5 # This program is free software; you can redistribute it and/or modify |
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 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7 # the Free Software Foundation; either version 2, or (at your option) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
8 # any later version. |
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 |
6549
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
16 # along with this program; if not, write to the Free Software Foundation, |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
17 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
4112
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 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
20 # 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
|
21 # modules from gnulib into their packages. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
22 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
23 progname=$0 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
24 package=gnulib |
7105
641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents:
7090
diff
changeset
|
25 cvsdatestamp='$Date: 2006-08-10 14:22:53 $' |
4124
5b5f22d7530e
(last_checkin_date): don't expand the $Date here.
Karl Berry <karl@freefriends.org>
parents:
4112
diff
changeset
|
26 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
27 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
28 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
29 # 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
|
30 AUTOCONFPATH= |
5250
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
31 #case $USER in |
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
32 # bruno ) |
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
33 # AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin |
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
34 # AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH " |
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
35 # ;; |
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
36 #esac |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
37 |
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
38 # 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
|
39 AUTOMAKEPATH= |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
40 |
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
41 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
42 # variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually. |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
43 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
|
44 AUTOCONF="${AUTOCONFPATH}autoconf" |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
45 fi |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
46 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
|
47 ACLOCAL="${AUTOMAKEPATH}aclocal" |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
48 fi |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
49 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
|
50 AUTOMAKE="${AUTOMAKEPATH}automake" |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
51 fi |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
52 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
|
53 AUTORECONF="${AUTOCONFPATH}autoreconf" |
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
54 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
55 |
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
56 # GNU sort is needed. Set SORT to its location (not needed if it's called |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
57 # 'sort' and already in the PATH). |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
58 if test -z "$SORT"; then |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
59 SORT=sort |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
60 fi |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
61 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
62 # func_usage |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
63 # outputs to stdout the --help usage message. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
64 func_usage () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
65 { |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
66 echo "\ |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
67 Usage: gnulib-tool --list |
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
68 gnulib-tool --import [module1 ... moduleN] |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
69 gnulib-tool --update |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
70 gnulib-tool --create-testdir --dir=directory module1 ... moduleN |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
71 gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
72 gnulib-tool --test --dir=directory module1 ... moduleN |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
73 gnulib-tool --megatest --dir=directory [module1 ... moduleN] |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
74 gnulib-tool --extract-description module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
75 gnulib-tool --extract-filelist module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
76 gnulib-tool --extract-dependencies module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
77 gnulib-tool --extract-autoconf-snippet module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
78 gnulib-tool --extract-automake-snippet module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
79 gnulib-tool --extract-include-directive module |
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
80 gnulib-tool --extract-license module |
4197 | 81 gnulib-tool --extract-maintainer module |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
82 gnulib-tool --extract-tests-module module |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
83 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
84 Operation modes: |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
85 --list print the available module names |
6633
5118aa463328
* gnulib-tool (Usage): Fix --import, from
Simon Josefsson <simon@josefsson.org>
parents:
6614
diff
changeset
|
86 --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
|
87 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
|
88 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
|
89 --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
|
90 from CVS |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
91 --create-testdir create a scratch package with the given modules |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
92 --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
|
93 one by one and all together |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
94 --test test the combination of the given modules |
4197 | 95 (recommended to use CC=\"gcc -Wall\" here) |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
96 --megatest test the given modules one by one and all together |
4197 | 97 (recommended to use CC=\"gcc -Wall\" here) |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
98 --extract-description extract the description |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
99 --extract-filelist extract the list of files |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
100 --extract-dependencies extract the dependencies |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
101 --extract-autoconf-snippet extract the snippet for configure.ac |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
102 --extract-automake-snippet extract the snippet for lib/Makefile.am |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
103 --extract-include-directive extract the #include directive |
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
104 --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
|
105 under lib/ |
4197 | 106 --extract-maintainer report the maintainer(s) inside gnulib |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
107 --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
|
108 |
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
109 General options: |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
110 --dir=DIRECTORY Specify the target directory. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
111 For --import, this specifies where your |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
112 configure.ac can be found. Defaults to current |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
113 directory. |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
114 --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
|
115 up files before looking in gnulib's directory. |
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
116 |
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
117 Options for --import: |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
118 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
119 --source-base=DIRECTORY |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
120 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
|
121 placed (default \"lib\"). |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
122 --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
|
123 placed (default \"m4\"). |
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
124 --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
|
125 placed (default \"doc\"). |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
126 --tests-base=DIRECTORY |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
127 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
|
128 placed (default \"tests\"). |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
129 --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
|
130 tools are placed (default \"build-aux\"). |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
131 --with-tests Include unit tests for the included modules. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
132 --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
|
133 have code that provides equivalent functionality. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
134 This option can be repeated. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
135 --lgpl Abort if modules aren't available under the LGPL. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
136 Also modify license template from GPL to LGPL. |
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
137 --libtool Use libtool rules. |
7077 | 138 --no-libtool Don't use libtool rules. |
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
139 --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
|
140 'gl_INIT'. Default is 'gl'. |
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
141 --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
|
142 |
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
143 Options for --import and --update: |
6966 | 144 --dry-run For --import, only print what would have been done. |
145 -s, --symbolic, --symlink Make symbolic links instead of copying files. | |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
146 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
147 Report bugs to <bug-gnulib@gnu.org>." |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
148 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
149 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
150 # func_version |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
151 # outputs to stdout the --version message. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
152 func_version () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
153 { |
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
154 year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'` |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
155 echo "$progname (GNU $package) $version" |
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
156 echo "Copyright (C) $year Free Software Foundation, Inc. |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
157 This is free software; see the source for copying conditions. There is NO |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
158 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
6111
4bc400780d6a
Update copyright year and authors.
Bruno Haible <bruno@clisp.org>
parents:
6110
diff
changeset
|
159 echo "Written by" "Bruno Haible" "and" "Simon Josefsson" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
160 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
161 |
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
162 # func_emit_copyright_notice |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
163 # 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
|
164 func_emit_copyright_notice () |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
165 { |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
166 echo "# Copyright (C) 2004-2006 Free Software Foundation, Inc." |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
167 echo "#" |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
168 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
|
169 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
|
170 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
|
171 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
|
172 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
|
173 echo "#" |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
174 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
|
175 } |
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
176 |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
177 # func_tmpdir |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
178 # creates a temporary directory. |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
179 # Sets variable |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
180 # - 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
|
181 func_tmpdir () |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
182 { |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
183 # 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
|
184 # 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
|
185 # /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
|
186 : ${TMPDIR=/tmp} |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
187 { |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
188 # 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
|
189 # 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
|
190 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
|
191 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
|
192 } || |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
193 { |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
194 # 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
|
195 # 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
|
196 # 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
|
197 # 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
|
198 # directory. |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
199 tmp=$TMPDIR/gl$$-$RANDOM |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
200 (umask 077 && mkdir "$tmp") |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
201 } || |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
202 { |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
203 echo "$0: cannot create a temporary directory in $TMPDIR" >&2 |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
204 { (exit 1); exit 1; } |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
205 } |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
206 } |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
207 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
208 # func_fatal_error message |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
209 # outputs to stderr a fatal error message, and terminates the program. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
210 func_fatal_error () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
211 { |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
212 echo "gnulib-tool: *** $1" 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
213 echo "gnulib-tool: *** Stop." 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
214 exit 1 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
215 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
216 |
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
217 # func_readlink SYMLINK |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
218 # outputs the target of the given symlink. |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
219 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
|
220 func_readlink () |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
221 { |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
222 # Use the readlink program from GNU coreutils. |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
223 readlink "$1" |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
224 } |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
225 else |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
226 func_readlink () |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
227 { |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
228 # 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
|
229 # would do the wrong thing if the link target contains " -> ". |
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
230 LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p' |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
231 } |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
232 fi |
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
233 |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
234 # func_ln_if_changed SRC DEST |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
235 # Like ln -s, but avoids munging timestamps if the link is correct. |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
236 func_ln_if_changed () |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
237 { |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
238 if test $# -ne 2; then |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
239 echo "usage: func_ln_if_changed SRC DEST" >&2 |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
240 fi |
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
241 if test -L "$2" && test "$1" = "`func_readlink "$2"`"; then |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
242 : |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
243 else |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
244 rm -f "$2" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
245 ln -s "$1" "$2" |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
246 fi |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
247 } |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
248 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
249 # Command-line option processing. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
250 # Removes the OPTIONS from the arguments. Sets the variables: |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
251 # - mode list or import or create-testdir or create-megatestdir |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
252 # - destdir from --dir |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
253 # - libname, supplied_libname from --lib |
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
254 # - sourcebase from --source-base |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
255 # - m4base from --m4-base |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
256 # - docbase from --doc-base |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
257 # - testsbase from --tests-base |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
258 # - auxdir from --aux-dir |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
259 # - inctests true if --with-tests was given, blank otherwise |
5981 | 260 # - avoidlist list of modules to avoid, from --avoid |
261 # - lgpl true if --lgpl was given, blank otherwise | |
7077 | 262 # - libtool true if --libtool was given, false if --no-libtool was |
263 # given, blank otherwise | |
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
264 # - macro_prefix from --macro-prefix |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
265 # - autoconf_minversion minimum supported autoconf version |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
266 # - 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
|
267 # - doit : if actions shall be executed, false if only to be printed |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
268 # - local_gnulib_dir from --local-dir |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
269 # - symbolic true if --symbolic was given, blank otherwise |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
270 { |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
271 mode= |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
272 destdir= |
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
273 libname=libgnu |
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
274 supplied_libname= |
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
275 sourcebase= |
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
276 m4base= |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
277 docbase= |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
278 testsbase= |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
279 auxdir= |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
280 inctests= |
5981 | 281 avoidlist= |
282 lgpl= | |
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
283 libtool= |
6176 | 284 macro_prefix= |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
285 do_changelog=: |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
286 doit=: |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
287 local_gnulib_dir= |
5799
ad9eff556694
2005-04-15 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
5798
diff
changeset
|
288 symbolic= |
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
289 |
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
290 supplied_opts="$@" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
291 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
292 while test $# -gt 0; do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
293 case "$1" in |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
294 --list | --lis ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
295 mode=list |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
296 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
297 --import | --impor | --impo | --imp | --im | --i ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
298 mode=import |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
299 shift ;; |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
300 --update | --updat | --upda | --upd | --up | --u ) |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
301 mode=update |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
302 shift ;; |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
303 --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
|
304 mode=create-testdir |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
305 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
306 --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
|
307 mode=create-megatestdir |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
308 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
309 --test | --tes | --te | --t ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
310 mode=test |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
311 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
312 --megatest | --megates | --megate | --megat | --mega | --meg | --me | --m ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
313 mode=megatest |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
314 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
315 --extract-* ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
316 mode=`echo "X$1" | sed -e 's/^X--//'` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
317 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
318 --dir ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
319 shift |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
320 if test $# = 0; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
321 func_fatal_error "missing argument for --dir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
322 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
323 destdir=$1 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
324 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
325 --dir=* ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
326 destdir=`echo "X$1" | sed -e 's/^X--dir=//'` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
327 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
328 --lib ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
329 shift |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
330 if test $# = 0; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
331 func_fatal_error "missing argument for --lib" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
332 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
333 libname=$1 |
5343 | 334 supplied_libname=true |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
335 shift ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
336 --lib=* ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
337 libname=`echo "X$1" | sed -e 's/^X--lib=//'` |
5343 | 338 supplied_libname=true |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
339 shift ;; |
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
340 --source-base ) |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
341 shift |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
342 if test $# = 0; then |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
343 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
|
344 fi |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
345 sourcebase=$1 |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
346 shift ;; |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
347 --source-base=* ) |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
348 sourcebase=`echo "X$1" | sed -e 's/^X--source-base=//'` |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
349 shift ;; |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
350 --m4-base ) |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
351 shift |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
352 if test $# = 0; then |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
353 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
|
354 fi |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
355 m4base=$1 |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
356 shift ;; |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
357 --m4-base=* ) |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
358 m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'` |
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
359 shift ;; |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
360 --doc-base ) |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
361 shift |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
362 if test $# = 0; then |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
363 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
|
364 fi |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
365 docbase=$1 |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
366 shift ;; |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
367 --doc-base=* ) |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
368 docbase=`echo "X$1" | sed -e 's/^X--doc-base=//'` |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
369 shift ;; |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
370 --tests-base ) |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
371 shift |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
372 if test $# = 0; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
373 func_fatal_error "missing argument for --tests-base" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
374 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
375 testsbase=$1 |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
376 shift ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
377 --tests-base=* ) |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
378 testsbase=`echo "X$1" | sed -e 's/^X--tests-base=//'` |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
379 shift ;; |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
380 --aux-dir ) |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
381 shift |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
382 if test $# = 0; then |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
383 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
|
384 fi |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
385 auxdir=$1 |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
386 shift ;; |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
387 --aux-dir=* ) |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
388 auxdir=`echo "X$1" | sed -e 's/^X--aux-dir=//'` |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
389 shift ;; |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
390 --with-tests ) |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
391 inctests=true |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
392 shift ;; |
5981 | 393 --avoid ) |
394 shift | |
395 if test $# = 0; then | |
396 func_fatal_error "missing argument for --avoid" | |
397 fi | |
398 avoidlist="$avoidlist $1" | |
399 shift ;; | |
400 --avoid=* ) | |
401 avoidlist="$avoidlist "`echo "X$1" | sed -e 's/^X--avoid=//'` | |
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
402 shift ;; |
5262
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
403 --lgpl ) |
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
404 lgpl=true |
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
405 shift ;; |
5981 | 406 --libtool ) |
407 libtool=true | |
408 shift ;; | |
7077 | 409 --no-libtool ) |
410 libtool=false | |
411 shift ;; | |
6176 | 412 --macro-prefix ) |
413 shift | |
414 if test $# = 0; then | |
415 func_fatal_error "missing argument for --macro-prefix" | |
416 fi | |
417 macro_prefix="$1" | |
418 shift ;; | |
419 --macro-prefix=* ) | |
420 macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'` | |
421 shift ;; | |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
422 --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
|
423 do_changelog=false |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
424 shift ;; |
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
425 --dry-run ) |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
426 doit=false |
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
427 shift ;; |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
428 --local-dir ) |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
429 shift |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
430 if test $# = 0; then |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
431 func_fatal_error "missing argument for --local-dir" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
432 fi |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
433 local_gnulib_dir=$1 |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
434 shift ;; |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
435 --local-dir=* ) |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
436 local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
437 shift ;; |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
438 -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
|
439 symbolic=true |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
440 shift ;; |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
441 --help | --hel | --he | --h ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
442 func_usage |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
443 exit 0 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
444 --version | --versio | --versi | --vers | --ver | --ve | --v ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
445 func_version |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
446 exit 0 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
447 -- ) |
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
448 # Stop option processing |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
449 shift |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
450 break ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
451 -* ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
452 echo "gnulib-tool: unknown option $1" 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
453 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
454 exit 1 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
455 * ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
456 break ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
457 esac |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
458 done |
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
459 |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
460 if test "$mode" = update; then |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
461 if test $# != 0; then |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
462 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
|
463 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
464 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
|
465 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
466 exit 1 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
467 fi |
6765
eccab879e7e7
Make --update option actually work.
Bruno Haible <bruno@clisp.org>
parents:
6756
diff
changeset
|
468 if test -n "$supplied_libname" || test -n "$sourcebase" || test -n "$m4base" \ |
6993
dc8f2a1ff75f
Reorder tests in doc-base patch.
Bruno Haible <bruno@clisp.org>
parents:
6966
diff
changeset
|
469 || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ |
dc8f2a1ff75f
Reorder tests in doc-base patch.
Bruno Haible <bruno@clisp.org>
parents:
6966
diff
changeset
|
470 || test -n "$inctests" || test -n "$avoidlist" || test -n "$lgpl" \ |
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
471 || test -n "$macro_prefix"; then |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
472 echo "gnulib-tool: invalid options for 'update' mode" 1>&2 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
473 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
474 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
|
475 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
476 exit 1 |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
477 fi |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
478 do_changelog=false |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
479 fi |
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
480 |
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
481 # 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
|
482 # configure.ac. |
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
483 DEFAULT_AUTOCONF_MINVERSION="2.59" |
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
484 autoconf_minversion= |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
485 configure_ac= |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
486 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
|
487 if test -f "$destdir"/configure.ac; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
488 configure_ac="$destdir/configure.ac" |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
489 else |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
490 if test -f "$destdir"/configure.in; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
491 configure_ac="$destdir/configure.in" |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
492 fi |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
493 fi |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
494 else |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
495 if test -f configure.ac; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
496 configure_ac="configure.ac" |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
497 else |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
498 if test -f configure.in; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
499 configure_ac="configure.in" |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
500 fi |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
501 fi |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
502 fi |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
503 if test -n "$configure_ac"; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
504 # 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
|
505 # 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
|
506 # "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
|
507 # 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
|
508 # autom4te: m4 failed with exit status: 1 |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
509 prereqs= |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
510 my_sed_traces=' |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
511 s,#.*$,, |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
512 s,^dnl .*$,, |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
513 s, dnl .*$,, |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
514 /AC_PREREQ/ { |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
515 s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,prereqs="$prereqs \1",p |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
516 }' |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
517 eval `sed -n -e "$my_sed_traces" < "$configure_ac"` |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
518 if test -n "$prereqs"; then |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
519 autoconf_minversion=`for version in $prereqs; do echo $version; done | $SORT -g | uniq | tail -1` |
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
520 fi |
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
521 fi |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
522 if test -z "$autoconf_minversion"; then |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
523 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION |
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
524 fi |
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
525 case "$autoconf_minversion" in |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
526 1.* | 2.[0-4]* | 2.5[0-8]*) |
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
527 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
|
528 esac |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
529 |
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
530 # 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
|
531 # 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
|
532 sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
533 case "$sourcebase" in |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
534 */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
535 esac |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
536 case "$m4base" in |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
537 */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;; |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
538 esac |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
539 case "$docbase" in |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
540 */ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;; |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
541 esac |
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
542 case "$testsbase" in |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
543 */ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;; |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
544 esac |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
545 case "$auxdir" in |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
546 */ ) auxdir=`echo "$auxdir" | sed -e "$sed_trimtrailingslashes"` ;; |
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
547 esac |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
548 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
549 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
550 case "$0" in |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
551 /*) self_abspathname="$0" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
552 */*) self_abspathname=`pwd`/"$0" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
553 *) for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`; do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
554 if test -x "$d/$0" && test ! -d "$d/$0"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
555 self_abspathname="$d/$0" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
556 break |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
557 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
558 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
559 if test -z "$self_abspathname"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
560 func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
561 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
562 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
563 esac |
4717
ed7cd4050365
Port gnulib-tool to Solaris 8.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4712
diff
changeset
|
564 while test -h "$self_abspathname"; do |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
565 # Resolve symbolic link. |
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
566 linkval=`func_readlink "$self_abspathname"` |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
567 test -n "$linkval" || break |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
568 case "$linkval" in |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
569 /* ) self_abspathname="$linkval" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
570 * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
571 esac |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
572 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
573 gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
574 |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
575 func_tmpdir |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
576 trap 'rm -rf "$tmp"' 0 1 2 3 15 |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
577 |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
578 # func_lookup_file file |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
579 # 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
|
580 # 'patch'. |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
581 # Output: |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
582 # - 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
|
583 # - 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
|
584 func_lookup_file () |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
585 { |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
586 lkfile="$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
587 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
|
588 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
|
589 lookedup_tmp= |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
590 else |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
591 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
|
592 if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile.diff"; then |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
593 lkbase=`echo "$lkfile" | sed -e 's,^.*/,,'` |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
594 rm -f "$tmp/$lkbase" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
595 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
|
596 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
|
597 || 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
|
598 lookedup_file="$tmp/$lkbase" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
599 lookedup_tmp=true |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
600 else |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
601 lookedup_file="$gnulib_dir/$lkfile" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
602 lookedup_tmp= |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
603 fi |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
604 else |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
605 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
|
606 fi |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
607 fi |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
608 } |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
609 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
610 # func_all_modules |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
611 func_all_modules () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
612 { |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
613 # 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
|
614 # 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
|
615 # --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
|
616 { |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
617 (cd "$gnulib_dir/modules" && ls -1) |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
618 if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
619 (cd "$local_gnulib_dir/modules" && ls -1 | sed -e 's,\.diff$,,') |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
620 fi |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
621 } \ |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
622 | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \ |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
623 | sed -e '/-tests$/d' \ |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
624 | LC_ALL=C sort \ |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
625 | LC_ALL=C uniq |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
626 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
627 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
628 # func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
629 # verifies a module name |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
630 func_verify_module () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
631 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
632 if ! { test -f "$gnulib_dir/modules/$module" \ |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
633 || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
634 && test -f "$local_gnulib_dir/modules/$module"; }; } \ |
4128
1346b5405a74
(func_verify_module): report module name $module
Karl Berry <karl@freefriends.org>
parents:
4126
diff
changeset
|
635 || test "CVS" = "$module" \ |
1346b5405a74
(func_verify_module): report module name $module
Karl Berry <karl@freefriends.org>
parents:
4126
diff
changeset
|
636 || test "ChangeLog" = "$module" \ |
5312 | 637 || test "README" = "$module" \ |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
638 || test "TEMPLATE" = "$module" \ |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
639 || test "TEMPLATE-TESTS" = "$module"; then |
4128
1346b5405a74
(func_verify_module): report module name $module
Karl Berry <karl@freefriends.org>
parents:
4126
diff
changeset
|
640 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
|
641 module= |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
642 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
643 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
644 |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
645 # func_verify_nontests_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
646 # verifies a module name, excluding tests modules |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
647 func_verify_nontests_module () |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
648 { |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
649 case "$module" in |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
650 *-tests ) module= ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
651 * ) func_verify_module ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
652 esac |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
653 } |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
654 |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
655 # func_verify_tests_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
656 # verifies a module name, considering only tests modules |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
657 func_verify_tests_module () |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
658 { |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
659 case "$module" in |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
660 *-tests ) func_verify_module ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
661 * ) module= ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
662 esac |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
663 } |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
664 |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
665 sed_extract_prog=':[ ]*$/ { |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
666 :a |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
667 n |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
668 s/^Description:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
669 s/^Files:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
670 s/^Depends-on:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
671 s/^configure\.ac:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
672 s/^Makefile\.am:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
673 s/^Include:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
674 s/^License:[ ]*$// |
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
675 s/^Maintainer:[ ]*$// |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
676 tb |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
677 p |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
678 ba |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
679 :b |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
680 }' |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
681 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
682 # func_get_description module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
683 func_get_description () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
684 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
685 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
686 sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
687 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
688 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
689 # func_get_filelist module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
690 func_get_filelist () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
691 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
692 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
693 sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" |
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
694 case "$autoconf_minversion" in |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
695 2.59) |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
696 #echo m4/onceonly.m4 |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
697 echo m4/onceonly_2_57.m4 |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
698 ;; |
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
699 esac |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
700 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
701 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
702 # func_get_dependencies module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
703 func_get_dependencies () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
704 { |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
705 # ${module}-tests always implicitly depends on ${module}. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
706 echo "$1" | sed -n -e 's/-tests//p' |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
707 # 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
|
708 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
709 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
|
710 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
711 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
712 # func_get_autoconf_snippet module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
713 func_get_autoconf_snippet () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
714 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
715 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
716 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
|
717 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
718 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
719 # func_get_automake_snippet module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
720 func_get_automake_snippet () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
721 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
722 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
723 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
724 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
725 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
726 # func_get_include_directive module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
727 func_get_include_directive () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
728 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
729 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
730 sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" | \ |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
731 sed -e 's/^\(["<]\)/#include \1/' |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
732 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
733 |
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
734 # func_get_license module |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
735 func_get_license () |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
736 { |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
737 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
738 sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" |
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
739 } |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
740 |
4197 | 741 # func_get_maintainer module |
742 func_get_maintainer () | |
743 { | |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
744 func_lookup_file "modules/$1" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
745 sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" |
4197 | 746 } |
747 | |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
748 # func_get_tests_module module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
749 func_get_tests_module () |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
750 { |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
751 # The naming convention for tests modules is hardwired: ${module}-tests. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
752 if test -f modules/"$1"-tests; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
753 echo "$1"-tests |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
754 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
755 } |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
756 |
5981 | 757 # func_acceptable module |
758 # tests whether a module is acceptable. | |
759 # Input: | |
760 # - avoidlist list of modules to avoid | |
761 func_acceptable () | |
762 { | |
763 for avoid in $avoidlist; do | |
764 if test "$avoid" = "$1"; then | |
765 return 1 | |
766 fi | |
767 done | |
768 return 0 | |
769 } | |
770 | |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
771 # func_modules_transitive_closure |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
772 # Input: |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
773 # - modules list of specified modules |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
774 # - inctests true if tests should be included, blank otherwise |
5981 | 775 # - avoidlist list of modules to avoid |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
776 # Output: |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
777 # - 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
|
778 func_modules_transitive_closure () |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
779 { |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
780 while true; do |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
781 xmodules= |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
782 for module in $modules; do |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
783 func_verify_module |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
784 if test -n "$module"; then |
5981 | 785 # Duplicate dependencies are harmless, but Jim wants a warning. |
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
786 duplicated_deps=`func_get_dependencies $module | LC_ALL=C sort | LC_ALL=C uniq -d` |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
787 if test -n "$duplicated_deps"; then |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
788 echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2 |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
789 fi |
5981 | 790 if func_acceptable $module; then |
791 xmodules="$xmodules $module" | |
792 for depmodule in `func_get_dependencies $module`; do | |
793 if func_acceptable $depmodule; then | |
794 xmodules="$xmodules $depmodule" | |
795 fi | |
796 done | |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
797 if test -n "$inctests"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
798 testsmodule=`func_get_tests_module $module` |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
799 if test -n "$testsmodule"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
800 if func_acceptable $testsmodule; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
801 xmodules="$xmodules $testsmodule" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
802 for depmodule in `func_get_dependencies $testsmodule`; do |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
803 if func_acceptable $depmodule; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
804 xmodules="$xmodules $depmodule" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
805 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
806 done |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
807 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
808 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
809 fi |
5981 | 810 fi |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
811 fi |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
812 done |
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
813 xmodules=`for m in $xmodules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
814 if test "$xmodules" = "$modules"; then |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
815 break |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
816 fi |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
817 modules="$xmodules" |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
818 done |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
819 } |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
820 |
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
821 # func_modules_add_dummy |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
822 # Input: |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
823 # - 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
|
824 # Output: |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
825 # - 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
|
826 func_modules_add_dummy () |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
827 { |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
828 have_lib_SOURCES= |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
829 sed_remove_backslash_newline=':a |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
830 /\\$/{ |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
831 s/\\$// |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
832 N |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
833 s/\n// |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
834 ba |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
835 }' |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
836 for module in $modules; do |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
837 func_verify_nontests_module |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
838 if test -n "$module"; then |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
839 # Extract the value of "lib_SOURCES += ...". |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
840 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
|
841 # 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
|
842 case "$file" in |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
843 *.h) ;; |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
844 *) have_lib_SOURCES=yes ;; |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
845 esac |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
846 done |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
847 fi |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
848 done |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
849 # 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
|
850 if test -z "$have_lib_SOURCES"; then |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
851 modules="$modules dummy" |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
852 fi |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
853 } |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
854 |
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
855 # func_modules_to_filelist |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
856 # Input: |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
857 # - 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
|
858 # Output: |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
859 # - files list of files |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
860 func_modules_to_filelist () |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
861 { |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
862 files= |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
863 for module in $modules; do |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
864 func_verify_module |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
865 if test -n "$module"; then |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
866 files="$files "`func_get_filelist $module` |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
867 fi |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
868 done |
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
869 files=`for f in $files; do echo $f; done | LC_ALL=C sort | LC_ALL=C uniq` |
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
870 } |
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
871 |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
872 # 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
|
873 # emits the contents of lib/Makefile.am to standard output. |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
874 # Input: |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
875 # - 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
|
876 # - libname library name |
7077 | 877 # - libtool true if libtool will be used, false or blank otherwise |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
878 # - actioncmd (optional) command that will reproduce this invocation |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
879 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
|
880 { |
7077 | 881 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
|
882 libext=la |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
883 perhapsLT=LT |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
884 else |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
885 libext=a |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
886 perhapsLT= |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
887 fi |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
888 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
|
889 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
|
890 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
|
891 echo "# Reproduce by: $actioncmd" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
892 fi |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
893 echo |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
894 # No need to generate dependencies since the sources are in gnulib, not here. |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
895 echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
896 echo |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
897 echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
898 echo |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
899 echo "${libname}_${libext}_SOURCES =" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
900 echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@" |
6548
060487c0b13c
Initialize also noinst_HEADERS to empty.
Bruno Haible <bruno@clisp.org>
parents:
6547
diff
changeset
|
901 echo "noinst_HEADERS =" |
7089
537f18903d33
Make pkgdata_DATA a cumulative variable. From Ralf Wildenhues.
Bruno Haible <bruno@clisp.org>
parents:
7086
diff
changeset
|
902 echo "pkgdata_DATA =" |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
903 echo "EXTRA_DIST =" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
904 echo "BUILT_SOURCES =" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
905 echo "SUFFIXES =" |
7079 | 906 echo "MOSTLYCLEANFILES = core *.stackdump" |
6862 | 907 echo "MOSTLYCLEANDIRS =" |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
908 echo "CLEANFILES =" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
909 echo "DISTCLEANFILES =" |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
910 echo "MAINTAINERCLEANFILES =" |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
911 echo |
6750
608add4e5b80
Support for packages that use "gettextize --intl". From Claudio Fontana.
Bruno Haible <bruno@clisp.org>
parents:
6745
diff
changeset
|
912 echo "AM_CPPFLAGS =" |
608add4e5b80
Support for packages that use "gettextize --intl". From Claudio Fontana.
Bruno Haible <bruno@clisp.org>
parents:
6745
diff
changeset
|
913 echo |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
914 for module in $modules; do |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
915 func_verify_nontests_module |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
916 if test -n "$module"; then |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
917 { |
5527
1270fb7d6695
(func_emit_lib_Makefile_am): Shorten a long sed command.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5358
diff
changeset
|
918 func_get_automake_snippet "$module" | |
1270fb7d6695
(func_emit_lib_Makefile_am): Shorten a long sed command.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5358
diff
changeset
|
919 sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
920 if test "$module" = 'alloca'; then |
5358
e3d296179cc6
(func_emit_lib_Makefile_am): Fix typo: a $ was
Paul Eggert <eggert@cs.ucla.edu>
parents:
5357
diff
changeset
|
921 echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
922 fi |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
923 } > amsnippet.tmp |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
924 # Skip the contents if its entirely empty. |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
925 if grep '[^ ]' amsnippet.tmp > /dev/null ; then |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
926 echo "## begin gnulib module $module" |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
927 echo |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
928 cat amsnippet.tmp |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
929 echo "## end gnulib module $module" |
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
930 echo |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
931 fi |
5352
f1f20fc1ff2f
Emit separators in lib/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
5351
diff
changeset
|
932 rm -f amsnippet.tmp |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
933 fi |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
934 done |
5357
8bce169f70cc
Fix comments. Fix parse problem.
Simon Josefsson <simon@josefsson.org>
parents:
5356
diff
changeset
|
935 echo |
7086 | 936 echo "mostlyclean-local: mostlyclean-generic" |
6862 | 937 echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" |
938 echo " for dir in \$(MOSTLYCLEANDIRS); do \\" | |
939 echo " if test -d \$\$dir; then \\" | |
940 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" | |
941 echo " fi; \\" | |
942 echo " done" | |
943 echo | |
5357
8bce169f70cc
Fix comments. Fix parse problem.
Simon Josefsson <simon@josefsson.org>
parents:
5356
diff
changeset
|
944 echo "# Makefile.am ends here" |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
945 } |
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
946 |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
947 # func_emit_tests_Makefile_am |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
948 # emits the contents of tests/Makefile.am to standard output. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
949 # Input: |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
950 # - modules list of modules, including dependencies |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
951 # - libname library name |
7077 | 952 # - 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
|
953 # - sourcebase relative directory containing lib source code |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
954 # - m4base relative directory containing autoconf macros |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
955 # - testsbase relative directory containing unit test code |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
956 func_emit_tests_Makefile_am () |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
957 { |
7077 | 958 if test "$libtool" = true; then |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
959 libext=la |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
960 else |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
961 libext=a |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
962 fi |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
963 testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
964 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
|
965 func_emit_copyright_notice |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
966 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
967 # Generate dependencies here, since it eases the debugging of test failures. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
968 echo "AUTOMAKE_OPTIONS = 1.5 foreign" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
969 echo |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
970 echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
971 echo |
6533
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
972 # 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
|
973 # 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
|
974 # "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
|
975 echo "SUBDIRS =" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
976 echo "TESTS =" |
6380 | 977 echo "TESTS_ENVIRONMENT =" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
978 echo "noinst_PROGRAMS =" |
6570
c965a389db71
Simplify my *-tests modules.
Simon Josefsson <simon@josefsson.org>
parents:
6556
diff
changeset
|
979 echo "check_PROGRAMS =" |
6548
060487c0b13c
Initialize also noinst_HEADERS to empty.
Bruno Haible <bruno@clisp.org>
parents:
6547
diff
changeset
|
980 echo "noinst_HEADERS =" |
7089
537f18903d33
Make pkgdata_DATA a cumulative variable. From Ralf Wildenhues.
Bruno Haible <bruno@clisp.org>
parents:
7086
diff
changeset
|
981 echo "pkgdata_DATA =" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
982 echo "EXTRA_DIST =" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
983 echo "BUILT_SOURCES =" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
984 echo "SUFFIXES =" |
7079 | 985 echo "MOSTLYCLEANFILES = core *.stackdump" |
6862 | 986 echo "MOSTLYCLEANDIRS =" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
987 echo "CLEANFILES =" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
988 echo "DISTCLEANFILES =" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
989 echo "MAINTAINERCLEANFILES =" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
990 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
991 echo "AM_CPPFLAGS = \\" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
992 echo " -I. -I\$(srcdir) \\" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
993 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
994 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
|
995 echo |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
996 echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
997 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
998 for module in $modules; do |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
999 func_verify_tests_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1000 if test -n "$module"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1001 func_get_automake_snippet "$module" > amsnippet.tmp |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1002 # Skip the contents if its entirely empty. |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1003 if grep '[^ ]' amsnippet.tmp > /dev/null ; then |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1004 echo "## begin gnulib module $module" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1005 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1006 cat amsnippet.tmp |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1007 echo "## end gnulib module $module" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1008 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1009 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1010 rm -f amsnippet.tmp |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1011 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1012 done |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1013 echo "# Clean up after Solaris cc." |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1014 echo "clean-local:" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1015 echo " rm -rf SunWS_cache" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1016 echo |
7086 | 1017 echo "mostlyclean-local: mostlyclean-generic" |
6862 | 1018 echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" |
1019 echo " for dir in \$(MOSTLYCLEANDIRS); do \\" | |
1020 echo " if test -d \$\$dir; then \\" | |
1021 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" | |
1022 echo " fi; \\" | |
1023 echo " done" | |
1024 echo | |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1025 echo "# Makefile.am ends here" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1026 } |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1027 |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1028 # func_import modules |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1029 # Uses also the variables |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1030 # - destdir target directory |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1031 # - libname library name |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1032 # - 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
|
1033 # - m4base directory relative to destdir where to place *.m4 macros |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1034 # - 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
|
1035 # - 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
|
1036 # - 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
|
1037 # - inctests true if --with-tests was given, blank otherwise |
5981 | 1038 # - avoidlist list of modules to avoid, from --avoid |
1039 # - lgpl true if library's license shall be LGPL, blank otherwise | |
7077 | 1040 # - libtool true if --libtool was given, false if --no-libtool was |
1041 # given, blank otherwise | |
1042 # - guessed_libtool true if the configure.ac file uses libtool, false otherwise | |
6176 | 1043 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use |
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1044 # - autoconf_minversion minimum supported autoconf version |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1045 # - 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
|
1046 # - symbolic true if files should be symlinked, copied otherwise |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1047 func_import () |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1048 { |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1049 # Get the cached settings. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1050 cached_specified_modules= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1051 cached_avoidlist= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1052 cached_sourcebase= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1053 cached_m4base= |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1054 cached_docbase= |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1055 cached_testsbase= |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1056 cached_libname= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1057 cached_lgpl= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1058 cached_libtool= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1059 cached_macro_prefix= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1060 cached_files= |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1061 if test -f "$destdir"/$m4base/gnulib-cache.m4; then |
7077 | 1062 cached_libtool=false |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1063 my_sed_traces=' |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1064 s,#.*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1065 s,^dnl .*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1066 s, dnl .*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1067 /gl_MODULES(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1068 s,^.*gl_MODULES([[ ]*\([^])]*\).*$,cached_specified_modules="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1069 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1070 /gl_AVOID(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1071 s,^.*gl_AVOID([[ ]*\([^])]*\).*$,cached_avoidlist="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1072 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1073 /gl_SOURCE_BASE(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1074 s,^.*gl_SOURCE_BASE([[ ]*\([^])]*\).*$,cached_sourcebase="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1075 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1076 /gl_M4_BASE(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1077 s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1078 } |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1079 /gl_DOC_BASE(/ { |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1080 s,^.*gl_DOC_BASE([[ ]*\([^])]*\).*$,cached_docbase="\1",p |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1081 } |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1082 /gl_TESTS_BASE(/ { |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1083 s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1084 } |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1085 /gl_LIB(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1086 s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1087 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1088 /gl_LGPL/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1089 s,^.*$,cached_lgpl=true,p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1090 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1091 /gl_LIBTOOL/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1092 s,^.*$,cached_libtool=true,p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1093 } |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1094 /gl_MACRO_PREFIX(/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1095 s,^.*gl_MACRO_PREFIX([[ ]*\([^])]*\).*$,cached_macro_prefix="\1",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1096 }' |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1097 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4` |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1098 if test -f "$destdir"/$m4base/gnulib-comp.m4; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1099 my_sed_traces=' |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1100 s,#.*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1101 s,^dnl .*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1102 s, dnl .*$,, |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1103 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ { |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1104 s,^.*$,cached_files=",p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1105 n |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1106 ta |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1107 :a |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1108 s,^\]).*$,", |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1109 tb |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1110 p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1111 n |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1112 ba |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1113 :b |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1114 p |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1115 }' |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1116 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-comp.m4` |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1117 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1118 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1119 |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1120 # Merge the cached settings with the specified ones. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1121 # 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
|
1122 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
|
1123 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
|
1124 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1125 # 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
|
1126 # "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
|
1127 specified_modules="$cached_specified_modules $1" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1128 # 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
|
1129 # than dropping the cached one when --avoid is specified at least once. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1130 avoidlist=`echo $cached_avoidlist $avoidlist` |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1131 # The sourcebase defaults to the cached one. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1132 if test -z "$sourcebase"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1133 sourcebase="$cached_sourcebase" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1134 if test -z "$sourcebase"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1135 func_fatal_error "missing --source-base option" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1136 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1137 fi |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1138 # 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
|
1139 if test -z "$docbase"; then |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1140 docbase="$cached_docbase" |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1141 if test -z "$docbase"; then |
7076
0e471c8eb020
Tweak error message about missing --doc-base.
Bruno Haible <bruno@clisp.org>
parents:
7073
diff
changeset
|
1142 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
|
1143 fi |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1144 fi |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1145 # The testsbase defaults to the cached one. |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1146 if test -z "$testsbase"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1147 testsbase="$cached_testsbase" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1148 if test -z "$testsbase"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1149 func_fatal_error "missing --tests-base option" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1150 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1151 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1152 # 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
|
1153 if test -z "$supplied_libname"; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1154 libname="$cached_libname" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1155 if test -z "$libname"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1156 func_fatal_error "missing --lib option" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1157 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1158 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1159 # Require LGPL if specified either way. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1160 if test -z "$lgpl"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1161 lgpl="$cached_lgpl" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1162 fi |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1163 # 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
|
1164 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
|
1165 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
|
1166 libtool="$cached_libtool" |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1167 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1168 libtool="$guessed_libtool" |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1169 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1170 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1171 # The macro_prefix defaults to the cached one. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1172 if test -z "$macro_prefix"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1173 macro_prefix="$cached_macro_prefix" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1174 if test -z "$macro_prefix"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1175 func_fatal_error "missing --macro-prefix option" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1176 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1177 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1178 |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1179 # Canonicalize the list of specified modules. |
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
1180 specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1181 |
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1182 # Determine final module list. |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1183 modules="$specified_modules" |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1184 func_modules_transitive_closure |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1185 echo "Module list with included dependencies:" |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1186 echo "$modules" | sed -e 's/^/ /' |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1187 |
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
1188 # 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
|
1189 func_modules_add_dummy |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
1190 |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1191 # If --lgpl, check the license of modules are compatible. |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1192 if test -n "$lgpl"; then |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1193 for module in $modules; do |
5346 | 1194 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
|
1195 case $license in |
6464
d4112cb80f32
Accept GPLed build tool modules when --lgpl is given.
Bruno Haible <bruno@clisp.org>
parents:
6443
diff
changeset
|
1196 LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;; |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1197 *) func_fatal_error "incompatible license on module $module: $license" ;; |
5963
6fb8c48c4dcd
* gnulib-tool (func_import): Add support for 'public domain' license.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
1198 esac |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1199 done |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1200 fi |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1201 |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1202 # Determine final file list. |
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
1203 func_modules_to_filelist |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1204 echo "File list:" |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1205 echo "$files" | sed -e 's/^/ /' |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1206 |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1207 test -n "$files" \ |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1208 || 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
|
1209 |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1210 # 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
|
1211 new_files="$files m4/gnulib-tool.m4" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1212 old_files="$cached_files" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1213 if test -f "$destdir"/$m4base/gnulib-tool.m4; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1214 old_files="$old_files m4/gnulib-tool.m4" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1215 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1216 |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1217 # Create directories. |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1218 if test ! -d "$destdir/$sourcebase"; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1219 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1220 echo "Creating directory $destdir/$sourcebase" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1221 mkdir "$destdir/$sourcebase" || func_fatal_error "failed" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1222 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1223 echo "Create directory $destdir/$sourcebase" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1224 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1225 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1226 if test ! -d "$destdir/$m4base"; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1227 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1228 echo "Creating directory $destdir/$m4base" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1229 mkdir "$destdir/$m4base" || func_fatal_error "failed" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1230 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1231 echo "Create directory $destdir/$m4base" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1232 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1233 fi |
7070
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1234 docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'` |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1235 if test -n "$docfiles"; then |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1236 if test ! -d "$destdir/$docbase"; then |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1237 if $doit; then |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1238 echo "Creating directory $destdir/$docbase" |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1239 mkdir "$destdir/$docbase" || func_fatal_error "failed" |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1240 else |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1241 echo "Create directory $destdir/$docbase" |
a733c0af6d39
Avoid creating an empty doc directory.
Bruno Haible <bruno@clisp.org>
parents:
7069
diff
changeset
|
1242 fi |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1243 fi |
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1244 fi |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1245 if test -n "$inctests"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1246 if test ! -d "$destdir/$testsbase"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1247 if $doit; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1248 echo "Creating directory $destdir/$testsbase" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1249 mkdir "$destdir/$testsbase" || func_fatal_error "failed" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1250 else |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1251 echo "Create directory $destdir/$testsbase" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1252 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1253 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1254 fi |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1255 if test ! -d "$destdir/$auxdir"; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1256 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1257 echo "Creating directory $destdir/$auxdir" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1258 mkdir "$destdir/$auxdir" || func_fatal_error "failed" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1259 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1260 echo "Create directory $destdir/$auxdir" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1261 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1262 fi |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
1263 |
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
|
1264 # 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
|
1265 # 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
|
1266 # 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
|
1267 # - 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
|
1268 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
|
1269 { |
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
1270 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
|
1271 # 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
|
1272 # 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
|
1273 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
|
1274 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
|
1275 # 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
|
1276 # (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
|
1277 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
|
1278 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
|
1279 } |
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
1280 |
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
1281 # Copy files or make symbolic links. Remove obsolete files. |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1282 delimiter=' ' |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1283 for f in $old_files; do |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1284 case "$f" in |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1285 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1286 doc/*) g=`echo "$f" | sed -e "s,^doc/,$cached_docbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1287 lib/*) g=`echo "$f" | sed -e "s,^lib/,$cached_sourcebase/,"` ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1288 m4/*) g=`echo "$f" | sed -e "s,^m4/,$cached_m4base/,"` ;; |
6425
d33210bfaeae
* gnulib-tool: Fix --tests-base.
Simon Josefsson <simon@josefsson.org>
parents:
6418
diff
changeset
|
1289 tests/*) g=`echo "$f" | sed -e "s,^tests/,$cached_testsbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1290 *) g="$f" ;; |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1291 esac |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1292 echo "$g""$delimiter""$f" |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1293 done | LC_ALL=C sort > "$tmp"/old-files |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1294 for f in $new_files; do |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1295 case "$f" in |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1296 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1297 doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1298 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1299 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; |
6425
d33210bfaeae
* gnulib-tool: Fix --tests-base.
Simon Josefsson <simon@josefsson.org>
parents:
6418
diff
changeset
|
1300 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1301 *) g="$f" ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1302 esac |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1303 echo "$g""$delimiter""$f" |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1304 done | LC_ALL=C sort > "$tmp"/new-files |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1305 # 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
|
1306 sed_take_first_column='s,'"$delimiter"'.*,,' |
0c67f1400c5b
Fix portability problem to Solaris 9 sh.
Bruno Haible <bruno@clisp.org>
parents:
6581
diff
changeset
|
1307 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
|
1308 # Remove the file. Do nothing if the user already removed it. |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1309 if test -f "$destdir/$g"; then |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1310 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1311 echo "Removing file $g (backup in ${g}~)" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1312 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
|
1313 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1314 echo "Remove file $g (backup in ${g}~)" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1315 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1316 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1317 done |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1318 # func_add_or_update handles a file that ought to be present afterwards. |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1319 # Uses parameters f, g, already_present. |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1320 func_add_or_update () |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1321 { |
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
|
1322 func_dest_tmpfilename "$g" |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1323 func_lookup_file "$f" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1324 cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1325 if test -n "$lgpl"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1326 # Update license. |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1327 case "$f" in |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1328 lib/*) |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1329 sed -e 's/GNU General/GNU Lesser General/g' \ |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1330 -e 's/version 2\([ ,]\)/version 2.1\1/g' \ |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1331 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1332 ;; |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1333 esac |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1334 fi |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1335 if test -f "$destdir/$g"; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1336 # 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
|
1337 if cmp "$destdir/$g" "$tmpfile" > /dev/null; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1338 : # The file has not changed. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1339 else |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1340 # Replace the file. |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1341 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1342 if test -n "$already_present"; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1343 echo "Updating file $g (backup in ${g}~)" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1344 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1345 echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1346 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1347 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1348 if test -n "$symbolic" && test -z "$lookedup_tmp" \ |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1349 && 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
|
1350 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
|
1351 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
|
1352 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
|
1353 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1354 else |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1355 if test -n "$already_present"; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1356 echo "Update file $g (backup in ${g}~)" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1357 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1358 echo "Replace file $g (non-gnulib code backuped in ${g}~) !!" |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1359 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1360 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1361 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1362 else |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1363 # Install the file. |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1364 # 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
|
1365 # 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
|
1366 if $doit; then |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1367 echo "Copying file $g" |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1368 if test -n "$symbolic" && test -z "$lookedup_tmp" \ |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1369 && 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
|
1370 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
|
1371 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
|
1372 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
|
1373 fi |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1374 else |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1375 echo "Copy file $g" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1376 fi |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1377 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
|
1378 rm -f "$tmpfile" |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1379 } |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1380 # 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
|
1381 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
|
1382 already_present= |
6595
0c67f1400c5b
Fix portability problem to Solaris 9 sh.
Bruno Haible <bruno@clisp.org>
parents:
6581
diff
changeset
|
1383 for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1384 case "$f" in |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1385 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1386 doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1387 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1388 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; |
6425
d33210bfaeae
* gnulib-tool: Fix --tests-base.
Simon Josefsson <simon@josefsson.org>
parents:
6418
diff
changeset
|
1389 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1390 *) g="$f" ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1391 esac |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1392 func_add_or_update |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1393 done |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1394 # 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
|
1395 already_present=true |
6595
0c67f1400c5b
Fix portability problem to Solaris 9 sh.
Bruno Haible <bruno@clisp.org>
parents:
6581
diff
changeset
|
1396 for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1397 case "$f" in |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1398 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1399 doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1400 lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1401 m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; |
6425
d33210bfaeae
* gnulib-tool: Fix --tests-base.
Simon Josefsson <simon@josefsson.org>
parents:
6418
diff
changeset
|
1402 tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; |
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1403 *) g="$f" ;; |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1404 esac |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1405 func_add_or_update |
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
1406 done |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1407 |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1408 # 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
|
1409 actioncmd="gnulib-tool --import" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1410 actioncmd="$actioncmd --dir=$destdir" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1411 actioncmd="$actioncmd --lib=$libname" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1412 actioncmd="$actioncmd --source-base=$sourcebase" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1413 actioncmd="$actioncmd --m4-base=$m4base" |
6952
b1f02ed7eeab
* modules/fdl: New module, to install doc/fdl.texi.
Eric Blake <ebb9@byu.net>
parents:
6940
diff
changeset
|
1414 actioncmd="$actioncmd --doc-base=$docbase" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1415 actioncmd="$actioncmd --aux-dir=$auxdir" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1416 for module in $avoidlist; do |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1417 actioncmd="$actioncmd --avoid=$module" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1418 done |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1419 if test -n "$lgpl"; then |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1420 actioncmd="$actioncmd --lgpl" |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1421 fi |
7077 | 1422 if test "$libtool" = true; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1423 actioncmd="$actioncmd --libtool" |
7077 | 1424 else |
1425 actioncmd="$actioncmd --no-libtool" | |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1426 fi |
6208
c72d8c259348
2005-09-03 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
6204
diff
changeset
|
1427 actioncmd="$actioncmd --macro-prefix=$macro_prefix" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1428 actioncmd="$actioncmd `echo $specified_modules`" |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1429 |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1430 # Create lib/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
|
1431 func_dest_tmpfilename $sourcebase/Makefile.am |
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
1432 func_emit_lib_Makefile_am > "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1433 if test -f "$destdir"/$sourcebase/Makefile.am; 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
|
1434 if cmp "$destdir"/$sourcebase/Makefile.am "$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
|
1435 rm -f "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1436 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1437 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1438 echo "Updating $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)" |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1439 mv -f "$destdir"/$sourcebase/Makefile.am "$destdir"/$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
|
1440 mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1441 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1442 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
|
1443 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1444 fi |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1445 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1446 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1447 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1448 echo "Creating $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
|
1449 mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1450 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1451 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
|
1452 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1453 fi |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
1454 fi |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1455 |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1456 # 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
|
1457 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
|
1458 ( |
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
1459 func_emit_copyright_notice |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1460 echo "#" |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1461 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
|
1462 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
|
1463 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
|
1464 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
|
1465 echo |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1466 echo |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1467 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
|
1468 echo "# $actioncmd" |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1469 echo |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1470 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1471 echo "gl_MODULES(["`echo $specified_modules`"])" |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1472 echo "gl_AVOID([$avoidlist])" |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1473 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
|
1474 echo "gl_M4_BASE([$m4base])" |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1475 echo "gl_DOC_BASE([$docbase])" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1476 echo "gl_TESTS_BASE([$testsbase])" |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1477 echo "gl_LIB([$libname])" |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1478 test -z "$lgpl" || echo "gl_LGPL" |
7077 | 1479 if test "$libtool" = true; then |
1480 echo "gl_LIBTOOL" | |
1481 fi | |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1482 echo "gl_MACRO_PREFIX([$macro_prefix])" |
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
|
1483 ) > "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1484 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
|
1485 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
|
1486 rm -f "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1487 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1488 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1489 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
|
1490 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
|
1491 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
|
1492 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1493 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
|
1494 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
|
1495 cat "$tmpfile" |
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1496 echo |
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1497 echo "# gnulib-cache.m4 ends here" |
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1498 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
|
1499 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1500 fi |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1501 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1502 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1503 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1504 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
|
1505 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
|
1506 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1507 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
|
1508 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
|
1509 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1510 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1511 fi |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1512 |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1513 # 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
|
1514 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
|
1515 ( |
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
1516 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
|
1517 echo "#" |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1518 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
|
1519 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
|
1520 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
|
1521 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
|
1522 echo |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1523 echo |
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1524 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
|
1525 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
|
1526 echo "# any checks for libraries, header files, types and library functions." |
6176 | 1527 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
|
1528 echo "[" |
7105
641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents:
7090
diff
changeset
|
1529 echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" |
641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents:
7090
diff
changeset
|
1530 echo " m4_pattern_allow([^gl_ES$])dnl a valid locale name" |
6512 | 1531 echo " AC_REQUIRE([AC_PROG_RANLIB])" |
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
|
1532 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
|
1533 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
|
1534 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
|
1535 if grep gl_USE_SYSTEM_EXTENSIONS "$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
|
1536 echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])" |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1537 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
|
1538 if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then |
6549
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1539 echo " AC_REQUIRE([gl_LOCK])" |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1540 fi |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1541 echo "])" |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1542 echo |
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1543 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
|
1544 echo "# \"Check for header files, types and library functions\"." |
6176 | 1545 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
|
1546 echo "[" |
7077 | 1547 if test "$libtool" = true; then |
1548 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
1549 else | |
6512 | 1550 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
1551 fi |
6556 | 1552 if test "$auxdir" != "build-aux"; then |
1553 sed_replace_build_aux=' | |
1554 :a | |
1555 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
1556 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
1557 ba | |
1558 }' | |
1559 sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` | |
1560 else | |
1561 sed_replace_build_aux= | |
1562 fi | |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1563 for module in $modules; do |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1564 func_verify_module |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1565 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
|
1566 func_get_autoconf_snippet "$module" \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1567 | sed -e '/^$/d;' -e 's/^/ /' \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1568 -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1569 -e "$sed_replace_build_aux" |
7077 | 1570 if test "$module" = 'alloca' && test "$libtool" = true; then |
5356
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
1571 echo 'changequote(,)dnl' |
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
1572 echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' |
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
1573 echo 'changequote([, ])dnl' |
6106
66bd85c8a9cd
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6039
diff
changeset
|
1574 echo 'AC_SUBST([LTALLOCA])' |
5356
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
1575 fi |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1576 fi |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1577 done |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1578 echo "])" |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1579 echo |
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1580 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
|
1581 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
|
1582 echo "AC_DEFUN([${macro_prefix}_FILE_LIST], [" |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1583 echo "$files" | sed -e 's,^, ,' |
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
1584 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
|
1585 ) > "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1586 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
|
1587 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
|
1588 rm -f "$tmpfile" |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1589 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1590 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1591 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
|
1592 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
|
1593 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
|
1594 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1595 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
|
1596 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
|
1597 cat "$tmpfile" |
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1598 echo |
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1599 echo "# gnulib-comp.m4 ends here" |
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
1600 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
|
1601 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1602 fi |
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1603 fi |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1604 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1605 if $doit; then |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1606 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
|
1607 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
|
1608 else |
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1609 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
|
1610 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
|
1611 rm -f "$tmpfile" |
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1612 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1613 fi |
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
1614 |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1615 if test -n "$inctests"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1616 # Create tests/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
|
1617 func_dest_tmpfilename $testsbase/Makefile.am |
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
1618 func_emit_tests_Makefile_am > "$tmpfile" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1619 if test -f "$destdir"/$testsbase/Makefile.am; 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
|
1620 if cmp "$destdir"/$testsbase/Makefile.am "$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
|
1621 rm -f "$tmpfile" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1622 else |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1623 if $doit; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1624 echo "Updating $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)" |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1625 mv -f "$destdir"/$testsbase/Makefile.am "$destdir"/$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
|
1626 mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1627 else |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1628 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
|
1629 rm -f "$tmpfile" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1630 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1631 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1632 else |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1633 if $doit; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1634 echo "Creating $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
|
1635 mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1636 else |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1637 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
|
1638 rm -f "$tmpfile" |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1639 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1640 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1641 fi |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1642 |
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1643 echo "Finished." |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1644 echo |
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
1645 echo "You may need to add #include directives for the following .h files." |
6756
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1646 ( |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1647 # First the #include <...> directives without #ifs, sorted for convenience. |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1648 for module in $modules; do |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1649 if func_get_include_directive "$module" | grep '^#if' >/dev/null; then |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1650 : |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1651 else |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1652 func_get_include_directive "$module" | grep -v 'include "' |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1653 fi |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1654 done | LC_ALL=C sort -u |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1655 # Then the #include "..." directives without #ifs, sorted for convenience. |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1656 for module in $modules; do |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1657 if func_get_include_directive "$module" | grep '^#if' >/dev/null; then |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1658 : |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1659 else |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1660 func_get_include_directive "$module" | grep 'include "' |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1661 fi |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1662 done | LC_ALL=C sort -u |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1663 # Then the #include directives that are surrounded by #ifs. Not sorted. |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1664 for module in $modules; do |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1665 if func_get_include_directive "$module" | grep '^#if' >/dev/null; then |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1666 func_get_include_directive "$module" |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1667 fi |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1668 done |
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
1669 ) | sed -e '/^$/d;' -e 's/^/ /' |
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
1670 echo |
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1671 echo "Don't forget to" |
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1672 echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac," |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1673 if test -n "$inctests"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1674 echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1675 fi |
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1676 sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'` |
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1677 sourcebase_base=`basename "$sourcebase"` |
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1678 echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am," |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1679 if test -n "$inctests"; then |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1680 testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'` |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1681 testsbase_base=`basename "$testsbase"` |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1682 echo " - mention \"${testsbase_base}\" in SUBDIRS in ${testsbase_dir}Makefile.am," |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1683 fi |
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
1684 echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am," |
6176 | 1685 echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," |
1686 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
|
1687 } |
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1688 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1689 # func_create_testdir testdir modules |
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1690 # Input: |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1691 # - 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
|
1692 func_create_testdir () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1693 { |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1694 testdir="$1" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1695 modules="$2" |
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
1696 modules=`for m in $modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1697 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1698 # Determine final module list. |
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
1699 func_modules_transitive_closure |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1700 echo "Module list with included dependencies:" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1701 echo "$modules" | sed -e 's/^/ /' |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1702 |
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
1703 # 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
|
1704 func_modules_add_dummy |
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
1705 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1706 # Determine final file list. |
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
1707 func_modules_to_filelist |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1708 echo "File list:" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1709 echo "$files" | sed -e 's/^/ /' |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1710 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1711 # Create directories. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1712 for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1713 if test "$d" = build-aux; then |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1714 mkdir -p "$testdir/$auxdir" |
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1715 else |
4175
ace040a2b821
Files meant for the AUX_DIR are now in the config subdirectory.
Bruno Haible <bruno@clisp.org>
parents:
4171
diff
changeset
|
1716 mkdir -p "$testdir/$d" |
ace040a2b821
Files meant for the AUX_DIR are now in the config subdirectory.
Bruno Haible <bruno@clisp.org>
parents:
4171
diff
changeset
|
1717 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1718 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1719 |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1720 # Copy files or make symbolic links. |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1721 for f in $files; do |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1722 func_lookup_file "$f" |
4175
ace040a2b821
Files meant for the AUX_DIR are now in the config subdirectory.
Bruno Haible <bruno@clisp.org>
parents:
4171
diff
changeset
|
1723 case "$f" in |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1724 build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; |
4175
ace040a2b821
Files meant for the AUX_DIR are now in the config subdirectory.
Bruno Haible <bruno@clisp.org>
parents:
4171
diff
changeset
|
1725 *) g="$f" ;; |
ace040a2b821
Files meant for the AUX_DIR are now in the config subdirectory.
Bruno Haible <bruno@clisp.org>
parents:
4171
diff
changeset
|
1726 esac |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1727 if test -n "$lookedup_tmp"; then |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1728 cp -p "$lookedup_file" "$testdir/$g" |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1729 else |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1730 ln "$lookedup_file" "$testdir/$g" 2>/dev/null || |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1731 if test -z "$symbolic"; then |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1732 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
|
1733 else |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1734 ln -s "$lookedup_file" "$testdir/$g" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1735 fi |
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1736 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1737 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1738 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1739 # Create lib/Makefile.am. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1740 mkdir -p "$testdir/lib" |
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
1741 func_emit_lib_Makefile_am > "$testdir/lib/Makefile.am" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1742 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1743 # Create m4/Makefile.am. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1744 mkdir -p "$testdir/m4" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1745 (echo "## Process this file with automake to produce Makefile.in." |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1746 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1747 echo "EXTRA_DIST =" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1748 for f in $files; do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1749 case "$f" in |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1750 m4/* ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1751 echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1752 esac |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1753 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1754 ) > "$testdir/m4/Makefile.am" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1755 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1756 subdirs="lib m4" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1757 subdirs_with_configure_ac="" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1758 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1759 if test -f "$testdir"/m4/gettext.m4; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1760 # Avoid stupid error message from automake: |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1761 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1762 mkdir -p "$testdir/po" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1763 (echo "## Process this file with automake to produce Makefile.in." |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1764 ) > "$testdir/po/Makefile.am" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1765 subdirs="$subdirs po" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1766 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1767 |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1768 if test -n "$inctests"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1769 test -d "$testdir/tests" || mkdir "$testdir/tests" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1770 # Create tests/Makefile.am. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1771 sourcebase=lib |
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1772 m4base=m4 |
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
1773 testsbase=tests |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1774 func_emit_tests_Makefile_am > "$testdir/tests/Makefile.am" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1775 # Create tests/configure.ac. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1776 (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
|
1777 echo "AC_INIT([dummy], [0])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1778 echo "AC_CONFIG_AUX_DIR([../$auxdir])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1779 echo "AM_INIT_AUTOMAKE" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1780 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1781 echo "AM_CONFIG_HEADER([config.h])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1782 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1783 echo "AC_PROG_CC" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1784 echo "AC_PROG_INSTALL" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1785 echo "AC_PROG_MAKE_SET" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1786 echo "AC_PROG_RANLIB" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1787 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
|
1788 if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1789 echo "AC_GNU_SOURCE" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1790 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1791 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
|
1792 if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1793 echo "gl_USE_SYSTEM_EXTENSIONS" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1794 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1795 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
|
1796 if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
6549
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1797 echo "gl_LOCK" |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1798 echo |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1799 fi |
7077 | 1800 if test "$libtool" = true; then |
1801 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
1802 else | |
6418
e0a8b9b05999
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6414
diff
changeset
|
1803 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
1804 fi |
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1805 # 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
|
1806 # 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
|
1807 # at the top level: |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1808 # 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
|
1809 # 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
|
1810 # 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
|
1811 # expansion total). |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1812 echo "AC_DEFUN([gl_INIT], [" |
6556 | 1813 if test "$auxdir" != "build-aux"; then |
1814 sed_replace_build_aux=' | |
1815 :a | |
1816 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
1817 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)| | |
1818 ba | |
1819 }' | |
1820 sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` | |
1821 else | |
1822 sed_replace_build_aux= | |
1823 fi | |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1824 # 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
|
1825 # 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
|
1826 # those of the tests. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1827 for module in $modules; do |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1828 func_verify_nontests_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1829 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
|
1830 func_get_autoconf_snippet "$module" \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1831 | sed -e "$sed_replace_build_aux" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1832 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1833 done |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1834 for module in $modules; do |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1835 func_verify_tests_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1836 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
|
1837 func_get_autoconf_snippet "$module" \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1838 | sed -e "$sed_replace_build_aux" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1839 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1840 done |
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1841 echo "])" |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1842 echo "gl_INIT" |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1843 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1844 # Usually tests/config.h will be a superset of config.h. Verify this by |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1845 # "merging" config.h into tests/config.h; look out for gcc warnings. |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1846 echo "AH_TOP([#include \"../config.h\"])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1847 echo |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1848 echo "AC_OUTPUT([Makefile])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1849 ) > "$testdir/tests/configure.ac" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1850 subdirs="$subdirs tests" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1851 subdirs_with_configure_ac="$subdirs_with_configure_ac tests" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1852 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1853 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1854 # Create Makefile.am. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1855 (echo "## Process this file with automake to produce Makefile.in." |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1856 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1857 echo "AUTOMAKE_OPTIONS = 1.5 foreign" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1858 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1859 echo "SUBDIRS = $subdirs" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1860 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1861 echo "ACLOCAL_AMFLAGS = -I m4" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1862 ) > "$testdir/Makefile.am" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1863 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1864 # Create configure.ac. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1865 (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
|
1866 echo "AC_INIT([dummy], [0])" |
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1867 if test "$auxdir" != "."; then |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1868 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1869 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1870 echo "AM_INIT_AUTOMAKE" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1871 echo |
6106
66bd85c8a9cd
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6039
diff
changeset
|
1872 echo "AM_CONFIG_HEADER([config.h])" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1873 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1874 echo "AC_PROG_CC" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1875 echo "AC_PROG_INSTALL" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1876 echo "AC_PROG_MAKE_SET" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1877 echo "AC_PROG_RANLIB" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1878 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
|
1879 if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1880 echo "AC_GNU_SOURCE" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1881 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1882 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
|
1883 if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
4586
eb1b4acf2e86
Avoid autoconf/autoheader warning
Bruno Haible <bruno@clisp.org>
parents:
4325
diff
changeset
|
1884 echo "gl_USE_SYSTEM_EXTENSIONS" |
eb1b4acf2e86
Avoid autoconf/autoheader warning
Bruno Haible <bruno@clisp.org>
parents:
4325
diff
changeset
|
1885 echo |
eb1b4acf2e86
Avoid autoconf/autoheader warning
Bruno Haible <bruno@clisp.org>
parents:
4325
diff
changeset
|
1886 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
|
1887 if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then |
6549
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1888 echo "gl_LOCK" |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1889 echo |
2f04f595e14e
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Bruno Haible <bruno@clisp.org>
parents:
6548
diff
changeset
|
1890 fi |
7077 | 1891 if test "$libtool" = true; then |
1892 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
1893 else | |
6418
e0a8b9b05999
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6414
diff
changeset
|
1894 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
1895 fi |
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1896 # 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
|
1897 # 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
|
1898 # at the top level: |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1899 # 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
|
1900 # 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
|
1901 # 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
|
1902 # expansion total). |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1903 echo "AC_DEFUN([gl_INIT], [" |
6556 | 1904 if test "$auxdir" != "build-aux"; then |
1905 sed_replace_build_aux=' | |
1906 :a | |
1907 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
1908 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
1909 ba | |
1910 }' | |
1911 sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` | |
1912 else | |
1913 sed_replace_build_aux= | |
1914 fi | |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1915 for module in $modules; do |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1916 func_verify_nontests_module |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1917 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
|
1918 func_get_autoconf_snippet "$module" \ |
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
1919 | sed -e "$sed_replace_build_aux" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1920 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1921 done |
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1922 echo "])" |
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
1923 echo "gl_INIT" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1924 echo |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1925 if test -n "$subdirs_with_configure_ac"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1926 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1927 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1928 makefiles="Makefile" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1929 for d in $subdirs; do |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1930 # 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
|
1931 # 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
|
1932 case " $subdirs_with_configure_ac " in |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1933 *" $d "*) ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1934 *) makefiles="$makefiles $d/Makefile" ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1935 esac |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1936 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1937 echo "AC_OUTPUT([$makefiles])" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1938 ) > "$testdir/configure.ac" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1939 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1940 # Create autogenerated files. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1941 (cd "$testdir" |
5237
bd85db908172
Replace various ad-hoc automake/autoconf/aclocal
Paul Eggert <eggert@cs.ucla.edu>
parents:
5202
diff
changeset
|
1942 echo "executing ${AUTORECONF} --force --install" |
bd85db908172
Replace various ad-hoc automake/autoconf/aclocal
Paul Eggert <eggert@cs.ucla.edu>
parents:
5202
diff
changeset
|
1943 ${AUTORECONF} --force --install |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1944 ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1945 if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1946 (cd "$testdir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1947 ./configure |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1948 cd lib |
6389
c1766dccfd4f
Simplification, from Stepan Kasal.
Bruno Haible <bruno@clisp.org>
parents:
6380
diff
changeset
|
1949 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile |
c1766dccfd4f
Simplification, from Stepan Kasal.
Bruno Haible <bruno@clisp.org>
parents:
6380
diff
changeset
|
1950 make built_sources |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1951 cd .. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1952 make distclean |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1953 ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1954 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1955 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1956 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1957 # func_create_megatestdir megatestdir allmodules |
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1958 # Input: |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1959 # - 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
|
1960 func_create_megatestdir () |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1961 { |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1962 megatestdir="$1" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1963 allmodules="$2" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1964 if test -z "$allmodules"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1965 allmodules=`func_all_modules` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1966 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1967 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1968 megasubdirs= |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1969 # First, all modules one by one. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1970 for onemodule in $allmodules; do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1971 func_create_testdir "$megatestdir/$onemodule" $onemodule |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1972 megasubdirs="${megasubdirs}$onemodule " |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1973 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1974 # Then, all modules all together. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1975 # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1976 allmodules=`for m in $allmodules; do if test $m != fnmatch-posix; then echo $m; fi; done` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1977 func_create_testdir "$megatestdir/ALL" "$allmodules" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1978 megasubdirs="${megasubdirs}ALL" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1979 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1980 # Create Makefile.am. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1981 (echo "## Process this file with automake to produce Makefile.in." |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1982 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1983 echo "AUTOMAKE_OPTIONS = 1.5 foreign" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1984 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1985 echo "SUBDIRS = $megasubdirs" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1986 ) > "$megatestdir/Makefile.am" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1987 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1988 # Create configure.ac. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1989 (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
|
1990 echo "AC_INIT([dummy], [0])" |
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1991 if test "$auxdir" != "."; then |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1992 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
1993 fi |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1994 echo "AM_INIT_AUTOMAKE" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1995 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1996 echo "AC_PROG_MAKE_SET" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1997 echo |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1998 echo "AC_CONFIG_SUBDIRS([$megasubdirs])" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1999 echo "AC_OUTPUT([Makefile])" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2000 ) > "$megatestdir/configure.ac" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2001 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2002 # Create autogenerated files. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2003 (cd "$megatestdir" |
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2004 # 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
|
2005 # 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
|
2006 # calling autoreconf here would only waste lots of CPU time. |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2007 echo "executing ${ACLOCAL}" |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2008 ${ACLOCAL} |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2009 echo "executing mkdir build-aux" |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2010 mkdir build-aux |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2011 echo "executing ${AUTOCONF}" |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2012 ${AUTOCONF} |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2013 echo "executing ${AUTOMAKE} --add-missing --copy" |
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
2014 ${AUTOMAKE} --add-missing --copy |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2015 ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2016 } |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2017 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2018 case $mode in |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2019 "" ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2020 func_fatal_error "no mode specified" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2021 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2022 list ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2023 func_all_modules |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2024 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2025 |
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
2026 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
|
2027 |
5343 | 2028 # Where to import. |
2029 if test -z "$destdir"; then | |
2030 destdir=. | |
2031 fi | |
2032 test -d "$destdir" \ | |
2033 || 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
|
2034 |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2035 # 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
|
2036 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
|
2037 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
|
2038 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2039 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
|
2040 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
|
2041 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2042 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
|
2043 fi |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2044 fi |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2045 |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2046 # Analyze configure.ac. |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2047 guessed_auxdir="." |
7077 | 2048 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
|
2049 my_sed_traces=' |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2050 s,#.*$,, |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2051 s,^dnl .*$,, |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2052 s, dnl .*$,, |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2053 /AC_CONFIG_AUX_DIR/ { |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2054 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
|
2055 } |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2056 /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
|
2057 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
|
2058 }' |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2059 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
|
2060 |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2061 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
|
2062 auxdir="$guessed_auxdir" |
5343 | 2063 fi |
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
2064 |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2065 # 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
|
2066 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
|
2067 # 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
|
2068 # Any number of additional modules can be given. |
6204
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2069 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then |
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2070 # First use of gnulib in the given m4base. |
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2071 test -n "$supplied_libname" || supplied_libname=true |
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2072 test -n "$sourcebase" || sourcebase="lib" |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
2073 test -n "$docbase" || docbase="doc" |
6262
bef30dac846f
Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents:
6250
diff
changeset
|
2074 test -n "$testsbase" || testsbase="tests" |
6204
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2075 test -n "$macro_prefix" || macro_prefix="gl" |
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
2076 fi |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2077 func_import "$*" |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2078 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2079 # 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
|
2080 # 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
|
2081 # 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
|
2082 # "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
|
2083 m4dirs= |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2084 m4dirs_count=0 |
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2085 if test -f "$destdir"/Makefile.am; then |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2086 aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2087 m4dir_is_next= |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2088 for arg in $aclocal_amflags; do |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2089 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
|
2090 # 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
|
2091 case "$arg" in |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2092 /*) ;; |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2093 *) |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2094 if test -f "$destdir/$arg"/gnulib-cache.m4; then |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2095 m4dirs="$m4dirs $arg" |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2096 m4dirs_count=`expr $m4dirs_count + 1` |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2097 fi |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2098 ;; |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2099 esac |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2100 else |
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2101 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
|
2102 m4dir_is_next=yes |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2103 else |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2104 m4dir_is_next= |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2105 fi |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2106 fi |
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2107 done |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2108 else |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2109 # 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
|
2110 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
|
2111 sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2112 sedexpr2='s,^[^/]*$,.,' |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2113 sedexpr3='s,/[^/]*$,,' |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2114 m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort | LC_ALL=C uniq` |
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2115 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
|
2116 fi |
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
2117 fi |
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2118 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
|
2119 # 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
|
2120 # 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
|
2121 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
|
2122 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
|
2123 m4base="m4" |
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
2124 test -n "$docbase" || docbase="doc" |
6262
bef30dac846f
Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents:
6250
diff
changeset
|
2125 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
|
2126 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
|
2127 func_import "$*" |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2128 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2129 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
|
2130 # 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
|
2131 # 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
|
2132 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
|
2133 func_import "$*" |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2134 done |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2135 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2136 # 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
|
2137 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
|
2138 # 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
|
2139 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
|
2140 func_import |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2141 done |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2142 else |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2143 # Really ambiguous. |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2144 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
|
2145 fi |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2146 fi |
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
2147 fi |
6178 | 2148 fi |
5343 | 2149 ;; |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2150 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2151 create-testdir ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2152 if test -z "$destdir"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2153 func_fatal_error "please specify --dir option" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2154 fi |
4126
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
2155 mkdir "$destdir" |
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
2156 test -d "$destdir" \ |
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
2157 || func_fatal_error "could not create destination directory" |
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
2158 test -n "$auxdir" || auxdir="build-aux" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2159 func_create_testdir "$destdir" "$*" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2160 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2161 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2162 create-megatestdir ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2163 if test -z "$destdir"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2164 func_fatal_error "please specify --dir option" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2165 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2166 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
|
2167 test -n "$auxdir" || auxdir="build-aux" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2168 func_create_megatestdir "$destdir" "$*" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2169 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2170 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2171 test ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2172 test -n "$destdir" || destdir=testdir$$ |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2173 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
|
2174 test -n "$auxdir" || auxdir="build-aux" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2175 func_create_testdir "$destdir" "$*" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2176 cd "$destdir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2177 mkdir build |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2178 cd build |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2179 ../configure |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2180 make |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2181 make check |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2182 make distclean |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2183 remaining=`find . -type f -print` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2184 if test -n "$remaining"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2185 echo "Remaining files:" $remaining 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2186 echo "gnulib-tool: *** Stop." 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2187 exit 1 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2188 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2189 cd .. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2190 cd .. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2191 rm -rf "$destdir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2192 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2193 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2194 megatest ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2195 test -n "$destdir" || destdir=testdir$$ |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2196 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
|
2197 test -n "$auxdir" || auxdir="build-aux" |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2198 func_create_megatestdir "$destdir" "$*" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2199 cd "$destdir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2200 mkdir build |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2201 cd build |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2202 ../configure |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2203 make |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2204 make check |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2205 make distclean |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2206 remaining=`find . -type f -print` |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2207 if test -n "$remaining"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2208 echo "Remaining files:" $remaining 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2209 echo "gnulib-tool: *** Stop." 1>&2 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2210 exit 1 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2211 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2212 cd .. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2213 cd .. |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2214 rm -rf "$destdir" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2215 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2216 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2217 extract-description ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2218 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2219 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2220 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2221 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2222 func_get_description "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2223 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2224 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2225 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2226 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2227 extract-filelist ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2228 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2229 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2230 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2231 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2232 func_get_filelist "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2233 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2234 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2235 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2236 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2237 extract-dependencies ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2238 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2239 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2240 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2241 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2242 func_get_dependencies "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2243 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2244 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2245 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2246 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2247 extract-autoconf-snippet ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2248 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2249 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2250 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2251 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2252 func_get_autoconf_snippet "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2253 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2254 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2255 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2256 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2257 extract-automake-snippet ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2258 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2259 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2260 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2261 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2262 func_get_automake_snippet "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2263 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2264 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2265 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2266 |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2267 extract-include-directive ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2268 for module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2269 do |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2270 func_verify_module |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2271 if test -n "$module"; then |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2272 func_get_include_directive "$module" |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2273 fi |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2274 done |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2275 ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2276 |
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2277 extract-license ) |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2278 for module |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2279 do |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2280 func_verify_module |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2281 if test -n "$module"; then |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2282 func_get_license "$module" |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2283 fi |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2284 done |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2285 ;; |
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2286 |
4197 | 2287 extract-maintainer ) |
2288 for module | |
2289 do | |
2290 func_verify_module | |
2291 if test -n "$module"; then | |
2292 func_get_maintainer "$module" | |
2293 fi | |
2294 done | |
2295 ;; | |
2296 | |
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2297 extract-tests-module ) |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2298 for module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2299 do |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2300 func_verify_module |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2301 if test -n "$module"; then |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2302 func_get_tests_module "$module" |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2303 fi |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2304 done |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2305 ;; |
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2306 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2307 * ) |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2308 func_fatal_error "unknown operation mode --$mode" ;; |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2309 esac |
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2310 |
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2311 rm -rf "$tmp" |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2312 # Undo the effect of the previous 'trap' command. Some shellology: |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2313 # We cannot use "trap - 0 1 2 3 15", because Solaris sh would attempt to |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2314 # 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
|
2315 # 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
|
2316 # 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
|
2317 trap '' 0 |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2318 trap 'exit $?' 1 2 3 15 |
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
2319 |
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2320 exit 0 |