gnulib: gnulib-tool annotate

annotate gnulib-tool @ 7332:dd6e80d0c89e

* gnulib-tool (func_exit): New function, to allow to pass the exit status portably through the trap. Use everywhere. (--help, --version): Signal a write error. (trap): catch SIGPIPE, for write errors. Exit at the end of the trap, with the correct exit status.

author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
date	Tue, 19 Sep 2006 06:03:01 +0000
parents	6db875979695
children	6a496bee90ff

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

Mercurial > gnulib

annotate gnulib-tool @ 7332:dd6e80d0c89e