gnulib: gnulib-tool annotate

annotate gnulib-tool @ 7647:c26d75cebcfa

Fix --create-testdir --with-tests.

author	Bruno Haible <bruno@clisp.org>
date	Tue, 14 Nov 2006 09:37:20 +0000
parents	33bd42644eec
children	7aa6fbd6b3b7

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 f8abe8d41137 RANLIB is needed. Bruno Haible <bruno@clisp.org> parents: 6464 diff changeset	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
7647 c26d75cebcfa Fix --create-testdir --with-tests. Bruno Haible <bruno@clisp.org> parents: 7646 diff changeset	25 cvsdatestamp='$Date: 2006-11-14 09:37:20 $'
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'`
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	28 nl='
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	29 '
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	30
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	31 # 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	32 AUTOCONFPATH=
5250 46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	33 #case $USER in
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	34 # bruno )
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	35 # AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	36 # AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH "
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	37 # ;;
46a747db97f2 Comment out private settings. Bruno Haible <bruno@clisp.org> parents: 5237 diff changeset	38 #esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	39
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	40 # 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	41 AUTOMAKEPATH=
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	42
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	43 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	44 GETTEXTPATH=
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	45
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	46 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	47 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	48 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	49 AUTOCONF="${AUTOCONFPATH}autoconf"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	50 fi
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	51 if test -z "${AUTOHEADER}" \|\| test -n "${AUTOCONFPATH}"; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	52 AUTOHEADER="${AUTOCONFPATH}autoheader"
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	53 fi
6551 d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	54 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	55 ACLOCAL="${AUTOMAKEPATH}aclocal"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	56 fi
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	57 if test -z "${AUTOMAKE}" \|\| test -n "${AUTOMAKEPATH}"; then
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	58 AUTOMAKE="${AUTOMAKEPATH}automake"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	59 fi
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	60 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	61 AUTORECONF="${AUTOCONFPATH}autoreconf"
d37637700b4e Make the AUTOCONF etc. commands overridable by the user. Bruno Haible <bruno@clisp.org> parents: 6550 diff changeset	62 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	63
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	64 # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	65 if test -z "${AUTOPOINT}" \|\| test -n "${GETTEXTPATH}"; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	66 AUTOPOINT="${GETTEXTPATH}autopoint"
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	67 fi
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	68
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	69 # 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	70 # 'sort' and already in the PATH).
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	71 if test -z "$SORT"; then
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	72 SORT=sort
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	73 fi
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	74
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	75 # func_usage
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	76 # outputs to stdout the --help usage message.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	77 func_usage ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	78 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	79 echo "\
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	80 Usage: gnulib-tool --list
5344 c2f5677fc6ed Initialize supplied_libname. Tweak usage message. Bruno Haible <bruno@clisp.org> parents: 5343 diff changeset	81 gnulib-tool --import [module1 ... moduleN]
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	82 gnulib-tool --update
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	83 gnulib-tool --create-testdir --dir=directory [module1 ... moduleN]
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	84 gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN]
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	85 gnulib-tool --test --dir=directory module1 ... moduleN
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	86 gnulib-tool --megatest --dir=directory [module1 ... moduleN]
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	87 gnulib-tool --extract-description module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	88 gnulib-tool --extract-filelist module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	89 gnulib-tool --extract-dependencies module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	90 gnulib-tool --extract-autoconf-snippet module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	91 gnulib-tool --extract-automake-snippet module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	92 gnulib-tool --extract-include-directive module
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	93 gnulib-tool --extract-license module
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	94 gnulib-tool --extract-maintainer module
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	95 gnulib-tool --extract-tests-module module
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	96
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	97 Operation modes:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	98 --list print the available module names
6633 5118aa463328 * gnulib-tool (Usage): Fix --import, from Simon Josefsson <simon@josefsson.org> parents: 6614 diff changeset	99 --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	100 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	101 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	102 --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	103 from CVS
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	104 --create-testdir create a scratch package with the given modules
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	105 --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	106 one by one and all together
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	107 --test test the combination of the given modules
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	108 (recommended to use CC=\"gcc -Wall\" here)
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	109 --megatest test the given modules one by one and all together
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	110 (recommended to use CC=\"gcc -Wall\" here)
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	111 --extract-description extract the description
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	112 --extract-filelist extract the list of files
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	113 --extract-dependencies extract the dependencies
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	114 --extract-autoconf-snippet extract the snippet for configure.ac
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	115 --extract-automake-snippet extract the snippet for library makefile
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	116 --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	117 --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	118 under lib/
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	119 --extract-maintainer report the maintainer(s) inside gnulib
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	120 --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	121
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	122 General options:
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	123 --dir=DIRECTORY Specify the target directory.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	124 For --import, this specifies where your
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	125 configure.ac can be found. Defaults to current
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	126 directory.
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	127 --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	128 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	129
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	130 Options for --import:
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	131 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	132 --source-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	133 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	134 placed (default \"lib\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	135 --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	136 placed (default \"m4\").
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	137 --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	138 placed (default \"doc\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	139 --tests-base=DIRECTORY
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	140 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	141 placed (default \"tests\").
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	142 --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	143 tools are placed (default \"build-aux\").
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	144 --with-tests Include unit tests for the included modules.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	145 --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	146 have code that provides equivalent functionality.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	147 This option can be repeated.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	148 --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	149 Also modify license template from GPL to LGPL.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	150 --makefile-name=NAME Name of makefile in automake syntax in the
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	151 source-base and tests-base directories
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	152 (default \"Makefile.am\").
7069 0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	153 --libtool Use libtool rules.
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	154 --no-libtool Don't use libtool rules.
7068 ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	155 --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	156 'gl_INIT'. Default is 'gl'.
ec1cfcfd352a Revert the --help output reordering. Bruno Haible <bruno@clisp.org> parents: 7067 diff changeset	157 --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	158
0fb5ef99e00f Split the --help output into several paragraphs. Bruno Haible <bruno@clisp.org> parents: 7068 diff changeset	159 Options for --import and --update:
6966 42730fffa002 help message tweaks Karl Berry <karl@freefriends.org> parents: 6955 diff changeset	160 --dry-run For --import, only print what would have been done.
42730fffa002 help message tweaks Karl Berry <karl@freefriends.org> parents: 6955 diff changeset	161 -s, --symbolic, --symlink Make symbolic links instead of copying files.
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	162 --local-symlink Make symbolic links instead of copying files, only
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	163 for files from the local override directory.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	164
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	165 Report bugs to <bug-gnulib@gnu.org>."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	166 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	167
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	168 # func_version
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	169 # outputs to stdout the --version message.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	170 func_version ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	171 {
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	172 year=`echo "$last_checkin_date" \| sed -e 's,/.*$,,'`
7347 d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	173 echo "\
d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	174 $progname (GNU $package) $version
d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	175 Copyright (C) $year Free Software Foundation, Inc.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	176 This is free software; see the source for copying conditions. There is NO
7347 d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	177 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
d86464f614f7 * gnulib-tool (func_version): Create output all at once. This Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7335 diff changeset	178 Written by" "Bruno Haible" "and" "Simon Josefsson"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	179 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	180
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	181 # func_emit_copyright_notice
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	182 # 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	183 func_emit_copyright_notice ()
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	184 {
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	185 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	186 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	187 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	188 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	189 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	190 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	191 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	192 echo "#"
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	193 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	194 }
d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	195
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	196 # func_exit STATUS
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	197 # exit with status
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	198 func_exit ()
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	199 {
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	200 (exit $1); exit $1
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	201 }
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	202
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	203 # func_tmpdir
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	204 # creates a temporary directory.
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	205 # Sets variable
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	206 # - 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	207 func_tmpdir ()
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	208 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	209 # 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	210 # 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	211 # /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	212 : ${TMPDIR=/tmp}
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	213 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	214 # 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	215 # 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	216 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	217 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	218 } \|\|
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	219 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	220 # 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	221 # 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	222 # 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	223 # 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	224 # directory.
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	225 tmp=$TMPDIR/gl$$-$RANDOM
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	226 (umask 077 && mkdir "$tmp")
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	227 } \|\|
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	228 {
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	229 echo "$0: cannot create a temporary directory in $TMPDIR" >&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	230 func_exit 1
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	231 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	232 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	233
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	234 # func_append var value
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	235 # appends the given value to the shell variable var.
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	236 if ( foo=bar; foo+=baz && test "$foo" = barbaz ) >/dev/null 2>&1; then
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	237 # Use bash's += operator. It reduces complexity of appending repeatedly to
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	238 # a single variable from O(n^2) to O(n).
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	239 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	240 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	241 eval "$1+=\"\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	242 }
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	243 else
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	244 func_append ()
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	245 {
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	246 eval "$1=\"\$$1\$2\""
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	247 }
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	248 fi
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	249
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	250 # func_fatal_error message
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	251 # 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	252 func_fatal_error ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	253 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	254 echo "gnulib-tool: *** $1" 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	255 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	256 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	257 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	258
6248 ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	259 # func_readlink SYMLINK
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	260 # outputs the target of the given symlink.
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	261 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	262 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	263 {
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	264 # Use the readlink program from GNU coreutils.
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	265 readlink "$1"
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	266 }
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	267 else
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	268 func_readlink ()
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	269 {
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	270 # 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	271 # 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	272 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	273 }
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	274 fi
ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	275
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	276 # func_relativize DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	277 # computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	278 # Input:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	279 # - DIR1 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	280 # - DIR2 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	281 # Output:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	282 # - reldir relative pathname of DIR2, relative to DIR1
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	283 func_relativize ()
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	284 {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	285 dir0=`pwd`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	286 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	287 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	288 sed_first='s,^$[^/]$/.$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	289 sed_rest='s,^[^/]/,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	290 sed_last='s,^./$[^/]$$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	291 sed_butlast='s,/[^/]$,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	292 while test -n "$dir1"; do
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	293 first=`echo "$dir1" \| sed -e "$sed_first"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	294 if test "$first" != "."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	295 if test "$first" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	296 dir2=`echo "$dir0" \| sed -e "$sed_last"`/"$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	297 dir0=`echo "$dir0" \| sed -e "$sed_butlast"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	298 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	299 first2=`echo "$dir2" \| sed -e "$sed_first"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	300 if test "$first2" = "$first"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	301 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	302 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	303 dir2="../$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	304 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	305 dir0="$dir0"/"$first"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	306 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	307 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	308 dir1=`echo "$dir1" \| sed -e "$sed_rest"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	309 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	310 reldir="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	311 }
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	312
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	313 # func_relconcat DIR1 DIR2
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	314 # computes a relative pathname DIR1/DIR2, with obvious simplifications.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	315 # Input:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	316 # - DIR1 relative pathname, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	317 # - DIR2 relative pathname, relative to DIR1
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	318 # Output:
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	319 # - relconcat DIR1/DIR2, relative to the current directory
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	320 func_relconcat ()
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	321 {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	322 dir1="$1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	323 dir2="$2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	324 sed_first='s,^$[^/]$/.$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	325 sed_rest='s,^[^/]/,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	326 sed_last='s,^./$[^/]$$,\1,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	327 sed_butlast='s,/[^/]$,,'
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	328 while true; do
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	329 first=`echo "$dir2" \| sed -e "$sed_first"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	330 if test "$first" = "."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	331 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	332 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	333 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	334 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	335 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	336 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	337 last=`echo "$dir1" \| sed -e "$sed_last"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	338 while test "$last" = "."; do
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	339 dir1=`echo "$dir1" \| sed -e "$sed_butlast"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	340 last=`echo "$dir1" \| sed -e "$sed_last"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	341 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	342 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	343 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	344 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	345 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	346 if test "$first" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	347 if test "$last" = ".."; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	348 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	349 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	350 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	351 dir1=`echo "$dir1" \| sed -e "$sed_butlast"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	352 dir2=`echo "$dir2" \| sed -e "$sed_rest"`
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	353 if test -z "$dir1"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	354 relconcat="$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	355 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	356 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	357 if test -z "$dir2"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	358 relconcat="$dir1"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	359 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	360 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	361 else
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	362 relconcat="$dir1/$dir2"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	363 break
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	364 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	365 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	366 done
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	367 }
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	368
7642 0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	369 # func_ln SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	370 # Like ln -s, except that SRC is given relative to the current directory (or
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	371 # absolute), not given relative to the directory of DEST.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	372 func_ln ()
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	373 {
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	374 case "$1" in
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	375 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	376 ln -s "$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	377 *) # SRC is relative.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	378 case "$2" in
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	379 /*)
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	380 ln -s "`pwd`/$1" "$2" ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	381 *) # DEST is relative too.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	382 ln_destdir=`echo "$2" \| sed -e 's,[^/]*$,,'`
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	383 test -n "$ln_destdir" \|\| ln_destdir="."
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	384 func_relativize "$ln_destdir" "$1"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	385 ln -s "$reldir" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	386 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	387 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	388 ;;
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	389 esac
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	390 }
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	391
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	392 # func_ln_if_changed SRC DEST
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	393 # Like func_ln, but avoids munging timestamps if the link is correct.
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	394 func_ln_if_changed ()
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	395 {
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	396 if test $# -ne 2; then
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	397 echo "usage: func_ln_if_changed SRC DEST" >&2
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	398 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	399 ln_target=`func_readlink "$2"`
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	400 if test -L "$2" && test "$1" = "$ln_target"; then
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	401 :
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	402 else
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	403 rm -f "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	404 func_ln "$1" "$2"
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	405 fi
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	406 }
0878abcc59c9 Fix the symlinks installed by the --symlink option. Bruno Haible <bruno@clisp.org> parents: 7641 diff changeset	407
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	408 # Command-line option processing.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	409 # Removes the OPTIONS from the arguments. Sets the variables:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	410 # - mode list or import or create-testdir or create-megatestdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	411 # - destdir from --dir
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	412 # - local_gnulib_dir from --local-dir
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	413 # - libname, supplied_libname from --lib
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	414 # - sourcebase from --source-base
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	415 # - m4base from --m4-base
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	416 # - docbase from --doc-base
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	417 # - testsbase from --tests-base
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	418 # - auxdir from --aux-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	419 # - inctests true if --with-tests was given, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	420 # - avoidlist list of modules to avoid, from --avoid
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	421 # - lgpl true if --lgpl was given, blank otherwise
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	422 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	423 # - libtool true if --libtool was given, false if --no-libtool was
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	424 # given, blank otherwise
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	425 # - 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	426 # - autoconf_minversion minimum supported autoconf version
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	427 # - 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	428 # - doit : if actions shall be executed, false if only to be printed
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	429 # - symbolic true if --symlink was given, blank otherwise
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	430 # - lsymbolic true if --local-symlink was given, blank otherwise
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	431 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	432 mode=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	433 destdir=
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	434 local_gnulib_dir=
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	435 libname=libgnu
5344 c2f5677fc6ed Initialize supplied_libname. Tweak usage message. Bruno Haible <bruno@clisp.org> parents: 5343 diff changeset	436 supplied_libname=
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	437 sourcebase=
64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	438 m4base=
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	439 docbase=
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	440 testsbase=
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	441 auxdir=
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	442 inctests=
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	443 avoidlist=
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	444 lgpl=
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	445 makefile_name=
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	446 libtool=
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	447 macro_prefix=
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	448 do_changelog=:
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	449 doit=:
5799 ad9eff556694 2005-04-15 Simon Josefsson <jas@extundo.com> Simon Josefsson <simon@josefsson.org> parents: 5798 diff changeset	450 symbolic=
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	451 lsymbolic=
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	452
64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	453 supplied_opts="$@"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	454
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	455 while test $# -gt 0; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	456 case "$1" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	457 --list \| --lis )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	458 mode=list
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	459 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	460 --import \| --impor \| --impo \| --imp \| --im \| --i )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	461 mode=import
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	462 shift ;;
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	463 --update \| --updat \| --upda \| --upd \| --up \| --u )
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	464 mode=update
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	465 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	466 --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	467 mode=create-testdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	468 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	469 --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	470 mode=create-megatestdir
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	471 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	472 --test \| --tes \| --te \| --t )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	473 mode=test
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	474 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	475 --megatest \| --megates \| --megate \| --megat \| --mega \| --meg \| --me \| --m )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	476 mode=megatest
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	477 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	478 --extract-* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	479 mode=`echo "X$1" \| sed -e 's/^X--//'`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	480 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	481 --dir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	482 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	483 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	484 func_fatal_error "missing argument for --dir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	485 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	486 destdir=$1
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	487 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	488 --dir=* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	489 destdir=`echo "X$1" \| sed -e 's/^X--dir=//'`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	490 shift ;;
7215 3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	491 --local-dir )
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	492 shift
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	493 if test $# = 0; then
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	494 func_fatal_error "missing argument for --local-dir"
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	495 fi
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	496 local_gnulib_dir=$1
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	497 shift ;;
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	498 --local-dir=* )
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	499 local_gnulib_dir=`echo "X$1" \| sed -e 's/^X--local-dir=//'`
3869ca15e2bb Reorder some statements. Bruno Haible <bruno@clisp.org> parents: 7214 diff changeset	500 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	501 --lib )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	502 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	503 if test $# = 0; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	504 func_fatal_error "missing argument for --lib"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	505 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	506 libname=$1
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	507 supplied_libname=true
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	508 shift ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	509 --lib=* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	510 libname=`echo "X$1" \| sed -e 's/^X--lib=//'`
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	511 supplied_libname=true
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	512 shift ;;
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	513 --source-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	514 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	515 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	516 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	517 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	518 sourcebase=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	519 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	520 --source-base=* )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	521 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	522 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	523 --m4-base )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	524 shift
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	525 if test $# = 0; then
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	526 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	527 fi
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	528 m4base=$1
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	529 shift ;;
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	530 --m4-base=* )
9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	531 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	532 shift ;;
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	533 --doc-base )
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	534 shift
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	535 if test $# = 0; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	536 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	537 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	538 docbase=$1
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	539 shift ;;
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	540 --doc-base=* )
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	541 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	542 shift ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	543 --tests-base )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	544 shift
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	545 if test $# = 0; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	546 func_fatal_error "missing argument for --tests-base"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	547 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	548 testsbase=$1
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	549 shift ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	550 --tests-base=* )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	551 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	552 shift ;;
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	553 --aux-dir )
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	554 shift
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	555 if test $# = 0; then
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	556 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	557 fi
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	558 auxdir=$1
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	559 shift ;;
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	560 --aux-dir=* )
49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	561 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	562 shift ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	563 --with-tests )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	564 inctests=true
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	565 shift ;;
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	566 --avoid )
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	567 shift
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	568 if test $# = 0; then
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	569 func_fatal_error "missing argument for --avoid"
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	570 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	571 func_append avoidlist " $1"
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	572 shift ;;
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	573 --avoid=* )
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	574 arg=`echo "X$1" \| sed -e 's/^X--avoid=//'`
7327 6db875979695 * gnulib-tool (avoidlist): Fix typo that broke options like Paul Eggert <eggert@cs.ucla.edu> parents: 7326 diff changeset	575 func_append avoidlist " $arg"
5198 9317c9ebe82c Add --source-base, --m4-base, --libtool options. Paul Eggert <eggert@cs.ucla.edu> parents: 4717 diff changeset	576 shift ;;
5262 97ed4b64d853 New parameter --lgpl, to asseert that modules are Paul Eggert <eggert@cs.ucla.edu> parents: 5255 diff changeset	577 --lgpl )
97ed4b64d853 New parameter --lgpl, to asseert that modules are Paul Eggert <eggert@cs.ucla.edu> parents: 5255 diff changeset	578 lgpl=true
97ed4b64d853 New parameter --lgpl, to asseert that modules are Paul Eggert <eggert@cs.ucla.edu> parents: 5255 diff changeset	579 shift ;;
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	580 --makefile-name )
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	581 shift
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	582 if test $# = 0; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	583 func_fatal_error "missing argument for --makefile-name"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	584 fi
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	585 makefile_name="$1"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	586 shift ;;
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	587 --makefile-name=* )
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	588 makefile_name=`echo "X$1" \| sed -e 's/^X--makefile-name=//'`
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	589 shift ;;
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	590 --libtool )
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	591 libtool=true
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	592 shift ;;
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	593 --no-libtool )
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	594 libtool=false
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	595 shift ;;
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	596 --macro-prefix )
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	597 shift
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	598 if test $# = 0; then
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	599 func_fatal_error "missing argument for --macro-prefix"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	600 fi
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	601 macro_prefix="$1"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	602 shift ;;
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	603 --macro-prefix=* )
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	604 macro_prefix=`echo "X$1" \| sed -e 's/^X--macro-prefix=//'`
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	605 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	606 --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	607 do_changelog=false
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	608 shift ;;
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	609 --dry-run )
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	610 doit=false
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	611 shift ;;
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	612 -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	613 symbolic=true
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	614 shift ;;
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	615 --local-symlink \| --local-symlin \| --local-symli \| --local-syml \| --local-sym \| --local-sy \| --local-s )
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	616 lsymbolic=true
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	617 shift ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	618 --help \| --hel \| --he \| --h )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	619 func_usage
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	620 func_exit $? ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	621 --version \| --versio \| --versi \| --vers \| --ver \| --ve \| --v )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	622 func_version
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	623 func_exit $? ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	624 -- )
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	625 # Stop option processing
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	626 shift
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	627 break ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	628 -* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	629 echo "gnulib-tool: unknown option $1" 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	630 echo "Try 'gnulib-tool --help' for more information." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	631 func_exit 1 ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	632 * )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	633 break ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	634 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	635 done
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	636
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	637 if test "$mode" = update; then
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	638 if test $# != 0; then
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	639 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	640 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	641 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	642 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	643 func_exit 1
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	644 fi
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	645 if test -n "$local_gnulib_dir" \|\| test -n "$supplied_libname" \
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	646 \|\| test -n "$sourcebase" \|\| test -n "$m4base" \
6993 dc8f2a1ff75f Reorder tests in doc-base patch. Bruno Haible <bruno@clisp.org> parents: 6966 diff changeset	647 \|\| 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	648 \|\| test -n "$inctests" \|\| test -n "$avoidlist" \|\| test -n "$lgpl" \
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	649 \|\| test -n "$makefile_name" \|\| test -n "$macro_prefix"; then
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	650 echo "gnulib-tool: invalid options for 'update' mode" 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	651 echo "Try 'gnulib-tool --help' for more information." 1>&2
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	652 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	653 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	654 func_exit 1
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	655 fi
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	656 do_changelog=false
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	657 fi
1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	658
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	659 # 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	660 # configure.ac.
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	661 DEFAULT_AUTOCONF_MINVERSION="2.59"
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	662 autoconf_minversion=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	663 configure_ac=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	664 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	665 if test -f "$destdir"/configure.ac; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	666 configure_ac="$destdir/configure.ac"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	667 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	668 if test -f "$destdir"/configure.in; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	669 configure_ac="$destdir/configure.in"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	670 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	671 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	672 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	673 if test -f configure.ac; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	674 configure_ac="configure.ac"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	675 else
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	676 if test -f configure.in; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	677 configure_ac="configure.in"
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	678 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	679 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	680 fi
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	681 if test -n "$configure_ac"; then
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	682 # 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	683 # 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	684 # "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	685 # 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	686 # autom4te: m4 failed with exit status: 1
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	687 prereqs=
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	688 my_sed_traces='
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	689 s,#.*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	690 s,^dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	691 s, dnl .*$,,
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	692 /AC_PREREQ/ {
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	693 s,^.AC_PREREQ([[ ]$[^])]$.$,prereqs="$prereqs \1",p
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	694 }'
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	695 eval `sed -n -e "$my_sed_traces" < "$configure_ac"`
a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	696 if test -n "$prereqs"; then
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	697 autoconf_minversion=`for version in $prereqs; do echo $version; done \| $SORT -g -u \| tail -1`
7078 a060dfddc867 Improve autoconf_minversion detection. Bruno Haible <bruno@clisp.org> parents: 7077 diff changeset	698 fi
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	699 fi
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	700 if test -z "$autoconf_minversion"; then
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	701 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION
71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	702 fi
6994 3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	703 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	704 1.* \| 2.[0-4]* \| 2.5[0-8]*)
7071 71c5caf223fc Remove the --assume-autoconf option. Bruno Haible <bruno@clisp.org> parents: 7070 diff changeset	705 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	706 esac
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	707
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	708 # 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	709 # 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	710 sed_trimtrailingslashes='s,$[^/]$//*$,\1,'
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	711 case "$local_gnulib_dir" in
7530 16228468de35 Fix from Charles Wilson. Bruno Haible <bruno@clisp.org> parents: 7528 diff changeset	712 */ ) local_gnulib_dir=`echo "$local_gnulib_dir" \| sed -e "$sed_trimtrailingslashes"` ;;
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	713 esac
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	714 case "$sourcebase" in
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	715 */ ) 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	716 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	717 case "$m4base" in
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	718 */ ) 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	719 esac
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	720 case "$docbase" in
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	721 */ ) 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	722 esac
6264 eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	723 case "$testsbase" in
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	724 */ ) 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	725 esac
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	726 case "$auxdir" in
eaa3b6787ec9 Ignore trailing slashes in --m4-base value etc. Bruno Haible <bruno@clisp.org> parents: 6263 diff changeset	727 */ ) 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	728 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	729 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	730
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	731 case "$0" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	732 /*) self_abspathname="$0" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	733 /) self_abspathname=`pwd`/"$0" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	734 ) 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	735 if test -x "$d/$0" && test ! -d "$d/$0"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	736 self_abspathname="$d/$0"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	737 break
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	738 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	739 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	740 if test -z "$self_abspathname"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	741 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	742 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	743 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	744 esac
4717 ed7cd4050365 Port gnulib-tool to Solaris 8. Paul Eggert <eggert@cs.ucla.edu> parents: 4712 diff changeset	745 while test -h "$self_abspathname"; do
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	746 # Resolve symbolic link.
6248 ba937772eda4 Portability fix: readlink is not portable. Bruno Haible <bruno@clisp.org> parents: 6247 diff changeset	747 linkval=`func_readlink "$self_abspathname"`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	748 test -n "$linkval" \|\| break
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	749 case "$linkval" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	750 /* ) self_abspathname="$linkval" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	751 * ) self_abspathname=`echo "$self_abspathname" \| sed -e 's,/[^/]*$,,'`/"$linkval" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	752 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	753 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	754 gnulib_dir=`echo "$self_abspathname" \| sed -e 's,/[^/]*$,,'`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	755
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	756 func_tmpdir
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	757 trap 'exit_status=$?
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	758 if test "$signal" != 0; then
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	759 echo "caught signal $signal" >&2
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	760 fi
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	761 rm -rf "$tmp"
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	762 exit $exit_status' 0
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	763 for signal in 1 2 3 13 15; do
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	764 trap '{ signal='$signal'; func_exit 1; }' $signal
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	765 done
dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	766 signal=0
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	767
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	768 # func_lookup_file file
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	769 # 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	770 # 'patch'.
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	771 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	772 # - local_gnulib_dir from --local-dir
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	773 # Output:
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	774 # - 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	775 # - 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	776 func_lookup_file ()
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	777 {
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	778 lkfile="$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	779 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	780 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	781 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	782 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	783 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	784 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	785 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	786 rm -f "$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	787 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	788 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	789 \|\| 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	790 lookedup_file="$tmp/$lkbase"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	791 lookedup_tmp=true
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	792 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	793 lookedup_file="$gnulib_dir/$lkfile"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	794 lookedup_tmp=
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	795 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	796 else
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	797 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	798 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	799 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	800 }
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	801
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	802 # func_all_modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	803 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	804 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	805 func_all_modules ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	806 {
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	807 # 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	808 # 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	809 # --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	810 {
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	811 (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	812 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	813 (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	814 fi
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	815 } \
7142 f846a8f5a5a4 COPYING is not a module. Bruno Haible <bruno@clisp.org> parents: 7106 diff changeset	816 \| sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^COPYING$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	817 \| sed -e '/-tests$/d' \
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	818 \| LC_ALL=C sort -u
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	819 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	820
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	821 # func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	822 # verifies a module name
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	823 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	824 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	825 # - module module name argument
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	826 func_verify_module ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	827 {
7168 56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	828 if { test -f "$gnulib_dir/modules/$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	829 \|\| { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	830 && test -f "$local_gnulib_dir/modules/$module"; }; } \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	831 && test "CVS" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	832 && test "ChangeLog" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	833 && test "COPYING" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	834 && test "README" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	835 && test "TEMPLATE" != "$module" \
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	836 && test "TEMPLATE-TESTS" != "$module"; then
56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	837 # OK, $module is a correct module name.
7212 232ee448d272 Better error handling. Bruno Haible <bruno@clisp.org> parents: 7199 diff changeset	838 # Verify that building the module description with 'patch' succeeds.
232ee448d272 Better error handling. Bruno Haible <bruno@clisp.org> parents: 7199 diff changeset	839 func_lookup_file "modules/$module"
7168 56632b3512af Make it work also with Solaris /bin/sh. Bruno Haible <bruno@clisp.org> parents: 7142 diff changeset	840 else
4128 1346b5405a74 (func_verify_module): report module name $module Karl Berry <karl@freefriends.org> parents: 4126 diff changeset	841 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	842 module=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	843 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	844 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	845
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	846 # func_verify_nontests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	847 # verifies a module name, excluding tests modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	848 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	849 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	850 # - module module name argument
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	851 func_verify_nontests_module ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	852 {
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	853 case "$module" in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	854 *-tests ) module= ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	855 * ) func_verify_module ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	856 esac
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	857 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	858
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	859 # func_verify_tests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	860 # verifies a module name, considering only tests modules
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	861 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	862 # - local_gnulib_dir from --local-dir
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	863 # - module module name argument
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	864 func_verify_tests_module ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	865 {
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	866 case "$module" in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	867 *-tests ) func_verify_module ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	868 * ) module= ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	869 esac
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	870 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	871
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	872 sed_extract_prog=':[ ]*$/ {
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	873 :a
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	874 n
6952 b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	875 s/^Description:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	876 s/^Files:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	877 s/^Depends-on:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	878 s/^configure\.ac:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	879 s/^Makefile\.am:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	880 s/^Include:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	881 s/^License:[ ]*$//
b1f02ed7eeab * modules/fdl: New module, to install doc/fdl.texi. Eric Blake <ebb9@byu.net> parents: 6940 diff changeset	882 s/^Maintainer:[ ]*$//
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	883 tb
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	884 p
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	885 ba
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	886 :b
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	887 }'
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	888
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	889 # func_get_description module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	890 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	891 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	892 func_get_description ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	893 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	894 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	895 sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	896 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	897
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	898 # func_get_filelist module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	899 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	900 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	901 func_get_filelist ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	902 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	903 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	904 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	905 case "$autoconf_minversion" in
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	906 2.59)
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	907 #echo m4/onceonly.m4
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	908 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	909 ;;
3484a8772427 Add option --assume-autoconf. Default is back to 2.59. Bruno Haible <bruno@clisp.org> parents: 6993 diff changeset	910 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	911 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	912
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	913 # func_get_dependencies module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	914 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	915 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	916 func_get_dependencies ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	917 {
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	918 # ${module}-tests always implicitly depends on ${module}.
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	919 echo "$1" \| sed -n -e 's/-tests//p'
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	920 # 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	921 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	922 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	923 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	924
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	925 # func_get_autoconf_snippet module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	926 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	927 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	928 func_get_autoconf_snippet ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	929 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	930 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	931 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	932 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	933
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	934 # func_get_automake_snippet module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	935 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	936 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	937 func_get_automake_snippet ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	938 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	939 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	940 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file"
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	941 case "$1" in
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	942 *-tests)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	943 # *-tests module live in tests/, not lib/.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	944 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	945 *)
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	946 # Synthesize an EXTRA_DIST augmentation.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	947 sed_combine_lines='/\\$/{
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	948 :a
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	949 N
7599 352da45c182e Interpret a backslash-newline sequence in the Makefile.am snippet as a space. Bruno Haible <bruno@clisp.org> parents: 7591 diff changeset	950 s/\\\n/ /
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	951 s/\\$/\\/
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	952 ta
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	953 }'
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	954 sed_extract_mentioned_files='s/^lib_SOURCES[ ]+=[ ]//p'
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	955 already_mentioned_files=` \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	956 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	957 \| sed -e "$sed_combine_lines" \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	958 \| sed -n -e "$sed_extract_mentioned_files" \| sed -e 's/#.*//'`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	959 all_files=`func_get_filelist $1`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	960 lib_files=`for f in $all_files; do \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	961 case $f in \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	962 lib/*) echo $f ;; \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	963 esac; \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	964 done \| sed -e 's,^lib/,,'`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	965 # Remove $already_mentioned_files from $lib_files.
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	966 echo "$lib_files" \| LC_ALL=C sort -u > "$tmp"/lib-files
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	967 extra_files=`for f in $already_mentioned_files; do echo $f; done \
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	968 \| LC_ALL=C sort -u \| LC_ALL=C join -v 2 - "$tmp"/lib-files`
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	969 if test -n "$extra_files"; then
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	970 echo "EXTRA_DIST +=" $extra_files
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	971 echo
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	972 fi
7640 a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	973 # Synthesize also an EXTRA_lib_SOURCES augmentation.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	974 # This is necessary so that automake can generate the right list of
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	975 # dependency rules.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	976 # A possible approach would be to use autom4te --trace of the redefined
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	977 # AC_LIBOBJ and AC_REPLACE_FUNCS macros when creating the Makefile.am
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	978 # (use autom4te --trace, not just grep, so that AC_LIBOBJ invocations
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	979 # inside autoconf's built-in macros are not missed).
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	980 # But it's simpler and more robust to do it here, based on the file list.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	981 # If some .c file exists and is not used with AC_LIBOBJ - for example,
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	982 # a .c file is preprocessed into another .c file for BUILT_SOURCES -,
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	983 # automake will generate a useless dependency; this is harmless.
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	984 sed_extract_c_files='/\.c$/p'
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	985 extra_files=`echo "$extra_files" \| sed -n -e "$sed_extract_c_files"`
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	986 if test -n "$extra_files"; then
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	987 echo "EXTRA_lib_SOURCES +=" $extra_files
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	988 echo
a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	989 fi
7497 6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	990 ;;
6a764f23e302 gnulib-tool now synthesizes the EXTRA_DIST line. Bruno Haible <bruno@clisp.org> parents: 7486 diff changeset	991 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	992 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	993
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	994 # func_get_include_directive module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	995 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	996 # - local_gnulib_dir from --local-dir
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	997 func_get_include_directive ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	998 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	999 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1000 sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" \| \
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1001 sed -e 's/^$["<]$/#include \1/'
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1002 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	1003
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1004 # func_get_license module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1005 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1006 # - local_gnulib_dir from --local-dir
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1007 func_get_license ()
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1008 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1009 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1010 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	1011 }
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	1012
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1013 # func_get_maintainer module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1014 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1015 # - local_gnulib_dir from --local-dir
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1016 func_get_maintainer ()
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1017 {
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1018 func_lookup_file "modules/$1"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1019 sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file"
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1020 }
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	1021
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1022 # func_get_tests_module module
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1023 # Input:
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1024 # - local_gnulib_dir from --local-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1025 func_get_tests_module ()
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 # The naming convention for tests modules is hardwired: ${module}-tests.
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1028 if test -f "$gnulib_dir/modules/$1"-tests \
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1029 \|\| { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1030 && test -f "$local_gnulib_dir/modules/$1"-tests; }; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1031 echo "$1"-tests
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1032 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1033 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1034
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1035 # func_acceptable module
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1036 # tests whether a module is acceptable.
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1037 # Input:
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1038 # - avoidlist list of modules to avoid
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1039 func_acceptable ()
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1040 {
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1041 for avoid in $avoidlist; do
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1042 if test "$avoid" = "$1"; then
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1043 return 1
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1044 fi
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1045 done
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1046 return 0
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1047 }
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1048
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1049 # func_modules_transitive_closure
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1050 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1051 # - local_gnulib_dir from --local-dir
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1052 # - modules list of specified modules
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1053 # - inctests true if tests should be included, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1054 # - avoidlist list of modules to avoid
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1055 # - tmp pathname of a temporary directory
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1056 # Output:
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1057 # - 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	1058 func_modules_transitive_closure ()
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1059 {
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1060 # In order to process every module only once (for speed), process an "input
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1061 # list" of modules, producing an "output list" of modules. During each round,
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1062 # more modules can be queued in the input list. Once a module on the input
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1063 # list has been processed, it is added to the "handled list", so we can avoid
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1064 # to process it again.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1065 handledmodules=
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1066 inmodules="$modules"
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1067 outmodules=
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1068 while test -n "$inmodules"; do
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1069 inmodules_this_round="$inmodules"
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1070 inmodules= # Accumulator, queue for next round
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1071 for module in $inmodules_this_round; do
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1072 func_verify_module
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1073 if test -n "$module"; then
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1074 if func_acceptable $module; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1075 func_append outmodules " $module"
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1076 deps=`func_get_dependencies $module`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1077 # Duplicate dependencies are harmless, but Jim wants a warning.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1078 duplicated_deps=`echo "$deps" \| LC_ALL=C sort \| LC_ALL=C uniq -d`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1079 if test -n "$duplicated_deps"; then
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1080 echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1081 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1082 func_append inmodules " $deps"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1083 if test -n "$inctests"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1084 testsmodule=`func_get_tests_module $module`
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1085 if test -n "$testsmodule"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1086 func_append inmodules " $testsmodule"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1087 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1088 fi
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1089 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1090 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1091 done
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1092 handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done \| LC_ALL=C sort -u`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1093 # Remove $handledmodules from $inmodules.
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1094 for m in $inmodules; do echo $m; done \| LC_ALL=C sort -u > "$tmp"/queued-modules
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1095 inmodules=`echo "$handledmodules" \| LC_ALL=C join -v 2 - "$tmp"/queued-modules`
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1096 done
7320 9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1097 modules=`for m in $outmodules; do echo $m; done \| LC_ALL=C sort -u`
9349ee4e633c Speed up func_modules_transitive_closure. Bruno Haible <bruno@clisp.org> parents: 7319 diff changeset	1098 rm -f "$tmp"/queued-modules
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1099 }
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1100
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1101 # func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1102 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1103 # - local_gnulib_dir from --local-dir
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1104 # - 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	1105 # Output:
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1106 # - 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	1107 func_modules_add_dummy ()
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1108 {
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1109 have_lib_SOURCES=
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1110 sed_remove_backslash_newline=':a
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1111 /\\$/{
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1112 s/\\$//
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1113 N
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1114 s/\n//
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1115 ba
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1116 }'
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1117 for module in $modules; do
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1118 func_verify_nontests_module
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1119 if test -n "$module"; then
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1120 # 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	1121 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	1122 # 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	1123 case "$file" in
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1124 *.h) ;;
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1125 *) have_lib_SOURCES=yes ;;
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1126 esac
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1127 done
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1128 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1129 done
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1130 # 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	1131 if test -z "$have_lib_SOURCES"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1132 func_append modules " dummy"
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1133 fi
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1134 }
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1135
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1136 # func_modules_to_filelist
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1137 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1138 # - local_gnulib_dir from --local-dir
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1139 # - 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	1140 # Output:
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1141 # - files list of files
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1142 func_modules_to_filelist ()
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1143 {
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1144 files=
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1145 for module in $modules; do
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1146 func_verify_module
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1147 if test -n "$module"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1148 fs=`func_get_filelist $module`
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1149 func_append files " $fs"
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1150 fi
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1151 done
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	1152 files=`for f in $files; do echo $f; done \| LC_ALL=C sort -u`
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1153 }
6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1154
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1155 # func_emit_lib_Makefile_am
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1156 # emits the contents of library makefile to standard output.
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1157 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1158 # - local_gnulib_dir from --local-dir
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1159 # - 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	1160 # - libname library name
7644 3c0ece164bab Replace build-aux/ also in the Makefile snippet. Bruno Haible <bruno@clisp.org> parents: 7643 diff changeset	1161 # - auxdir directory relative to destdir where to place build aux files
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1162 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1163 # - libtool true if libtool will be used, false or blank otherwise
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1164 # - macro_prefix prefix of gl_LIBOBJS macros to use
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1165 # - actioncmd (optional) command that will reproduce this invocation
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1166 # Output:
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1167 # - uses_subdirs nonempty if object files in subdirs exist
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1168 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	1169 {
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1170 # When creating an includable Makefile.am snippet, augment variables with
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1171 # += instead of assigning them.
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1172 if test -n "$makefile_name"; then
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1173 assign='+='
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1174 else
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1175 assign='='
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1176 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1177 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	1178 libext=la
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1179 perhapsLT=LT
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1180 sed_eliminate_LDFLAGS=
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1181 else
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1182 libext=a
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1183 perhapsLT=
7335 6a496bee90ff * gnulib-tool: Avoid space-tab. Eric Blake <ebb9@byu.net> parents: 7332 diff changeset	1184 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1185 fi
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	1186 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1187 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	1188 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	1189 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	1190 echo "# Reproduce by: $actioncmd"
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1191 fi
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1192 echo
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1193 uses_subdirs=
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1194 {
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1195 for module in $modules; do
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1196 func_verify_nontests_module
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1197 if test -n "$module"; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1198 {
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1199 func_get_automake_snippet "$module" \|
7182 f03a51e31a89 Make it possible to use lib_LTLIBRARIES in a snippet. Bruno Haible <bruno@clisp.org> parents: 7171 diff changeset	1200 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
f03a51e31a89 Make it possible to use lib_LTLIBRARIES in a snippet. Bruno Haible <bruno@clisp.org> parents: 7171 diff changeset	1201 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \|
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1202 sed -e "$sed_eliminate_LDFLAGS" \|
7182 f03a51e31a89 Make it possible to use lib_LTLIBRARIES in a snippet. Bruno Haible <bruno@clisp.org> parents: 7171 diff changeset	1203 sed -e 's,lib_$[A-Z][A-Z]*$,'"${libname}_${libext}"'_\1,g' \|
f03a51e31a89 Make it possible to use lib_LTLIBRARIES in a snippet. Bruno Haible <bruno@clisp.org> parents: 7171 diff changeset	1204 sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
f03a51e31a89 Make it possible to use lib_LTLIBRARIES in a snippet. Bruno Haible <bruno@clisp.org> parents: 7171 diff changeset	1205 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g'
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1206 if test "$module" = 'alloca'; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1207 echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1208 echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1209 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1210 } > amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1211 # Skip the contents if its entirely empty.
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1212 if grep '[^ ]' amsnippet.tmp > /dev/null ; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1213 echo "## begin gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1214 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1215 cat amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1216 echo "## end gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1217 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1218 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1219 rm -f amsnippet.tmp
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1220 # Test whether there are some source files in subdirectories.
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1221 for f in `func_get_filelist "$module"`; do
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1222 case $f in
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1223 lib//.c) uses_subdirs=yes ;;
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1224 esac
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1225 done
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1226 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1227 done
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1228 } > allsnippets.tmp
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1229 if test -z "$makefile_name"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1230 # If there are source files in subdirectories, prevent collision of the
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1231 # object files (example: hash.c and libxml/hash.c).
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1232 subdir_options=
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1233 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1234 subdir_options=' subdir-objects'
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1235 fi
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1236 echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1237 fi
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	1238 echo
7171 bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1239 if grep "^[a-zA-Z0-9_]_${perhapsLT}LIBRARIES = *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then
bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1240 # One of the snippets already specifies an installation location for the
bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1241 # library. Don't confuse automake by saying it should not be installed.
bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1242 :
bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1243 else
bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1244 # By default, the generated library should not be installed.
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1245 echo "noinst_${perhapsLT}LIBRARIES $assign $libname.$libext"
7171 bc1c94eecdb1 Make it possible to install the generated library. Bruno Haible <bruno@clisp.org> parents: 7169 diff changeset	1246 fi
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1247 echo
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1248 echo "${libname}_${libext}_SOURCES ="
7299 d9040941c9dd Tweak for automake. Bruno Haible <bruno@clisp.org> parents: 7286 diff changeset	1249 # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However,
d9040941c9dd Tweak for automake. Bruno Haible <bruno@clisp.org> parents: 7286 diff changeset	1250 # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@.
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1251 echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1252 echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)"
7640 a4d97c9b97de Synthesize also an EXTRA_lib_SOURCES augmentation. Bruno Haible <bruno@clisp.org> parents: 7638 diff changeset	1253 echo "EXTRA_${libname}_${libext}_SOURCES ="
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1254 if test "$libtool" = true; then
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1255 echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1256 fi
7246 4a748ab30907 * gnulib-tool (func_emit_lib_Makefile_am): Fix typos in Paul Eggert <eggert@cs.ucla.edu> parents: 7245 diff changeset	1257 if test -z "$makefile_name"; then
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1258 echo "noinst_HEADERS ="
7270 3d4ebfd658b2 A comment about automake-1.9b. Bruno Haible <bruno@clisp.org> parents: 7264 diff changeset	1259 # Automake versions < 1.9b create an empty pkgdatadir at installation time
3d4ebfd658b2 A comment about automake-1.9b. Bruno Haible <bruno@clisp.org> parents: 7264 diff changeset	1260 # if you specify pkgdata_DATA to empty. This is a workaround.
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1261 if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1262 echo "pkgdata_DATA ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1263 fi
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1264 echo "EXTRA_DIST ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1265 echo "BUILT_SOURCES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1266 echo "SUFFIXES ="
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1267 fi
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1268 echo "MOSTLYCLEANFILES $assign core *.stackdump"
7246 4a748ab30907 * gnulib-tool (func_emit_lib_Makefile_am): Fix typos in Paul Eggert <eggert@cs.ucla.edu> parents: 7245 diff changeset	1269 if test -z "$makefile_name"; then
7240 e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1270 echo "MOSTLYCLEANDIRS ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1271 echo "CLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1272 echo "DISTCLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1273 echo "MAINTAINERCLEANFILES ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1274 echo
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1275 echo "AM_CPPFLAGS ="
e9d3ace50303 Slightly change the output generated by --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7239 diff changeset	1276 fi
6750 608add4e5b80 Support for packages that use "gettextize --intl". From Claudio Fontana. Bruno Haible <bruno@clisp.org> parents: 6745 diff changeset	1277 echo
7644 3c0ece164bab Replace build-aux/ also in the Makefile snippet. Bruno Haible <bruno@clisp.org> parents: 7643 diff changeset	1278 cat allsnippets.tmp \
3c0ece164bab Replace build-aux/ also in the Makefile snippet. Bruno Haible <bruno@clisp.org> parents: 7643 diff changeset	1279 \| sed -e 's\|\$(top_srcdir)/build-aux/\|$(top_srcdir)/'"$auxdir"'/\|g'
5357 8bce169f70cc Fix comments. Fix parse problem. Simon Josefsson <simon@josefsson.org> parents: 5356 diff changeset	1280 echo
7086 ba6d3c85213f Fix for "make -j 3". Bruno Haible <bruno@clisp.org> parents: 7079 diff changeset	1281 echo "mostlyclean-local: mostlyclean-generic"
7545 fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1282 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1283 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1284 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1285 echo " fi; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1286 echo " done"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1287 rm -f allsnippets.tmp
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1288 }
7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1289
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1290 # func_emit_tests_Makefile_am
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1291 # emits the contents of tests makefile to standard output.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1292 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1293 # - local_gnulib_dir from --local-dir
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1294 # - modules list of modules, including dependencies
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1295 # - libname library name
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1296 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1297 # - 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	1298 # - sourcebase relative directory containing lib source code
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1299 # - m4base relative directory containing autoconf macros
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1300 # - testsbase relative directory containing unit test code
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1301 func_emit_tests_Makefile_am ()
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1302 {
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1303 if test "$libtool" = true; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1304 libext=la
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1305 else
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1306 libext=a
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1307 fi
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1308 if test "$libtool" = true; then
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1309 libext=la
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1310 sed_eliminate_LDFLAGS=
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1311 else
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1312 libext=a
7335 6a496bee90ff * gnulib-tool: Avoid space-tab. Eric Blake <ebb9@byu.net> parents: 7332 diff changeset	1313 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1314 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1315 testsbase_inverse=`echo "$testsbase" \| sed -e 's,/$,,' \| sed -e 's,[^/][^/]*,..,g'`
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	1316 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1317 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	1318 func_emit_copyright_notice
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1319 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1320 # 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	1321 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1322 echo
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1323 echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1324 echo
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1325 (
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1326 for module in $modules; do
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1327 func_verify_tests_module
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1328 if test -n "$module"; then
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1329 {
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1330 func_get_automake_snippet "$module" \|
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1331 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1332 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \|
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1333 sed -e "$sed_eliminate_LDFLAGS" \|
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1334 sed -e 's,lib_$[A-Z][A-Z]*$,'"${libname}_${libext}"'_\1,g' \|
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1335 sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1336 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g'
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	1337 } > amsnippet.tmp
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1338 # Skip the contents if its entirely empty.
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1339 if grep '[^ ]' amsnippet.tmp > /dev/null ; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1340 echo "## begin gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1341 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1342 cat amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1343 echo "## end gnulib module $module"
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1344 echo
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1345 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1346 rm -f amsnippet.tmp
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1347 fi
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1348 done
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1349 ) > allsnippets.tmp
6533 6bc4290ca85f Avoid an automake error regarding the 'gettext' module. Bruno Haible <bruno@clisp.org> parents: 6512 diff changeset	1350 # 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	1351 # 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	1352 # "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	1353 echo "SUBDIRS ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1354 echo "TESTS ="
6380 9bc99115d4d6 Small tweaks. Bruno Haible <bruno@clisp.org> parents: 6264 diff changeset	1355 echo "TESTS_ENVIRONMENT ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1356 echo "noinst_PROGRAMS ="
6570 c965a389db71 Simplify my -tests modules. Simon Josefsson <simon@josefsson.org>* parents: 6556 diff changeset	1357 echo "check_PROGRAMS ="
6548 060487c0b13c Initialize also noinst_HEADERS to empty. Bruno Haible <bruno@clisp.org> parents: 6547 diff changeset	1358 echo "noinst_HEADERS ="
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1359 if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1360 echo "pkgdata_DATA ="
cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1361 fi
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1362 echo "EXTRA_DIST ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1363 echo "BUILT_SOURCES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1364 echo "SUFFIXES ="
7079 ecd48b98b094 Clean core dumps. Bruno Haible <bruno@clisp.org> parents: 7078 diff changeset	1365 echo "MOSTLYCLEANFILES = core *.stackdump"
6862 ba1b5722df42 Invent MOSTLYCLEANDIRS. Bruno Haible <bruno@clisp.org> parents: 6777 diff changeset	1366 echo "MOSTLYCLEANDIRS ="
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1367 echo "CLEANFILES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1368 echo "DISTCLEANFILES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1369 echo "MAINTAINERCLEANFILES ="
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1370 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1371 echo "AM_CPPFLAGS = \\"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1372 echo " -I. -I\$(srcdir) \\"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1373 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1374 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	1375 echo
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1376 echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1377 echo
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1378 cat allsnippets.tmp
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1379 echo "# Clean up after Solaris cc."
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1380 echo "clean-local:"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1381 echo " rm -rf SunWS_cache"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1382 echo
7086 ba6d3c85213f Fix for "make -j 3". Bruno Haible <bruno@clisp.org> parents: 7079 diff changeset	1383 echo "mostlyclean-local: mostlyclean-generic"
7545 fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1384 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1385 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1386 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1387 echo " fi; \\"
fade8d6feee3 Avoid syntax error from bash 2.00 ... 2.05. Bruno Haible <bruno@clisp.org> parents: 7533 diff changeset	1388 echo " done"
7169 cb505deddb22 Don't create a $(pkgdatadir) if there's nothing to be installed in it. Bruno Haible <bruno@clisp.org> parents: 7168 diff changeset	1389 rm -f allsnippets.tmp
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1390 }
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	1391
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1392 # func_emit_initmacro_start
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1393 # emits the first few statements of the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1394 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1395 func_emit_initmacro_start ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1396 {
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1397 # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1398 # platform-dependent object files in ${macro_prefix}_LIBOBJS instead of
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1399 # LIBOBJS. The purpose is to allow several gnulib instantiations under
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1400 # a single configure.ac file. (AC_CONFIG_LIBOBJ_DIR does not allow this
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1401 # flexibility.)
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1402 # Furthermore it avoids an automake error like this when a Makefile.am
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1403 # that uses pieces of gnulib also uses $(LIBOBJ):
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1404 # automatically discovered file `error.c' should not be explicitly mentioned
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1405 echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix}_LIBOBJ]))"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1406 echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix}_REPLACE_FUNCS]))"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1407 # Overriding AC_LIBSOURCES has the same purpose of avoiding the automake
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1408 # error when a Makefile.am that uses pieces of gnulib also uses $(LIBOBJ):
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1409 # automatically discovered file `error.c' should not be explicitly mentioned
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1410 # We let automake know about the files to be distributed through the
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1411 # EXTRA_lib_SOURCES variable.
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1412 echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix}_LIBSOURCES]))"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1413 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1414
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1415 # func_emit_initmacro_end
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1416 # emits the last few statements of the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1417 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1418 func_emit_initmacro_end ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1419 {
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1420 echo " m4_popdef([AC_LIBSOURCES])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1421 echo " m4_popdef([AC_REPLACE_FUNCS])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1422 echo " m4_popdef([AC_LIBOBJ])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1423 echo " AC_CONFIG_COMMANDS_PRE(["
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1424 echo " ${macro_prefix}_libobjs="
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1425 echo " ${macro_prefix}_ltlibobjs="
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1426 echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then"
7528 472795eea368 Remove duplicates from the gl_LIBOBJS list. Bruno Haible <bruno@clisp.org> parents: 7497 diff changeset	1427 echo " # Remove the extension."
472795eea368 Remove duplicates from the gl_LIBOBJS list. Bruno Haible <bruno@clisp.org> parents: 7497 diff changeset	1428 echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'"
472795eea368 Remove duplicates from the gl_LIBOBJS list. Bruno Haible <bruno@clisp.org> parents: 7497 diff changeset	1429 echo " for i in \`for i in \$${macro_prefix}_LIBOBJS; do echo \"\$i\"; done \| sed \"\$sed_drop_objext\" \| sort \| uniq\`; do"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1430 echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\""
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1431 echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\""
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1432 echo " done"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1433 echo " fi"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1434 echo " AC_SUBST([${macro_prefix}_LIBOBJS], [\$${macro_prefix}_libobjs])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1435 echo " AC_SUBST([${macro_prefix}_LTLIBOBJS], [\$${macro_prefix}_ltlibobjs])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1436 echo " ])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1437 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1438
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1439 # func_emit_initmacro_done
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1440 # emits a few statements after the gl_INIT macro to standard output.
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1441 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1442 func_emit_initmacro_done ()
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1443 {
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1444 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1445 echo "# Like AC_LIBOBJ, except that the module name goes"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1446 echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1447 echo "AC_DEFUN([${macro_prefix}_LIBOBJ],"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1448 echo " [${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS \$1.\$ac_objext\"])"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1449 echo
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1450 echo "# Like AC_REPLACE_FUNCS, except that the module name goes"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1451 echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1452 echo "AC_DEFUN([${macro_prefix}_REPLACE_FUNCS],"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1453 echo " [AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])])"
7646 33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1454 echo
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1455 echo "# Like AC_LIBSOURCES, except that it does nothing."
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1456 echo "# We rely on EXTRA_lib..._SOURCES instead."
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1457 echo "AC_DEFUN([${macro_prefix}_LIBSOURCES],"
33bd42644eec Override also AC_LIBSOURCES. Works around an automake error Bruno Haible <bruno@clisp.org> parents: 7644 diff changeset	1458 echo " [])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1459 }
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	1460
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1461 # func_import modules
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1462 # Uses also the variables
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1463 # - destdir target directory
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	1464 # - local_gnulib_dir from --local-dir
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1465 # - libname library name
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1466 # - 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	1467 # - 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	1468 # - 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	1469 # - 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	1470 # - 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	1471 # - inctests true if --with-tests was given, blank otherwise
5981 09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1472 # - avoidlist list of modules to avoid, from --avoid
09850e201e79 New option --avoid. Bruno Haible <bruno@clisp.org> parents: 5963 diff changeset	1473 # - lgpl true if library's license shall be LGPL, blank otherwise
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1474 # - makefile_name from --makefile-name
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1475 # - libtool true if --libtool was given, false if --no-libtool was
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1476 # given, blank otherwise
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1477 # - guessed_libtool true if the configure.ac file uses libtool, false otherwise
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	1478 # - 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	1479 # - autoconf_minversion minimum supported autoconf version
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1480 # - 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	1481 # - symbolic true if files should be symlinked, copied otherwise
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1482 # - lsymbolic true if files from local_gnulib_dir should be symlinked,
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1483 # copied otherwise
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1484 func_import ()
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1485 {
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1486 # Get the cached settings.
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1487 cached_local_gnulib_dir=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1488 cached_specified_modules=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1489 cached_avoidlist=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1490 cached_sourcebase=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1491 cached_m4base=
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1492 cached_docbase=
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1493 cached_testsbase=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1494 cached_libname=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1495 cached_lgpl=
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1496 cached_makefile_name=
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1497 cached_libtool=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1498 cached_macro_prefix=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1499 cached_files=
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1500 if test -f "$destdir"/$m4base/gnulib-cache.m4; then
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1501 cached_libtool=false
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1502 my_sed_traces='
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1503 s,#.*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1504 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1505 s, dnl .*$,,
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1506 /gl_LOCAL_DIR(/ {
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1507 s,^.gl_LOCAL_DIR([[ ]$[^])]$.$,cached_local_gnulib_dir="\1",p
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1508 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1509 /gl_MODULES(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1510 s,^.gl_MODULES([[ ]$[^])]$.$,cached_specified_modules="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1511 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1512 /gl_AVOID(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1513 s,^.gl_AVOID([[ ]$[^])]$.$,cached_avoidlist="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1514 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1515 /gl_SOURCE_BASE(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1516 s,^.gl_SOURCE_BASE([[ ]$[^])]$.$,cached_sourcebase="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1517 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1518 /gl_M4_BASE(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1519 s,^.gl_M4_BASE([[ ]$[^])]$.$,cached_m4base="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1520 }
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1521 /gl_DOC_BASE(/ {
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1522 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	1523 }
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1524 /gl_TESTS_BASE(/ {
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1525 s,^.gl_TESTS_BASE([[ ]$[^])]$.$,cached_testsbase="\1",p
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1526 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1527 /gl_LIB(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1528 s,^.gl_LIB([[ ]$[^])]$.$,cached_libname="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1529 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1530 /gl_LGPL/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1531 s,^.*$,cached_lgpl=true,p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1532 }
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1533 /gl_MAKEFILE_NAME(/ {
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1534 s,^.gl_MAKEFILE_NAME([[ ]$[^])]$.$,cached_makefile_name="\1",p
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1535 }
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1536 /gl_LIBTOOL/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1537 s,^.*$,cached_libtool=true,p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1538 }
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1539 /gl_MACRO_PREFIX(/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1540 s,^.gl_MACRO_PREFIX([[ ]$[^])]$.$,cached_macro_prefix="\1",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1541 }'
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1542 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	1543 if test -f "$destdir"/$m4base/gnulib-comp.m4; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1544 my_sed_traces='
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1545 s,#.*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1546 s,^dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1547 s, dnl .*$,,
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1548 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ {
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1549 s,^.*$,cached_files=",p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1550 n
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1551 ta
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1552 :a
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1553 s,^\]).*$,",
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1554 tb
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1555 p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1556 n
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1557 ba
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1558 :b
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1559 p
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1560 }'
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1561 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	1562 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1563 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1564
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1565 # Merge the cached settings with the specified ones.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1566 # 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	1567 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	1568 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	1569 fi
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1570 # The local_gnulib_dir defaults to the cached one. Recall that the cached one
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1571 # is relative to $destdir, whereas the one we use is relative to . or absolute.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1572 if test -z "$local_gnulib_dir"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1573 if test -n "$cached_local_gnulib_dir"; then
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1574 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1575 /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1576 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1577 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1578 case "$cached_local_gnulib_dir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1579 /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1580 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1581 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1582 func_relconcat "$destdir" "$cached_local_gnulib_dir"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1583 local_gnulib_dir="$relconcat" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1584 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1585 esac
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1586 fi
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1587 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1588 # 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	1589 # "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	1590 specified_modules="$cached_specified_modules $1"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1591 # 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	1592 # 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	1593 avoidlist=`echo $cached_avoidlist $avoidlist`
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1594 # The sourcebase defaults to the cached one.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1595 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1596 sourcebase="$cached_sourcebase"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1597 if test -z "$sourcebase"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1598 func_fatal_error "missing --source-base option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1599 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1600 fi
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1601 # 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	1602 if test -z "$docbase"; then
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1603 docbase="$cached_docbase"
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1604 if test -z "$docbase"; then
7076 0e471c8eb020 Tweak error message about missing --doc-base. Bruno Haible <bruno@clisp.org> parents: 7073 diff changeset	1605 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	1606 fi
7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1607 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1608 # The testsbase defaults to the cached one.
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1609 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1610 testsbase="$cached_testsbase"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1611 if test -z "$testsbase"; then
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1612 func_fatal_error "missing --tests-base option"
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1613 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1614 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1615 # 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	1616 if test -z "$supplied_libname"; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1617 libname="$cached_libname"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1618 if test -z "$libname"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1619 func_fatal_error "missing --lib option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1620 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1621 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1622 # Require LGPL if specified either way.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1623 if test -z "$lgpl"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1624 lgpl="$cached_lgpl"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1625 fi
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1626 # The makefile_name defaults to the cached one.
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1627 if test -z "$makefile_name"; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1628 makefile_name="$cached_makefile_name"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1629 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1630 # 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	1631 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	1632 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	1633 libtool="$cached_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1634 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1635 libtool="$guessed_libtool"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1636 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1637 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1638 # The macro_prefix defaults to the cached one.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1639 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1640 macro_prefix="$cached_macro_prefix"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1641 if test -z "$macro_prefix"; then
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1642 func_fatal_error "missing --macro-prefix option"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1643 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1644 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1645
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1646 # Canonicalize the list of specified modules.
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	1647 specified_modules=`for m in $specified_modules; do echo $m; done \| LC_ALL=C sort -u`
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1648
0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1649 # Determine final module list.
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1650 modules="$specified_modules"
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	1651 func_modules_transitive_closure
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1652 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	1653 echo "$modules" \| sed -e 's/^/ /'
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1654
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1655 # 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	1656 func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	1657
7235 3dbbe645b976 * MODULES.html.sh (Support for building documentation): Add gpl, lgpl. Paul Eggert <eggert@cs.ucla.edu> parents: 7222 diff changeset	1658 # If --lgpl, verify that the licenses of modules are compatible.
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1659 if test -n "$lgpl"; then
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1660 for module in $modules; do
5346 40f5d74050d5 Use func_get_license. Bruno Haible <bruno@clisp.org> parents: 5345 diff changeset	1661 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	1662 case $license in
7235 3dbbe645b976 * MODULES.html.sh (Support for building documentation): Add gpl, lgpl. Paul Eggert <eggert@cs.ucla.edu> parents: 7222 diff changeset	1663 LGPL \| 'GPLed build tool') ;;
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1664 'public domain' \| 'unlimited' \| 'unmodifiable license text') ;;
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1665 *) 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	1666 esac
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1667 done
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1668 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1669
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1670 # Determine script to apply to imported library files.
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1671 sed_transform_lib_file=
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1672 for module in $modules; do
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1673 if test $module = config-h; then
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1674 # Assume config.h exists, and that -DHAVE_CONFIG_H is omitted.
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1675 sed_transform_lib_file=$sed_transform_lib_file'
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1676 s/^#ifdef[ ]HAVE_CONFIG_H[ ]$/#if 1/
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1677 '
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1678 break
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1679 fi
138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1680 done
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1681 if test -n "$lgpl"; then
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1682 # Update license.
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1683 sed_transform_lib_file=$sed_transform_lib_file'
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1684 s/GNU General/GNU Lesser General/g
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1685 s/version 2$[ ,]$/version 2.1\1/g
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1686 '
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1687 fi
85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1688
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1689 # Determine final file list.
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	1690 func_modules_to_filelist
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1691 echo "File list:"
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1692 echo "$files" \| sed -e 's/^/ /'
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1693
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1694 test -n "$files" \
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1695 \|\| 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	1696
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1697 # 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	1698 new_files="$files m4/gnulib-tool.m4"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1699 old_files="$cached_files"
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1700 if test -f "$destdir"/$m4base/gnulib-tool.m4; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1701 func_append old_files " m4/gnulib-tool.m4"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1702 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1703
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1704 sed_rewrite_old_files="\
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1705 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1706 s,^doc/,$cached_docbase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1707 s,^lib/,$cached_sourcebase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1708 s,^m4/,$cached_m4base/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1709 s,^tests/,$cached_testsbase/,"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1710 sed_rewrite_new_files="\
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1711 s,^build-aux/,$auxdir/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1712 s,^doc/,$docbase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1713 s,^lib/,$sourcebase/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1714 s,^m4/,$m4base/,
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1715 s,^tests/,$testsbase/,"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1716
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1717 # Create directories.
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1718 { echo "$sourcebase"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1719 echo "$m4base"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1720 docfiles=`echo "$files" \| sed -n -e 's,^doc/,,p'`
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1721 if test -n "$docfiles"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1722 echo "$docbase"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1723 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1724 if test -n "$inctests"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1725 echo "$testsbase"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1726 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1727 echo "$auxdir"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1728 for f in $files; do echo $f; done \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1729 \| sed -e "$sed_rewrite_new_files" \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1730 \| sed -n -e 's,^$.$/[^/],\1,p' \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1731 \| LC_ALL=C sort -u
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1732 } > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1733 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1734 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1735 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1736 while read d; do
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1737 if test ! -d "$destdir/$d"; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1738 if $doit; then
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1739 echo "Creating directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1740 mkdir -p "$destdir/$d" \|\| func_fatal_error "failed"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1741 else
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1742 echo "Create directory $destdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1743 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1744 fi
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1745 done
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1746 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	1747 }
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	1748
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	1749 # 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	1750 # 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	1751 # 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	1752 # - 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	1753 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	1754 {
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	1755 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	1756 # 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	1757 # 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	1758 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	1759 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	1760 # 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	1761 # (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	1762 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	1763 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	1764 }
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	1765
aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	1766 # 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	1767 delimiter=' '
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1768 # Construct a table with 2 columns: rewritten-file-name original-file-name,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1769 # representing the files according to the last gnulib-tool invocation.
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1770 for f in $old_files; do echo $f; done \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1771 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_old_files" \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1772 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1773 > "$tmp"/old-files
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1774 # Construct a table with 2 columns: rewritten-file-name original-file-name,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1775 # representing the files after this gnulib-tool invocation.
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1776 for f in $new_files; do echo $f; done \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1777 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1778 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1779 > "$tmp"/new-files
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1780 # 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	1781 sed_take_first_column='s,'"$delimiter"'.*,,'
0c67f1400c5b Fix portability problem to Solaris 9 sh. Bruno Haible <bruno@clisp.org> parents: 6581 diff changeset	1782 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	1783 # 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	1784 if test -f "$destdir/$g"; then
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1785 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1786 echo "Removing file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1787 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	1788 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1789 echo "Remove file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1790 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1791 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1792 done
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1793 # func_add_or_update handles a file that ought to be present afterwards.
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1794 # Uses parameters
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1795 # - f the original file name
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1796 # - g the rewritten file name
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1797 # - already_present nonempty if the file already exists, empty otherwise
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1798 func_add_or_update ()
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1799 {
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	1800 func_dest_tmpfilename "$g"
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1801 func_lookup_file "$f"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1802 cp "$lookedup_file" "$tmpfile" \|\| func_fatal_error "failed"
7245 138333fc7a90 Improve maintainability. Bruno Haible <bruno@clisp.org> parents: 7241 diff changeset	1803 if test -n "$sed_transform_lib_file"; then
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1804 case "$f" in
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1805 lib/*)
7199 85ef7b18536b New config-h module, so that "make" output needn't be cluttered Paul Eggert <eggert@cs.ucla.edu> parents: 7195 diff changeset	1806 sed -e "$sed_transform_lib_file" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1807 < "$lookedup_file" > "$tmpfile" \|\| func_fatal_error "failed"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1808 ;;
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1809 esac
5798 49900d80eaaf 2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu> Simon Josefsson <simon@josefsson.org> parents: 5685 diff changeset	1810 fi
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1811 if test -f "$destdir/$g"; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1812 # 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	1813 if cmp "$destdir/$g" "$tmpfile" > /dev/null; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1814 : # The file has not changed.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1815 else
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1816 # Replace the file.
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1817 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1818 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1819 echo "Updating file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1820 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1821 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	1822 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1823 mv -f "$destdir/$g" "$destdir/${g}~" \|\| func_fatal_error "failed"
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1824 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1825 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1826 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1827 && test -z "$lookedup_tmp" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1828 && 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	1829 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	1830 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	1831 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	1832 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1833 else
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1834 if test -n "$already_present"; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1835 echo "Update file $g (backup in ${g}~)"
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1836 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1837 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	1838 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1839 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1840 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1841 else
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1842 # Install the file.
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1843 # 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	1844 # 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	1845 if $doit; then
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1846 echo "Copying file $g"
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1847 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1848 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1849 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	1850 && test -z "$lookedup_tmp" \
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	1851 && 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	1852 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	1853 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	1854 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	1855 fi
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1856 else
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1857 echo "Copy file $g"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1858 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1859 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	1860 rm -f "$tmpfile"
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1861 }
07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1862 # 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	1863 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	1864 already_present=
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1865 LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1866 \| sed -e "$sed_take_last_column" \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1867 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/added-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1868 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1869 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	1870 exec 5<&0 < "$tmp"/added-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1871 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1872 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1873 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	1874 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1875 }
6245 07b16a28510d Speed up the matching of new and old files. Bruno Haible <bruno@clisp.org> parents: 6213 diff changeset	1876 # 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	1877 already_present=true
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1878 LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1879 \| sed -e "$sed_take_last_column" \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	1880 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/kept-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1881 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1882 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	1883 exec 5<&0 < "$tmp"/kept-files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1884 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1885 func_add_or_update
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1886 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	1887 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	1888 }
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1889
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1890 # 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	1891 actioncmd="gnulib-tool --import"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1892 func_append actioncmd " --dir=$destdir"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1893 if test -n "$local_gnulib_dir"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1894 func_append actioncmd " --local-dir=$local_gnulib_dir"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1895 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1896 func_append actioncmd " --lib=$libname"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1897 func_append actioncmd " --source-base=$sourcebase"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1898 func_append actioncmd " --m4-base=$m4base"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1899 func_append actioncmd " --doc-base=$docbase"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1900 func_append actioncmd " --aux-dir=$auxdir"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1901 for module in $avoidlist; do
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1902 func_append actioncmd " --avoid=$module"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1903 done
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1904 if test -n "$lgpl"; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1905 func_append actioncmd " --lgpl"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1906 fi
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1907 if test -n "$makefile_name"; then
7600 42c51a6fef88 Fix typo in actioncmd. From Charles WIlson. Bruno Haible <bruno@clisp.org> parents: 7599 diff changeset	1908 func_append actioncmd " --makefile-name=$makefile_name"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1909 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1910 if test "$libtool" = true; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1911 func_append actioncmd " --libtool"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1912 else
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1913 func_append actioncmd " --no-libtool"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1914 fi
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1915 func_append actioncmd " --macro-prefix=$macro_prefix"
7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	1916 func_append actioncmd " `echo $specified_modules`"
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1917
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1918 # Default the makefile name to Makefile.am.
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1919 if test -n "$makefile_name"; then
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1920 makefile_am=$makefile_name
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1921 else
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1922 makefile_am=Makefile.am
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1923 fi
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1924
06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	1925 # Create library makefile.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1926 func_dest_tmpfilename $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	1927 func_emit_lib_Makefile_am > "$tmpfile"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1928 if test -f "$destdir"/$sourcebase/$makefile_am; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1929 if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	1930 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1931 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1932 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1933 echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1934 mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1935 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1936 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1937 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	1938 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1939 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1940 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1941 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1942 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1943 echo "Creating $sourcebase/$makefile_am"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1944 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1945 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1946 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	1947 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1948 fi
5351 7c565c8ecabc Move duplicated code into function func_emit_lib_Makefile_am(). Bruno Haible <bruno@clisp.org> parents: 5350 diff changeset	1949 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1950
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1951 # 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	1952 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	1953 (
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	1954 func_emit_copyright_notice
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	1955 echo "#"
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1956 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	1957 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	1958 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	1959 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	1960 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1961 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1962 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	1963 echo "# $actioncmd"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1964 echo
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1965 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:"
7213 0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1966 # Store the local_gnulib_dir relative to destdir.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1967 case "$local_gnulib_dir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1968 "" \| /*)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1969 relative_local_gnulib_dir="$local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1970 * )
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1971 case "$destdir" in
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1972 /*) relative_local_gnulib_dir="$local_gnulib_dir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1973 *)
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1974 # destdir, local_gnulib_dir are both relative.
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1975 func_relativize "$destdir" "$local_gnulib_dir"
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1976 relative_local_gnulib_dir="$reldir" ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1977 esac ;;
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1978 esac
0f2957c42e86 Save the --local-dir value in the cache file. Bruno Haible <bruno@clisp.org> parents: 7212 diff changeset	1979 echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1980 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	1981 echo "gl_AVOID([$avoidlist])"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1982 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	1983 echo "gl_M4_BASE([$m4base])"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	1984 echo "gl_DOC_BASE([$docbase])"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	1985 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	1986 echo "gl_LIB([$libname])"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1987 test -z "$lgpl" \|\| echo "gl_LGPL"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	1988 echo "gl_MAKEFILE_NAME([$makefile_name])"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1989 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1990 echo "gl_LIBTOOL"
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	1991 fi
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	1992 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	1993 ) > "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1994 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	1995 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	1996 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1997 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	1998 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	1999 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	2000 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	2001 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	2002 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2003 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	2004 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	2005 cat "$tmpfile"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2006 echo
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2007 echo "# gnulib-cache.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2008 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	2009 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2010 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2011 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2012 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2013 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2014 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	2015 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	2016 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2017 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	2018 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	2019 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2020 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2021 fi
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	2022
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	2023 # 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	2024 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	2025 (
7421 8bace4b08db5 Mark generated files as "DO NOT EDIT". Bruno Haible <bruno@clisp.org> parents: 7391 diff changeset	2026 echo "# DO NOT EDIT! GENERATED AUTOMATICALLY!"
6777 d9b10884dc69 * gnulib-tool (func_version): Base copyright year on CVS date. Eric Blake <ebb9@byu.net> parents: 6765 diff changeset	2027 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	2028 echo "#"
a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	2029 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	2030 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	2031 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	2032 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	2033 echo
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2034 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	2035 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	2036 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	2037 echo "# any checks for libraries, header files, types and library functions."
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	2038 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	2039 echo "["
7105 641bac73140c * gnulib-tool (func_import): Detect unexpanded macros in gnulib Eric Blake <ebb9@byu.net> parents: 7090 diff changeset	2040 echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2041 echo " m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2042 echo " m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2043 echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
6512 f8abe8d41137 RANLIB is needed. Bruno Haible <bruno@clisp.org> parents: 6464 diff changeset	2044 echo " AC_REQUIRE([AC_PROG_RANLIB])"
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2045 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2046 echo " AC_REQUIRE([AM_PROG_CC_C_O])"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2047 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	2048 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	2049 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	2050 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	2051 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	2052 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	2053 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	2054 if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
7187 89a978aa0b12 Separate the "early" and the "normal" part of the macro. Bruno Haible <bruno@clisp.org> parents: 7182 diff changeset	2055 echo " AC_REQUIRE([gl_LOCK_EARLY])"
6549 2f04f595e14e Ensure automatic ordering between gl_LOCK and gl_ARGP. Bruno Haible <bruno@clisp.org> parents: 6548 diff changeset	2056 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2057 echo "])"
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2058 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	2059 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	2060 echo "# \"Check for header files, types and library functions\"."
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	2061 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	2062 echo "["
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2063 func_emit_initmacro_start
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2064 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2065 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2066 echo " gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2067 else
6512 f8abe8d41137 RANLIB is needed. Bruno Haible <bruno@clisp.org> parents: 6464 diff changeset	2068 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2069 echo " gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2070 echo " gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2071 echo " gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	2072 fi
7348 7d0519d18212 Pass to the gl_GETLOADAVG macro the $gl_source_base from gnulib-tool. Bruno Haible <bruno@clisp.org> parents: 7347 diff changeset	2073 echo " gl_source_base='$sourcebase'"
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2074 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2075 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2076 :a
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2077 /AC_CONFIG_FILES(.:build-aux\/.)/{
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2078 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)\|
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2079 ba
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2080 }'
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2081 sed_replace_build_aux=`echo "$sed_replace_build_aux" \| sed -e 1d -e 's/^ *//'`
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2082 else
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2083 sed_replace_build_aux=
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2084 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2085 for module in $modules; do
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2086 func_verify_module
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2087 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	2088 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	2089 \| 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	2090 -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	2091 -e "$sed_replace_build_aux"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2092 if test "$module" = 'alloca' && test "$libtool" = true; then
5356 144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	2093 echo 'changequote(,)dnl'
144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	2094 echo 'LTALLOCA=`echo "$ALLOCA" \| sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	2095 echo 'changequote([, ])dnl'
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	2096 echo 'AC_SUBST([LTALLOCA])'
5356 144b29bba7b7 Provisions for defining LTALLOCA. Bruno Haible <bruno@clisp.org> parents: 5353 diff changeset	2097 fi
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2098 fi
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2099 done
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2100 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2101 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2102 if test "$libtool" != true; then
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2103 libname_upper=`echo "$libname" \| tr 'a-z' 'A-Z'`
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2104 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2105 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2106 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2107 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2108 fi
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2109 func_emit_initmacro_end
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2110 echo "])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2111 func_emit_initmacro_done
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2112 echo
6180 a0904de304e5 Separate the generates files into cvs-committable files and frequently Bruno Haible <bruno@clisp.org> parents: 6179 diff changeset	2113 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	2114 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	2115 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	2116 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	2117 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	2118 ) > "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2119 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	2120 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	2121 rm -f "$tmpfile"
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2122 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2123 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2124 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	2125 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	2126 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	2127 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2128 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	2129 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	2130 cat "$tmpfile"
6249 564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2131 echo
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2132 echo "# gnulib-comp.m4 ends here"
564133adbd69 Comment out too much verbosity in --dry-run. Bruno Haible <bruno@clisp.org> parents: 6248 diff changeset	2133 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	2134 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2135 fi
6246 7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2136 fi
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2137 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2138 if $doit; then
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2139 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	2140 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	2141 else
7c089b3b2200 Rework the way --dry-run works. Bruno Haible <bruno@clisp.org> parents: 6245 diff changeset	2142 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	2143 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	2144 rm -f "$tmpfile"
6181 95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2145 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2146 fi
95b89dc3f638 Read the previous cached settings. Bruno Haible <bruno@clisp.org> parents: 6180 diff changeset	2147
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2148 if test -n "$inctests"; then
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2149 # Create tests makefile.
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2150 func_dest_tmpfilename $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	2151 func_emit_tests_Makefile_am > "$tmpfile"
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2152 if test -f "$destdir"/$testsbase/$makefile_am; then
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2153 if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then
6745 aca74c06bca0 Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and Bruno Haible <bruno@clisp.org> parents: 6633 diff changeset	2154 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2155 else
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2156 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2157 echo "Updating $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2158 mv -f "$destdir"/$testsbase/$makefile_am "$destdir"/$testsbase/$makefile_am~
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2159 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2160 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2161 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	2162 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2163 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2164 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2165 else
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2166 if $doit; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2167 echo "Creating $testsbase/$makefile_am"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2168 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2169 else
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2170 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	2171 rm -f "$tmpfile"
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2172 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2173 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2174 fi
2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2175
5345 8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2176 echo "Finished."
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2177 echo
5572 54000928a33d Print #include directives when --import'ing. Simon Josefsson <simon@josefsson.org> parents: 5527 diff changeset	2178 echo "You may need to add #include directives for the following .h files."
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2179 # First the #include <...> directives without #ifs, sorted for convenience,
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2180 # then the #include "..." directives without #ifs, sorted for convenience,
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2181 # then the #include directives that are surrounded by #ifs. Not sorted.
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2182 for module in $modules; do
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2183 include_directive=`func_get_include_directive "$module"`
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2184 case "$nl$include_directive" in
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2185 "$nl#if")
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2186 echo "$include_directive" 1>&5
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2187 ;;
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2188 *)
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2189 echo "$include_directive" \| grep -v 'include "' 1>&6
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2190 echo "$include_directive" \| grep 'include "' 1>&7
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2191 ;;
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2192 esac
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2193 done 5> "$tmp"/include-if 6> "$tmp"/include-angles 7> "$tmp"/include-quotes
6756 4d481eff340f Sort the #include directives more carefully. Bruno Haible <bruno@clisp.org> parents: 6750 diff changeset	2194 (
7322 46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2195 LC_ALL=C sort -u "$tmp"/include-angles
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2196 LC_ALL=C sort -u "$tmp"/include-quotes
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2197 cat "$tmp"/include-if
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2198 ) \| sed -e '/^$/d' -e 's/^/ /'
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2199 rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if
46d98b687a87 Speed up presentation of the include files. Bruno Haible <bruno@clisp.org> parents: 7321 diff changeset	2200
5572 54000928a33d Print #include directives when --import'ing. Simon Josefsson <simon@josefsson.org> parents: 5527 diff changeset	2201 echo
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	2202 echo "Don't forget to"
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2203 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2204 echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2205 else
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2206 echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\","
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2207 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2208 if test -n "$inctests"; then
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2209 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2210 echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2211 else
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2212 echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\","
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2213 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2214 fi
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2215 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2216 sourcebase_dir=`echo "$sourcebase" \| sed -n -e 's,/[^/]*$,/,p'`
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2217 sourcebase_base=`basename "$sourcebase"`
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2218 echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2219 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2220 if test -n "$inctests"; then
7222 06eec4eaf416 * gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name Paul Eggert <eggert@cs.ucla.edu> parents: 7216 diff changeset	2221 if test "$makefile_am" = Makefile.am; then
7216 91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2222 testsbase_dir=`echo "$testsbase" \| sed -n -e 's,/[^/]*$,/,p'`
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2223 testsbase_base=`basename "$testsbase"`
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2224 echo " - mention \"${testsbase_base}\" in SUBDIRS in ${testsbase_dir}Makefile.am,"
91df49e70c77 New option --makefile-name. Bruno Haible <bruno@clisp.org> parents: 7215 diff changeset	2225 fi
6250 2c772fe1e1d0 Support --with-tests also with --import. Bruno Haible <bruno@clisp.org> parents: 6249 diff changeset	2226 fi
6160 2fb771c0af6b Emit more comments and advice. Bruno Haible <bruno@clisp.org> parents: 6159 diff changeset	2227 echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am,"
6176 1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	2228 echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC,"
1a1e2f878f04 New option --macro-prefix. Bruno Haible <bruno@clisp.org> parents: 6175 diff changeset	2229 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	2230 }
8394c9bf619f Move a lot of code into function func_import(). Bruno Haible <bruno@clisp.org> parents: 5344 diff changeset	2231
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2232 # func_create_testdir testdir modules
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2233 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	2234 # - local_gnulib_dir from --local-dir
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2235 # - 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	2236 func_create_testdir ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2237 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2238 testdir="$1"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2239 modules="$2"
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2240 if test -z "$modules"; then
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2241 # All modules together.
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2242 # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2243 # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
7533 029a26ecb19a Don't include ftruncate and mountlist by default. Bruno Haible <bruno@clisp.org> parents: 7530 diff changeset	2244 # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME.
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2245 modules=`func_all_modules`
7533 029a26ecb19a Don't include ftruncate and mountlist by default. Bruno Haible <bruno@clisp.org> parents: 7530 diff changeset	2246 modules=`for m in $modules; do case $m in config-h \| fnmatch-posix \| ftruncate \| mountlist) ;; *) echo $m;; esac; done`
7484 57fe575409ae --create-testdir without module names now means to use nearly all modules. Bruno Haible <bruno@clisp.org> parents: 7421 diff changeset	2247 fi
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	2248 modules=`for m in $modules; do echo $m; done \| LC_ALL=C sort -u`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2249
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2250 # Subdirectory names.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2251 sourcebase=gllib
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2252 m4base=glm4
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2253 docbase=gldoc
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2254 testsbase=gltests
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2255 macro_prefix=gl
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2256
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2257 # Determine final module list.
5347 0318c37925dc Move duplicated code into function func_modules_transitive_closure(). Bruno Haible <bruno@clisp.org> parents: 5346 diff changeset	2258 func_modules_transitive_closure
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2259 echo "Module list with included dependencies:"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2260 echo "$modules" \| sed -e 's/^/ /'
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2261
6550 3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	2262 # 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	2263 func_modules_add_dummy
3bb57675fc1b Avoid error due to empty archive on MacOS X. Bruno Haible <bruno@clisp.org> parents: 6549 diff changeset	2264
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2265 # Determine final file list.
5348 6afb021e2fc1 Move duplicated code into function func_modules_to_filelist(). Bruno Haible <bruno@clisp.org> parents: 5347 diff changeset	2266 func_modules_to_filelist
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2267 echo "File list:"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2268 echo "$files" \| sed -e 's/^/ /'
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2269
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2270 sed_rewrite_files="\
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2271 s,^build-aux/,$auxdir/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2272 s,^doc/,$docbase/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2273 s,^lib/,$sourcebase/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2274 s,^m4/,$m4base/,
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2275 s,^tests/,$testsbase/,"
7605 ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2276
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2277 # Create directories.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2278 for f in $files; do echo $f; done \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2279 \| sed -e "$sed_rewrite_files" \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2280 \| sed -n -e 's,^$.$/[^/],\1,p' \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2281 \| LC_ALL=C sort -u \
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2282 > "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2283 { # Rearrange file descriptors. Needed because "while ... done < ..."
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2284 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2285 exec 5<&0 < "$tmp"/dirs
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2286 while read d; do
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2287 mkdir -p "$testdir/$d"
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2288 done
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2289 exec 0<&5 5<&-
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2290 }
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2291
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2292 # Copy files or make symbolic links.
ae17dea0254d Create also all needed subdirectories. Bruno Haible <bruno@clisp.org> parents: 7600 diff changeset	2293 delimiter=' '
7321 3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2294 for f in $files; do echo $f; done \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2295 \| sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_files" \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2296 \| LC_ALL=C sort \
3bf1b669d1e1 Rewrite all file names at once. Bruno Haible <bruno@clisp.org> parents: 7320 diff changeset	2297 > "$tmp"/files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2298 { # Rearrange file descriptors. Needed because "while ... done < ..."
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2299 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
7368 a7abebdb07f4 * gnulib-tool (func_import, func_create_testdir): Fix typos in Eric Blake <ebb9@byu.net> parents: 7350 diff changeset	2300 exec 5<&0 < "$tmp"/files
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2301 while read g f; do
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2302 func_lookup_file "$f"
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2303 if test -n "$lookedup_tmp"; then
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2304 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	2305 else
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2306 ln "$lookedup_file" "$testdir/$g" 2>/dev/null \|\|
7643 d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2307 if { test -n "$symbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2308 \|\| { test -n "$lsymbolic" \
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2309 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; }; then
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2310 func_ln "$lookedup_file" "$testdir/$g"
d67f9dc6019d New option --local-symlink. Bruno Haible <bruno@clisp.org> parents: 7642 diff changeset	2311 else
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2312 cp -p "$lookedup_file" "$testdir/$g"
1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2313 fi
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2314 fi
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2315 done
7373 330a972d58f0 Tweak last patch, for symmetry. Bruno Haible <bruno@clisp.org> parents: 7368 diff changeset	2316 exec 0<&5 5<&-
7326 1ca1035630dd Avoid to execute while loops in a subshell. Bruno Haible <bruno@clisp.org> parents: 7323 diff changeset	2317 }
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2318
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2319 # Create $sourcebase/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2320 mkdir -p "$testdir/$sourcebase"
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2321 func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2322
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2323 # Create $m4base/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2324 mkdir -p "$testdir/$m4base"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2325 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2326 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2327 echo "EXTRA_DIST ="
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2328 for f in $files; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2329 case "$f" in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2330 m4/* )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2331 echo "EXTRA_DIST += "`echo "$f" \| sed -e 's,^m4/,,'` ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2332 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2333 done
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2334 ) > "$testdir/$m4base/Makefile.am"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2335
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2336 subdirs="$sourcebase $m4base"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2337 subdirs_with_configure_ac=""
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2338
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2339 if false && test -f "$testdir"/$m4base/gettext.m4; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2340 # Avoid stupid error message from automake:
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2341 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2342 mkdir -p "$testdir/po"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2343 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2344 ) > "$testdir/po/Makefile.am"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2345 func_append subdirs " po"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2346 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2347
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2348 if test -n "$inctests"; then
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2349 test -d "$testdir/$testsbase" \|\| mkdir "$testdir/$testsbase"
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2350 # Create $testsbase/Makefile.am.
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2351 func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am"
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2352 # Create $testsbase/configure.ac.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2353 (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	2354 echo "AC_INIT([dummy], [0])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2355 echo "AC_CONFIG_AUX_DIR([../$auxdir])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2356 echo "AM_INIT_AUTOMAKE"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2357 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2358 echo "AM_CONFIG_HEADER([config.h])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2359 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2360 echo "AC_PROG_CC"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2361 echo "AC_PROG_INSTALL"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2362 echo "AC_PROG_MAKE_SET"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2363 echo "AC_PROG_RANLIB"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2364 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2365 if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2366 echo "AC_GNU_SOURCE"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2367 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2368 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2369 if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2370 echo "gl_USE_SYSTEM_EXTENSIONS"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2371 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2372 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2373 if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
7187 89a978aa0b12 Separate the "early" and the "normal" part of the macro. Bruno Haible <bruno@clisp.org> parents: 7182 diff changeset	2374 echo "gl_LOCK_EARLY"
6549 2f04f595e14e Ensure automatic ordering between gl_LOCK and gl_ARGP. Bruno Haible <bruno@clisp.org> parents: 6548 diff changeset	2375 echo
2f04f595e14e Ensure automatic ordering between gl_LOCK and gl_ARGP. Bruno Haible <bruno@clisp.org> parents: 6548 diff changeset	2376 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2377 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2378 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2379 echo "gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2380 else
6418 e0a8b9b05999 Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6414 diff changeset	2381 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2382 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2383 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2384 echo "gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	2385 fi
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2386 # 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	2387 # 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	2388 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2389 # 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	2390 # 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	2391 # 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	2392 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2393 echo "AC_DEFUN([gl_INIT], ["
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2394 func_emit_initmacro_start
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2395 sed_replace_build_aux='
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2396 :a
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2397 /AC_CONFIG_FILES(.:build-aux\/.)/{
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2398 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)\|
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2399 ba
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2400 }'
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2401 sed_replace_build_aux=`echo "$sed_replace_build_aux" \| sed -e 1d -e 's/^ *//'`
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2402 # 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	2403 # 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	2404 # those of the tests.
7647 c26d75cebcfa Fix --create-testdir --with-tests. Bruno Haible <bruno@clisp.org> parents: 7646 diff changeset	2405 echo "gl_source_base='../$sourcebase'"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2406 for module in $modules; do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2407 func_verify_nontests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2408 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	2409 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	2410 \| sed -e "$sed_replace_build_aux"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2411 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2412 done
7647 c26d75cebcfa Fix --create-testdir --with-tests. Bruno Haible <bruno@clisp.org> parents: 7646 diff changeset	2413 echo "gl_source_base='.'"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2414 for module in $modules; do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2415 func_verify_tests_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2416 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	2417 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	2418 \| sed -e "$sed_replace_build_aux"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2419 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2420 done
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2421 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2422 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2423 if test "$libtool" != true; then
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2424 libname_upper=`echo "$libname" \| tr 'a-z' 'A-Z'`
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2425 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2426 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2427 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2428 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2429 fi
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2430 func_emit_initmacro_end
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2431 echo "])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2432 func_emit_initmacro_done
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2433 echo
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2434 echo "gl_INIT"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2435 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2436 # Usually $testsbase/config.h will be a superset of config.h. Verify this
e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2437 # by "merging" config.h into $testsbase/config.h; look out for gcc warnings.
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2438 echo "AH_TOP([#include \"../config.h\"])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2439 echo
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2440 echo "AC_OUTPUT([Makefile])"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2441 ) > "$testdir/$testsbase/configure.ac"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2442 func_append subdirs " $testsbase"
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2443 subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase"
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2444 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2445
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2446 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2447 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2448 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2449 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2450 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2451 echo "SUBDIRS = $subdirs"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2452 echo
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2453 echo "ACLOCAL_AMFLAGS = -I $m4base"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2454 ) > "$testdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2455
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2456 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2457 (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	2458 echo "AC_INIT([dummy], [0])"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2459 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2460 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2461 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2462 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2463 echo
6106 66bd85c8a9cd Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6039 diff changeset	2464 echo "AM_CONFIG_HEADER([config.h])"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2465 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2466 echo "AC_PROG_CC"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2467 echo "AC_PROG_INSTALL"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2468 echo "AC_PROG_MAKE_SET"
7106 b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	2469 echo
b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	2470 echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2471 echo "m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2472 echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2473 echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable"
7106 b9fff044578d Apply last patch also to --create-testdir. Bruno Haible <bruno@clisp.org> parents: 7105 diff changeset	2474 echo
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2475 echo "AC_PROG_RANLIB"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2476 echo
7641 d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2477 if test -n "$uses_subdirs"; then
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2478 echo "AM_PROG_CC_C_O"
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2479 echo
d6fbdb213b01 Finish support for source files in subdirectories. Bruno Haible <bruno@clisp.org> parents: 7640 diff changeset	2480 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2481 if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2482 echo "AC_GNU_SOURCE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2483 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2484 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2485 if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
4586 eb1b4acf2e86 Avoid autoconf/autoheader warning Bruno Haible <bruno@clisp.org> parents: 4325 diff changeset	2486 echo "gl_USE_SYSTEM_EXTENSIONS"
eb1b4acf2e86 Avoid autoconf/autoheader warning Bruno Haible <bruno@clisp.org> parents: 4325 diff changeset	2487 echo
eb1b4acf2e86 Avoid autoconf/autoheader warning Bruno Haible <bruno@clisp.org> parents: 4325 diff changeset	2488 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2489 if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then
7187 89a978aa0b12 Separate the "early" and the "normal" part of the macro. Bruno Haible <bruno@clisp.org> parents: 7182 diff changeset	2490 echo "gl_LOCK_EARLY"
6549 2f04f595e14e Ensure automatic ordering between gl_LOCK and gl_ARGP. Bruno Haible <bruno@clisp.org> parents: 6548 diff changeset	2491 echo
2f04f595e14e Ensure automatic ordering between gl_LOCK and gl_ARGP. Bruno Haible <bruno@clisp.org> parents: 6548 diff changeset	2492 fi
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2493 if test "$libtool" = true; then
c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2494 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2495 echo "gl_cond_libtool=true"
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2496 else
6418 e0a8b9b05999 Proper autoconf macro argument quoting. Bruno Haible <bruno@clisp.org> parents: 6414 diff changeset	2497 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2498 echo "gl_cond_libtool=false"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2499 echo "gl_libdeps="
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2500 echo "gl_ltlibdeps="
6414 46d47c8fe734 * gnulib-tool: Define automake conditional GL_COND_LIBTOOL if Simon Josefsson <simon@josefsson.org> parents: 6389 diff changeset	2501 fi
7348 7d0519d18212 Pass to the gl_GETLOADAVG macro the $gl_source_base from gnulib-tool. Bruno Haible <bruno@clisp.org> parents: 7347 diff changeset	2502 echo "gl_source_base='$sourcebase'"
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2503 # 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	2504 # 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	2505 # at the top level:
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2506 # 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	2507 # 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	2508 # 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	2509 # expansion total).
dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2510 echo "AC_DEFUN([gl_INIT], ["
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2511 func_emit_initmacro_start
6556 85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2512 if test "$auxdir" != "build-aux"; then
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2513 sed_replace_build_aux='
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2514 :a
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2515 /AC_CONFIG_FILES(.:build-aux\/.)/{
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2516 s\|AC_CONFIG_FILES($.$:build-aux/$.$)\|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)\|
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2517 ba
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2518 }'
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2519 sed_replace_build_aux=`echo "$sed_replace_build_aux" \| sed -e 1d -e 's/^ *//'`
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2520 else
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2521 sed_replace_build_aux=
85c3c00fcec1 Fix sed_replace_auxdir. Bruno Haible <bruno@clisp.org> parents: 6551 diff changeset	2522 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2523 for module in $modules; do
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2524 func_verify_nontests_module
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2525 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	2526 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	2527 \| sed -e "$sed_replace_build_aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2528 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2529 done
7286 727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2530 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2531 # created using libtool, because libtool already handles the dependencies.
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2532 if test "$libtool" != true; then
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2533 libname_upper=`echo "$libname" \| tr 'a-z' 'A-Z'`
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2534 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2535 echo " AC_SUBST([${libname_upper}_LIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2536 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\""
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2537 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])"
727bb5526bad For libraries not built with libtool: Bruno Haible <bruno@clisp.org> parents: 7270 diff changeset	2538 fi
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2539 func_emit_initmacro_end
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2540 echo "])"
7486 46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2541 func_emit_initmacro_done
46b72819ef52 Add support for multiple gnulib-tool invocations in the scope of a single Bruno Haible <bruno@clisp.org> parents: 7485 diff changeset	2542 echo
7090 dfc92f94c781 Allow AC_REQUIREs in the configure.ac snippet. Bruno Haible <bruno@clisp.org> parents: 7089 diff changeset	2543 echo "gl_INIT"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2544 echo
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2545 if test -n "$subdirs_with_configure_ac"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2546 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2547 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2548 makefiles="Makefile"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2549 for d in $subdirs; do
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2550 # 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	2551 # 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	2552 case " $subdirs_with_configure_ac " in
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2553 " $d ") ;;
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2554 *) func_append makefiles " $d/Makefile" ;;
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2555 esac
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2556 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2557 echo "AC_OUTPUT([$makefiles])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2558 ) > "$testdir/configure.ac"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2559
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2560 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2561 (cd "$testdir"
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2562 # Do not use "${AUTORECONF} --force --install", because it may invoke
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2563 # autopoint, which brings in older versions of some of our .m4 files.
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2564 if test -f $m4base/gettext.m4; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2565 echo "executing ${AUTOPOINT} --force"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2566 ${AUTOPOINT} --force \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2567 for f in $m4base/*.m4~; do
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2568 mv -f $f `echo $f \| sed -e 's,~$,,'` \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2569 done
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2570 fi
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2571 echo "executing ${ACLOCAL} -I $m4base"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2572 ${ACLOCAL} -I $m4base \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2573 if ! test -d build-aux; then
0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2574 echo "executing mkdir build-aux"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2575 mkdir build-aux \|\| func_exit 1
7485 0194db3ad154 Handle mismatch between latest gettext release and current gnulib. Bruno Haible <bruno@clisp.org> parents: 7484 diff changeset	2576 fi
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2577 echo "executing ${AUTOCONF}"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2578 ${AUTOCONF} \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2579 echo "executing ${AUTOHEADER}"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2580 ${AUTOHEADER} \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2581 echo "executing ${AUTOMAKE} --add-missing --copy"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2582 ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2583 ) \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2584 if test -n "$inctests"; then
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2585 # Create autogenerated files.
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2586 (cd "$testdir/$testsbase" \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2587 # Do not use "${AUTORECONF} --force --install", because it may invoke
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2588 # autopoint, which brings in older versions of some of our .m4 files.
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2589 if test -f ../$m4base/gettext.m4; then
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2590 echo "executing ${AUTOPOINT} --force"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2591 ${AUTOPOINT} --force \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2592 for f in ../$m4base/*.m4~; do
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2593 mv -f $f `echo $f \| sed -e 's,~$,,'` \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2594 done
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2595 fi
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2596 echo "executing ${ACLOCAL} -I ../$m4base"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2597 ${ACLOCAL} -I ../$m4base \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2598 if ! test -d ../build-aux; then
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2599 echo "executing mkdir ../build-aux"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2600 mkdir ../build-aux
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2601 fi
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2602 echo "executing ${AUTOCONF}"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2603 ${AUTOCONF} \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2604 echo "executing ${AUTOHEADER}"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2605 ${AUTOHEADER} \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2606 echo "executing ${AUTOMAKE} --add-missing --copy"
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2607 ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2608 ) \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2609 fi
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2610 if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > /dev/null; then
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2611 (cd "$testdir"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2612 ./configure \|\| func_exit 1
7195 e4a459055e78 Test other subdirectory names than 'lib' and 'm4'. Bruno Haible <bruno@clisp.org> parents: 7187 diff changeset	2613 cd "$sourcebase"
6389 c1766dccfd4f Simplification, from Stepan Kasal. Bruno Haible <bruno@clisp.org> parents: 6380 diff changeset	2614 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2615 make built_sources \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2616 cd ..
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2617 make distclean \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2618 ) \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2619 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2620 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2621
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2622 # func_create_megatestdir megatestdir allmodules
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2623 # Input:
7214 eb43edab28c3 Small fix after --local-dir introduction. Bruno Haible <bruno@clisp.org> parents: 7213 diff changeset	2624 # - local_gnulib_dir from --local-dir
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2625 # - 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	2626 func_create_megatestdir ()
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2627 {
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2628 megatestdir="$1"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2629 allmodules="$2"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2630 if test -z "$allmodules"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2631 allmodules=`func_all_modules`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2632 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2633
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2634 megasubdirs=
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2635 # First, all modules one by one.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2636 for onemodule in $allmodules; do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2637 func_create_testdir "$megatestdir/$onemodule" $onemodule
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2638 func_append megasubdirs "$onemodule "
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2639 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2640 # Then, all modules all together.
7350 6c5c8c8b93a3 Don't include the config-h module in megatestdir. Bruno Haible <bruno@clisp.org> parents: 7348 diff changeset	2641 # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2642 # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
7350 6c5c8c8b93a3 Don't include the config-h module in megatestdir. Bruno Haible <bruno@clisp.org> parents: 7348 diff changeset	2643 allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done`
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2644 func_create_testdir "$megatestdir/ALL" "$allmodules"
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2645 func_append megasubdirs "ALL"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2646
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2647 # Create Makefile.am.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2648 (echo "## Process this file with automake to produce Makefile.in."
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2649 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2650 echo "AUTOMAKE_OPTIONS = 1.5 foreign"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2651 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2652 echo "SUBDIRS = $megasubdirs"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2653 ) > "$megatestdir/Makefile.am"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2654
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2655 # Create configure.ac.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2656 (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	2657 echo "AC_INIT([dummy], [0])"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2658 if test "$auxdir" != "."; then
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2659 echo "AC_CONFIG_AUX_DIR([$auxdir])"
a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2660 fi
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2661 echo "AM_INIT_AUTOMAKE"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2662 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2663 echo "AC_PROG_MAKE_SET"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2664 echo
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2665 echo "AC_CONFIG_SUBDIRS([$megasubdirs])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2666 echo "AC_OUTPUT([Makefile])"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2667 ) > "$megatestdir/configure.ac"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2668
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2669 # Create autogenerated files.
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2670 (cd "$megatestdir"
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	2671 # 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	2672 # 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	2673 # 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	2674 echo "executing ${ACLOCAL}"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2675 ${ACLOCAL} \|\| func_exit 1
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	2676 echo "executing mkdir build-aux"
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	2677 mkdir build-aux
1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	2678 echo "executing ${AUTOCONF}"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2679 ${AUTOCONF} \|\| func_exit 1
6547 1a65fb7ddbbb Don't waste time in a recursive autoreconf. Bruno Haible <bruno@clisp.org> parents: 6546 diff changeset	2680 echo "executing ${AUTOMAKE} --add-missing --copy"
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2681 ${AUTOMAKE} --add-missing --copy \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2682 ) \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2683 }
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2684
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2685 case $mode in
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2686 "" )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2687 func_fatal_error "no mode specified" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2688
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2689 list )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2690 func_all_modules
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2691 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2692
6443 1a35941d29ab Implement the --update option. Bruno Haible <bruno@clisp.org> parents: 6425 diff changeset	2693 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	2694
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2695 # Where to import.
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2696 if test -z "$destdir"; then
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2697 destdir=.
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2698 fi
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2699 test -d "$destdir" \
eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2700 \|\| 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	2701
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2702 # 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	2703 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	2704 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	2705 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2706 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	2707 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	2708 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2709 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	2710 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2711 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2712
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2713 # Analyze configure.ac.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2714 guessed_auxdir="."
7077 c2122624e8ed New option --no-libtool. Bruno Haible <bruno@clisp.org> parents: 7076 diff changeset	2715 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	2716 my_sed_traces='
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2717 s,#.*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2718 s,^dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2719 s, dnl .*$,,
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2720 /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	2721 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	2722 }
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2723 /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	2724 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	2725 }'
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2726 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	2727
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2728 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	2729 auxdir="$guessed_auxdir"
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2730 fi
5202 64446bf39961 Use sed instead of autoconf --trace, inspired by Paul Eggert <eggert@cs.ucla.edu> parents: 5198 diff changeset	2731
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2732 # 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	2733 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	2734 # 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	2735 # Any number of additional modules can be given.
6204 104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2736 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2737 # First use of gnulib in the given m4base.
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2738 test -n "$supplied_libname" \|\| supplied_libname=true
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2739 test -n "$sourcebase" \|\| sourcebase="lib"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2740 test -n "$docbase" \|\| docbase="doc"
6262 bef30dac846f Provide a default for --tests-base. Bruno Haible <bruno@clisp.org> parents: 6250 diff changeset	2741 test -n "$testsbase" \|\| testsbase="tests"
6204 104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2742 test -n "$macro_prefix" \|\| macro_prefix="gl"
104bcb14d247 Provide defaults where needed. Bruno Haible <bruno@clisp.org> parents: 6199 diff changeset	2743 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2744 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2745 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2746 # 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	2747 # 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	2748 # 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	2749 # "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	2750 m4dirs=
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2751 m4dirs_count=0
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2752 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	2753 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	2754 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2755 for arg in $aclocal_amflags; do
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2756 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	2757 # 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	2758 case "$arg" in
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2759 /*) ;;
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2760 *)
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2761 if test -f "$destdir/$arg"/gnulib-cache.m4; then
7323 7ca0e325d5db Avoid quadratic complexity due to string concatenations. Bruno Haible <bruno@clisp.org> parents: 7322 diff changeset	2762 func_append m4dirs " $arg"
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2763 m4dirs_count=`expr $m4dirs_count + 1`
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2764 fi
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2765 ;;
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2766 esac
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2767 else
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2768 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	2769 m4dir_is_next=yes
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2770 else
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2771 m4dir_is_next=
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2772 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2773 fi
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2774 done
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2775 else
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2776 # 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	2777 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	2778 sedexpr1='s,^m4_include(\[$.*$])$,\1,p'
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2779 sedexpr2='s,^[^/]*$,.,'
a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2780 sedexpr3='s,/[^/]*$,,'
7319 1726cc39709b Use "sort -u" where it makes sense. Bruno Haible <bruno@clisp.org> parents: 7299 diff changeset	2781 m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 \| sed -e "$sedexpr2" -e "$sedexpr3" \| LC_ALL=C sort -u`
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2782 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	2783 fi
7072 a1e9235fc6ff Support projects without a top-level Makefile.am. Bruno Haible <bruno@clisp.org> parents: 7071 diff changeset	2784 fi
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2785 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	2786 # 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	2787 # 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	2788 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	2789 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	2790 m4base="m4"
6955 7715890c929a * gnulib-tool: List --doc-base before --tests-base. Eric Blake <ebb9@byu.net> parents: 6952 diff changeset	2791 test -n "$docbase" \|\| docbase="doc"
6262 bef30dac846f Provide a default for --tests-base. Bruno Haible <bruno@clisp.org> parents: 6250 diff changeset	2792 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	2793 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	2794 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2795 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2796 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	2797 # 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	2798 # 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	2799 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	2800 func_import "$*"
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2801 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2802 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2803 # 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	2804 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	2805 # 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	2806 for m4base in $m4dirs; do
7239 e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	2807 # Perform func_import in a subshell, so that variable values
e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	2808 # such as
e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	2809 # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase,
e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	2810 # testsbase, libname, lgpl, makefile_name, libtool, macro_prefix
e6f5fe9992ff Fix problem when calling "gnulib-tool --update" on multiple directories. Bruno Haible <bruno@clisp.org> parents: 7235 diff changeset	2811 # don't propagate from one directory to another.
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	2812 (func_import) \|\| func_exit 1
6183 d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2813 done
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2814 else
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2815 # Really ambiguous.
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2816 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	2817 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2818 fi
d12635ef6eb5 Make it possible to use multiple gnulib instantiations with the same Bruno Haible <bruno@clisp.org> parents: 6182 diff changeset	2819 fi
6178 3830993b4c7a Rename some variables. Bruno Haible <bruno@clisp.org> parents: 6177 diff changeset	2820 fi
5343 eae956a8e0ec Untabify. Bruno Haible <bruno@clisp.org> parents: 5312 diff changeset	2821 ;;
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2822
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2823 create-testdir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2824 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2825 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2826 fi
4126 e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	2827 mkdir "$destdir"
e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	2828 test -d "$destdir" \
e8caa337b4e1 (create-testdir): don't complain if destdir Karl Berry <karl@freefriends.org> parents: 4124 diff changeset	2829 \|\| func_fatal_error "could not create destination directory"
6109 a52f596fdf00 Generalize support for --aux-dir. Bruno Haible <bruno@clisp.org> parents: 6108 diff changeset	2830 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2831 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2832 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2833
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2834 create-megatestdir )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2835 if test -z "$destdir"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2836 func_fatal_error "please specify --dir option"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2837 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2838 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	2839 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2840 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2841 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2842
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2843 test )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2844 test -n "$destdir" \|\| destdir=testdir$$
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2845 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	2846 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2847 func_create_testdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2848 cd "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2849 mkdir build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2850 cd build
7638 581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2851 ../configure \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2852 make \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2853 make check \|\| func_exit 1
581c011e05d6 * gnulib-tool (func_create_testdir): Fix replacement of Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7605 diff changeset	2854 make distclean \|\| func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2855 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2856 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2857 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2858 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	2859 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2860 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2861 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2862 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2863 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2864 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2865
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2866 megatest )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2867 test -n "$destdir" \|\| destdir=testdir$$
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2868 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	2869 test -n "$auxdir" \|\| auxdir="build-aux"
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2870 func_create_megatestdir "$destdir" "$*"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2871 cd "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2872 mkdir build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2873 cd build
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2874 ../configure
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2875 make
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2876 make check
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2877 make distclean
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2878 remaining=`find . -type f -print`
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2879 if test -n "$remaining"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2880 echo "Remaining files:" $remaining 1>&2
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2881 echo "gnulib-tool: *** Stop." 1>&2
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	2882 func_exit 1
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2883 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2884 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2885 cd ..
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2886 rm -rf "$destdir"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2887 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2888
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2889 extract-description )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2890 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2891 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2892 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2893 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2894 func_get_description "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2895 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2896 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2897 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2898
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2899 extract-filelist )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2900 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2901 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2902 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2903 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2904 func_get_filelist "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2905 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2906 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2907 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2908
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2909 extract-dependencies )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2910 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2911 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2912 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2913 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2914 func_get_dependencies "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2915 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2916 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2917 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2918
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2919 extract-autoconf-snippet )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2920 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2921 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2922 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2923 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2924 func_get_autoconf_snippet "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2925 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2926 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2927 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2928
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2929 extract-automake-snippet )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2930 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2931 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2932 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2933 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2934 func_get_automake_snippet "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2935 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2936 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2937 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2938
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2939 extract-include-directive )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2940 for module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2941 do
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2942 func_verify_module
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2943 if test -n "$module"; then
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2944 func_get_include_directive "$module"
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2945 fi
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2946 done
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2947 ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2948
5251 42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2949 extract-license )
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2950 for module
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2951 do
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2952 func_verify_module
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2953 if test -n "$module"; then
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2954 func_get_license "$module"
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2955 fi
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2956 done
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2957 ;;
42b53a22aee5 Add a license tag to every module. Bruno Haible <bruno@clisp.org> parents: 5250 diff changeset	2958
4197 3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2959 extract-maintainer )
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2960 for module
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2961 do
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2962 func_verify_module
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2963 if test -n "$module"; then
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2964 func_get_maintainer "$module"
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2965 fi
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2966 done
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2967 ;;
3ccc6d0d52bb Add a Maintainer. Bruno Haible <bruno@clisp.org> parents: 4175 diff changeset	2968
6113 dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2969 extract-tests-module )
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2970 for module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2971 do
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2972 func_verify_module
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2973 if test -n "$module"; then
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2974 func_get_tests_module "$module"
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2975 fi
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2976 done
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2977 ;;
dac0e048bd40 Support for unit test modules. Bruno Haible <bruno@clisp.org> parents: 6111 diff changeset	2978
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2979 * )
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2980 func_fatal_error "unknown operation mode --$mode" ;;
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2981 esac
98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2982
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2983 rm -rf "$tmp"
eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2984 # Undo the effect of the previous 'trap' command. Some shellology:
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	2985 # We cannot use "trap - 0 1 2 3 13 15", because Solaris sh would attempt to
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2986 # 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	2987 # 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	2988 # 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	2989 trap '' 0
7332 dd6e80d0c89e * gnulib-tool (func_exit): New function, to allow to pass the Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parents: 7327 diff changeset	2990 trap 'func_exit $?' 1 2 3 13 15
7073 eb23418a908e Make it possible to use a locally augmented gnulib. Bruno Haible <bruno@clisp.org> parents: 7072 diff changeset	2991
4112 98e795b64056 Tool for managing gnulib modules. Bruno Haible <bruno@clisp.org> parents: diff changeset	2992 exit 0
7241 aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	2993
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	2994 # Local Variables:
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	2995 # indent-tabs-mode: nil
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	2996 # whitespace-check-buffer-indent: nil
aed440dca701 * gnulib-tool: Don't let emacs change spaces to TAB. Eric Blake <ebb9@byu.net> parents: 7240 diff changeset	2997 # End:

Mercurial > gnulib

annotate gnulib-tool @ 7647:c26d75cebcfa