octave: bootstrap annotate

annotate bootstrap @ 28019:c45a0d7e9385

maint: merge stable to default

author	Mike Miller <mtmiller@octave.org>
date	Mon, 27 Jan 2020 10:34:00 -0800
parents	626ba7cc1d6c f6b390541a37
children	f00e92f9e85b

rev	line source
3298 aaf82ff88c82 [project @ 1999-10-19 17:58:31 by jwe] jwe parents: diff changeset	1 #! /bin/sh
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	2 # Print a version string.
28016 626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	3 scriptversion=2019-01-04.17; # UTC
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	4
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	5 # Bootstrap this package from checked-out sources.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	6
28016 626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	7 # Copyright (C) 2003-2020 Free Software Foundation, Inc.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	8
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	9 # This program is free software: you can redistribute it and/or modify
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	10 # it under the terms of the GNU General Public License as published by
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	11 # the Free Software Foundation, either version 3 of the License, or
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	12 # (at your option) any later version.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	13
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	14 # This program is distributed in the hope that it will be useful,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	15 # but WITHOUT ANY WARRANTY; without even the implied warranty of
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	17 # GNU General Public License for more details.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	18
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	19 # You should have received a copy of the GNU General Public License
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 22323 diff changeset	20 # along with this program. If not, see <https://www.gnu.org/licenses/>.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	21
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	22 # Originally written by Paul Eggert. The canonical version of this
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	23 # script is maintained as build-aux/bootstrap in gnulib, however, to
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	24 # be useful to your project, you should place a copy of it under
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	25 # version control in the top-level directory of your project. The
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	26 # intent is that all customization can be done with a bootstrap.conf
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	27 # file also maintained in your version control; gnulib comes with a
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	28 # template build-aux/bootstrap.conf to get you started.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	29
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	30 # Please report bugs or propose patches to bug-gnulib@gnu.org.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	31
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	32 nl='
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	33 '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	34
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	35 # Ensure file names are sorted consistently across platforms.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	36 LC_ALL=C
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	37 export LC_ALL
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	38
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	39 # Ensure that CDPATH is not set. Otherwise, the output from cd
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	40 # would cause trouble in at least one use below.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	41 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	42
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	43 local_gl_dir=gl
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	44
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	45 # Honor $PERL, but work even if there is none.
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	46 PERL="${PERL-perl}"
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	47
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	48 me=$0
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	49
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	50 default_gnulib_url=git://git.sv.gnu.org/gnulib
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	51
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	52 usage() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	53 cat <<EOF
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	54 Usage: $me [OPTION]...
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	55 Bootstrap this package from the checked-out sources.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	56
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	57 Options:
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	58 --gnulib-srcdir=DIRNAME specify the local directory where gnulib
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	59 sources reside. Use this if you already
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	60 have gnulib sources on your machine, and
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	61 do not want to waste your bandwidth downloading
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	62 them again. Defaults to \$GNULIB_SRCDIR
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	63 --bootstrap-sync if this bootstrap script is not identical to
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	64 the version in the local gnulib sources,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	65 update this script, and then restart it with
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	66 /bin/sh or the shell \$CONFIG_SHELL
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	67 --no-bootstrap-sync do not check whether bootstrap is out of sync
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	68 --copy copy files instead of creating symbolic links
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	69 --force attempt to bootstrap even if the sources seem
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	70 not to have been checked out
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	71 --no-git do not use git to update gnulib. Requires that
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	72 --gnulib-srcdir point to a correct gnulib snapshot
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	73 --skip-po do not download po files
3298 aaf82ff88c82 [project @ 1999-10-19 17:58:31 by jwe] jwe parents: diff changeset	74
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	75 If the file $me.conf exists in the same directory as this script, its
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	76 contents are read as shell variables to configure the bootstrap.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	77
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	78 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	79 are honored.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	80
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	81 Gnulib sources can be fetched in various ways:
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	82
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	83 * If this package is in a git repository with a 'gnulib' submodule
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	84 configured, then that submodule is initialized and updated and sources
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	85 are fetched from there. If \$GNULIB_SRCDIR is set (directly or via
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	86 --gnulib-srcdir) and is a git repository, then it is used as a reference.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	87
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	88 * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	89 then sources are fetched from that local directory. If it is a git
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	90 repository and \$GNULIB_REVISION is set, then that revision is checked
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	91 out.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	92
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	93 * Otherwise, if this package is in a git repository with a 'gnulib'
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	94 submodule configured, then that submodule is initialized and updated and
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	95 sources are fetched from there.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	96
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	97 * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	98 cloned into that directory using git from \$GNULIB_URL, defaulting to
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	99 $default_gnulib_url.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	100 If \$GNULIB_REVISION is set, then that revision is checked out.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	101
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	102 * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	103 used. If it is a git repository and \$GNULIB_REVISION is set, then that
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	104 revision is checked out.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	105
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	106 If you maintain a package and want to pin a particular revision of the
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	107 Gnulib sources that has been tested with your package, then there are two
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	108 possible approaches: either configure a 'gnulib' submodule with the
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	109 appropriate revision, or set \$GNULIB_REVISION (and if necessary
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	110 \$GNULIB_URL) in $me.conf.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	111
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	112 Running without arguments will suffice in most cases.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	113 EOF
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	114 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	115
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	116 # warnf_ FORMAT-STRING ARG1...
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	117 warnf_ ()
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	118 {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	119 warnf_format_=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	120 shift
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	121 nl='
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	122 '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	123 case $* in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	124 $nl) me_=$(printf "$me"\|tr "$nl\|" '??')
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	125 printf "$warnf_format_" "$@" \| sed "s\|^\|$me_: \|" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	126 *) printf "$me: $warnf_format_" "$@" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	127 esac >&2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	128 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	129
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	130 # warn_ WORD1...
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	131 warn_ ()
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	132 {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	133 # If IFS does not start with ' ', set it and emit the warning in a subshell.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	134 case $IFS in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	135 ' ') warnf_ '%s\n' "$";;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	136 *) (IFS=' '; warn_ "$@");;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	137 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	138 }
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	139
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	140 # die WORD1...
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	141 die() { warn_ "$@"; exit 1; }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	142
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	143 # Configuration.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	144
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	145 # Name of the Makefile.am
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	146 gnulib_mk=gnulib.mk
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	147
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	148 # List of gnulib modules needed.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	149 gnulib_modules=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	150
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	151 # Any gnulib files needed that are not in modules.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	152 gnulib_files=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	153
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	154 : ${AUTOPOINT=autopoint}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	155 : ${AUTORECONF=autoreconf}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	156
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	157 # A function to be called right after gnulib-tool is run.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	158 # Override it via your own definition in bootstrap.conf.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	159 bootstrap_post_import_hook() { :; }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	160
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	161 # A function to be called after everything else in this script.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	162 # Override it via your own definition in bootstrap.conf.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	163 bootstrap_epilogue() { :; }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	164
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	165 # The command to download all .po files for a specified domain into a
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	166 # specified directory. Fill in the first %s with the destination
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	167 # directory and the second with the domain name.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	168 po_download_command_format=\
28016 626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	169 "wget --mirror --level=1 -nd -nv -A.po -P '%s' \
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	170 https://translationproject.org/latest/%s/"
12158 a73df5341f3c autogen.sh: check for required files instead of having automake do it John W. Eaton <jwe@octave.org> parents: 9946 diff changeset	171
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	172 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	173 # fall back to the package name (1st argument with munging)
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	174 extract_package_name='
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	175 /^AC_INIT(\[*/{
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	176 s///
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	177 /^[^,],[^,],[^,],[ []$[^][ ,)]$/{
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	178 s//\1/
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	179 s/[],)].*//
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	180 p
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	181 q
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	182 }
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	183 s/[],)].*//
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	184 s/^GNU //
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	185 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	186 s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	187 p
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	188 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	189 '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	190 package=$(sed -n "$extract_package_name" configure.ac) \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	191 \|\| die 'cannot find package name in configure.ac'
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	192 gnulib_name=lib$package
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	193
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	194 build_aux=build-aux
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	195 source_base=lib
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	196 m4_base=m4
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	197 doc_base=doc
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	198 tests_base=tests
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	199 gnulib_extra_files="
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	200 build-aux/install-sh
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	201 build-aux/mdate-sh
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	202 build-aux/texinfo.tex
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	203 build-aux/depcomp
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	204 build-aux/config.guess
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	205 build-aux/config.sub
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	206 doc/INSTALL
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	207 "
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	208
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	209 # Additional gnulib-tool options to use. Use "\newline" to break lines.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	210 gnulib_tool_option_extras=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	211
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	212 # Other locale categories that need message catalogs.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	213 EXTRA_LOCALE_CATEGORIES=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	214
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	215 # Additional xgettext options to use. Use "\\\newline" to break lines.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	216 XGETTEXT_OPTIONS='\\\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	217 --flag=_:1:pass-c-format\\\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	218 --flag=N_:1:pass-c-format\\\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	219 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	220 '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	221
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	222 # Package bug report address and copyright holder for gettext files
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	223 COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	224 MSGID_BUGS_ADDRESS=bug-$package@gnu.org
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	225
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	226 # Files we don't want to import.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	227 excluded_files=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	228
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	229 # File that should exist in the top directory of a checked out hierarchy,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	230 # but not in a distribution tarball.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	231 checkout_only_file=README-hacking
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	232
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	233 # Whether to use copies instead of symlinks.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	234 copy=false
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	235
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	236 # Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	237 # those files to be generated in directories like lib/, m4/, and po/.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	238 # Or set it to 'auto' to make this script select which to use based
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	239 # on which version control system (if any) is used in the source directory.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	240 vc_ignore=auto
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	241
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	242 # Set this to true in bootstrap.conf to enable --bootstrap-sync by
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	243 # default.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	244 bootstrap_sync=false
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	245
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	246 # Use git to update gnulib sources
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	247 use_git=true
12158 a73df5341f3c autogen.sh: check for required files instead of having automake do it John W. Eaton <jwe@octave.org> parents: 9946 diff changeset	248
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	249 check_exists() {
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	250 if test "$1" = "--verbose"; then
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	251 ($2 --version </dev/null) >/dev/null 2>&1
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	252 if test $? -ge 126; then
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	253 # If not found, run with diagnostics as one may be
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	254 # presented with env variables to set to find the right version
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	255 ($2 --version </dev/null)
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	256 fi
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	257 else
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	258 ($1 --version </dev/null) >/dev/null 2>&1
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	259 fi
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	260
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	261 test $? -lt 126
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	262 }
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	263
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	264 # find_tool ENVVAR NAMES...
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	265 # -------------------------
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	266 # Search for a required program. Use the value of ENVVAR, if set,
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	267 # otherwise find the first of the NAMES that can be run.
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	268 # If found, set ENVVAR to the program name, die otherwise.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	269 #
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	270 # FIXME: code duplication, see also gnu-web-doc-update.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	271 find_tool ()
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	272 {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	273 find_tool_envvar=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	274 shift
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	275 find_tool_names=$@
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	276 eval "find_tool_res=\$$find_tool_envvar"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	277 if test x"$find_tool_res" = x; then
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	278 for i; do
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	279 if check_exists $i; then
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	280 find_tool_res=$i
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	281 break
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	282 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	283 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	284 fi
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	285 if test x"$find_tool_res" = x; then
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	286 warn_ "one of these is required: $find_tool_names;"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	287 die "alternatively set $find_tool_envvar to a compatible tool"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	288 fi
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	289 eval "$find_tool_envvar=\$find_tool_res"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	290 eval "export $find_tool_envvar"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	291 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	292
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	293 # Override the default configuration, if necessary.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	294 # Make sure that bootstrap.conf is sourced from the current directory
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	295 # if we were invoked as "sh bootstrap".
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	296 case "$0" in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	297 /) test -r "$0.conf" && . "$0.conf" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	298 *) test -r "$0.conf" && . ./"$0.conf" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	299 esac
12158 a73df5341f3c autogen.sh: check for required files instead of having automake do it John W. Eaton <jwe@octave.org> parents: 9946 diff changeset	300
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	301 if test "$vc_ignore" = auto; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	302 vc_ignore=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	303 test -d .git && vc_ignore=.gitignore
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	304 test -d CVS && vc_ignore="$vc_ignore .cvsignore"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	305 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	306
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	307 if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	308 use_gnulib=false
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	309 else
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	310 use_gnulib=true
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	311 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	312
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	313 # Translate configuration into internal form.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	314
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	315 # Parse options.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	316
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	317 for option
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	318 do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	319 case $option in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	320 --help)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	321 usage
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	322 exit;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	323 --gnulib-srcdir=*)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	324 GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	325 --skip-po)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	326 SKIP_PO=t;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	327 --force)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	328 checkout_only_file=;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	329 --copy)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	330 copy=true;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	331 --bootstrap-sync)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	332 bootstrap_sync=true;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	333 --no-bootstrap-sync)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	334 bootstrap_sync=false;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	335 --no-git)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	336 use_git=false;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	337 *)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	338 die "$option: unknown option";;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	339 esac
12158 a73df5341f3c autogen.sh: check for required files instead of having automake do it John W. Eaton <jwe@octave.org> parents: 9946 diff changeset	340 done
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	341
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	342 $use_git \|\| test -d "$GNULIB_SRCDIR" \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	343 \|\| die "Error: --no-git requires --gnulib-srcdir"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	344
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	345 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	346 die "Bootstrapping from a non-checked-out distribution is risky."
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	347 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	348
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	349 # Strip blank and comment lines to leave significant entries.
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	350 gitignore_entries() {
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	351 sed '/^#/d; /^$/d' "$@"
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	352 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	353
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	354 # If $STR is not already on a line by itself in $FILE, insert it at the start.
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	355 # Entries are inserted at the start of the ignore list to ensure existing
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	356 # entries starting with ! are not overridden. Such entries support
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	357 # whitelisting exceptions after a more generic blacklist pattern.
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	358 insert_if_absent() {
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	359 file=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	360 str=$2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	361 test -f $file \|\| touch $file
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	362 test -r $file \|\| die "Error: failed to read ignore file: $file"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	363 duplicate_entries=$(gitignore_entries $file \| sort \| uniq -d)
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	364 if [ "$duplicate_entries" ] ; then
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	365 die "Error: Duplicate entries in $file: " $duplicate_entries
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	366 fi
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	367 linesold=$(gitignore_entries $file \| wc -l)
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	368 linesnew=$( { echo "$str"; cat $file; } \| gitignore_entries \| sort -u \| wc -l)
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	369 if [ $linesold != $linesnew ] ; then
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	370 { echo "$str" \| cat - $file > $file.bak && mv $file.bak $file; } \
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	371 \|\| die "insert_if_absent $file $str: failed"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	372 fi
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	373 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	374
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	375 # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	376 # insert_if_absent.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	377 insert_vc_ignore() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	378 vc_ignore_file="$1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	379 pattern="$2"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	380 case $vc_ignore_file in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	381 *.gitignore)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	382 # A .gitignore entry that does not start with '/' applies
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	383 # recursively to subdirectories, so prepend '/' to every
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	384 # .gitignore entry.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	385 pattern=$(echo "$pattern" \| sed s,^,/,);;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	386 esac
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	387 insert_if_absent "$vc_ignore_file" "$pattern"
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	388 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	389
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	390 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	391 found_aux_dir=no
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	392 grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	393 >/dev/null && found_aux_dir=yes
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	394 grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	395 >/dev/null && found_aux_dir=yes
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	396 test $found_aux_dir = yes \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	397 \|\| die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	398
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	399 # If $build_aux doesn't exist, create it now, otherwise some bits
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	400 # below will malfunction. If creating it, also mark it as ignored.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	401 if test ! -d $build_aux; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	402 mkdir $build_aux
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	403 for dot_ig in x $vc_ignore; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	404 test $dot_ig = x && continue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	405 insert_vc_ignore $dot_ig $build_aux
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	406 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	407 fi
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	408
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	409 # Note this deviates from the version comparison in automake
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	410 # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	411 # but this should suffice as we won't be specifying old
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	412 # version formats or redundant trailing .0 in bootstrap.conf.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	413 # If we did want full compatibility then we should probably
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	414 # use m4_version_compare from autoconf.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	415 sort_ver() { # sort -V is not generally available
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	416 ver1="$1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	417 ver2="$2"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	418
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	419 # split on '.' and compare each component
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	420 i=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	421 while : ; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	422 p1=$(echo "$ver1" \| cut -d. -f$i)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	423 p2=$(echo "$ver2" \| cut -d. -f$i)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	424 if [ ! "$p1" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	425 echo "$1 $2"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	426 break
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	427 elif [ ! "$p2" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	428 echo "$2 $1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	429 break
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	430 elif [ ! "$p1" = "$p2" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	431 if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	432 echo "$2 $1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	433 elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	434 echo "$1 $2"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	435 else # numeric, then lexicographic comparison
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	436 lp=$(printf "$p1\n$p2\n" \| LANG=C sort -n \| tail -n1)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	437 if [ "$lp" = "$p2" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	438 echo "$1 $2"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	439 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	440 echo "$2 $1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	441 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	442 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	443 break
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	444 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	445 i=$(($i+1))
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	446 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	447 }
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	448
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	449 get_version_sed='
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	450 # Move version to start of line.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	451 s/.*[v ]$[0-9]$/\1/
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	452
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	453 # Skip lines that do not start with version.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	454 /^[0-9]/!d
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	455
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	456 # Remove characters after the version.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	457 s/[^.a-z0-9-].*//
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	458
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	459 # The first component must be digits only.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	460 s/^$[0-9]$[a-z-]./\1/
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	461
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	462 #the following essentially does s/5.005/5.5/
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	463 s/\.0*$[1-9]$/.\1/g
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	464 p
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	465 q'
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	466
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	467 get_version() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	468 app=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	469
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	470 $app --version >/dev/null 2>&1 \|\| { $app --version; return 1; }
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	471
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	472 $app --version 2>&1 \| sed -n "$get_version_sed"
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	473 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	474
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	475 check_versions() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	476 ret=0
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	477
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	478 while read app req_ver; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	479 # We only need libtoolize from the libtool package.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	480 if test "$app" = libtool; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	481 app=libtoolize
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	482 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	483 # Exempt git if --no-git is in effect.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	484 if test "$app" = git; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	485 $use_git \|\| continue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	486 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	487 # Honor $APP variables ($TAR, $AUTOCONF, etc.)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	488 appvar=$(echo $app \| LC_ALL=C tr '[a-z]-' '[A-Z]_')
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	489 test "$appvar" = TAR && appvar=AMTAR
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	490 case $appvar in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	491 GZIP) ;; # Do not use $GZIP: it contains gzip options.
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	492 PERL::*) ;; # Keep perl modules as-is
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	493 *) eval "app=\${$appvar-$app}" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	494 esac
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	495
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	496 # Handle the still-experimental Automake-NG programs specially.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	497 # They remain named as the mainstream Automake programs ("automake",
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	498 # and "aclocal") to avoid gratuitous incompatibilities with
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	499 # pre-existing usages (by, say, autoreconf, or custom autogen.sh
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	500 # scripts), but correctly identify themselves (as being part of
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	501 # "GNU automake-ng") when asked their version.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	502 case $app in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	503 automake-ng\|aclocal-ng)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	504 app=${app%-ng}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	505 ($app --version \| grep '(GNU automake-ng)') >/dev/null 2>&1 \|\| {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	506 warn_ "Error: '$app' not found or not from Automake-NG"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	507 ret=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	508 continue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	509 } ;;
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	510 # Another check is for perl modules. These can be written as
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	511 # e.g. perl::XML::XPath in case of XML::XPath module, etc.
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	512 perl::*)
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	513 # Extract module name
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	514 app="${app#perl::}"
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	515 if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	516 warn_ "Error: perl module '$app' not found"
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	517 ret=1
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	518 fi
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	519 continue
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	520 ;;
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	521 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	522 if [ "$req_ver" = "-" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	523 # Merely require app to exist; not all prereq apps are well-behaved
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	524 # so we have to rely on $? rather than get_version.
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	525 if ! check_exists --verbose $app; then
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	526 warn_ "Error: '$app' not found"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	527 ret=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	528 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	529 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	530 # Require app to produce a new enough version string.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	531 inst_ver=$(get_version $app)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	532 if [ ! "$inst_ver" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	533 warn_ "Error: '$app' not found"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	534 ret=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	535 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	536 latest_ver=$(sort_ver $req_ver $inst_ver \| cut -d' ' -f2)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	537 if [ ! "$latest_ver" = "$inst_ver" ]; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	538 warnf_ '%s\n' \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	539 "Error: '$app' version == $inst_ver is too old" \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	540 " '$app' version >= $req_ver is required"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	541 ret=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	542 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	543 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	544 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	545 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	546
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	547 return $ret
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	548 }
3298 aaf82ff88c82 [project @ 1999-10-19 17:58:31 by jwe] jwe parents: diff changeset	549
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	550 print_versions() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	551 echo "Program Min_version"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	552 echo "----------------------"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	553 printf %s "$buildreq"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	554 echo "----------------------"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	555 # can't depend on column -t
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	556 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	557
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	558 # Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	559 # Also find the compatible sha1 utility on the BSDs
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	560 if test x"$SKIP_PO" = x; then
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	561 find_tool SHA1SUM sha1sum gsha1sum shasum sha1
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	562 fi
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	563
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	564 use_libtool=0
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	565 # We'd like to use grep -E, to see if any of LT_INIT,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	566 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	567 # but that's not portable enough (e.g., for Solaris).
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	568 grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	569 && use_libtool=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	570 grep '^[ ]*LT_INIT' configure.ac >/dev/null \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	571 && use_libtool=1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	572 if test $use_libtool = 1; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	573 find_tool LIBTOOLIZE glibtoolize libtoolize
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	574 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	575
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	576 # gnulib-tool requires at least automake and autoconf.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	577 # If either is not listed, add it (with minimum version) as a prerequisite.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	578 case $buildreq in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	579 automake) ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	580 *) buildreq="automake 1.9
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	581 $buildreq" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	582 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	583 case $buildreq in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	584 autoconf) ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	585 *) buildreq="autoconf 2.59
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	586 $buildreq" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	587 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	588
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	589 # When we can deduce that gnulib-tool will require patch,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	590 # and when patch is not already listed as a prerequisite, add it, too.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	591 if test -d "$local_gl_dir" \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	592 && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	593 case $buildreq in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	594 patch) ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	595 *) buildreq="patch -
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	596 $buildreq" ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	597 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	598 fi
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	599
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	600 if ! printf "$buildreq" \| check_versions; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	601 echo >&2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	602 if test -f README-prereq; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	603 die "See README-prereq for how to get the prerequisite programs"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	604 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	605 die "Please install the prerequisite programs"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	606 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	607 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	608
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	609 # Warn the user if autom4te appears to be broken; this causes known
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	610 # issues with at least gettext 0.18.3.
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	611 probe=$(echo 'm4_quote([hi])' \| autom4te -l M4sugar -t 'm4_quote:$%' -)
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	612 if test "x$probe" != xhi; then
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	613 warn_ "WARNING: your autom4te wrapper eats stdin;"
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	614 warn_ "if bootstrap fails, consider upgrading your autotools"
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	615 fi
2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	616
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	617 echo "$0: Bootstrapping from checked-out $package sources..."
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	618
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	619 # See if we can use gnulib's git-merge-changelog merge driver.
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	620 if $use_git && test -d .git && check_exists git; then
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	621 if git config merge.merge-changelog.driver >/dev/null ; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	622 :
20460 2de0eb7405e4 * bootstrap: Update from gnulib sources. John W. Eaton <jwe@octave.org> parents: 17299 diff changeset	623 elif check_exists git-merge-changelog; then
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	624 echo "$0: initializing git-merge-changelog driver"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	625 git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	626 git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	627 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	628 echo "$0: consider installing git-merge-changelog from gnulib"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	629 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	630 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	631
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	632
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	633 cleanup_gnulib() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	634 status=$?
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	635 rm -fr "$gnulib_path"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	636 exit $status
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	637 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	638
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	639 git_modules_config () {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	640 test -f .gitmodules && git config --file .gitmodules "$@"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	641 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	642
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	643 if $use_gnulib; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	644 if $use_git; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	645 gnulib_path=$(git_modules_config submodule.gnulib.path)
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	646 test -z "$gnulib_path" && gnulib_path=gnulib
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	647 fi
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	648
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	649 # Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	650 # submodule, for use in the rest of the script.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	651
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	652 case ${GNULIB_SRCDIR--} in
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	653 -)
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	654 # Note that $use_git is necessarily true in this case.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	655 if git_modules_config submodule.gnulib.url >/dev/null; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	656 echo "$0: getting gnulib files..."
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	657 git submodule init -- "$gnulib_path" \|\| exit $?
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	658 git submodule update -- "$gnulib_path" \|\| exit $?
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	659
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	660 elif [ ! -d "$gnulib_path" ]; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	661 echo "$0: getting gnulib files..."
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	662
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	663 trap cleanup_gnulib 1 2 13 15
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	664
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	665 shallow=
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	666 if test -z "$GNULIB_REVISION"; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	667 git clone -h 2>&1 \| grep -- --depth > /dev/null && shallow='--depth 2'
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	668 fi
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	669 git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	670 \|\| cleanup_gnulib
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	671
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	672 trap - 1 2 13 15
28013 717e3780805c update gnulib archive if requested changeset is not in the local archive Markus Mützel <markus.muetzel@gmx.de> parents: 26416 diff changeset	673
717e3780805c update gnulib archive if requested changeset is not in the local archive Markus Mützel <markus.muetzel@gmx.de> parents: 26416 diff changeset	674 elif test -n "$GNULIB_REVISION" \
717e3780805c update gnulib archive if requested changeset is not in the local archive Markus Mützel <markus.muetzel@gmx.de> parents: 26416 diff changeset	675 && ! git --git-dir="$gnulib_path"/.git cat-file \
717e3780805c update gnulib archive if requested changeset is not in the local archive Markus Mützel <markus.muetzel@gmx.de> parents: 26416 diff changeset	676 commit "$GNULIB_REVISION"; then
28017 f6b390541a37 fetch upstream gnulib changes using `git fetch` Mike Miller <mtmiller@octave.org> parents: 28013 diff changeset	677 git --git-dir="$gnulib_path"/.git fetch
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	678 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	679 GNULIB_SRCDIR=$gnulib_path
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	680 ;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	681 *)
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	682 # Use GNULIB_SRCDIR directly or as a reference.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	683 if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	684 git_modules_config submodule.gnulib.url >/dev/null; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	685 echo "$0: getting gnulib files..."
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	686 if git submodule -h\|grep -- --reference > /dev/null; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	687 # Prefer the one-liner available in git 1.6.4 or newer.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	688 git submodule update --init --reference "$GNULIB_SRCDIR" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	689 "$gnulib_path" \|\| exit $?
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	690 else
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	691 # This fallback allows at least git 1.5.5.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	692 if test -f "$gnulib_path"/gnulib-tool; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	693 # Since file already exists, assume submodule init already complete.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	694 git submodule update -- "$gnulib_path" \|\| exit $?
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	695 else
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	696 # Older git can't clone into an empty directory.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	697 rmdir "$gnulib_path" 2>/dev/null
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	698 git clone --reference "$GNULIB_SRCDIR" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	699 "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	700 && git submodule init -- "$gnulib_path" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	701 && git submodule update -- "$gnulib_path" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	702 \|\| exit $?
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	703 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	704 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	705 GNULIB_SRCDIR=$gnulib_path
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	706 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	707 ;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	708 esac
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	709
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	710 if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	711 && ! git_modules_config submodule.gnulib.url >/dev/null; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	712 (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") \|\| cleanup_gnulib
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	713 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	714
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	715 # $GNULIB_SRCDIR now points to the version of gnulib to use, and
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	716 # we no longer need to use git or $gnulib_path below here.
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	717
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	718 if $bootstrap_sync; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	719 cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" \|\| {
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	720 echo "$0: updating bootstrap and restarting..."
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	721 case $(sh -c 'echo "$1"' -- a) in
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	722 a) ignored=--;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	723 *) ignored=ignored;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	724 esac
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	725 exec sh -c \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	726 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	727 $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	728 "$0" "$@" --no-bootstrap-sync
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	729 }
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	730 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	731
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	732 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	733 <$gnulib_tool \|\| exit $?
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	734 fi
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9645 diff changeset	735
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	736 # Get translations.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	737
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	738 download_po_files() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	739 subdir=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	740 domain=$2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	741 echo "$me: getting translations into $subdir for $domain..."
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	742 cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	743 eval "$cmd"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	744 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	745
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	746 # Mirror .po files to $po_dir/.reference and copy only the new
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	747 # or modified ones into $po_dir. Also update $po_dir/LINGUAS.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	748 # Note po files that exist locally only are left in $po_dir but will
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	749 # not be included in LINGUAS and hence will not be distributed.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	750 update_po_files() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	751 # Directory containing primary .po files.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	752 # Overwrite them only when we're sure a .po file is new.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	753 po_dir=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	754 domain=$2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	755
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	756 # Mirror *.po files into this dir.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	757 # Usually contains *.s1 checksum files.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	758 ref_po_dir="$po_dir/.reference"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	759
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	760 test -d $ref_po_dir \|\| mkdir $ref_po_dir \|\| return
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	761 download_po_files $ref_po_dir $domain \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	762 && ls "$ref_po_dir"/*.po 2>/dev/null \|
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	763 sed 's\|.*/\|\|; s\|\.po$\|\|' > "$po_dir/LINGUAS" \|\| return
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	764
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	765 langs=$(cd $ref_po_dir && echo *.po \| sed 's/\.po//g')
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	766 test "$langs" = '*' && langs=x
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	767 for po in $langs; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	768 case $po in x) continue;; esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	769 new_po="$ref_po_dir/$po.po"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	770 cksum_file="$ref_po_dir/$po.s1"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	771 if ! test -f "$cksum_file" \|\|
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	772 ! test -f "$po_dir/$po.po" \|\|
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	773 ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	774 echo "$me: updated $po_dir/$po.po..."
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	775 cp "$new_po" "$po_dir/$po.po" \
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	776 && $SHA1SUM < "$new_po" > "$cksum_file" \|\| return
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	777 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	778 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	779 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	780
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	781 case $SKIP_PO in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	782 '')
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	783 if test -d po; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	784 update_po_files po $package \|\| exit
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	785 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	786
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	787 if test -d runtime-po; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	788 update_po_files runtime-po $package-runtime \|\| exit
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	789 fi;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	790 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	791
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	792 symlink_to_dir()
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	793 {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	794 src=$1/$2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	795 dst=${3-$2}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	796
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	797 test -f "$src" && {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	798
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	799 # If the destination directory doesn't exist, create it.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	800 # This is required at least for "lib/uniwidth/cjk.h".
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	801 dst_dir=$(dirname "$dst")
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	802 if ! test -d "$dst_dir"; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	803 mkdir -p "$dst_dir"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	804
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	805 # If we've just created a directory like lib/uniwidth,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	806 # tell version control system(s) it's ignorable.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	807 # FIXME: for now, this does only one level
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	808 parent=$(dirname "$dst_dir")
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	809 for dot_ig in x $vc_ignore; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	810 test $dot_ig = x && continue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	811 ig=$parent/$dot_ig
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	812 insert_vc_ignore $ig "${dst_dir##*/}"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	813 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	814 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	815
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	816 if $copy; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	817 {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	818 test ! -h "$dst" \|\| {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	819 echo "$me: rm -f $dst" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	820 rm -f "$dst"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	821 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	822 } &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	823 test -f "$dst" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	824 cmp -s "$src" "$dst" \|\| {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	825 echo "$me: cp -fp $src $dst" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	826 cp -fp "$src" "$dst"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	827 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	828 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	829 # Leave any existing symlink alone, if it already points to the source,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	830 # so that broken build tools that care about symlink times
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	831 # aren't confused into doing unnecessary builds. Conversely, if the
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	832 # existing symlink's timestamp is older than the source, make it afresh,
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	833 # so that broken tools aren't confused into skipping needed builds. See
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	834 # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	835 test -h "$dst" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	836 src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	837 dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	838 test "$src_i" = "$dst_i" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	839 both_ls=$(ls -dt "$src" "$dst") &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	840 test "X$both_ls" = "X$dst$nl$src" \|\| {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	841 dot_dots=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	842 case $src in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	843 /*) ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	844 *)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	845 case /$dst/ in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	846 // \| /../ \| /./ \| /////*/)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	847 die "invalid symlink calculation: $src -> $dst";;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	848 /////) dot_dots=../../../;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	849 ///*/) dot_dots=../../;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	850 ///) dot_dots=../;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	851 esac;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	852 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	853
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	854 echo "$me: ln -fs $dot_dots$src $dst" &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	855 ln -fs "$dot_dots$src" "$dst"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	856 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	857 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	858 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	859 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	860
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	861 version_controlled_file() {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	862 parent=$1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	863 file=$2
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	864 if test -d .git; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	865 git rm -n "$file" > /dev/null 2>&1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	866 elif test -d .svn; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	867 svn log -r HEAD "$file" > /dev/null 2>&1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	868 elif test -d CVS; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	869 grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null \|
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	870 grep '^/[^/]*/[0-9]' > /dev/null
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	871 else
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	872 warn_ "no version control for $file?"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	873 false
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	874 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	875 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	876
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	877 # NOTE: we have to be careful to run both autopoint and libtoolize
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	878 # before gnulib-tool, since gnulib-tool is likely to provide newer
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	879 # versions of files "installed" by these two programs.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	880 # Then, after gnulib-tool (see below), we have to be careful to
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	881 # run autoreconf in such a way that it does not run either of these
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	882 # two just-pre-run programs.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	883
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	884 # Import from gettext.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	885 with_gettext=yes
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	886 grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null \|\| \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	887 with_gettext=no
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	888
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	889 if test $with_gettext = yes \|\| test $use_libtool = 1; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	890
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	891 tempbase=.bootstrap$$
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	892 trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	893
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	894 > $tempbase.0 > $tempbase.1 &&
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	895 find . ! -type d -print \| sort > $tempbase.0 \|\| exit
14185 d584f90d2c47 configure: search for gfortran first instead of g77 John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	896
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	897 if test $with_gettext = yes; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	898 # Released autopoint has the tendency to install macros that have been
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	899 # obsoleted in current gnulib, so run this before gnulib-tool.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	900 echo "$0: $AUTOPOINT --force"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	901 $AUTOPOINT --force \|\| exit
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	902 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	903
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	904 # Autoreconf runs aclocal before libtoolize, which causes spurious
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	905 # warnings if the initial aclocal is confused by the libtoolized
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	906 # (or worse out-of-date) macro directory.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	907 # libtoolize 1.9b added the --install option; but we support back
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	908 # to libtoolize 1.5.22, where the install action was default.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	909 if test $use_libtool = 1; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	910 install=
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	911 case $($LIBTOOLIZE --help) in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	912 --install) install=--install ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	913 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	914 echo "running: $LIBTOOLIZE $install --copy"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	915 $LIBTOOLIZE $install --copy
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	916 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	917
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	918 find . ! -type d -print \| sort >$tempbase.1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	919 old_IFS=$IFS
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	920 IFS=$nl
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	921 for file in $(comm -13 $tempbase.0 $tempbase.1); do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	922 IFS=$old_IFS
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	923 parent=${file%/*}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	924 version_controlled_file "$parent" "$file" \|\| {
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	925 for dot_ig in x $vc_ignore; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	926 test $dot_ig = x && continue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	927 ig=$parent/$dot_ig
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	928 insert_vc_ignore "$ig" "${file##*/}"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	929 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	930 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	931 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	932 IFS=$old_IFS
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	933
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	934 rm -f $tempbase.0 $tempbase.1
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	935 trap - 1 2 13 15
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	936 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	937
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	938 # Import from gnulib.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	939
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	940 if $use_gnulib; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	941 gnulib_tool_options="\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	942 --no-changelog\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	943 --aux-dir=$build_aux\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	944 --doc-base=$doc_base\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	945 --lib=$gnulib_name\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	946 --m4-base=$m4_base/\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	947 --source-base=$source_base/\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	948 --tests-base=$tests_base\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	949 --local-dir=$local_gl_dir\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	950 $gnulib_tool_option_extras\
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	951 "
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	952 if test $use_libtool = 1; then
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	953 case "$gnulib_tool_options " in
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	954 ' --libtool ') ;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	955 *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	956 esac
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	957 fi
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	958 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	959 $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	960 \|\| die "gnulib-tool failed"
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	961
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	962 for file in $gnulib_files; do
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	963 symlink_to_dir "$GNULIB_SRCDIR" $file \
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	964 \|\| die "failed to symlink $file"
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	965 done
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	966 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	967
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	968 bootstrap_post_import_hook \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	969 \|\| die "bootstrap_post_import_hook failed"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	970
28016 626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	971 # Don't proceed if there are uninitialized submodules. In particular,
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	972 # the next step will remove dangling links, which might be links into
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	973 # uninitialized submodules.
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	974 #
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	975 # Uninitialized submodules are listed with an initial dash.
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	976 if $use_git && git submodule \| grep '^-' >/dev/null; then
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	977 die "some git submodules are not initialized. " \
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	978 "Run 'git submodule init' and bootstrap again."
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	979 fi
626ba7cc1d6c update bootstrap script with changes from gnulib version John W. Eaton <jwe@octave.org> parents: 28013 diff changeset	980
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	981 # Remove any dangling symlink matching ".m4" or ".[ch]" in some
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	982 # gnulib-populated directories. Such .m4 files would cause aclocal to fail.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	983 # The following requires GNU find 4.2.3 or newer. Considering the usual
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	984 # portability constraints of this script, that may seem a very demanding
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	985 # requirement, but it should be ok. Ignore any failure, which is fine,
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	986 # since this is only a convenience to help developers avoid the relatively
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	987 # unusual case in which a symlinked-to .m4 file is git-removed from gnulib
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	988 # between successive runs of this script.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	989 find "$m4_base" "$source_base" \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	990 -depth $ -name '.m4' -o -name '.[ch]' $ \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	991 -type l -xtype l -delete > /dev/null 2>&1
14185 d584f90d2c47 configure: search for gfortran first instead of g77 John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	992
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	993 # Invoke autoreconf with --force --install to ensure upgrades of tools
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	994 # such as ylwrap.
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	995 AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	996
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	997 # Some systems (RHEL 5) are using ancient autotools, for which the
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	998 # --no-recursive option had not been invented. Detect that lack and
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	999 # omit the option when it's not supported. FIXME in 2017: remove this
c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	1000 # hack when RHEL 5 autotools are updated, or when they become irrelevant.
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1001 case $($AUTORECONF --help) in
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	1002 --no-recursive) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1003 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1004
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1005 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
17299 a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	1006 echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
a801d0ab5830 bootstrap: Update from gnulib sources, make portable to OpenBSD (bug #35580) Mike Miller <mtmiller@ieee.org> parents: 15920 diff changeset	1007 AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1008 \|\| die "autoreconf failed"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1009
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1010 # Get some extra files from gnulib, overriding existing files.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1011 for file in $gnulib_extra_files; do
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1012 case $file in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1013 */INSTALL) dst=INSTALL;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1014 build-aux/*) dst=$build_aux/${file#build-aux/};;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1015 *) dst=$file;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1016 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1017 symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1018 \|\| die "failed to symlink $file"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1019 done
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1020
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1021 if test $with_gettext = yes; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1022 # Create gettext configuration.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1023 echo "$0: Creating po/Makevars from po/Makevars.template ..."
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1024 rm -f po/Makevars
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1025 sed '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1026 /^EXTRA_LOCALE_CATEGORIES =/s/=./= '"$EXTRA_LOCALE_CATEGORIES"'/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1027 /^COPYRIGHT_HOLDER =/s/=./= '"$COPYRIGHT_HOLDER"'/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1028 /^MSGID_BUGS_ADDRESS =/s\|=.\|= '"$MSGID_BUGS_ADDRESS"'\|
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1029 /^XGETTEXT_OPTIONS *=/{
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1030 s/$/ \\/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1031 a\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1032 '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1033 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1034 ' po/Makevars.template >po/Makevars \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1035 \|\| die 'cannot generate po/Makevars'
14185 d584f90d2c47 configure: search for gfortran first instead of g77 John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	1036
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1037 # If the 'gettext' module is in use, grab the latest Makefile.in.in.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1038 # If only the 'gettext-h' module is in use, assume autopoint already
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1039 # put the correct version of this file into place.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1040 case $gnulib_modules in
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1041 gettext-h) ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1042 gettext)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1043 cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1044 \|\| die "cannot create po/Makefile.in.in"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1045 ;;
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1046 esac
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1047
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1048 if test -d runtime-po; then
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1049 # Similarly for runtime-po/Makevars, but not quite the same.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1050 rm -f runtime-po/Makevars
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1051 sed '
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1052 /^DOMAIN =./s/=.*/= '"$package"'-runtime/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1053 /^subdir =./s/=.*/= runtime-po/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1054 /^MSGID_BUGS_ADDRESS =/s/=./= bug-'"$package"'@gnu.org/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1055 /^XGETTEXT_OPTIONS *=/{
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1056 s/$/ \\/
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1057 a\
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1058 '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1059 }
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1060 ' po/Makevars.template >runtime-po/Makevars \
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1061 \|\| die 'cannot generate runtime-po/Makevars'
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1062
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1063 # Copy identical files from po to runtime-po.
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1064 (cd po && cp -p Makefile.in.in -quot .header .sed .sin ../runtime-po)
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1065 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1066 fi
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1067
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1068 bootstrap_epilogue
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1069
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1070 echo "$0: done. Now you can run './configure'."
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1071
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1072 # Local variables:
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	1073 # eval: (add-hook 'before-save-hook 'time-stamp)
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1074 # time-stamp-start: "scriptversion="
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1075 # time-stamp-format: "%:y-%02m-%02d.%02H"
26416 c36321a88d17 * bootstrap: update from gnulib source repository Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	1076 # time-stamp-time-zone: "UTC0"
15920 b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1077 # time-stamp-end: "; # UTC"
b91fc9348e2e use hook functions for gnulib's bootrap script instead of our wrapper script John W. Eaton <jwe@octave.org> parents: 15414 diff changeset	1078 # End:

Mercurial > octave

annotate bootstrap @ 28019:c45a0d7e9385