annotate bootstrap-funclib.sh @ 33482:787937817a64 bytecode-interpreter tip

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