Merge ~3v1n0/ubuntu/+source/mutter:upstream/3.28.x into ~ubuntu-desktop/ubuntu/+source/mutter:upstream/3.28.x

Proposed by Marco Trevisan (Treviño) on 2019-01-15
Status: Merged
Merged at revision: 5b1eb29c39cba26439f6f98cd5f4a113fc64ac1f
Proposed branch: ~3v1n0/ubuntu/+source/mutter:upstream/3.28.x
Merge into: ~ubuntu-desktop/ubuntu/+source/mutter:upstream/3.28.x
Diff against target: 22794 lines (+7590/-4542)
116 files modified
Makefile.in (+11/-7)
aclocal.m4 (+87/-104)
build-aux/compile (+5/-5)
build-aux/config.guess (+282/-278)
build-aux/config.sub (+107/-142)
build-aux/depcomp (+5/-5)
build-aux/install-sh (+31/-14)
build-aux/ltmain.sh (+171/-72)
build-aux/missing (+8/-8)
clutter/Makefile.in (+10/-6)
clutter/aclocal.m4 (+303/-388)
clutter/build/Makefile.in (+10/-6)
clutter/build/autotools/Makefile.in (+9/-5)
clutter/build/autotools/libtool.m4 (+32/-16)
clutter/build/compile (+5/-5)
clutter/build/config.guess (+282/-278)
clutter/build/config.sub (+107/-142)
clutter/build/depcomp (+5/-5)
clutter/build/install-sh (+31/-14)
clutter/build/ltmain.sh (+171/-72)
clutter/build/missing (+8/-8)
clutter/build/test-driver (+5/-5)
clutter/clutter/Makefile.in (+621/-166)
clutter/clutter/cally/cally-util.c (+2/-0)
clutter/clutter/clutter-actor.c (+83/-11)
clutter/clutter/clutter-effect-private.h (+1/-0)
clutter/clutter/clutter-effect.c (+8/-0)
clutter/clutter/clutter-offscreen-effect.c (+6/-3)
clutter/clutter/clutter-paint-volume.c (+15/-0)
clutter/clutter/clutter-text.c (+2/-8)
clutter/clutter/evdev/clutter-virtual-input-device-evdev.c (+29/-6)
clutter/clutter/x11/clutter-keymap-x11.c (+177/-1)
clutter/clutter/x11/clutter-keymap-x11.h (+8/-0)
clutter/clutter/x11/clutter-virtual-input-device-x11.c (+21/-3)
clutter/configure (+131/-109)
clutter/examples/Makefile.in (+79/-28)
clutter/tests/Makefile.in (+10/-6)
clutter/tests/accessibility/Makefile.in (+41/-15)
clutter/tests/conform/Makefile.in (+207/-131)
clutter/tests/conform/actor-shader-effect.c (+4/-4)
clutter/tests/interactive/Makefile.in (+217/-59)
clutter/tests/micro-bench/Makefile.in (+35/-14)
clutter/tests/performance/Makefile.in (+43/-16)
cogl/Makefile.in (+10/-6)
cogl/aclocal.m4 (+303/-388)
cogl/build/autotools/libtool.m4 (+32/-16)
cogl/build/compile (+5/-5)
cogl/build/config.guess (+282/-278)
cogl/build/config.sub (+107/-142)
cogl/build/depcomp (+5/-5)
cogl/build/install-sh (+31/-14)
cogl/build/ltmain.sh (+171/-72)
cogl/build/missing (+8/-8)
cogl/cogl-gles2/Makefile.in (+25/-14)
cogl/cogl-pango/Makefile.in (+41/-18)
cogl/cogl-path/Makefile.in (+65/-24)
cogl/cogl/Makefile.in (+460/-127)
cogl/cogl/deprecated/cogl-auto-texture.c (+1/-0)
cogl/configure (+154/-121)
cogl/test-fixtures/Makefile.in (+30/-19)
cogl/tests/Makefile.in (+10/-6)
cogl/tests/conform/Makefile.in (+220/-71)
cogl/tests/data/Makefile.in (+9/-5)
cogl/tests/micro-perf/Makefile.in (+23/-12)
cogl/tests/unit/Makefile.in (+23/-12)
configure (+131/-109)
data/Makefile.in (+9/-5)
doc/Makefile.in (+10/-6)
doc/man/Makefile.in (+9/-5)
m4/libtool.m4 (+32/-16)
m4/pkg.m4 (+3/-71)
po/mutter.pot (+46/-51)
src/Makefile-tests.am (+1/-0)
src/Makefile.in (+1036/-406)
src/backends/meta-idle-monitor.c (+7/-3)
src/backends/meta-monitor-manager-private.h (+1/-0)
src/backends/meta-monitor-manager.c (+17/-3)
src/backends/meta-monitor.c (+33/-8)
src/backends/meta-monitor.h (+2/-0)
src/backends/native/meta-gpu-kms.c (+81/-19)
src/backends/native/meta-gpu-kms.h (+9/-0)
src/backends/native/meta-monitor-manager-kms.c (+20/-0)
src/backends/native/meta-renderer-native.c (+77/-25)
src/backends/x11/meta-backend-x11.c (+3/-2)
src/backends/x11/nested/meta-renderer-x11-nested.c (+6/-2)
src/compositor/compositor.c (+4/-0)
src/compositor/meta-shaped-texture.c (+83/-42)
src/compositor/meta-surface-actor.c (+8/-0)
src/compositor/plugins/Makefile.in (+35/-23)
src/core/delete.c (+3/-0)
src/core/frame.c (+12/-0)
src/core/screen.c (+3/-1)
src/core/window-private.h (+15/-4)
src/core/window.c (+60/-18)
src/tests/stacking/closed-transient.metatest (+19/-0)
src/wayland/meta-wayland-actor-surface.c (+8/-4)
src/wayland/meta-wayland-actor-surface.h (+3/-0)
src/wayland/meta-wayland-buffer.c (+16/-21)
src/wayland/meta-wayland-buffer.h (+2/-0)
src/wayland/meta-wayland-data-device.c (+18/-0)
src/wayland/meta-wayland-dma-buf.c (+1/-0)
src/wayland/meta-wayland-gtk-shell.c (+19/-10)
src/wayland/meta-wayland-keyboard.c (+56/-82)
src/wayland/meta-wayland-keyboard.h (+1/-2)
src/wayland/meta-wayland-legacy-xdg-shell.c (+87/-15)
src/wayland/meta-wayland-outputs.c (+34/-21)
src/wayland/meta-wayland-shell-surface.c (+1/-1)
src/wayland/meta-wayland-surface.c (+14/-7)
src/wayland/meta-wayland-surface.h (+3/-0)
src/wayland/meta-wayland-xdg-shell.c (+81/-14)
src/wayland/meta-window-wayland.c (+9/-3)
src/wayland/meta-xwayland-grab-keyboard.c (+7/-7)
src/x11/events.c (+6/-0)
src/x11/window-props.c (+1/-4)
src/x11/window-x11.c (+3/-3)
src/x11/xprops.c (+5/-1)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-01-15 Pending
Review via email: mp+361808@code.launchpad.net

Description of the change

Update upstream/3.28.x with latest git snapshot

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile.in b/Makefile.in
2index 8569c31..f738308 100644
3--- a/Makefile.in
4+++ b/Makefile.in
5@@ -1,7 +1,7 @@
6-# Makefile.in generated by automake 1.15.1 from Makefile.am.
7+# Makefile.in generated by automake 1.16.1 from Makefile.am.
8 # @configure_input@
9
10-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
11+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
12
13 # This Makefile.in is free software; the Free Software Foundation
14 # gives unlimited permission to copy and/or distribute it,
15@@ -143,7 +143,7 @@ am__recursive_targets = \
16 $(RECURSIVE_CLEAN_TARGETS) \
17 $(am__extra_recursive_targets)
18 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
19- cscope distdir dist dist-all distcheck
20+ cscope distdir distdir-am dist dist-all distcheck
21 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
22 $(LISP)config.h.in
23 # Read a list of newline-separated strings from the standard input,
24@@ -176,7 +176,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
25 $(top_srcdir)/build-aux/missing \
26 $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \
27 NEWS build-aux/compile build-aux/config.guess \
28- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
29+ build-aux/config.rpath build-aux/config.sub \
30 build-aux/install-sh build-aux/ltmain.sh build-aux/missing
31 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
32 distdir = $(PACKAGE)-$(VERSION)
33@@ -398,6 +398,7 @@ pdfdir = @pdfdir@
34 prefix = @prefix@
35 program_transform_name = @program_transform_name@
36 psdir = @psdir@
37+runstatedir = @runstatedir@
38 sbindir = @sbindir@
39 sharedstatedir = @sharedstatedir@
40 srcdir = @srcdir@
41@@ -440,8 +441,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
42 echo ' $(SHELL) ./config.status'; \
43 $(SHELL) ./config.status;; \
44 *) \
45- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
46- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
47+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
48+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
49 esac;
50
51 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
52@@ -585,7 +586,10 @@ distclean-tags:
53 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
54 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
55
56-distdir: $(DISTFILES)
57+distdir: $(BUILT_SOURCES)
58+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
59+
60+distdir-am: $(DISTFILES)
61 $(am__remove_distdir)
62 test -d "$(distdir)" || mkdir "$(distdir)"
63 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
64diff --git a/aclocal.m4 b/aclocal.m4
65index 4d8ccdc..f605e15 100644
66--- a/aclocal.m4
67+++ b/aclocal.m4
68@@ -1,6 +1,6 @@
69-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
70+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
71
72-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
73+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
74
75 # This file is free software; the Free Software Foundation
76 # gives unlimited permission to copy and/or distribute it,
77@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
78 If you have problems, you may need to regenerate the build system entirely.
79 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
80
81-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
82+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
83 #
84 # This file is free software; the Free Software Foundation
85 # gives unlimited permission to copy and/or distribute it,
86@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
87 # generated from the m4 files accompanying Automake X.Y.
88 # (This private macro should not be called outside this file.)
89 AC_DEFUN([AM_AUTOMAKE_VERSION],
90-[am__api_version='1.15'
91+[am__api_version='1.16'
92 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
93 dnl require some minimum version. Point them to the right macro.
94-m4_if([$1], [1.15.1], [],
95+m4_if([$1], [1.16.1], [],
96 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
97 ])
98
99@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
100 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
101 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
102 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
103-[AM_AUTOMAKE_VERSION([1.15.1])dnl
104+[AM_AUTOMAKE_VERSION([1.16.1])dnl
105 m4_ifndef([AC_AUTOCONF_VERSION],
106 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
107 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
108
109 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
110
111-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
112+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
113 #
114 # This file is free software; the Free Software Foundation
115 # gives unlimited permission to copy and/or distribute it,
116@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
117
118 # AM_CONDITIONAL -*- Autoconf -*-
119
120-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
121+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
122 #
123 # This file is free software; the Free Software Foundation
124 # gives unlimited permission to copy and/or distribute it,
125@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
126 Usually this means the macro was only invoked conditionally.]])
127 fi])])
128
129-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
130+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
131 #
132 # This file is free software; the Free Software Foundation
133 # gives unlimited permission to copy and/or distribute it,
134@@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
135
136 # Generate code to set up dependency tracking. -*- Autoconf -*-
137
138-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
139+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
140 #
141 # This file is free software; the Free Software Foundation
142 # gives unlimited permission to copy and/or distribute it,
143 # with or without modifications, as long as this notice is preserved.
144
145-
146 # _AM_OUTPUT_DEPENDENCY_COMMANDS
147 # ------------------------------
148 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
149@@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
150 # Older Autoconf quotes --file arguments for eval, but not when files
151 # are listed without --file. Let's play safe and only enable the eval
152 # if we detect the quoting.
153- case $CONFIG_FILES in
154- *\'*) eval set x "$CONFIG_FILES" ;;
155- *) set x $CONFIG_FILES ;;
156- esac
157+ # TODO: see whether this extra hack can be removed once we start
158+ # requiring Autoconf 2.70 or later.
159+ AS_CASE([$CONFIG_FILES],
160+ [*\'*], [eval set x "$CONFIG_FILES"],
161+ [*], [set x $CONFIG_FILES])
162 shift
163- for mf
164+ # Used to flag and report bootstrapping failures.
165+ am_rc=0
166+ for am_mf
167 do
168 # Strip MF so we end up with the name of the file.
169- mf=`echo "$mf" | sed -e 's/:.*$//'`
170- # Check whether this is an Automake generated Makefile or not.
171- # We used to match only the files named 'Makefile.in', but
172- # some people rename them; so instead we look at the file content.
173- # Grep'ing the first line is not enough: some people post-process
174- # each Makefile.in and add a new line on top of each file to say so.
175- # Grep'ing the whole file is not good either: AIX grep has a line
176+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
177+ # Check whether this is an Automake generated Makefile which includes
178+ # dependency-tracking related rules and includes.
179+ # Grep'ing the whole file directly is not great: AIX grep has a line
180 # limit of 2048, but all sed's we know have understand at least 4000.
181- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
182- dirpart=`AS_DIRNAME("$mf")`
183- else
184- continue
185- fi
186- # Extract the definition of DEPDIR, am__include, and am__quote
187- # from the Makefile without running 'make'.
188- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
189- test -z "$DEPDIR" && continue
190- am__include=`sed -n 's/^am__include = //p' < "$mf"`
191- test -z "$am__include" && continue
192- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
193- # Find all dependency output files, they are included files with
194- # $(DEPDIR) in their names. We invoke sed twice because it is the
195- # simplest approach to changing $(DEPDIR) to its actual value in the
196- # expansion.
197- for file in `sed -n "
198- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
199- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
200- # Make sure the directory exists.
201- test -f "$dirpart/$file" && continue
202- fdir=`AS_DIRNAME(["$file"])`
203- AS_MKDIR_P([$dirpart/$fdir])
204- # echo "creating $dirpart/$file"
205- echo '# dummy' > "$dirpart/$file"
206- done
207+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
208+ || continue
209+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
210+ am_filepart=`AS_BASENAME(["$am_mf"])`
211+ AM_RUN_LOG([cd "$am_dirpart" \
212+ && sed -e '/# am--include-marker/d' "$am_filepart" \
213+ | $MAKE -f - am--depfiles]) || am_rc=$?
214 done
215+ if test $am_rc -ne 0; then
216+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
217+ for automatic dependency tracking. Try re-running configure with the
218+ '--disable-dependency-tracking' option to at least be able to build
219+ the package (albeit without support for automatic dependency tracking).])
220+ fi
221+ AS_UNSET([am_dirpart])
222+ AS_UNSET([am_filepart])
223+ AS_UNSET([am_mf])
224+ AS_UNSET([am_rc])
225+ rm -f conftest-deps.mk
226 }
227 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
228
229@@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
230 # -----------------------------
231 # This macro should only be invoked once -- use via AC_REQUIRE.
232 #
233-# This code is only required when automatic dependency tracking
234-# is enabled. FIXME. This creates each '.P' file that we will
235-# need in order to bootstrap the dependency handling code.
236+# This code is only required when automatic dependency tracking is enabled.
237+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
238+# order to bootstrap the dependency handling code.
239 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
240 [AC_CONFIG_COMMANDS([depfiles],
241 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
242- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
243-])
244+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
245
246 # Do all the work for Automake. -*- Autoconf -*-
247
248-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
249+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
250 #
251 # This file is free software; the Free Software Foundation
252 # gives unlimited permission to copy and/or distribute it,
253@@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
254 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
255 # For better backward compatibility. To be removed once Automake 1.9.x
256 # dies out for good. For more background, see:
257-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
258-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
259+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
260+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
261 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
262 # We need awk for the "check" target (and possibly the TAP driver). The
263 # system "awk" is bad on some platforms.
264@@ -563,7 +553,7 @@ END
265 Aborting the configuration process, to ensure you take notice of the issue.
266
267 You can download and install GNU coreutils to get an 'rm' implementation
268-that behaves properly: <http://www.gnu.org/software/coreutils/>.
269+that behaves properly: <https://www.gnu.org/software/coreutils/>.
270
271 If you want to complete the configuration process using your problematic
272 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
273@@ -605,7 +595,7 @@ for _am_header in $config_headers :; do
274 done
275 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
276
277-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
278+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
279 #
280 # This file is free software; the Free Software Foundation
281 # gives unlimited permission to copy and/or distribute it,
282@@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then
283 fi
284 AC_SUBST([install_sh])])
285
286-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
287+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
288 #
289 # This file is free software; the Free Software Foundation
290 # gives unlimited permission to copy and/or distribute it,
291@@ -648,7 +638,7 @@ AC_SUBST([am__leading_dot])])
292 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
293 # From Jim Meyering
294
295-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
296+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
297 #
298 # This file is free software; the Free Software Foundation
299 # gives unlimited permission to copy and/or distribute it,
300@@ -683,7 +673,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
301
302 # Check to see how 'make' treats includes. -*- Autoconf -*-
303
304-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
305+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
306 #
307 # This file is free software; the Free Software Foundation
308 # gives unlimited permission to copy and/or distribute it,
309@@ -691,49 +681,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
310
311 # AM_MAKE_INCLUDE()
312 # -----------------
313-# Check to see how make treats includes.
314+# Check whether make has an 'include' directive that can support all
315+# the idioms we need for our automatic dependency tracking code.
316 AC_DEFUN([AM_MAKE_INCLUDE],
317-[am_make=${MAKE-make}
318-cat > confinc << 'END'
319+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
320+cat > confinc.mk << 'END'
321 am__doit:
322- @echo this is the am__doit target
323+ @echo this is the am__doit target >confinc.out
324 .PHONY: am__doit
325 END
326-# If we don't find an include directive, just comment out the code.
327-AC_MSG_CHECKING([for style of include used by $am_make])
328 am__include="#"
329 am__quote=
330-_am_result=none
331-# First try GNU make style include.
332-echo "include confinc" > confmf
333-# Ignore all kinds of additional output from 'make'.
334-case `$am_make -s -f confmf 2> /dev/null` in #(
335-*the\ am__doit\ target*)
336- am__include=include
337- am__quote=
338- _am_result=GNU
339- ;;
340-esac
341-# Now try BSD make style include.
342-if test "$am__include" = "#"; then
343- echo '.include "confinc"' > confmf
344- case `$am_make -s -f confmf 2> /dev/null` in #(
345- *the\ am__doit\ target*)
346- am__include=.include
347- am__quote="\""
348- _am_result=BSD
349- ;;
350- esac
351-fi
352-AC_SUBST([am__include])
353-AC_SUBST([am__quote])
354-AC_MSG_RESULT([$_am_result])
355-rm -f confinc confmf
356-])
357+# BSD make does it like this.
358+echo '.include "confinc.mk" # ignored' > confmf.BSD
359+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
360+echo 'include confinc.mk # ignored' > confmf.GNU
361+_am_result=no
362+for s in GNU BSD; do
363+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
364+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
365+ ['0:this is the am__doit target'],
366+ [AS_CASE([$s],
367+ [BSD], [am__include='.include' am__quote='"'],
368+ [am__include='include' am__quote=''])])
369+ if test "$am__include" != "#"; then
370+ _am_result="yes ($s style)"
371+ break
372+ fi
373+done
374+rm -f confinc.* confmf.*
375+AC_MSG_RESULT([${_am_result}])
376+AC_SUBST([am__include])])
377+AC_SUBST([am__quote])])
378
379 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
380
381-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
382+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
383 #
384 # This file is free software; the Free Software Foundation
385 # gives unlimited permission to copy and/or distribute it,
386@@ -772,7 +755,7 @@ fi
387
388 # Helper functions for option handling. -*- Autoconf -*-
389
390-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
391+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
392 #
393 # This file is free software; the Free Software Foundation
394 # gives unlimited permission to copy and/or distribute it,
395@@ -801,7 +784,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
396 AC_DEFUN([_AM_IF_OPTION],
397 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
398
399-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
400+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
401 #
402 # This file is free software; the Free Software Foundation
403 # gives unlimited permission to copy and/or distribute it,
404@@ -848,7 +831,7 @@ AC_LANG_POP([C])])
405 # For backward compatibility.
406 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
407
408-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
409+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
410 #
411 # This file is free software; the Free Software Foundation
412 # gives unlimited permission to copy and/or distribute it,
413@@ -867,7 +850,7 @@ AC_DEFUN([AM_RUN_LOG],
414
415 # Check to make sure that the build environment is sane. -*- Autoconf -*-
416
417-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
418+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
419 #
420 # This file is free software; the Free Software Foundation
421 # gives unlimited permission to copy and/or distribute it,
422@@ -948,7 +931,7 @@ AC_CONFIG_COMMANDS_PRE(
423 rm -f conftest.file
424 ])
425
426-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
427+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
428 #
429 # This file is free software; the Free Software Foundation
430 # gives unlimited permission to copy and/or distribute it,
431@@ -1008,7 +991,7 @@ AC_SUBST([AM_BACKSLASH])dnl
432 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
433 ])
434
435-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
436+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
437 #
438 # This file is free software; the Free Software Foundation
439 # gives unlimited permission to copy and/or distribute it,
440@@ -1036,7 +1019,7 @@ fi
441 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
442 AC_SUBST([INSTALL_STRIP_PROGRAM])])
443
444-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
445+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
446 #
447 # This file is free software; the Free Software Foundation
448 # gives unlimited permission to copy and/or distribute it,
449@@ -1055,7 +1038,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
450
451 # Check how to create a tarball. -*- Autoconf -*-
452
453-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
454+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
455 #
456 # This file is free software; the Free Software Foundation
457 # gives unlimited permission to copy and/or distribute it,
458diff --git a/build-aux/compile b/build-aux/compile
459index de0005d..99e5052 100755
460--- a/build-aux/compile
461+++ b/build-aux/compile
462@@ -1,9 +1,9 @@
463-#!/bin/sh
464+#! /bin/sh
465 # Wrapper for compilers which do not understand '-c -o'.
466
467-scriptversion=2016-01-11.22; # UTC
468+scriptversion=2018-03-07.03; # UTC
469
470-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
471+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
472 # Written by Tom Tromey <tromey@cygnus.com>.
473 #
474 # This program is free software; you can redistribute it and/or modify
475@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
476 # GNU General Public License for more details.
477 #
478 # You should have received a copy of the GNU General Public License
479-# along with this program. If not, see <http://www.gnu.org/licenses/>.
480+# along with this program. If not, see <https://www.gnu.org/licenses/>.
481
482 # As a special exception to the GNU General Public License, if you
483 # distribute this file as part of a program that contains a
484@@ -340,7 +340,7 @@ exit $ret
485 # Local Variables:
486 # mode: shell-script
487 # sh-indentation: 2
488-# eval: (add-hook 'write-file-hooks 'time-stamp)
489+# eval: (add-hook 'before-save-hook 'time-stamp)
490 # time-stamp-start: "scriptversion="
491 # time-stamp-format: "%:y-%02m-%02d.%02H"
492 # time-stamp-time-zone: "UTC0"
493diff --git a/build-aux/config.guess b/build-aux/config.guess
494index 717b228..f50dcdb 100755
495--- a/build-aux/config.guess
496+++ b/build-aux/config.guess
497@@ -1,8 +1,8 @@
498-#!/bin/sh
499+#! /bin/sh
500 # Attempt to guess a canonical system name.
501-# Copyright 1992-2017 Free Software Foundation, Inc.
502+# Copyright 1992-2018 Free Software Foundation, Inc.
503
504-timestamp='2017-08-08'
505+timestamp='2018-02-24'
506
507 # This file is free software; you can redistribute it and/or modify it
508 # under the terms of the GNU General Public License as published by
509@@ -15,7 +15,7 @@ timestamp='2017-08-08'
510 # General Public License for more details.
511 #
512 # You should have received a copy of the GNU General Public License
513-# along with this program; if not, see <http://www.gnu.org/licenses/>.
514+# along with this program; if not, see <https://www.gnu.org/licenses/>.
515 #
516 # As a special exception to the GNU General Public License, if you
517 # distribute this file as part of a program that contains a
518@@ -27,7 +27,7 @@ timestamp='2017-08-08'
519 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
520 #
521 # You can get the latest version of this script from:
522-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
523+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
524 #
525 # Please send patches to <config-patches@gnu.org>.
526
527@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
528
529 Output the configuration name of the system \`$me' is run on.
530
531-Operation modes:
532+Options:
533 -h, --help print this help, then exit
534 -t, --time-stamp print date of last modification, then exit
535 -v, --version print version number, then exit
536@@ -50,7 +50,7 @@ version="\
537 GNU config.guess ($timestamp)
538
539 Originally written by Per Bothner.
540-Copyright 1992-2017 Free Software Foundation, Inc.
541+Copyright 1992-2018 Free Software Foundation, Inc.
542
543 This is free software; see the source for copying conditions. There is NO
544 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
545@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
546 dummy=$tmp/dummy ;
547 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
548 case $CC_FOR_BUILD,$HOST_CC,$CC in
549- ,,) echo "int x;" > $dummy.c ;
550+ ,,) echo "int x;" > "$dummy.c" ;
551 for c in cc gcc c89 c99 ; do
552- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
553+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
554 CC_FOR_BUILD="$c"; break ;
555 fi ;
556 done ;
557@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
558 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
559 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
560
561-case "${UNAME_SYSTEM}" in
562+case "$UNAME_SYSTEM" in
563 Linux|GNU|GNU/*)
564 # If the system lacks a compiler, then just pick glibc.
565 # We could probably try harder.
566 LIBC=gnu
567
568- eval $set_cc_for_build
569- cat <<-EOF > $dummy.c
570+ eval "$set_cc_for_build"
571+ cat <<-EOF > "$dummy.c"
572 #include <features.h>
573 #if defined(__UCLIBC__)
574 LIBC=uclibc
575@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
576 LIBC=gnu
577 #endif
578 EOF
579- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
580+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
581+
582+ # If ldd exists, use it to detect musl libc.
583+ if command -v ldd >/dev/null && \
584+ ldd --version 2>&1 | grep -q ^musl
585+ then
586+ LIBC=musl
587+ fi
588 ;;
589 esac
590
591 # Note: order is significant - the case branches are not exclusive.
592
593-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
594+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
595 *:NetBSD:*:*)
596 # NetBSD (nbsd) targets should (where applicable) match one or
597 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
598@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
599 # portion of the name. We always set it to "unknown".
600 sysctl="sysctl -n hw.machine_arch"
601 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
602- /sbin/$sysctl 2>/dev/null || \
603- /usr/sbin/$sysctl 2>/dev/null || \
604+ "/sbin/$sysctl" 2>/dev/null || \
605+ "/usr/sbin/$sysctl" 2>/dev/null || \
606 echo unknown)`
607- case "${UNAME_MACHINE_ARCH}" in
608+ case "$UNAME_MACHINE_ARCH" in
609 armeb) machine=armeb-unknown ;;
610 arm*) machine=arm-unknown ;;
611 sh3el) machine=shl-unknown ;;
612 sh3eb) machine=sh-unknown ;;
613 sh5el) machine=sh5le-unknown ;;
614 earmv*)
615- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
616- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
617- machine=${arch}${endian}-unknown
618+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
619+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
620+ machine="${arch}${endian}"-unknown
621 ;;
622- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
623+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
624 esac
625 # The Operating System including object format, if it has switched
626 # to ELF recently (or will in the future) and ABI.
627- case "${UNAME_MACHINE_ARCH}" in
628+ case "$UNAME_MACHINE_ARCH" in
629 earm*)
630 os=netbsdelf
631 ;;
632 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
633- eval $set_cc_for_build
634+ eval "$set_cc_for_build"
635 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
636 | grep -q __ELF__
637 then
638@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
639 ;;
640 esac
641 # Determine ABI tags.
642- case "${UNAME_MACHINE_ARCH}" in
643+ case "$UNAME_MACHINE_ARCH" in
644 earm*)
645 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
646- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
647+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
648 ;;
649 esac
650 # The OS release
651@@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
652 # thus, need a distinct triplet. However, they do not need
653 # kernel version information, so it can be replaced with a
654 # suitable tag, in the style of linux-gnu.
655- case "${UNAME_VERSION}" in
656+ case "$UNAME_VERSION" in
657 Debian*)
658 release='-gnu'
659 ;;
660 *)
661- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
662+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
663 ;;
664 esac
665 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
666 # contains redundant information, the shorter form:
667 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
668- echo "${machine}-${os}${release}${abi}"
669+ echo "$machine-${os}${release}${abi}"
670 exit ;;
671 *:Bitrig:*:*)
672 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
673- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
674+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
675 exit ;;
676 *:OpenBSD:*:*)
677 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
678- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
679+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
680 exit ;;
681 *:LibertyBSD:*:*)
682 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
683- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
684+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
685+ exit ;;
686+ *:MidnightBSD:*:*)
687+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
688 exit ;;
689 *:ekkoBSD:*:*)
690- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
691+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
692 exit ;;
693 *:SolidBSD:*:*)
694- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
695+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
696 exit ;;
697 macppc:MirBSD:*:*)
698- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
699+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
700 exit ;;
701 *:MirBSD:*:*)
702- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
703+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
704 exit ;;
705 *:Sortix:*:*)
706- echo ${UNAME_MACHINE}-unknown-sortix
707+ echo "$UNAME_MACHINE"-unknown-sortix
708 exit ;;
709 *:Redox:*:*)
710- echo ${UNAME_MACHINE}-unknown-redox
711+ echo "$UNAME_MACHINE"-unknown-redox
712 exit ;;
713+ mips:OSF1:*.*)
714+ echo mips-dec-osf1
715+ exit ;;
716 alpha:OSF1:*:*)
717 case $UNAME_RELEASE in
718 *4.0)
719@@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
720 # A Tn.n version is a released field test version.
721 # A Xn.n version is an unreleased experimental baselevel.
722 # 1.2 uses "1.2" for uname -r.
723- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
724+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
725 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
726 exitcode=$?
727 trap '' 0
728 exit $exitcode ;;
729- Alpha\ *:Windows_NT*:*)
730- # How do we know it's Interix rather than the generic POSIX subsystem?
731- # Should we change UNAME_MACHINE based on the output of uname instead
732- # of the specific Alpha model?
733- echo alpha-pc-interix
734- exit ;;
735- 21064:Windows_NT:50:3)
736- echo alpha-dec-winnt3.5
737- exit ;;
738 Amiga*:UNIX_System_V:4.0:*)
739 echo m68k-unknown-sysv4
740 exit ;;
741 *:[Aa]miga[Oo][Ss]:*:*)
742- echo ${UNAME_MACHINE}-unknown-amigaos
743+ echo "$UNAME_MACHINE"-unknown-amigaos
744 exit ;;
745 *:[Mm]orph[Oo][Ss]:*:*)
746- echo ${UNAME_MACHINE}-unknown-morphos
747+ echo "$UNAME_MACHINE"-unknown-morphos
748 exit ;;
749 *:OS/390:*:*)
750 echo i370-ibm-openedition
751@@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
752 echo powerpc-ibm-os400
753 exit ;;
754 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
755- echo arm-acorn-riscix${UNAME_RELEASE}
756+ echo arm-acorn-riscix"$UNAME_RELEASE"
757 exit ;;
758 arm*:riscos:*:*|arm*:RISCOS:*:*)
759 echo arm-unknown-riscos
760@@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
761 sparc) echo sparc-icl-nx7; exit ;;
762 esac ;;
763 s390x:SunOS:*:*)
764- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
765+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
766 exit ;;
767 sun4H:SunOS:5.*:*)
768- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
769+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
770 exit ;;
771 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
772- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
773+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
774 exit ;;
775 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
776- echo i386-pc-auroraux${UNAME_RELEASE}
777+ echo i386-pc-auroraux"$UNAME_RELEASE"
778 exit ;;
779 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
780- eval $set_cc_for_build
781+ eval "$set_cc_for_build"
782 SUN_ARCH=i386
783 # If there is a compiler, see if it is configured for 64-bit objects.
784 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
785@@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
786 SUN_ARCH=x86_64
787 fi
788 fi
789- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
790+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
791 exit ;;
792 sun4*:SunOS:6*:*)
793 # According to config.sub, this is the proper way to canonicalize
794 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
795 # it's likely to be more like Solaris than SunOS4.
796- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
797+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
798 exit ;;
799 sun4*:SunOS:*:*)
800 case "`/usr/bin/arch -k`" in
801@@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
802 ;;
803 esac
804 # Japanese Language versions have a version number like `4.1.3-JL'.
805- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
806+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
807 exit ;;
808 sun3*:SunOS:*:*)
809- echo m68k-sun-sunos${UNAME_RELEASE}
810+ echo m68k-sun-sunos"$UNAME_RELEASE"
811 exit ;;
812 sun*:*:4.2BSD:*)
813 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
814- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
815+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
816 case "`/bin/arch`" in
817 sun3)
818- echo m68k-sun-sunos${UNAME_RELEASE}
819+ echo m68k-sun-sunos"$UNAME_RELEASE"
820 ;;
821 sun4)
822- echo sparc-sun-sunos${UNAME_RELEASE}
823+ echo sparc-sun-sunos"$UNAME_RELEASE"
824 ;;
825 esac
826 exit ;;
827 aushp:SunOS:*:*)
828- echo sparc-auspex-sunos${UNAME_RELEASE}
829+ echo sparc-auspex-sunos"$UNAME_RELEASE"
830 exit ;;
831 # The situation for MiNT is a little confusing. The machine name
832 # can be virtually everything (everything which is not
833@@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
834 # MiNT. But MiNT is downward compatible to TOS, so this should
835 # be no problem.
836 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
837- echo m68k-atari-mint${UNAME_RELEASE}
838+ echo m68k-atari-mint"$UNAME_RELEASE"
839 exit ;;
840 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
841- echo m68k-atari-mint${UNAME_RELEASE}
842+ echo m68k-atari-mint"$UNAME_RELEASE"
843 exit ;;
844 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
845- echo m68k-atari-mint${UNAME_RELEASE}
846+ echo m68k-atari-mint"$UNAME_RELEASE"
847 exit ;;
848 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
849- echo m68k-milan-mint${UNAME_RELEASE}
850+ echo m68k-milan-mint"$UNAME_RELEASE"
851 exit ;;
852 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
853- echo m68k-hades-mint${UNAME_RELEASE}
854+ echo m68k-hades-mint"$UNAME_RELEASE"
855 exit ;;
856 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
857- echo m68k-unknown-mint${UNAME_RELEASE}
858+ echo m68k-unknown-mint"$UNAME_RELEASE"
859 exit ;;
860 m68k:machten:*:*)
861- echo m68k-apple-machten${UNAME_RELEASE}
862+ echo m68k-apple-machten"$UNAME_RELEASE"
863 exit ;;
864 powerpc:machten:*:*)
865- echo powerpc-apple-machten${UNAME_RELEASE}
866+ echo powerpc-apple-machten"$UNAME_RELEASE"
867 exit ;;
868 RISC*:Mach:*:*)
869 echo mips-dec-mach_bsd4.3
870 exit ;;
871 RISC*:ULTRIX:*:*)
872- echo mips-dec-ultrix${UNAME_RELEASE}
873+ echo mips-dec-ultrix"$UNAME_RELEASE"
874 exit ;;
875 VAX*:ULTRIX*:*:*)
876- echo vax-dec-ultrix${UNAME_RELEASE}
877+ echo vax-dec-ultrix"$UNAME_RELEASE"
878 exit ;;
879 2020:CLIX:*:* | 2430:CLIX:*:*)
880- echo clipper-intergraph-clix${UNAME_RELEASE}
881+ echo clipper-intergraph-clix"$UNAME_RELEASE"
882 exit ;;
883 mips:*:*:UMIPS | mips:*:*:RISCos)
884- eval $set_cc_for_build
885- sed 's/^ //' << EOF >$dummy.c
886+ eval "$set_cc_for_build"
887+ sed 's/^ //' << EOF > "$dummy.c"
888 #ifdef __cplusplus
889 #include <stdio.h> /* for printf() prototype */
890 int main (int argc, char *argv[]) {
891@@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
892 #endif
893 #if defined (host_mips) && defined (MIPSEB)
894 #if defined (SYSTYPE_SYSV)
895- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
896+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
897 #endif
898 #if defined (SYSTYPE_SVR4)
899- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
900+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
901 #endif
902 #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
903- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
904+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
905 #endif
906 #endif
907 exit (-1);
908 }
909 EOF
910- $CC_FOR_BUILD -o $dummy $dummy.c &&
911- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
912- SYSTEM_NAME=`$dummy $dummyarg` &&
913+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
914+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
915+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
916 { echo "$SYSTEM_NAME"; exit; }
917- echo mips-mips-riscos${UNAME_RELEASE}
918+ echo mips-mips-riscos"$UNAME_RELEASE"
919 exit ;;
920 Motorola:PowerMAX_OS:*:*)
921 echo powerpc-motorola-powermax
922@@ -530,17 +534,17 @@ EOF
923 AViiON:dgux:*:*)
924 # DG/UX returns AViiON for all architectures
925 UNAME_PROCESSOR=`/usr/bin/uname -p`
926- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
927+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
928 then
929- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
930- [ ${TARGET_BINARY_INTERFACE}x = x ]
931+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
932+ [ "$TARGET_BINARY_INTERFACE"x = x ]
933 then
934- echo m88k-dg-dgux${UNAME_RELEASE}
935+ echo m88k-dg-dgux"$UNAME_RELEASE"
936 else
937- echo m88k-dg-dguxbcs${UNAME_RELEASE}
938+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
939 fi
940 else
941- echo i586-dg-dgux${UNAME_RELEASE}
942+ echo i586-dg-dgux"$UNAME_RELEASE"
943 fi
944 exit ;;
945 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
946@@ -557,7 +561,7 @@ EOF
947 echo m68k-tektronix-bsd
948 exit ;;
949 *:IRIX*:*:*)
950- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
951+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
952 exit ;;
953 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
954 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
955@@ -569,14 +573,14 @@ EOF
956 if [ -x /usr/bin/oslevel ] ; then
957 IBM_REV=`/usr/bin/oslevel`
958 else
959- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
960+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
961 fi
962- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
963+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
964 exit ;;
965 *:AIX:2:3)
966 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
967- eval $set_cc_for_build
968- sed 's/^ //' << EOF >$dummy.c
969+ eval "$set_cc_for_build"
970+ sed 's/^ //' << EOF > "$dummy.c"
971 #include <sys/systemcfg.h>
972
973 main()
974@@ -587,7 +591,7 @@ EOF
975 exit(0);
976 }
977 EOF
978- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
979+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
980 then
981 echo "$SYSTEM_NAME"
982 else
983@@ -601,7 +605,7 @@ EOF
984 exit ;;
985 *:AIX:*:[4567])
986 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
987- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
988+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
989 IBM_ARCH=rs6000
990 else
991 IBM_ARCH=powerpc
992@@ -610,18 +614,18 @@ EOF
993 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
994 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
995 else
996- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
997+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
998 fi
999- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
1000+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
1001 exit ;;
1002 *:AIX:*:*)
1003 echo rs6000-ibm-aix
1004 exit ;;
1005- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
1006+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
1007 echo romp-ibm-bsd4.4
1008 exit ;;
1009 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
1010- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
1011+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
1012 exit ;; # report: romp-ibm BSD 4.3
1013 *:BOSX:*:*)
1014 echo rs6000-bull-bosx
1015@@ -636,28 +640,28 @@ EOF
1016 echo m68k-hp-bsd4.4
1017 exit ;;
1018 9000/[34678]??:HP-UX:*:*)
1019- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
1020- case "${UNAME_MACHINE}" in
1021- 9000/31? ) HP_ARCH=m68000 ;;
1022- 9000/[34]?? ) HP_ARCH=m68k ;;
1023+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
1024+ case "$UNAME_MACHINE" in
1025+ 9000/31?) HP_ARCH=m68000 ;;
1026+ 9000/[34]??) HP_ARCH=m68k ;;
1027 9000/[678][0-9][0-9])
1028 if [ -x /usr/bin/getconf ]; then
1029 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1030 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
1031- case "${sc_cpu_version}" in
1032+ case "$sc_cpu_version" in
1033 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
1034 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
1035 532) # CPU_PA_RISC2_0
1036- case "${sc_kernel_bits}" in
1037+ case "$sc_kernel_bits" in
1038 32) HP_ARCH=hppa2.0n ;;
1039 64) HP_ARCH=hppa2.0w ;;
1040 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
1041 esac ;;
1042 esac
1043 fi
1044- if [ "${HP_ARCH}" = "" ]; then
1045- eval $set_cc_for_build
1046- sed 's/^ //' << EOF >$dummy.c
1047+ if [ "$HP_ARCH" = "" ]; then
1048+ eval "$set_cc_for_build"
1049+ sed 's/^ //' << EOF > "$dummy.c"
1050
1051 #define _HPUX_SOURCE
1052 #include <stdlib.h>
1053@@ -690,13 +694,13 @@ EOF
1054 exit (0);
1055 }
1056 EOF
1057- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
1058+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
1059 test -z "$HP_ARCH" && HP_ARCH=hppa
1060 fi ;;
1061 esac
1062- if [ ${HP_ARCH} = hppa2.0w ]
1063+ if [ "$HP_ARCH" = hppa2.0w ]
1064 then
1065- eval $set_cc_for_build
1066+ eval "$set_cc_for_build"
1067
1068 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
1069 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
1070@@ -715,15 +719,15 @@ EOF
1071 HP_ARCH=hppa64
1072 fi
1073 fi
1074- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
1075+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
1076 exit ;;
1077 ia64:HP-UX:*:*)
1078- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
1079- echo ia64-hp-hpux${HPUX_REV}
1080+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
1081+ echo ia64-hp-hpux"$HPUX_REV"
1082 exit ;;
1083 3050*:HI-UX:*:*)
1084- eval $set_cc_for_build
1085- sed 's/^ //' << EOF >$dummy.c
1086+ eval "$set_cc_for_build"
1087+ sed 's/^ //' << EOF > "$dummy.c"
1088 #include <unistd.h>
1089 int
1090 main ()
1091@@ -748,11 +752,11 @@ EOF
1092 exit (0);
1093 }
1094 EOF
1095- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
1096+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
1097 { echo "$SYSTEM_NAME"; exit; }
1098 echo unknown-hitachi-hiuxwe2
1099 exit ;;
1100- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
1101+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
1102 echo hppa1.1-hp-bsd
1103 exit ;;
1104 9000/8??:4.3bsd:*:*)
1105@@ -761,7 +765,7 @@ EOF
1106 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
1107 echo hppa1.0-hp-mpeix
1108 exit ;;
1109- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
1110+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
1111 echo hppa1.1-hp-osf
1112 exit ;;
1113 hp8??:OSF1:*:*)
1114@@ -769,9 +773,9 @@ EOF
1115 exit ;;
1116 i*86:OSF1:*:*)
1117 if [ -x /usr/sbin/sysversion ] ; then
1118- echo ${UNAME_MACHINE}-unknown-osf1mk
1119+ echo "$UNAME_MACHINE"-unknown-osf1mk
1120 else
1121- echo ${UNAME_MACHINE}-unknown-osf1
1122+ echo "$UNAME_MACHINE"-unknown-osf1
1123 fi
1124 exit ;;
1125 parisc*:Lites*:*:*)
1126@@ -796,128 +800,109 @@ EOF
1127 echo c4-convex-bsd
1128 exit ;;
1129 CRAY*Y-MP:*:*:*)
1130- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1131+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1132 exit ;;
1133 CRAY*[A-Z]90:*:*:*)
1134- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
1135+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
1136 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
1137 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
1138 -e 's/\.[^.]*$/.X/'
1139 exit ;;
1140 CRAY*TS:*:*:*)
1141- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1142+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1143 exit ;;
1144 CRAY*T3E:*:*:*)
1145- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1146+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1147 exit ;;
1148 CRAY*SV1:*:*:*)
1149- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1150+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1151 exit ;;
1152 *:UNICOS/mp:*:*)
1153- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1154+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
1155 exit ;;
1156 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
1157 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
1158 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1159- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
1160+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
1161 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1162 exit ;;
1163 5000:UNIX_System_V:4.*:*)
1164 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1165- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
1166+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
1167 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1168 exit ;;
1169 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
1170- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
1171+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
1172 exit ;;
1173 sparc*:BSD/OS:*:*)
1174- echo sparc-unknown-bsdi${UNAME_RELEASE}
1175+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
1176 exit ;;
1177 *:BSD/OS:*:*)
1178- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
1179+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
1180 exit ;;
1181 *:FreeBSD:*:*)
1182 UNAME_PROCESSOR=`/usr/bin/uname -p`
1183- case ${UNAME_PROCESSOR} in
1184+ case "$UNAME_PROCESSOR" in
1185 amd64)
1186 UNAME_PROCESSOR=x86_64 ;;
1187 i386)
1188 UNAME_PROCESSOR=i586 ;;
1189 esac
1190- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1191+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1192 exit ;;
1193 i*:CYGWIN*:*)
1194- echo ${UNAME_MACHINE}-pc-cygwin
1195+ echo "$UNAME_MACHINE"-pc-cygwin
1196 exit ;;
1197 *:MINGW64*:*)
1198- echo ${UNAME_MACHINE}-pc-mingw64
1199+ echo "$UNAME_MACHINE"-pc-mingw64
1200 exit ;;
1201 *:MINGW*:*)
1202- echo ${UNAME_MACHINE}-pc-mingw32
1203+ echo "$UNAME_MACHINE"-pc-mingw32
1204 exit ;;
1205 *:MSYS*:*)
1206- echo ${UNAME_MACHINE}-pc-msys
1207- exit ;;
1208- i*:windows32*:*)
1209- # uname -m includes "-pc" on this system.
1210- echo ${UNAME_MACHINE}-mingw32
1211+ echo "$UNAME_MACHINE"-pc-msys
1212 exit ;;
1213 i*:PW*:*)
1214- echo ${UNAME_MACHINE}-pc-pw32
1215+ echo "$UNAME_MACHINE"-pc-pw32
1216 exit ;;
1217 *:Interix*:*)
1218- case ${UNAME_MACHINE} in
1219+ case "$UNAME_MACHINE" in
1220 x86)
1221- echo i586-pc-interix${UNAME_RELEASE}
1222+ echo i586-pc-interix"$UNAME_RELEASE"
1223 exit ;;
1224 authenticamd | genuineintel | EM64T)
1225- echo x86_64-unknown-interix${UNAME_RELEASE}
1226+ echo x86_64-unknown-interix"$UNAME_RELEASE"
1227 exit ;;
1228 IA64)
1229- echo ia64-unknown-interix${UNAME_RELEASE}
1230+ echo ia64-unknown-interix"$UNAME_RELEASE"
1231 exit ;;
1232 esac ;;
1233- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
1234- echo i${UNAME_MACHINE}-pc-mks
1235- exit ;;
1236- 8664:Windows_NT:*)
1237- echo x86_64-pc-mks
1238- exit ;;
1239- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
1240- # How do we know it's Interix rather than the generic POSIX subsystem?
1241- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
1242- # UNAME_MACHINE based on the output of uname instead of i386?
1243- echo i586-pc-interix
1244- exit ;;
1245 i*:UWIN*:*)
1246- echo ${UNAME_MACHINE}-pc-uwin
1247+ echo "$UNAME_MACHINE"-pc-uwin
1248 exit ;;
1249 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
1250 echo x86_64-unknown-cygwin
1251 exit ;;
1252- p*:CYGWIN*:*)
1253- echo powerpcle-unknown-cygwin
1254- exit ;;
1255 prep*:SunOS:5.*:*)
1256- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1257+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
1258 exit ;;
1259 *:GNU:*:*)
1260 # the GNU system
1261- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
1262+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
1263 exit ;;
1264 *:GNU/*:*:*)
1265 # other systems with GNU libc and userland
1266- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
1267+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
1268 exit ;;
1269 i*86:Minix:*:*)
1270- echo ${UNAME_MACHINE}-pc-minix
1271+ echo "$UNAME_MACHINE"-pc-minix
1272 exit ;;
1273 aarch64:Linux:*:*)
1274- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1275+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1276 exit ;;
1277 aarch64_be:Linux:*:*)
1278 UNAME_MACHINE=aarch64_be
1279- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1280+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1281 exit ;;
1282 alpha:Linux:*:*)
1283 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1284@@ -931,63 +916,63 @@ EOF
1285 esac
1286 objdump --private-headers /bin/sh | grep -q ld.so.1
1287 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
1288- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1289+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1290 exit ;;
1291 arc:Linux:*:* | arceb:Linux:*:*)
1292- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1293+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1294 exit ;;
1295 arm*:Linux:*:*)
1296- eval $set_cc_for_build
1297+ eval "$set_cc_for_build"
1298 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
1299 | grep -q __ARM_EABI__
1300 then
1301- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1302+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1303 else
1304 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
1305 | grep -q __ARM_PCS_VFP
1306 then
1307- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
1308+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
1309 else
1310- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
1311+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
1312 fi
1313 fi
1314 exit ;;
1315 avr32*:Linux:*:*)
1316- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1317+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1318 exit ;;
1319 cris:Linux:*:*)
1320- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
1321+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
1322 exit ;;
1323 crisv32:Linux:*:*)
1324- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
1325+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
1326 exit ;;
1327 e2k:Linux:*:*)
1328- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1329+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1330 exit ;;
1331 frv:Linux:*:*)
1332- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1333+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1334 exit ;;
1335 hexagon:Linux:*:*)
1336- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1337+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1338 exit ;;
1339 i*86:Linux:*:*)
1340- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
1341+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1342 exit ;;
1343 ia64:Linux:*:*)
1344- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1345+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1346 exit ;;
1347 k1om:Linux:*:*)
1348- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1349+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1350 exit ;;
1351 m32r*:Linux:*:*)
1352- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1353+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1354 exit ;;
1355 m68*:Linux:*:*)
1356- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1357+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1358 exit ;;
1359 mips:Linux:*:* | mips64:Linux:*:*)
1360- eval $set_cc_for_build
1361- sed 's/^ //' << EOF >$dummy.c
1362+ eval "$set_cc_for_build"
1363+ sed 's/^ //' << EOF > "$dummy.c"
1364 #undef CPU
1365 #undef ${UNAME_MACHINE}
1366 #undef ${UNAME_MACHINE}el
1367@@ -1001,70 +986,74 @@ EOF
1368 #endif
1369 #endif
1370 EOF
1371- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
1372- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
1373+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
1374+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
1375 ;;
1376 mips64el:Linux:*:*)
1377- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1378+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1379 exit ;;
1380 openrisc*:Linux:*:*)
1381- echo or1k-unknown-linux-${LIBC}
1382+ echo or1k-unknown-linux-"$LIBC"
1383 exit ;;
1384 or32:Linux:*:* | or1k*:Linux:*:*)
1385- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1386+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1387 exit ;;
1388 padre:Linux:*:*)
1389- echo sparc-unknown-linux-${LIBC}
1390+ echo sparc-unknown-linux-"$LIBC"
1391 exit ;;
1392 parisc64:Linux:*:* | hppa64:Linux:*:*)
1393- echo hppa64-unknown-linux-${LIBC}
1394+ echo hppa64-unknown-linux-"$LIBC"
1395 exit ;;
1396 parisc:Linux:*:* | hppa:Linux:*:*)
1397 # Look for CPU level
1398 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
1399- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
1400- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
1401- *) echo hppa-unknown-linux-${LIBC} ;;
1402+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
1403+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
1404+ *) echo hppa-unknown-linux-"$LIBC" ;;
1405 esac
1406 exit ;;
1407 ppc64:Linux:*:*)
1408- echo powerpc64-unknown-linux-${LIBC}
1409+ echo powerpc64-unknown-linux-"$LIBC"
1410 exit ;;
1411 ppc:Linux:*:*)
1412- echo powerpc-unknown-linux-${LIBC}
1413+ echo powerpc-unknown-linux-"$LIBC"
1414 exit ;;
1415 ppc64le:Linux:*:*)
1416- echo powerpc64le-unknown-linux-${LIBC}
1417+ echo powerpc64le-unknown-linux-"$LIBC"
1418 exit ;;
1419 ppcle:Linux:*:*)
1420- echo powerpcle-unknown-linux-${LIBC}
1421+ echo powerpcle-unknown-linux-"$LIBC"
1422 exit ;;
1423 riscv32:Linux:*:* | riscv64:Linux:*:*)
1424- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1425+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1426 exit ;;
1427 s390:Linux:*:* | s390x:Linux:*:*)
1428- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1429+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1430 exit ;;
1431 sh64*:Linux:*:*)
1432- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1433+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1434 exit ;;
1435 sh*:Linux:*:*)
1436- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1437+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1438 exit ;;
1439 sparc:Linux:*:* | sparc64:Linux:*:*)
1440- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1441+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1442 exit ;;
1443 tile*:Linux:*:*)
1444- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1445+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1446 exit ;;
1447 vax:Linux:*:*)
1448- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1449+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1450 exit ;;
1451 x86_64:Linux:*:*)
1452- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
1453+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
1454+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1455+ else
1456+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1457+ fi
1458 exit ;;
1459 xtensa*:Linux:*:*)
1460- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1461+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1462 exit ;;
1463 i*86:DYNIX/ptx:4*:*)
1464 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1465@@ -1078,34 +1067,34 @@ EOF
1466 # I am not positive that other SVR4 systems won't match this,
1467 # I just have to hope. -- rms.
1468 # Use sysv4.2uw... so that sysv4* matches it.
1469- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1470+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1471 exit ;;
1472 i*86:OS/2:*:*)
1473 # If we were able to find `uname', then EMX Unix compatibility
1474 # is probably installed.
1475- echo ${UNAME_MACHINE}-pc-os2-emx
1476+ echo "$UNAME_MACHINE"-pc-os2-emx
1477 exit ;;
1478 i*86:XTS-300:*:STOP)
1479- echo ${UNAME_MACHINE}-unknown-stop
1480+ echo "$UNAME_MACHINE"-unknown-stop
1481 exit ;;
1482 i*86:atheos:*:*)
1483- echo ${UNAME_MACHINE}-unknown-atheos
1484+ echo "$UNAME_MACHINE"-unknown-atheos
1485 exit ;;
1486 i*86:syllable:*:*)
1487- echo ${UNAME_MACHINE}-pc-syllable
1488+ echo "$UNAME_MACHINE"-pc-syllable
1489 exit ;;
1490 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1491- echo i386-unknown-lynxos${UNAME_RELEASE}
1492+ echo i386-unknown-lynxos"$UNAME_RELEASE"
1493 exit ;;
1494 i*86:*DOS:*:*)
1495- echo ${UNAME_MACHINE}-pc-msdosdjgpp
1496+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
1497 exit ;;
1498- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1499- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1500+ i*86:*:4.*:*)
1501+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
1502 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1503- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
1504+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1505 else
1506- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1507+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1508 fi
1509 exit ;;
1510 i*86:*:5:[678]*)
1511@@ -1115,12 +1104,12 @@ EOF
1512 *Pentium) UNAME_MACHINE=i586 ;;
1513 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1514 esac
1515- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1516+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1517 exit ;;
1518 i*86:*:3.2:*)
1519 if test -f /usr/options/cb.name; then
1520 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1521- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1522+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1523 elif /bin/uname -X 2>/dev/null >/dev/null ; then
1524 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1525 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1526@@ -1130,9 +1119,9 @@ EOF
1527 && UNAME_MACHINE=i686
1528 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1529 && UNAME_MACHINE=i686
1530- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1531+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1532 else
1533- echo ${UNAME_MACHINE}-pc-sysv32
1534+ echo "$UNAME_MACHINE"-pc-sysv32
1535 fi
1536 exit ;;
1537 pc:*:*:*)
1538@@ -1152,9 +1141,9 @@ EOF
1539 exit ;;
1540 i860:*:4.*:*) # i860-SVR4
1541 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1542- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1543+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1544 else # Add other i860-SVR4 vendors below as they are discovered.
1545- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1546+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
1547 fi
1548 exit ;;
1549 mini*:CTIX:SYS*5:*)
1550@@ -1174,9 +1163,9 @@ EOF
1551 test -r /etc/.relid \
1552 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1553 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1554- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1555+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1556 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1557- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1558+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1559 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1560 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1561 && { echo i486-ncr-sysv4; exit; } ;;
1562@@ -1185,28 +1174,28 @@ EOF
1563 test -r /etc/.relid \
1564 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1565 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1566- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1567+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1568 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1569- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1570+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1571 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1572- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1573+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1574 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1575- echo m68k-unknown-lynxos${UNAME_RELEASE}
1576+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
1577 exit ;;
1578 mc68030:UNIX_System_V:4.*:*)
1579 echo m68k-atari-sysv4
1580 exit ;;
1581 TSUNAMI:LynxOS:2.*:*)
1582- echo sparc-unknown-lynxos${UNAME_RELEASE}
1583+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
1584 exit ;;
1585 rs6000:LynxOS:2.*:*)
1586- echo rs6000-unknown-lynxos${UNAME_RELEASE}
1587+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1588 exit ;;
1589 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1590- echo powerpc-unknown-lynxos${UNAME_RELEASE}
1591+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1592 exit ;;
1593 SM[BE]S:UNIX_SV:*:*)
1594- echo mips-dde-sysv${UNAME_RELEASE}
1595+ echo mips-dde-sysv"$UNAME_RELEASE"
1596 exit ;;
1597 RM*:ReliantUNIX-*:*:*)
1598 echo mips-sni-sysv4
1599@@ -1217,7 +1206,7 @@ EOF
1600 *:SINIX-*:*:*)
1601 if uname -p 2>/dev/null >/dev/null ; then
1602 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1603- echo ${UNAME_MACHINE}-sni-sysv4
1604+ echo "$UNAME_MACHINE"-sni-sysv4
1605 else
1606 echo ns32k-sni-sysv
1607 fi
1608@@ -1237,23 +1226,23 @@ EOF
1609 exit ;;
1610 i*86:VOS:*:*)
1611 # From Paul.Green@stratus.com.
1612- echo ${UNAME_MACHINE}-stratus-vos
1613+ echo "$UNAME_MACHINE"-stratus-vos
1614 exit ;;
1615 *:VOS:*:*)
1616 # From Paul.Green@stratus.com.
1617 echo hppa1.1-stratus-vos
1618 exit ;;
1619 mc68*:A/UX:*:*)
1620- echo m68k-apple-aux${UNAME_RELEASE}
1621+ echo m68k-apple-aux"$UNAME_RELEASE"
1622 exit ;;
1623 news*:NEWS-OS:6*:*)
1624 echo mips-sony-newsos6
1625 exit ;;
1626 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1627 if [ -d /usr/nec ]; then
1628- echo mips-nec-sysv${UNAME_RELEASE}
1629+ echo mips-nec-sysv"$UNAME_RELEASE"
1630 else
1631- echo mips-unknown-sysv${UNAME_RELEASE}
1632+ echo mips-unknown-sysv"$UNAME_RELEASE"
1633 fi
1634 exit ;;
1635 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1636@@ -1272,39 +1261,39 @@ EOF
1637 echo x86_64-unknown-haiku
1638 exit ;;
1639 SX-4:SUPER-UX:*:*)
1640- echo sx4-nec-superux${UNAME_RELEASE}
1641+ echo sx4-nec-superux"$UNAME_RELEASE"
1642 exit ;;
1643 SX-5:SUPER-UX:*:*)
1644- echo sx5-nec-superux${UNAME_RELEASE}
1645+ echo sx5-nec-superux"$UNAME_RELEASE"
1646 exit ;;
1647 SX-6:SUPER-UX:*:*)
1648- echo sx6-nec-superux${UNAME_RELEASE}
1649+ echo sx6-nec-superux"$UNAME_RELEASE"
1650 exit ;;
1651 SX-7:SUPER-UX:*:*)
1652- echo sx7-nec-superux${UNAME_RELEASE}
1653+ echo sx7-nec-superux"$UNAME_RELEASE"
1654 exit ;;
1655 SX-8:SUPER-UX:*:*)
1656- echo sx8-nec-superux${UNAME_RELEASE}
1657+ echo sx8-nec-superux"$UNAME_RELEASE"
1658 exit ;;
1659 SX-8R:SUPER-UX:*:*)
1660- echo sx8r-nec-superux${UNAME_RELEASE}
1661+ echo sx8r-nec-superux"$UNAME_RELEASE"
1662 exit ;;
1663 SX-ACE:SUPER-UX:*:*)
1664- echo sxace-nec-superux${UNAME_RELEASE}
1665+ echo sxace-nec-superux"$UNAME_RELEASE"
1666 exit ;;
1667 Power*:Rhapsody:*:*)
1668- echo powerpc-apple-rhapsody${UNAME_RELEASE}
1669+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1670 exit ;;
1671 *:Rhapsody:*:*)
1672- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1673+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1674 exit ;;
1675 *:Darwin:*:*)
1676 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1677- eval $set_cc_for_build
1678+ eval "$set_cc_for_build"
1679 if test "$UNAME_PROCESSOR" = unknown ; then
1680 UNAME_PROCESSOR=powerpc
1681 fi
1682- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1683+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
1684 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1685 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1686 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1687@@ -1332,7 +1321,7 @@ EOF
1688 # that Apple uses in portable devices.
1689 UNAME_PROCESSOR=x86_64
1690 fi
1691- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1692+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1693 exit ;;
1694 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1695 UNAME_PROCESSOR=`uname -p`
1696@@ -1340,22 +1329,25 @@ EOF
1697 UNAME_PROCESSOR=i386
1698 UNAME_MACHINE=pc
1699 fi
1700- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1701+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1702 exit ;;
1703 *:QNX:*:4*)
1704 echo i386-pc-qnx
1705 exit ;;
1706 NEO-*:NONSTOP_KERNEL:*:*)
1707- echo neo-tandem-nsk${UNAME_RELEASE}
1708+ echo neo-tandem-nsk"$UNAME_RELEASE"
1709 exit ;;
1710 NSE-*:NONSTOP_KERNEL:*:*)
1711- echo nse-tandem-nsk${UNAME_RELEASE}
1712+ echo nse-tandem-nsk"$UNAME_RELEASE"
1713 exit ;;
1714 NSR-*:NONSTOP_KERNEL:*:*)
1715- echo nsr-tandem-nsk${UNAME_RELEASE}
1716+ echo nsr-tandem-nsk"$UNAME_RELEASE"
1717+ exit ;;
1718+ NSV-*:NONSTOP_KERNEL:*:*)
1719+ echo nsv-tandem-nsk"$UNAME_RELEASE"
1720 exit ;;
1721 NSX-*:NONSTOP_KERNEL:*:*)
1722- echo nsx-tandem-nsk${UNAME_RELEASE}
1723+ echo nsx-tandem-nsk"$UNAME_RELEASE"
1724 exit ;;
1725 *:NonStop-UX:*:*)
1726 echo mips-compaq-nonstopux
1727@@ -1364,7 +1356,7 @@ EOF
1728 echo bs2000-siemens-sysv
1729 exit ;;
1730 DS/*:UNIX_System_V:*:*)
1731- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1732+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1733 exit ;;
1734 *:Plan9:*:*)
1735 # "uname -m" is not consistent, so use $cputype instead. 386
1736@@ -1375,7 +1367,7 @@ EOF
1737 else
1738 UNAME_MACHINE="$cputype"
1739 fi
1740- echo ${UNAME_MACHINE}-unknown-plan9
1741+ echo "$UNAME_MACHINE"-unknown-plan9
1742 exit ;;
1743 *:TOPS-10:*:*)
1744 echo pdp10-unknown-tops10
1745@@ -1396,14 +1388,14 @@ EOF
1746 echo pdp10-unknown-its
1747 exit ;;
1748 SEI:*:*:SEIUX)
1749- echo mips-sei-seiux${UNAME_RELEASE}
1750+ echo mips-sei-seiux"$UNAME_RELEASE"
1751 exit ;;
1752 *:DragonFly:*:*)
1753- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1754+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1755 exit ;;
1756 *:*VMS:*:*)
1757 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1758- case "${UNAME_MACHINE}" in
1759+ case "$UNAME_MACHINE" in
1760 A*) echo alpha-dec-vms ; exit ;;
1761 I*) echo ia64-dec-vms ; exit ;;
1762 V*) echo vax-dec-vms ; exit ;;
1763@@ -1412,32 +1404,44 @@ EOF
1764 echo i386-pc-xenix
1765 exit ;;
1766 i*86:skyos:*:*)
1767- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
1768+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
1769 exit ;;
1770 i*86:rdos:*:*)
1771- echo ${UNAME_MACHINE}-pc-rdos
1772+ echo "$UNAME_MACHINE"-pc-rdos
1773 exit ;;
1774 i*86:AROS:*:*)
1775- echo ${UNAME_MACHINE}-pc-aros
1776+ echo "$UNAME_MACHINE"-pc-aros
1777 exit ;;
1778 x86_64:VMkernel:*:*)
1779- echo ${UNAME_MACHINE}-unknown-esx
1780+ echo "$UNAME_MACHINE"-unknown-esx
1781 exit ;;
1782 amd64:Isilon\ OneFS:*:*)
1783 echo x86_64-unknown-onefs
1784 exit ;;
1785 esac
1786
1787+echo "$0: unable to guess system type" >&2
1788+
1789+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
1790+ mips:Linux | mips64:Linux)
1791+ # If we got here on MIPS GNU/Linux, output extra information.
1792+ cat >&2 <<EOF
1793+
1794+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
1795+the system type. Please install a C compiler and try again.
1796+EOF
1797+ ;;
1798+esac
1799+
1800 cat >&2 <<EOF
1801-$0: unable to guess system type
1802
1803 This script (version $timestamp), has failed to recognize the
1804 operating system you are using. If your script is old, overwrite *all*
1805 copies of config.guess and config.sub with the latest versions from:
1806
1807- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1808+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1809 and
1810- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1811+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1812
1813 If $0 has already been updated, send the following data and any
1814 information you think might be pertinent to config-patches@gnu.org to
1815@@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
1816 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1817 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1818
1819-UNAME_MACHINE = ${UNAME_MACHINE}
1820-UNAME_RELEASE = ${UNAME_RELEASE}
1821-UNAME_SYSTEM = ${UNAME_SYSTEM}
1822-UNAME_VERSION = ${UNAME_VERSION}
1823+UNAME_MACHINE = "$UNAME_MACHINE"
1824+UNAME_RELEASE = "$UNAME_RELEASE"
1825+UNAME_SYSTEM = "$UNAME_SYSTEM"
1826+UNAME_VERSION = "$UNAME_VERSION"
1827 EOF
1828
1829 exit 1
1830
1831 # Local variables:
1832-# eval: (add-hook 'write-file-hooks 'time-stamp)
1833+# eval: (add-hook 'write-file-functions 'time-stamp)
1834 # time-stamp-start: "timestamp='"
1835 # time-stamp-format: "%:y-%02m-%02d"
1836 # time-stamp-end: "'"
1837diff --git a/build-aux/config.sub b/build-aux/config.sub
1838index f4bafc1..1d8e98b 100755
1839--- a/build-aux/config.sub
1840+++ b/build-aux/config.sub
1841@@ -1,8 +1,8 @@
1842-#!/bin/sh
1843+#! /bin/sh
1844 # Configuration validation subroutine script.
1845-# Copyright 1992-2017 Free Software Foundation, Inc.
1846+# Copyright 1992-2018 Free Software Foundation, Inc.
1847
1848-timestamp='2017-04-02'
1849+timestamp='2018-02-22'
1850
1851 # This file is free software; you can redistribute it and/or modify it
1852 # under the terms of the GNU General Public License as published by
1853@@ -15,7 +15,7 @@ timestamp='2017-04-02'
1854 # General Public License for more details.
1855 #
1856 # You should have received a copy of the GNU General Public License
1857-# along with this program; if not, see <http://www.gnu.org/licenses/>.
1858+# along with this program; if not, see <https://www.gnu.org/licenses/>.
1859 #
1860 # As a special exception to the GNU General Public License, if you
1861 # distribute this file as part of a program that contains a
1862@@ -33,7 +33,7 @@ timestamp='2017-04-02'
1863 # Otherwise, we print the canonical config type on stdout and succeed.
1864
1865 # You can get the latest version of this script from:
1866-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1867+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1868
1869 # This file is supposed to be the same for all GNU packages
1870 # and recognize all the CPU types, system types and aliases
1871@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
1872
1873 Canonicalize a configuration name.
1874
1875-Operation modes:
1876+Options:
1877 -h, --help print this help, then exit
1878 -t, --time-stamp print date of last modification, then exit
1879 -v, --version print version number, then exit
1880@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
1881 version="\
1882 GNU config.sub ($timestamp)
1883
1884-Copyright 1992-2017 Free Software Foundation, Inc.
1885+Copyright 1992-2018 Free Software Foundation, Inc.
1886
1887 This is free software; see the source for copying conditions. There is NO
1888 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1889@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
1890
1891 *local*)
1892 # First pass through any local machine types.
1893- echo $1
1894+ echo "$1"
1895 exit ;;
1896
1897 * )
1898@@ -112,7 +112,7 @@ esac
1899
1900 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1901 # Here we must recognize all the valid KERNEL-OS combinations.
1902-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1903+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1904 case $maybe_os in
1905 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
1906 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
1907@@ -120,16 +120,16 @@ case $maybe_os in
1908 kopensolaris*-gnu* | cloudabi*-eabi* | \
1909 storm-chaos* | os2-emx* | rtmk-nova*)
1910 os=-$maybe_os
1911- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1912+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1913 ;;
1914 android-linux)
1915 os=-linux-android
1916- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1917+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
1918 ;;
1919 *)
1920- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1921- if [ $basic_machine != $1 ]
1922- then os=`echo $1 | sed 's/.*-/-/'`
1923+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
1924+ if [ "$basic_machine" != "$1" ]
1925+ then os=`echo "$1" | sed 's/.*-/-/'`
1926 else os=; fi
1927 ;;
1928 esac
1929@@ -178,44 +178,44 @@ case $os in
1930 ;;
1931 -sco6)
1932 os=-sco5v6
1933- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1934+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1935 ;;
1936 -sco5)
1937 os=-sco3.2v5
1938- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1939+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1940 ;;
1941 -sco4)
1942 os=-sco3.2v4
1943- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1944+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1945 ;;
1946 -sco3.2.[4-9]*)
1947 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
1948- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1949+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1950 ;;
1951 -sco3.2v[4-9]*)
1952 # Don't forget version if it is 3.2v4 or newer.
1953- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1954+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1955 ;;
1956 -sco5v6*)
1957 # Don't forget version if it is 3.2v4 or newer.
1958- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1959+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1960 ;;
1961 -sco*)
1962 os=-sco3.2v2
1963- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1964+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1965 ;;
1966 -udk*)
1967- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1968+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1969 ;;
1970 -isc)
1971 os=-isc2.2
1972- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1973+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1974 ;;
1975 -clix*)
1976 basic_machine=clipper-intergraph
1977 ;;
1978 -isc*)
1979- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1980+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
1981 ;;
1982 -lynx*178)
1983 os=-lynxos178
1984@@ -227,10 +227,7 @@ case $os in
1985 os=-lynxos
1986 ;;
1987 -ptx*)
1988- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
1989- ;;
1990- -windowsnt*)
1991- os=`echo $os | sed -e 's/windowsnt/winnt/'`
1992+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
1993 ;;
1994 -psos*)
1995 os=-psos
1996@@ -299,7 +296,7 @@ case $basic_machine in
1997 | nios | nios2 | nios2eb | nios2el \
1998 | ns16k | ns32k \
1999 | open8 | or1k | or1knd | or32 \
2000- | pdp10 | pdp11 | pj | pjl \
2001+ | pdp10 | pj | pjl \
2002 | powerpc | powerpc64 | powerpc64le | powerpcle \
2003 | pru \
2004 | pyramid \
2005@@ -316,7 +313,6 @@ case $basic_machine in
2006 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
2007 | visium \
2008 | wasm32 \
2009- | we32k \
2010 | x86 | xc16x | xstormy16 | xtensa \
2011 | z8k | z80)
2012 basic_machine=$basic_machine-unknown
2013@@ -337,7 +333,7 @@ case $basic_machine in
2014 basic_machine=$basic_machine-unknown
2015 os=-none
2016 ;;
2017- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
2018+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
2019 ;;
2020 ms1)
2021 basic_machine=mt-unknown
2022@@ -366,7 +362,7 @@ case $basic_machine in
2023 ;;
2024 # Object if more than one company name word.
2025 *-*-*)
2026- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
2027+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
2028 exit 1
2029 ;;
2030 # Recognize the basic CPU types with company name.
2031@@ -461,7 +457,7 @@ case $basic_machine in
2032 # Recognize the various machine names and aliases which stand
2033 # for a CPU type and a company and sometimes even an OS.
2034 386bsd)
2035- basic_machine=i386-unknown
2036+ basic_machine=i386-pc
2037 os=-bsd
2038 ;;
2039 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
2040@@ -495,7 +491,7 @@ case $basic_machine in
2041 basic_machine=x86_64-pc
2042 ;;
2043 amd64-*)
2044- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
2045+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2046 ;;
2047 amdahl)
2048 basic_machine=580-amdahl
2049@@ -540,7 +536,7 @@ case $basic_machine in
2050 os=-linux
2051 ;;
2052 blackfin-*)
2053- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2054+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2055 os=-linux
2056 ;;
2057 bluegene*)
2058@@ -548,13 +544,13 @@ case $basic_machine in
2059 os=-cnk
2060 ;;
2061 c54x-*)
2062- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
2063+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2064 ;;
2065 c55x-*)
2066- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
2067+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2068 ;;
2069 c6x-*)
2070- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
2071+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2072 ;;
2073 c90)
2074 basic_machine=c90-cray
2075@@ -643,7 +639,7 @@ case $basic_machine in
2076 basic_machine=rs6000-bull
2077 os=-bosx
2078 ;;
2079- dpx2* | dpx2*-bull)
2080+ dpx2*)
2081 basic_machine=m68k-bull
2082 os=-sysv3
2083 ;;
2084@@ -652,7 +648,7 @@ case $basic_machine in
2085 os=$os"spe"
2086 ;;
2087 e500v[12]-*)
2088- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2089+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2090 os=$os"spe"
2091 ;;
2092 ebmon29k)
2093@@ -744,9 +740,6 @@ case $basic_machine in
2094 hp9k8[0-9][0-9] | hp8[0-9][0-9])
2095 basic_machine=hppa1.0-hp
2096 ;;
2097- hppa-next)
2098- os=-nextstep3
2099- ;;
2100 hppaosf)
2101 basic_machine=hppa1.1-hp
2102 os=-osf
2103@@ -759,26 +752,26 @@ case $basic_machine in
2104 basic_machine=i370-ibm
2105 ;;
2106 i*86v32)
2107- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2108+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
2109 os=-sysv32
2110 ;;
2111 i*86v4*)
2112- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2113+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
2114 os=-sysv4
2115 ;;
2116 i*86v)
2117- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2118+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
2119 os=-sysv
2120 ;;
2121 i*86sol2)
2122- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2123+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
2124 os=-solaris2
2125 ;;
2126 i386mach)
2127 basic_machine=i386-mach
2128 os=-mach
2129 ;;
2130- i386-vsta | vsta)
2131+ vsta)
2132 basic_machine=i386-unknown
2133 os=-vsta
2134 ;;
2135@@ -797,19 +790,16 @@ case $basic_machine in
2136 os=-sysv
2137 ;;
2138 leon-*|leon[3-9]-*)
2139- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
2140+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
2141 ;;
2142 m68knommu)
2143 basic_machine=m68k-unknown
2144 os=-linux
2145 ;;
2146 m68knommu-*)
2147- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
2148+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2149 os=-linux
2150 ;;
2151- m88k-omron*)
2152- basic_machine=m88k-omron
2153- ;;
2154 magnum | m3230)
2155 basic_machine=mips-mips
2156 os=-sysv
2157@@ -841,10 +831,10 @@ case $basic_machine in
2158 os=-mint
2159 ;;
2160 mips3*-*)
2161- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2162+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
2163 ;;
2164 mips3*)
2165- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
2166+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
2167 ;;
2168 monitor)
2169 basic_machine=m68k-rom68k
2170@@ -863,7 +853,7 @@ case $basic_machine in
2171 os=-msdos
2172 ;;
2173 ms1-*)
2174- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
2175+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
2176 ;;
2177 msys)
2178 basic_machine=i686-pc
2179@@ -905,7 +895,7 @@ case $basic_machine in
2180 basic_machine=v70-nec
2181 os=-sysv
2182 ;;
2183- next | m*-next )
2184+ next | m*-next)
2185 basic_machine=m68k-next
2186 case $os in
2187 -nextstep* )
2188@@ -950,6 +940,9 @@ case $basic_machine in
2189 nsr-tandem)
2190 basic_machine=nsr-tandem
2191 ;;
2192+ nsv-tandem)
2193+ basic_machine=nsv-tandem
2194+ ;;
2195 nsx-tandem)
2196 basic_machine=nsx-tandem
2197 ;;
2198@@ -985,7 +978,7 @@ case $basic_machine in
2199 os=-linux
2200 ;;
2201 parisc-*)
2202- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
2203+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2204 os=-linux
2205 ;;
2206 pbd)
2207@@ -1001,7 +994,7 @@ case $basic_machine in
2208 basic_machine=i386-pc
2209 ;;
2210 pc98-*)
2211- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
2212+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2213 ;;
2214 pentium | p5 | k5 | k6 | nexgen | viac3)
2215 basic_machine=i586-pc
2216@@ -1016,16 +1009,16 @@ case $basic_machine in
2217 basic_machine=i786-pc
2218 ;;
2219 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2220- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2221+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2222 ;;
2223 pentiumpro-* | p6-* | 6x86-* | athlon-*)
2224- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2225+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2226 ;;
2227 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
2228- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2229+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2230 ;;
2231 pentium4-*)
2232- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
2233+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2234 ;;
2235 pn)
2236 basic_machine=pn-gould
2237@@ -1035,23 +1028,23 @@ case $basic_machine in
2238 ppc | ppcbe) basic_machine=powerpc-unknown
2239 ;;
2240 ppc-* | ppcbe-*)
2241- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2242+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2243 ;;
2244 ppcle | powerpclittle)
2245 basic_machine=powerpcle-unknown
2246 ;;
2247 ppcle-* | powerpclittle-*)
2248- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2249+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2250 ;;
2251 ppc64) basic_machine=powerpc64-unknown
2252 ;;
2253- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2254+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2255 ;;
2256 ppc64le | powerpc64little)
2257 basic_machine=powerpc64le-unknown
2258 ;;
2259 ppc64le-* | powerpc64little-*)
2260- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2261+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2262 ;;
2263 ps2)
2264 basic_machine=i386-ibm
2265@@ -1105,17 +1098,10 @@ case $basic_machine in
2266 sequent)
2267 basic_machine=i386-sequent
2268 ;;
2269- sh)
2270- basic_machine=sh-hitachi
2271- os=-hms
2272- ;;
2273 sh5el)
2274 basic_machine=sh5le-unknown
2275 ;;
2276- sh64)
2277- basic_machine=sh64-unknown
2278- ;;
2279- sparclite-wrs | simso-wrs)
2280+ simso-wrs)
2281 basic_machine=sparclite-wrs
2282 os=-vxworks
2283 ;;
2284@@ -1134,7 +1120,7 @@ case $basic_machine in
2285 os=-sysv4
2286 ;;
2287 strongarm-* | thumb-*)
2288- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
2289+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
2290 ;;
2291 sun2)
2292 basic_machine=m68000-sun
2293@@ -1248,9 +1234,6 @@ case $basic_machine in
2294 basic_machine=a29k-wrs
2295 os=-vxworks
2296 ;;
2297- wasm32)
2298- basic_machine=wasm32-unknown
2299- ;;
2300 w65*)
2301 basic_machine=w65-wdc
2302 os=-none
2303@@ -1259,6 +1242,9 @@ case $basic_machine in
2304 basic_machine=hppa1.1-winbond
2305 os=-proelf
2306 ;;
2307+ x64)
2308+ basic_machine=x86_64-pc
2309+ ;;
2310 xbox)
2311 basic_machine=i686-pc
2312 os=-mingw32
2313@@ -1267,20 +1253,12 @@ case $basic_machine in
2314 basic_machine=xps100-honeywell
2315 ;;
2316 xscale-* | xscalee[bl]-*)
2317- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
2318+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
2319 ;;
2320 ymp)
2321 basic_machine=ymp-cray
2322 os=-unicos
2323 ;;
2324- z8k-*-coff)
2325- basic_machine=z8k-unknown
2326- os=-sim
2327- ;;
2328- z80-*-coff)
2329- basic_machine=z80-unknown
2330- os=-sim
2331- ;;
2332 none)
2333 basic_machine=none-none
2334 os=-none
2335@@ -1309,10 +1287,6 @@ case $basic_machine in
2336 vax)
2337 basic_machine=vax-dec
2338 ;;
2339- pdp10)
2340- # there are many clones, so DEC is not a safe bet
2341- basic_machine=pdp10-unknown
2342- ;;
2343 pdp11)
2344 basic_machine=pdp11-dec
2345 ;;
2346@@ -1322,9 +1296,6 @@ case $basic_machine in
2347 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2348 basic_machine=sh-unknown
2349 ;;
2350- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
2351- basic_machine=sparc-sun
2352- ;;
2353 cydra)
2354 basic_machine=cydra-cydrome
2355 ;;
2356@@ -1344,7 +1315,7 @@ case $basic_machine in
2357 # Make sure to match an already-canonicalized machine name.
2358 ;;
2359 *)
2360- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
2361+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
2362 exit 1
2363 ;;
2364 esac
2365@@ -1352,10 +1323,10 @@ esac
2366 # Here we canonicalize certain aliases for manufacturers.
2367 case $basic_machine in
2368 *-digital*)
2369- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
2370+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
2371 ;;
2372 *-commodore*)
2373- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
2374+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
2375 ;;
2376 *)
2377 ;;
2378@@ -1366,8 +1337,8 @@ esac
2379 if [ x"$os" != x"" ]
2380 then
2381 case $os in
2382- # First match some system type aliases
2383- # that might get confused with valid system types.
2384+ # First match some system type aliases that might get confused
2385+ # with valid system types.
2386 # -solaris* is a basic system type, with this one exception.
2387 -auroraux)
2388 os=-auroraux
2389@@ -1378,18 +1349,19 @@ case $os in
2390 -solaris)
2391 os=-solaris2
2392 ;;
2393- -svr4*)
2394- os=-sysv4
2395- ;;
2396 -unixware*)
2397 os=-sysv4.2uw
2398 ;;
2399 -gnu/linux*)
2400 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
2401 ;;
2402- # First accept the basic system types.
2403+ # es1800 is here to avoid being matched by es* (a different OS)
2404+ -es1800*)
2405+ os=-ose
2406+ ;;
2407+ # Now accept the basic system types.
2408 # The portable systems comes first.
2409- # Each alternative MUST END IN A *, to match a version number.
2410+ # Each alternative MUST end in a * to match a version number.
2411 # -sysv* is not here because it comes later, after sysvr4.
2412 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
2413 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
2414@@ -1399,7 +1371,7 @@ case $os in
2415 | -aos* | -aros* | -cloudabi* | -sortix* \
2416 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
2417 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
2418- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
2419+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
2420 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
2421 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
2422 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2423@@ -1410,14 +1382,15 @@ case $os in
2424 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
2425 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
2426 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
2427- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
2428+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
2429 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
2430 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
2431 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
2432- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
2433+ | -morphos* | -superux* | -rtmk* | -windiss* \
2434 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
2435 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
2436- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
2437+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
2438+ | -midnightbsd*)
2439 # Remember, each alternative MUST END IN *, to match a version number.
2440 ;;
2441 -qnx*)
2442@@ -1434,12 +1407,12 @@ case $os in
2443 -nto*)
2444 os=`echo $os | sed -e 's|nto|nto-qnx|'`
2445 ;;
2446- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
2447- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
2448+ -sim | -xray | -os68k* | -v88r* \
2449+ | -windows* | -osx | -abug | -netware* | -os9* \
2450 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
2451 ;;
2452 -mac*)
2453- os=`echo $os | sed -e 's|mac|macos|'`
2454+ os=`echo "$os" | sed -e 's|mac|macos|'`
2455 ;;
2456 -linux-dietlibc)
2457 os=-linux-dietlibc
2458@@ -1448,10 +1421,10 @@ case $os in
2459 os=`echo $os | sed -e 's|linux|linux-gnu|'`
2460 ;;
2461 -sunos5*)
2462- os=`echo $os | sed -e 's|sunos5|solaris2|'`
2463+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
2464 ;;
2465 -sunos6*)
2466- os=`echo $os | sed -e 's|sunos6|solaris3|'`
2467+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
2468 ;;
2469 -opened*)
2470 os=-openedition
2471@@ -1462,12 +1435,6 @@ case $os in
2472 -wince*)
2473 os=-wince
2474 ;;
2475- -osfrose*)
2476- os=-osfrose
2477- ;;
2478- -osf*)
2479- os=-osf
2480- ;;
2481 -utek*)
2482 os=-bsd
2483 ;;
2484@@ -1492,7 +1459,7 @@ case $os in
2485 -nova*)
2486 os=-rtmk-nova
2487 ;;
2488- -ns2 )
2489+ -ns2)
2490 os=-nextstep2
2491 ;;
2492 -nsk*)
2493@@ -1514,7 +1481,7 @@ case $os in
2494 -oss*)
2495 os=-sysv3
2496 ;;
2497- -svr4)
2498+ -svr4*)
2499 os=-sysv4
2500 ;;
2501 -svr3)
2502@@ -1529,24 +1496,28 @@ case $os in
2503 -ose*)
2504 os=-ose
2505 ;;
2506- -es1800*)
2507- os=-ose
2508- ;;
2509- -xenix)
2510- os=-xenix
2511- ;;
2512 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
2513 os=-mint
2514 ;;
2515- -aros*)
2516- os=-aros
2517- ;;
2518 -zvmoe)
2519 os=-zvmoe
2520 ;;
2521 -dicos*)
2522 os=-dicos
2523 ;;
2524+ -pikeos*)
2525+ # Until real need of OS specific support for
2526+ # particular features comes up, bare metal
2527+ # configurations are quite functional.
2528+ case $basic_machine in
2529+ arm*)
2530+ os=-eabi
2531+ ;;
2532+ *)
2533+ os=-elf
2534+ ;;
2535+ esac
2536+ ;;
2537 -nacl*)
2538 ;;
2539 -ios)
2540@@ -1556,7 +1527,7 @@ case $os in
2541 *)
2542 # Get rid of the `-' at the beginning of $os.
2543 os=`echo $os | sed 's/[^-]*-//'`
2544- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
2545+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
2546 exit 1
2547 ;;
2548 esac
2549@@ -1652,9 +1623,6 @@ case $basic_machine in
2550 *-be)
2551 os=-beos
2552 ;;
2553- *-haiku)
2554- os=-haiku
2555- ;;
2556 *-ibm)
2557 os=-aix
2558 ;;
2559@@ -1694,7 +1662,7 @@ case $basic_machine in
2560 m88k-omron*)
2561 os=-luna
2562 ;;
2563- *-next )
2564+ *-next)
2565 os=-nextstep
2566 ;;
2567 *-sequent)
2568@@ -1709,9 +1677,6 @@ case $basic_machine in
2569 i370-*)
2570 os=-mvs
2571 ;;
2572- *-next)
2573- os=-nextstep3
2574- ;;
2575 *-gould)
2576 os=-sysv
2577 ;;
2578@@ -1821,15 +1786,15 @@ case $basic_machine in
2579 vendor=stratus
2580 ;;
2581 esac
2582- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
2583+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
2584 ;;
2585 esac
2586
2587-echo $basic_machine$os
2588+echo "$basic_machine$os"
2589 exit
2590
2591 # Local variables:
2592-# eval: (add-hook 'write-file-hooks 'time-stamp)
2593+# eval: (add-hook 'write-file-functions 'time-stamp)
2594 # time-stamp-start: "timestamp='"
2595 # time-stamp-format: "%:y-%02m-%02d"
2596 # time-stamp-end: "'"
2597diff --git a/build-aux/depcomp b/build-aux/depcomp
2598index 30379e2..65cbf70 100755
2599--- a/build-aux/depcomp
2600+++ b/build-aux/depcomp
2601@@ -1,9 +1,9 @@
2602-#!/bin/sh
2603+#! /bin/sh
2604 # depcomp - compile a program generating dependencies as side-effects
2605
2606-scriptversion=2016-01-11.22; # UTC
2607+scriptversion=2018-03-07.03; # UTC
2608
2609-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
2610+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
2611
2612 # This program is free software; you can redistribute it and/or modify
2613 # it under the terms of the GNU General Public License as published by
2614@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
2615 # GNU General Public License for more details.
2616
2617 # You should have received a copy of the GNU General Public License
2618-# along with this program. If not, see <http://www.gnu.org/licenses/>.
2619+# along with this program. If not, see <https://www.gnu.org/licenses/>.
2620
2621 # As a special exception to the GNU General Public License, if you
2622 # distribute this file as part of a program that contains a
2623@@ -783,7 +783,7 @@ exit 0
2624 # Local Variables:
2625 # mode: shell-script
2626 # sh-indentation: 2
2627-# eval: (add-hook 'write-file-hooks 'time-stamp)
2628+# eval: (add-hook 'before-save-hook 'time-stamp)
2629 # time-stamp-start: "scriptversion="
2630 # time-stamp-format: "%:y-%02m-%02d.%02H"
2631 # time-stamp-time-zone: "UTC0"
2632diff --git a/build-aux/install-sh b/build-aux/install-sh
2633index 0360b79..8175c64 100755
2634--- a/build-aux/install-sh
2635+++ b/build-aux/install-sh
2636@@ -1,7 +1,7 @@
2637 #!/bin/sh
2638 # install - install a program, script, or datafile
2639
2640-scriptversion=2016-01-11.22; # UTC
2641+scriptversion=2018-03-11.20; # UTC
2642
2643 # This originates from X11R5 (mit/util/scripts/install.sh), which was
2644 # later released in X11R6 (xc/config/util/install.sh) with the
2645@@ -271,15 +271,18 @@ do
2646 fi
2647 dst=$dst_arg
2648
2649- # If destination is a directory, append the input filename; won't work
2650- # if double slashes aren't ignored.
2651+ # If destination is a directory, append the input filename.
2652 if test -d "$dst"; then
2653 if test "$is_target_a_directory" = never; then
2654 echo "$0: $dst_arg: Is a directory" >&2
2655 exit 1
2656 fi
2657 dstdir=$dst
2658- dst=$dstdir/`basename "$src"`
2659+ dstbase=`basename "$src"`
2660+ case $dst in
2661+ */) dst=$dst$dstbase;;
2662+ *) dst=$dst/$dstbase;;
2663+ esac
2664 dstdir_status=0
2665 else
2666 dstdir=`dirname "$dst"`
2667@@ -288,6 +291,11 @@ do
2668 fi
2669 fi
2670
2671+ case $dstdir in
2672+ */) dstdirslash=$dstdir;;
2673+ *) dstdirslash=$dstdir/;;
2674+ esac
2675+
2676 obsolete_mkdir_used=false
2677
2678 if test $dstdir_status != 0; then
2679@@ -324,34 +332,43 @@ do
2680 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
2681 ;;
2682 *)
2683+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
2684+ # here however when possible just to lower collision chance.
2685 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
2686- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
2687
2688+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
2689+
2690+ # Because "mkdir -p" follows existing symlinks and we likely work
2691+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
2692+ # directory is successfully created first before we actually test
2693+ # 'mkdir -p' feature.
2694 if (umask $mkdir_umask &&
2695- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
2696+ $mkdirprog $mkdir_mode "$tmpdir" &&
2697+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
2698 then
2699 if test -z "$dir_arg" || {
2700 # Check for POSIX incompatibilities with -m.
2701 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
2702 # other-writable bit of parent directory when it shouldn't.
2703 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
2704- ls_ld_tmpdir=`ls -ld "$tmpdir"`
2705+ test_tmpdir="$tmpdir/a"
2706+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
2707 case $ls_ld_tmpdir in
2708 d????-?r-*) different_mode=700;;
2709 d????-?--*) different_mode=755;;
2710 *) false;;
2711 esac &&
2712- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
2713- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
2714+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
2715+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
2716 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
2717 }
2718 }
2719 then posix_mkdir=:
2720 fi
2721- rmdir "$tmpdir/d" "$tmpdir"
2722+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2723 else
2724 # Remove any dirs left behind by ancient mkdir implementations.
2725- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
2726+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
2727 fi
2728 trap '' 0;;
2729 esac;;
2730@@ -427,8 +444,8 @@ do
2731 else
2732
2733 # Make a couple of temp file names in the proper directory.
2734- dsttmp=$dstdir/_inst.$$_
2735- rmtmp=$dstdir/_rm.$$_
2736+ dsttmp=${dstdirslash}_inst.$$_
2737+ rmtmp=${dstdirslash}_rm.$$_
2738
2739 # Trap to clean up those temp files at exit.
2740 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
2741@@ -493,7 +510,7 @@ do
2742 done
2743
2744 # Local variables:
2745-# eval: (add-hook 'write-file-hooks 'time-stamp)
2746+# eval: (add-hook 'before-save-hook 'time-stamp)
2747 # time-stamp-start: "scriptversion="
2748 # time-stamp-format: "%:y-%02m-%02d.%02H"
2749 # time-stamp-time-zone: "UTC0"
2750diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
2751index 30be9c8..617dde4 100644
2752--- a/build-aux/ltmain.sh
2753+++ b/build-aux/ltmain.sh
2754@@ -31,7 +31,7 @@
2755
2756 PROGRAM=libtool
2757 PACKAGE=libtool
2758-VERSION=2.4.6
2759+VERSION="2.4.6 Debian-2.4.6-8"
2760 package_revision=2.4.6
2761
2762
2763@@ -1370,7 +1370,7 @@ func_lt_ver ()
2764 #! /bin/sh
2765
2766 # Set a version string for this script.
2767-scriptversion=2014-01-07.03; # UTC
2768+scriptversion=2015-10-07.11; # UTC
2769
2770 # A portable, pluggable option parser for Bourne shell.
2771 # Written by Gary V. Vaughan, 2010
2772@@ -1530,6 +1530,8 @@ func_run_hooks ()
2773 {
2774 $debug_cmd
2775
2776+ _G_rc_run_hooks=false
2777+
2778 case " $hookable_fns " in
2779 *" $1 "*) ;;
2780 *) func_fatal_error "'$1' does not support hook funcions.n" ;;
2781@@ -1538,16 +1540,16 @@ func_run_hooks ()
2782 eval _G_hook_fns=\$$1_hooks; shift
2783
2784 for _G_hook in $_G_hook_fns; do
2785- eval $_G_hook '"$@"'
2786-
2787- # store returned options list back into positional
2788- # parameters for next 'cmd' execution.
2789- eval _G_hook_result=\$${_G_hook}_result
2790- eval set dummy "$_G_hook_result"; shift
2791+ if eval $_G_hook '"$@"'; then
2792+ # store returned options list back into positional
2793+ # parameters for next 'cmd' execution.
2794+ eval _G_hook_result=\$${_G_hook}_result
2795+ eval set dummy "$_G_hook_result"; shift
2796+ _G_rc_run_hooks=:
2797+ fi
2798 done
2799
2800- func_quote_for_eval ${1+"$@"}
2801- func_run_hooks_result=$func_quote_for_eval_result
2802+ $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
2803 }
2804
2805
2806@@ -1557,10 +1559,16 @@ func_run_hooks ()
2807 ## --------------- ##
2808
2809 # In order to add your own option parsing hooks, you must accept the
2810-# full positional parameter list in your hook function, remove any
2811-# options that you action, and then pass back the remaining unprocessed
2812+# full positional parameter list in your hook function, you may remove/edit
2813+# any options that you action, and then pass back the remaining unprocessed
2814 # options in '<hooked_function_name>_result', escaped suitably for
2815-# 'eval'. Like this:
2816+# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
2817+# hook's caller know that it should pay attention to
2818+# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that
2819+# arguments are left untouched by the hook and therefore caller will ignore the
2820+# result variable.
2821+#
2822+# Like this:
2823 #
2824 # my_options_prep ()
2825 # {
2826@@ -1570,9 +1578,11 @@ func_run_hooks ()
2827 # usage_message=$usage_message'
2828 # -s, --silent don'\''t print informational messages
2829 # '
2830-#
2831-# func_quote_for_eval ${1+"$@"}
2832-# my_options_prep_result=$func_quote_for_eval_result
2833+# # No change in '$@' (ignored completely by this hook). There is
2834+# # no need to do the equivalent (but slower) action:
2835+# # func_quote_for_eval ${1+"$@"}
2836+# # my_options_prep_result=$func_quote_for_eval_result
2837+# false
2838 # }
2839 # func_add_hook func_options_prep my_options_prep
2840 #
2841@@ -1581,25 +1591,37 @@ func_run_hooks ()
2842 # {
2843 # $debug_cmd
2844 #
2845+# args_changed=false
2846+#
2847 # # Note that for efficiency, we parse as many options as we can
2848 # # recognise in a loop before passing the remainder back to the
2849 # # caller on the first unrecognised argument we encounter.
2850 # while test $# -gt 0; do
2851 # opt=$1; shift
2852 # case $opt in
2853-# --silent|-s) opt_silent=: ;;
2854+# --silent|-s) opt_silent=:
2855+# args_changed=:
2856+# ;;
2857 # # Separate non-argument short options:
2858 # -s*) func_split_short_opt "$_G_opt"
2859 # set dummy "$func_split_short_opt_name" \
2860 # "-$func_split_short_opt_arg" ${1+"$@"}
2861 # shift
2862+# args_changed=:
2863 # ;;
2864-# *) set dummy "$_G_opt" "$*"; shift; break ;;
2865+# *) # Make sure the first unrecognised option "$_G_opt"
2866+# # is added back to "$@", we could need that later
2867+# # if $args_changed is true.
2868+# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
2869 # esac
2870 # done
2871 #
2872-# func_quote_for_eval ${1+"$@"}
2873-# my_silent_option_result=$func_quote_for_eval_result
2874+# if $args_changed; then
2875+# func_quote_for_eval ${1+"$@"}
2876+# my_silent_option_result=$func_quote_for_eval_result
2877+# fi
2878+#
2879+# $args_changed
2880 # }
2881 # func_add_hook func_parse_options my_silent_option
2882 #
2883@@ -1611,16 +1633,32 @@ func_run_hooks ()
2884 # $opt_silent && $opt_verbose && func_fatal_help "\
2885 # '--silent' and '--verbose' options are mutually exclusive."
2886 #
2887-# func_quote_for_eval ${1+"$@"}
2888-# my_option_validation_result=$func_quote_for_eval_result
2889+# false
2890 # }
2891 # func_add_hook func_validate_options my_option_validation
2892 #
2893-# You'll alse need to manually amend $usage_message to reflect the extra
2894+# You'll also need to manually amend $usage_message to reflect the extra
2895 # options you parse. It's preferable to append if you can, so that
2896 # multiple option parsing hooks can be added safely.
2897
2898
2899+# func_options_finish [ARG]...
2900+# ----------------------------
2901+# Finishing the option parse loop (call 'func_options' hooks ATM).
2902+func_options_finish ()
2903+{
2904+ $debug_cmd
2905+
2906+ _G_func_options_finish_exit=false
2907+ if func_run_hooks func_options ${1+"$@"}; then
2908+ func_options_finish_result=$func_run_hooks_result
2909+ _G_func_options_finish_exit=:
2910+ fi
2911+
2912+ $_G_func_options_finish_exit
2913+}
2914+
2915+
2916 # func_options [ARG]...
2917 # ---------------------
2918 # All the functions called inside func_options are hookable. See the
2919@@ -1630,17 +1668,28 @@ func_options ()
2920 {
2921 $debug_cmd
2922
2923- func_options_prep ${1+"$@"}
2924- eval func_parse_options \
2925- ${func_options_prep_result+"$func_options_prep_result"}
2926- eval func_validate_options \
2927- ${func_parse_options_result+"$func_parse_options_result"}
2928+ _G_rc_options=false
2929+
2930+ for my_func in options_prep parse_options validate_options options_finish
2931+ do
2932+ if eval func_$my_func '${1+"$@"}'; then
2933+ eval _G_res_var='$'"func_${my_func}_result"
2934+ eval set dummy "$_G_res_var" ; shift
2935+ _G_rc_options=:
2936+ fi
2937+ done
2938
2939- eval func_run_hooks func_options \
2940- ${func_validate_options_result+"$func_validate_options_result"}
2941+ # Save modified positional parameters for caller. As a top-level
2942+ # options-parser function we always need to set the 'func_options_result'
2943+ # variable (regardless the $_G_rc_options value).
2944+ if $_G_rc_options; then
2945+ func_options_result=$_G_res_var
2946+ else
2947+ func_quote_for_eval ${1+"$@"}
2948+ func_options_result=$func_quote_for_eval_result
2949+ fi
2950
2951- # save modified positional parameters for caller
2952- func_options_result=$func_run_hooks_result
2953+ $_G_rc_options
2954 }
2955
2956
2957@@ -1649,9 +1698,9 @@ func_options ()
2958 # All initialisations required before starting the option parse loop.
2959 # Note that when calling hook functions, we pass through the list of
2960 # positional parameters. If a hook function modifies that list, and
2961-# needs to propogate that back to rest of this script, then the complete
2962+# needs to propagate that back to rest of this script, then the complete
2963 # modified list must be put in 'func_run_hooks_result' before
2964-# returning.
2965+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
2966 func_hookable func_options_prep
2967 func_options_prep ()
2968 {
2969@@ -1661,10 +1710,14 @@ func_options_prep ()
2970 opt_verbose=false
2971 opt_warning_types=
2972
2973- func_run_hooks func_options_prep ${1+"$@"}
2974+ _G_rc_options_prep=false
2975+ if func_run_hooks func_options_prep ${1+"$@"}; then
2976+ _G_rc_options_prep=:
2977+ # save modified positional parameters for caller
2978+ func_options_prep_result=$func_run_hooks_result
2979+ fi
2980
2981- # save modified positional parameters for caller
2982- func_options_prep_result=$func_run_hooks_result
2983+ $_G_rc_options_prep
2984 }
2985
2986
2987@@ -1678,18 +1731,20 @@ func_parse_options ()
2988
2989 func_parse_options_result=
2990
2991+ _G_rc_parse_options=false
2992 # this just eases exit handling
2993 while test $# -gt 0; do
2994 # Defer to hook functions for initial option parsing, so they
2995 # get priority in the event of reusing an option name.
2996- func_run_hooks func_parse_options ${1+"$@"}
2997-
2998- # Adjust func_parse_options positional parameters to match
2999- eval set dummy "$func_run_hooks_result"; shift
3000+ if func_run_hooks func_parse_options ${1+"$@"}; then
3001+ eval set dummy "$func_run_hooks_result"; shift
3002+ _G_rc_parse_options=:
3003+ fi
3004
3005 # Break out of the loop if we already parsed every option.
3006 test $# -gt 0 || break
3007
3008+ _G_match_parse_options=:
3009 _G_opt=$1
3010 shift
3011 case $_G_opt in
3012@@ -1704,7 +1759,10 @@ func_parse_options ()
3013 ;;
3014
3015 --warnings|--warning|-W)
3016- test $# = 0 && func_missing_arg $_G_opt && break
3017+ if test $# = 0 && func_missing_arg $_G_opt; then
3018+ _G_rc_parse_options=:
3019+ break
3020+ fi
3021 case " $warning_categories $1" in
3022 *" $1 "*)
3023 # trailing space prevents matching last $1 above
3024@@ -1757,15 +1815,25 @@ func_parse_options ()
3025 shift
3026 ;;
3027
3028- --) break ;;
3029+ --) _G_rc_parse_options=: ; break ;;
3030 -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
3031- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
3032+ *) set dummy "$_G_opt" ${1+"$@"}; shift
3033+ _G_match_parse_options=false
3034+ break
3035+ ;;
3036 esac
3037+
3038+ $_G_match_parse_options && _G_rc_parse_options=:
3039 done
3040
3041- # save modified positional parameters for caller
3042- func_quote_for_eval ${1+"$@"}
3043- func_parse_options_result=$func_quote_for_eval_result
3044+
3045+ if $_G_rc_parse_options; then
3046+ # save modified positional parameters for caller
3047+ func_quote_for_eval ${1+"$@"}
3048+ func_parse_options_result=$func_quote_for_eval_result
3049+ fi
3050+
3051+ $_G_rc_parse_options
3052 }
3053
3054
3055@@ -1778,16 +1846,21 @@ func_validate_options ()
3056 {
3057 $debug_cmd
3058
3059+ _G_rc_validate_options=false
3060+
3061 # Display all warnings if -W was not given.
3062 test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
3063
3064- func_run_hooks func_validate_options ${1+"$@"}
3065+ if func_run_hooks func_validate_options ${1+"$@"}; then
3066+ # save modified positional parameters for caller
3067+ func_validate_options_result=$func_run_hooks_result
3068+ _G_rc_validate_options=:
3069+ fi
3070
3071 # Bail if the options were screwed!
3072 $exit_cmd $EXIT_FAILURE
3073
3074- # save modified positional parameters for caller
3075- func_validate_options_result=$func_run_hooks_result
3076+ $_G_rc_validate_options
3077 }
3078
3079
3080@@ -2068,12 +2141,12 @@ include the following information:
3081 compiler: $LTCC
3082 compiler flags: $LTCFLAGS
3083 linker: $LD (gnu? $with_gnu_ld)
3084- version: $progname (GNU libtool) 2.4.6
3085+ version: $progname $scriptversion Debian-2.4.6-8
3086 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
3087 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
3088
3089 Report bugs to <bug-libtool@gnu.org>.
3090-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
3091+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
3092 General help using GNU software: <http://www.gnu.org/gethelp/>."
3093 exit 0
3094 }
3095@@ -2270,6 +2343,8 @@ libtool_options_prep ()
3096 nonopt=
3097 preserve_args=
3098
3099+ _G_rc_lt_options_prep=:
3100+
3101 # Shorthand for --mode=foo, only valid as the first argument
3102 case $1 in
3103 clean|clea|cle|cl)
3104@@ -2293,11 +2368,18 @@ libtool_options_prep ()
3105 uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
3106 shift; set dummy --mode uninstall ${1+"$@"}; shift
3107 ;;
3108+ *)
3109+ _G_rc_lt_options_prep=false
3110+ ;;
3111 esac
3112
3113- # Pass back the list of options.
3114- func_quote_for_eval ${1+"$@"}
3115- libtool_options_prep_result=$func_quote_for_eval_result
3116+ if $_G_rc_lt_options_prep; then
3117+ # Pass back the list of options.
3118+ func_quote_for_eval ${1+"$@"}
3119+ libtool_options_prep_result=$func_quote_for_eval_result
3120+ fi
3121+
3122+ $_G_rc_lt_options_prep
3123 }
3124 func_add_hook func_options_prep libtool_options_prep
3125
3126@@ -2309,9 +2391,12 @@ libtool_parse_options ()
3127 {
3128 $debug_cmd
3129
3130+ _G_rc_lt_parse_options=false
3131+
3132 # Perform our own loop to consume as many options as possible in
3133 # each iteration.
3134 while test $# -gt 0; do
3135+ _G_match_lt_parse_options=:
3136 _G_opt=$1
3137 shift
3138 case $_G_opt in
3139@@ -2386,15 +2471,22 @@ libtool_parse_options ()
3140 func_append preserve_args " $_G_opt"
3141 ;;
3142
3143- # An option not handled by this hook function:
3144- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
3145+ # An option not handled by this hook function:
3146+ *) set dummy "$_G_opt" ${1+"$@"} ; shift
3147+ _G_match_lt_parse_options=false
3148+ break
3149+ ;;
3150 esac
3151+ $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
3152 done
3153
3154+ if $_G_rc_lt_parse_options; then
3155+ # save modified positional parameters for caller
3156+ func_quote_for_eval ${1+"$@"}
3157+ libtool_parse_options_result=$func_quote_for_eval_result
3158+ fi
3159
3160- # save modified positional parameters for caller
3161- func_quote_for_eval ${1+"$@"}
3162- libtool_parse_options_result=$func_quote_for_eval_result
3163+ $_G_rc_lt_parse_options
3164 }
3165 func_add_hook func_parse_options libtool_parse_options
3166
3167@@ -7274,10 +7366,11 @@ func_mode_link ()
3168 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
3169 # -specs=* GCC specs files
3170 # -stdlib=* select c++ std lib with clang
3171+ # -fsanitize=* Clang/GCC memory and address sanitizer
3172 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
3173 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
3174 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
3175- -specs=*)
3176+ -specs=*|-fsanitize=*)
3177 func_quote_for_eval "$arg"
3178 arg=$func_quote_for_eval_result
3179 func_append compile_command " $arg"
3180@@ -7570,7 +7663,10 @@ func_mode_link ()
3181 case $pass in
3182 dlopen) libs=$dlfiles ;;
3183 dlpreopen) libs=$dlprefiles ;;
3184- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
3185+ link)
3186+ libs="$deplibs %DEPLIBS%"
3187+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
3188+ ;;
3189 esac
3190 fi
3191 if test lib,dlpreopen = "$linkmode,$pass"; then
3192@@ -7889,19 +7985,19 @@ func_mode_link ()
3193 # It is a libtool convenience library, so add in its objects.
3194 func_append convenience " $ladir/$objdir/$old_library"
3195 func_append old_convenience " $ladir/$objdir/$old_library"
3196+ tmp_libs=
3197+ for deplib in $dependency_libs; do
3198+ deplibs="$deplib $deplibs"
3199+ if $opt_preserve_dup_deps; then
3200+ case "$tmp_libs " in
3201+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
3202+ esac
3203+ fi
3204+ func_append tmp_libs " $deplib"
3205+ done
3206 elif test prog != "$linkmode" && test lib != "$linkmode"; then
3207 func_fatal_error "'$lib' is not a convenience library"
3208 fi
3209- tmp_libs=
3210- for deplib in $dependency_libs; do
3211- deplibs="$deplib $deplibs"
3212- if $opt_preserve_dup_deps; then
3213- case "$tmp_libs " in
3214- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
3215- esac
3216- fi
3217- func_append tmp_libs " $deplib"
3218- done
3219 continue
3220 fi # $pass = conv
3221
3222@@ -8825,6 +8921,9 @@ func_mode_link ()
3223 revision=$number_minor
3224 lt_irix_increment=no
3225 ;;
3226+ *)
3227+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
3228+ ;;
3229 esac
3230 ;;
3231 no)
3232diff --git a/build-aux/missing b/build-aux/missing
3233index b7e571e..625aeb1 100755
3234--- a/build-aux/missing
3235+++ b/build-aux/missing
3236@@ -1,9 +1,9 @@
3237-#!/bin/sh
3238+#! /bin/sh
3239 # Common wrapper for a few potentially missing GNU programs.
3240
3241-scriptversion=2016-01-11.22; # UTC
3242+scriptversion=2018-03-07.03; # UTC
3243
3244-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
3245+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
3246 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
3247
3248 # This program is free software; you can redistribute it and/or modify
3249@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
3250 # GNU General Public License for more details.
3251
3252 # You should have received a copy of the GNU General Public License
3253-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3254+# along with this program. If not, see <https://www.gnu.org/licenses/>.
3255
3256 # As a special exception to the GNU General Public License, if you
3257 # distribute this file as part of a program that contains a
3258@@ -101,9 +101,9 @@ else
3259 exit $st
3260 fi
3261
3262-perl_URL=http://www.perl.org/
3263-flex_URL=http://flex.sourceforge.net/
3264-gnu_software_URL=http://www.gnu.org/software
3265+perl_URL=https://www.perl.org/
3266+flex_URL=https://github.com/westes/flex
3267+gnu_software_URL=https://www.gnu.org/software
3268
3269 program_details ()
3270 {
3271@@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
3272 exit $st
3273
3274 # Local variables:
3275-# eval: (add-hook 'write-file-hooks 'time-stamp)
3276+# eval: (add-hook 'before-save-hook 'time-stamp)
3277 # time-stamp-start: "scriptversion="
3278 # time-stamp-format: "%:y-%02m-%02d.%02H"
3279 # time-stamp-time-zone: "UTC0"
3280diff --git a/clutter/Makefile.in b/clutter/Makefile.in
3281index 0827a9c..fd88e85 100644
3282--- a/clutter/Makefile.in
3283+++ b/clutter/Makefile.in
3284@@ -1,7 +1,7 @@
3285-# Makefile.in generated by automake 1.15.1 from Makefile.am.
3286+# Makefile.in generated by automake 1.16.1 from Makefile.am.
3287 # @configure_input@
3288
3289-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
3290+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
3291
3292 # This Makefile.in is free software; the Free Software Foundation
3293 # gives unlimited permission to copy and/or distribute it,
3294@@ -144,7 +144,7 @@ am__recursive_targets = \
3295 $(RECURSIVE_CLEAN_TARGETS) \
3296 $(am__extra_recursive_targets)
3297 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
3298- cscope distdir dist dist-all distcheck
3299+ cscope distdir distdir-am dist dist-all distcheck
3300 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
3301 # Read a list of newline-separated strings from the standard input,
3302 # and print each of them once, without duplicates. Input order is
3303@@ -394,6 +394,7 @@ pdfdir = @pdfdir@
3304 prefix = @prefix@
3305 program_transform_name = @program_transform_name@
3306 psdir = @psdir@
3307+runstatedir = @runstatedir@
3308 sbindir = @sbindir@
3309 sharedstatedir = @sharedstatedir@
3310 srcdir = @srcdir@
3311@@ -437,8 +438,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
3312 echo ' $(SHELL) ./config.status'; \
3313 $(SHELL) ./config.status;; \
3314 *) \
3315- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
3316- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
3317+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
3318+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
3319 esac;
3320
3321 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
3322@@ -565,7 +566,10 @@ distclean-tags:
3323 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
3324 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
3325
3326-distdir: $(DISTFILES)
3327+distdir: $(BUILT_SOURCES)
3328+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
3329+
3330+distdir-am: $(DISTFILES)
3331 $(am__remove_distdir)
3332 test -d "$(distdir)" || mkdir "$(distdir)"
3333 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
3334diff --git a/clutter/aclocal.m4 b/clutter/aclocal.m4
3335index 56e90b0..24c7061 100644
3336--- a/clutter/aclocal.m4
3337+++ b/clutter/aclocal.m4
3338@@ -1,6 +1,6 @@
3339-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
3340+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
3341
3342-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
3343+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
3344
3345 # This file is free software; the Free Software Foundation
3346 # gives unlimited permission to copy and/or distribute it,
3347@@ -20,9 +20,224 @@ You have another version of autoconf. It may work, but is not guaranteed to.
3348 If you have problems, you may need to regenerate the build system entirely.
3349 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
3350
3351-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3352-# serial 11 (pkg-config-0.29.1)
3353+# Configure paths for GLIB
3354+# Owen Taylor 1997-2001
3355+
3356+# Increment this whenever this file is changed.
3357+#serial 1
3358+
3359+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
3360+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
3361+dnl gthread, or gio is specified in MODULES, pass to pkg-config
3362+dnl
3363+AC_DEFUN([AM_PATH_GLIB_2_0],
3364+[dnl
3365+dnl Get the cflags and libraries from pkg-config
3366+dnl
3367+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
3368+ , enable_glibtest=yes)
3369+
3370+ pkg_config_args=glib-2.0
3371+ for module in . $4
3372+ do
3373+ case "$module" in
3374+ gmodule)
3375+ pkg_config_args="$pkg_config_args gmodule-2.0"
3376+ ;;
3377+ gmodule-no-export)
3378+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
3379+ ;;
3380+ gobject)
3381+ pkg_config_args="$pkg_config_args gobject-2.0"
3382+ ;;
3383+ gthread)
3384+ pkg_config_args="$pkg_config_args gthread-2.0"
3385+ ;;
3386+ gio*)
3387+ pkg_config_args="$pkg_config_args $module-2.0"
3388+ ;;
3389+ esac
3390+ done
3391+
3392+ PKG_PROG_PKG_CONFIG([0.16])
3393+
3394+ no_glib=""
3395+
3396+ if test "x$PKG_CONFIG" = x ; then
3397+ no_glib=yes
3398+ PKG_CONFIG=no
3399+ fi
3400+
3401+ min_glib_version=ifelse([$1], ,2.0.0,$1)
3402+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
3403+
3404+ if test x$PKG_CONFIG != xno ; then
3405+ ## don't try to run the test against uninstalled libtool libs
3406+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
3407+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
3408+ enable_glibtest=no
3409+ fi
3410+
3411+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
3412+ :
3413+ else
3414+ no_glib=yes
3415+ fi
3416+ fi
3417+
3418+ if test x"$no_glib" = x ; then
3419+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
3420+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
3421+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
3422+ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
3423+
3424+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
3425+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
3426+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
3427+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
3428+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
3429+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
3430+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
3431+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
3432+ if test "x$enable_glibtest" = "xyes" ; then
3433+ ac_save_CFLAGS="$CFLAGS"
3434+ ac_save_LIBS="$LIBS"
3435+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
3436+ LIBS="$GLIB_LIBS $LIBS"
3437+dnl
3438+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
3439+dnl checks the results of pkg-config to some extent)
3440+dnl
3441+ rm -f conf.glibtest
3442+ AC_TRY_RUN([
3443+#include <glib.h>
3444+#include <stdio.h>
3445+#include <stdlib.h>
3446+
3447+int
3448+main (void)
3449+{
3450+ unsigned int major, minor, micro;
3451+
3452+ fclose (fopen ("conf.glibtest", "w"));
3453+
3454+ if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
3455+ printf("%s, bad version string\n", "$min_glib_version");
3456+ exit(1);
3457+ }
3458+
3459+ if ((glib_major_version != $glib_config_major_version) ||
3460+ (glib_minor_version != $glib_config_minor_version) ||
3461+ (glib_micro_version != $glib_config_micro_version))
3462+ {
3463+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
3464+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
3465+ glib_major_version, glib_minor_version, glib_micro_version);
3466+ printf ("*** was found! If pkg-config was correct, then it is best\n");
3467+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
3468+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
3469+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
3470+ printf("*** required on your system.\n");
3471+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
3472+ printf("*** to point to the correct configuration files\n");
3473+ }
3474+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
3475+ (glib_minor_version != GLIB_MINOR_VERSION) ||
3476+ (glib_micro_version != GLIB_MICRO_VERSION))
3477+ {
3478+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
3479+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
3480+ printf("*** library (version %d.%d.%d)\n",
3481+ glib_major_version, glib_minor_version, glib_micro_version);
3482+ }
3483+ else
3484+ {
3485+ if ((glib_major_version > major) ||
3486+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
3487+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
3488+ {
3489+ return 0;
3490+ }
3491+ else
3492+ {
3493+ printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
3494+ glib_major_version, glib_minor_version, glib_micro_version);
3495+ printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
3496+ major, minor, micro);
3497+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
3498+ printf("***\n");
3499+ printf("*** If you have already installed a sufficiently new version, this error\n");
3500+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
3501+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
3502+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
3503+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
3504+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
3505+ printf("*** so that the correct libraries are found at run-time))\n");
3506+ }
3507+ }
3508+ return 1;
3509+}
3510+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
3511+ CFLAGS="$ac_save_CFLAGS"
3512+ LIBS="$ac_save_LIBS"
3513+ fi
3514+ fi
3515+ if test "x$no_glib" = x ; then
3516+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
3517+ ifelse([$2], , :, [$2])
3518+ else
3519+ AC_MSG_RESULT(no)
3520+ if test "$PKG_CONFIG" = "no" ; then
3521+ echo "*** A new enough version of pkg-config was not found."
3522+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
3523+ else
3524+ if test -f conf.glibtest ; then
3525+ :
3526+ else
3527+ echo "*** Could not run GLIB test program, checking why..."
3528+ ac_save_CFLAGS="$CFLAGS"
3529+ ac_save_LIBS="$LIBS"
3530+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
3531+ LIBS="$LIBS $GLIB_LIBS"
3532+ AC_TRY_LINK([
3533+#include <glib.h>
3534+#include <stdio.h>
3535+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
3536+ [ echo "*** The test program compiled, but did not run. This usually means"
3537+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
3538+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
3539+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
3540+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
3541+ echo "*** is required on your system"
3542+ echo "***"
3543+ echo "*** If you have an old version installed, it is best to remove it, although"
3544+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
3545+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
3546+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
3547+ CFLAGS="$ac_save_CFLAGS"
3548+ LIBS="$ac_save_LIBS"
3549+ fi
3550+ fi
3551+ GLIB_CFLAGS=""
3552+ GLIB_LIBS=""
3553+ GLIB_GENMARSHAL=""
3554+ GOBJECT_QUERY=""
3555+ GLIB_MKENUMS=""
3556+ GLIB_COMPILE_RESOURCES=""
3557+ ifelse([$3], , :, [$3])
3558+ fi
3559+ AC_SUBST(GLIB_CFLAGS)
3560+ AC_SUBST(GLIB_LIBS)
3561+ AC_SUBST(GLIB_GENMARSHAL)
3562+ AC_SUBST(GOBJECT_QUERY)
3563+ AC_SUBST(GLIB_MKENUMS)
3564+ AC_SUBST(GLIB_COMPILE_RESOURCES)
3565+ rm -f conf.glibtest
3566+])
3567
3568+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3569+dnl serial 11 (pkg-config-0.29.1)
3570+dnl
3571 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
3572 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
3573 dnl
3574@@ -296,290 +511,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
3575 AS_VAR_IF([$1], [""], [$5], [$4])dnl
3576 ])dnl PKG_CHECK_VAR
3577
3578-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
3579-dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
3580-dnl [DESCRIPTION], [DEFAULT])
3581-dnl ------------------------------------------
3582-dnl
3583-dnl Prepare a "--with-" configure option using the lowercase
3584-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
3585-dnl PKG_CHECK_MODULES in a single macro.
3586-AC_DEFUN([PKG_WITH_MODULES],
3587-[
3588-m4_pushdef([with_arg], m4_tolower([$1]))
3589-
3590-m4_pushdef([description],
3591- [m4_default([$5], [build with ]with_arg[ support])])
3592-
3593-m4_pushdef([def_arg], [m4_default([$6], [auto])])
3594-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
3595-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
3596-
3597-m4_case(def_arg,
3598- [yes],[m4_pushdef([with_without], [--without-]with_arg)],
3599- [m4_pushdef([with_without],[--with-]with_arg)])
3600-
3601-AC_ARG_WITH(with_arg,
3602- AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
3603- [AS_TR_SH([with_]with_arg)=def_arg])
3604-
3605-AS_CASE([$AS_TR_SH([with_]with_arg)],
3606- [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
3607- [auto],[PKG_CHECK_MODULES([$1],[$2],
3608- [m4_n([def_action_if_found]) $3],
3609- [m4_n([def_action_if_not_found]) $4])])
3610-
3611-m4_popdef([with_arg])
3612-m4_popdef([description])
3613-m4_popdef([def_arg])
3614-
3615-])dnl PKG_WITH_MODULES
3616-
3617-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
3618-dnl [DESCRIPTION], [DEFAULT])
3619-dnl -----------------------------------------------
3620-dnl
3621-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
3622-dnl check._[VARIABLE-PREFIX] is exported as make variable.
3623-AC_DEFUN([PKG_HAVE_WITH_MODULES],
3624-[
3625-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
3626-
3627-AM_CONDITIONAL([HAVE_][$1],
3628- [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
3629-])dnl PKG_HAVE_WITH_MODULES
3630-
3631-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
3632-dnl [DESCRIPTION], [DEFAULT])
3633-dnl ------------------------------------------------------
3634-dnl
3635-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
3636-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
3637-dnl and preprocessor variable.
3638-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
3639-[
3640-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
3641-
3642-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
3643- [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
3644-])dnl PKG_HAVE_DEFINE_WITH_MODULES
3645-
3646-# Configure paths for GLIB
3647-# Owen Taylor 1997-2001
3648-
3649-# Increment this whenever this file is changed.
3650-#serial 1
3651-
3652-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
3653-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
3654-dnl gthread, or gio is specified in MODULES, pass to pkg-config
3655-dnl
3656-AC_DEFUN([AM_PATH_GLIB_2_0],
3657-[dnl
3658-dnl Get the cflags and libraries from pkg-config
3659-dnl
3660-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
3661- , enable_glibtest=yes)
3662-
3663- pkg_config_args=glib-2.0
3664- for module in . $4
3665- do
3666- case "$module" in
3667- gmodule)
3668- pkg_config_args="$pkg_config_args gmodule-2.0"
3669- ;;
3670- gmodule-no-export)
3671- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
3672- ;;
3673- gobject)
3674- pkg_config_args="$pkg_config_args gobject-2.0"
3675- ;;
3676- gthread)
3677- pkg_config_args="$pkg_config_args gthread-2.0"
3678- ;;
3679- gio*)
3680- pkg_config_args="$pkg_config_args $module-2.0"
3681- ;;
3682- esac
3683- done
3684-
3685- PKG_PROG_PKG_CONFIG([0.16])
3686-
3687- no_glib=""
3688-
3689- if test "x$PKG_CONFIG" = x ; then
3690- no_glib=yes
3691- PKG_CONFIG=no
3692- fi
3693-
3694- min_glib_version=ifelse([$1], ,2.0.0,$1)
3695- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
3696-
3697- if test x$PKG_CONFIG != xno ; then
3698- ## don't try to run the test against uninstalled libtool libs
3699- if $PKG_CONFIG --uninstalled $pkg_config_args; then
3700- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
3701- enable_glibtest=no
3702- fi
3703-
3704- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
3705- :
3706- else
3707- no_glib=yes
3708- fi
3709- fi
3710-
3711- if test x"$no_glib" = x ; then
3712- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
3713- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
3714- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
3715- GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
3716-
3717- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
3718- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
3719- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
3720- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
3721- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
3722- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
3723- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
3724- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
3725- if test "x$enable_glibtest" = "xyes" ; then
3726- ac_save_CFLAGS="$CFLAGS"
3727- ac_save_LIBS="$LIBS"
3728- CFLAGS="$CFLAGS $GLIB_CFLAGS"
3729- LIBS="$GLIB_LIBS $LIBS"
3730-dnl
3731-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
3732-dnl checks the results of pkg-config to some extent)
3733-dnl
3734- rm -f conf.glibtest
3735- AC_TRY_RUN([
3736-#include <glib.h>
3737-#include <stdio.h>
3738-#include <stdlib.h>
3739-
3740-int
3741-main (void)
3742-{
3743- unsigned int major, minor, micro;
3744-
3745- fclose (fopen ("conf.glibtest", "w"));
3746-
3747- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
3748- printf("%s, bad version string\n", "$min_glib_version");
3749- exit(1);
3750- }
3751-
3752- if ((glib_major_version != $glib_config_major_version) ||
3753- (glib_minor_version != $glib_config_minor_version) ||
3754- (glib_micro_version != $glib_config_micro_version))
3755- {
3756- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
3757- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
3758- glib_major_version, glib_minor_version, glib_micro_version);
3759- printf ("*** was found! If pkg-config was correct, then it is best\n");
3760- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
3761- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
3762- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
3763- printf("*** required on your system.\n");
3764- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
3765- printf("*** to point to the correct configuration files\n");
3766- }
3767- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
3768- (glib_minor_version != GLIB_MINOR_VERSION) ||
3769- (glib_micro_version != GLIB_MICRO_VERSION))
3770- {
3771- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
3772- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
3773- printf("*** library (version %d.%d.%d)\n",
3774- glib_major_version, glib_minor_version, glib_micro_version);
3775- }
3776- else
3777- {
3778- if ((glib_major_version > major) ||
3779- ((glib_major_version == major) && (glib_minor_version > minor)) ||
3780- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
3781- {
3782- return 0;
3783- }
3784- else
3785- {
3786- printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
3787- glib_major_version, glib_minor_version, glib_micro_version);
3788- printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
3789- major, minor, micro);
3790- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
3791- printf("***\n");
3792- printf("*** If you have already installed a sufficiently new version, this error\n");
3793- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
3794- printf("*** being found. The easiest way to fix this is to remove the old version\n");
3795- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
3796- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
3797- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
3798- printf("*** so that the correct libraries are found at run-time))\n");
3799- }
3800- }
3801- return 1;
3802-}
3803-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
3804- CFLAGS="$ac_save_CFLAGS"
3805- LIBS="$ac_save_LIBS"
3806- fi
3807- fi
3808- if test "x$no_glib" = x ; then
3809- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
3810- ifelse([$2], , :, [$2])
3811- else
3812- AC_MSG_RESULT(no)
3813- if test "$PKG_CONFIG" = "no" ; then
3814- echo "*** A new enough version of pkg-config was not found."
3815- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
3816- else
3817- if test -f conf.glibtest ; then
3818- :
3819- else
3820- echo "*** Could not run GLIB test program, checking why..."
3821- ac_save_CFLAGS="$CFLAGS"
3822- ac_save_LIBS="$LIBS"
3823- CFLAGS="$CFLAGS $GLIB_CFLAGS"
3824- LIBS="$LIBS $GLIB_LIBS"
3825- AC_TRY_LINK([
3826-#include <glib.h>
3827-#include <stdio.h>
3828-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
3829- [ echo "*** The test program compiled, but did not run. This usually means"
3830- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
3831- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
3832- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
3833- echo "*** to the installed location Also, make sure you have run ldconfig if that"
3834- echo "*** is required on your system"
3835- echo "***"
3836- echo "*** If you have an old version installed, it is best to remove it, although"
3837- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
3838- [ echo "*** The test program failed to compile or link. See the file config.log for the"
3839- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
3840- CFLAGS="$ac_save_CFLAGS"
3841- LIBS="$ac_save_LIBS"
3842- fi
3843- fi
3844- GLIB_CFLAGS=""
3845- GLIB_LIBS=""
3846- GLIB_GENMARSHAL=""
3847- GOBJECT_QUERY=""
3848- GLIB_MKENUMS=""
3849- GLIB_COMPILE_RESOURCES=""
3850- ifelse([$3], , :, [$3])
3851- fi
3852- AC_SUBST(GLIB_CFLAGS)
3853- AC_SUBST(GLIB_LIBS)
3854- AC_SUBST(GLIB_GENMARSHAL)
3855- AC_SUBST(GOBJECT_QUERY)
3856- AC_SUBST(GLIB_MKENUMS)
3857- AC_SUBST(GLIB_COMPILE_RESOURCES)
3858- rm -f conf.glibtest
3859-])
3860-
3861-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
3862+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
3863 #
3864 # This file is free software; the Free Software Foundation
3865 # gives unlimited permission to copy and/or distribute it,
3866@@ -591,10 +523,10 @@ main (void)
3867 # generated from the m4 files accompanying Automake X.Y.
3868 # (This private macro should not be called outside this file.)
3869 AC_DEFUN([AM_AUTOMAKE_VERSION],
3870-[am__api_version='1.15'
3871+[am__api_version='1.16'
3872 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3873 dnl require some minimum version. Point them to the right macro.
3874-m4_if([$1], [1.15.1], [],
3875+m4_if([$1], [1.16.1], [],
3876 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3877 ])
3878
3879@@ -610,14 +542,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
3880 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
3881 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
3882 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
3883-[AM_AUTOMAKE_VERSION([1.15.1])dnl
3884+[AM_AUTOMAKE_VERSION([1.16.1])dnl
3885 m4_ifndef([AC_AUTOCONF_VERSION],
3886 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
3887 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
3888
3889 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
3890
3891-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
3892+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
3893 #
3894 # This file is free software; the Free Software Foundation
3895 # gives unlimited permission to copy and/or distribute it,
3896@@ -669,7 +601,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
3897
3898 # AM_CONDITIONAL -*- Autoconf -*-
3899
3900-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
3901+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
3902 #
3903 # This file is free software; the Free Software Foundation
3904 # gives unlimited permission to copy and/or distribute it,
3905@@ -700,7 +632,7 @@ AC_CONFIG_COMMANDS_PRE(
3906 Usually this means the macro was only invoked conditionally.]])
3907 fi])])
3908
3909-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
3910+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
3911 #
3912 # This file is free software; the Free Software Foundation
3913 # gives unlimited permission to copy and/or distribute it,
3914@@ -891,13 +823,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
3915
3916 # Generate code to set up dependency tracking. -*- Autoconf -*-
3917
3918-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
3919+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
3920 #
3921 # This file is free software; the Free Software Foundation
3922 # gives unlimited permission to copy and/or distribute it,
3923 # with or without modifications, as long as this notice is preserved.
3924
3925-
3926 # _AM_OUTPUT_DEPENDENCY_COMMANDS
3927 # ------------------------------
3928 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
3929@@ -905,49 +836,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
3930 # Older Autoconf quotes --file arguments for eval, but not when files
3931 # are listed without --file. Let's play safe and only enable the eval
3932 # if we detect the quoting.
3933- case $CONFIG_FILES in
3934- *\'*) eval set x "$CONFIG_FILES" ;;
3935- *) set x $CONFIG_FILES ;;
3936- esac
3937+ # TODO: see whether this extra hack can be removed once we start
3938+ # requiring Autoconf 2.70 or later.
3939+ AS_CASE([$CONFIG_FILES],
3940+ [*\'*], [eval set x "$CONFIG_FILES"],
3941+ [*], [set x $CONFIG_FILES])
3942 shift
3943- for mf
3944+ # Used to flag and report bootstrapping failures.
3945+ am_rc=0
3946+ for am_mf
3947 do
3948 # Strip MF so we end up with the name of the file.
3949- mf=`echo "$mf" | sed -e 's/:.*$//'`
3950- # Check whether this is an Automake generated Makefile or not.
3951- # We used to match only the files named 'Makefile.in', but
3952- # some people rename them; so instead we look at the file content.
3953- # Grep'ing the first line is not enough: some people post-process
3954- # each Makefile.in and add a new line on top of each file to say so.
3955- # Grep'ing the whole file is not good either: AIX grep has a line
3956+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
3957+ # Check whether this is an Automake generated Makefile which includes
3958+ # dependency-tracking related rules and includes.
3959+ # Grep'ing the whole file directly is not great: AIX grep has a line
3960 # limit of 2048, but all sed's we know have understand at least 4000.
3961- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
3962- dirpart=`AS_DIRNAME("$mf")`
3963- else
3964- continue
3965- fi
3966- # Extract the definition of DEPDIR, am__include, and am__quote
3967- # from the Makefile without running 'make'.
3968- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
3969- test -z "$DEPDIR" && continue
3970- am__include=`sed -n 's/^am__include = //p' < "$mf"`
3971- test -z "$am__include" && continue
3972- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
3973- # Find all dependency output files, they are included files with
3974- # $(DEPDIR) in their names. We invoke sed twice because it is the
3975- # simplest approach to changing $(DEPDIR) to its actual value in the
3976- # expansion.
3977- for file in `sed -n "
3978- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
3979- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
3980- # Make sure the directory exists.
3981- test -f "$dirpart/$file" && continue
3982- fdir=`AS_DIRNAME(["$file"])`
3983- AS_MKDIR_P([$dirpart/$fdir])
3984- # echo "creating $dirpart/$file"
3985- echo '# dummy' > "$dirpart/$file"
3986- done
3987+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
3988+ || continue
3989+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
3990+ am_filepart=`AS_BASENAME(["$am_mf"])`
3991+ AM_RUN_LOG([cd "$am_dirpart" \
3992+ && sed -e '/# am--include-marker/d' "$am_filepart" \
3993+ | $MAKE -f - am--depfiles]) || am_rc=$?
3994 done
3995+ if test $am_rc -ne 0; then
3996+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
3997+ for automatic dependency tracking. Try re-running configure with the
3998+ '--disable-dependency-tracking' option to at least be able to build
3999+ the package (albeit without support for automatic dependency tracking).])
4000+ fi
4001+ AS_UNSET([am_dirpart])
4002+ AS_UNSET([am_filepart])
4003+ AS_UNSET([am_mf])
4004+ AS_UNSET([am_rc])
4005+ rm -f conftest-deps.mk
4006 }
4007 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
4008
4009@@ -956,18 +879,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
4010 # -----------------------------
4011 # This macro should only be invoked once -- use via AC_REQUIRE.
4012 #
4013-# This code is only required when automatic dependency tracking
4014-# is enabled. FIXME. This creates each '.P' file that we will
4015-# need in order to bootstrap the dependency handling code.
4016+# This code is only required when automatic dependency tracking is enabled.
4017+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
4018+# order to bootstrap the dependency handling code.
4019 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
4020 [AC_CONFIG_COMMANDS([depfiles],
4021 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
4022- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
4023-])
4024+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
4025
4026 # Do all the work for Automake. -*- Autoconf -*-
4027
4028-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
4029+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
4030 #
4031 # This file is free software; the Free Software Foundation
4032 # gives unlimited permission to copy and/or distribute it,
4033@@ -1054,8 +976,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
4034 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
4035 # For better backward compatibility. To be removed once Automake 1.9.x
4036 # dies out for good. For more background, see:
4037-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
4038-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
4039+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
4040+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
4041 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
4042 # We need awk for the "check" target (and possibly the TAP driver). The
4043 # system "awk" is bad on some platforms.
4044@@ -1122,7 +1044,7 @@ END
4045 Aborting the configuration process, to ensure you take notice of the issue.
4046
4047 You can download and install GNU coreutils to get an 'rm' implementation
4048-that behaves properly: <http://www.gnu.org/software/coreutils/>.
4049+that behaves properly: <https://www.gnu.org/software/coreutils/>.
4050
4051 If you want to complete the configuration process using your problematic
4052 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
4053@@ -1164,7 +1086,7 @@ for _am_header in $config_headers :; do
4054 done
4055 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
4056
4057-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
4058+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
4059 #
4060 # This file is free software; the Free Software Foundation
4061 # gives unlimited permission to copy and/or distribute it,
4062@@ -1185,7 +1107,7 @@ if test x"${install_sh+set}" != xset; then
4063 fi
4064 AC_SUBST([install_sh])])
4065
4066-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
4067+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
4068 #
4069 # This file is free software; the Free Software Foundation
4070 # gives unlimited permission to copy and/or distribute it,
4071@@ -1206,7 +1128,7 @@ AC_SUBST([am__leading_dot])])
4072
4073 # Check to see how 'make' treats includes. -*- Autoconf -*-
4074
4075-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
4076+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
4077 #
4078 # This file is free software; the Free Software Foundation
4079 # gives unlimited permission to copy and/or distribute it,
4080@@ -1214,49 +1136,42 @@ AC_SUBST([am__leading_dot])])
4081
4082 # AM_MAKE_INCLUDE()
4083 # -----------------
4084-# Check to see how make treats includes.
4085+# Check whether make has an 'include' directive that can support all
4086+# the idioms we need for our automatic dependency tracking code.
4087 AC_DEFUN([AM_MAKE_INCLUDE],
4088-[am_make=${MAKE-make}
4089-cat > confinc << 'END'
4090+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
4091+cat > confinc.mk << 'END'
4092 am__doit:
4093- @echo this is the am__doit target
4094+ @echo this is the am__doit target >confinc.out
4095 .PHONY: am__doit
4096 END
4097-# If we don't find an include directive, just comment out the code.
4098-AC_MSG_CHECKING([for style of include used by $am_make])
4099 am__include="#"
4100 am__quote=
4101-_am_result=none
4102-# First try GNU make style include.
4103-echo "include confinc" > confmf
4104-# Ignore all kinds of additional output from 'make'.
4105-case `$am_make -s -f confmf 2> /dev/null` in #(
4106-*the\ am__doit\ target*)
4107- am__include=include
4108- am__quote=
4109- _am_result=GNU
4110- ;;
4111-esac
4112-# Now try BSD make style include.
4113-if test "$am__include" = "#"; then
4114- echo '.include "confinc"' > confmf
4115- case `$am_make -s -f confmf 2> /dev/null` in #(
4116- *the\ am__doit\ target*)
4117- am__include=.include
4118- am__quote="\""
4119- _am_result=BSD
4120- ;;
4121- esac
4122-fi
4123-AC_SUBST([am__include])
4124-AC_SUBST([am__quote])
4125-AC_MSG_RESULT([$_am_result])
4126-rm -f confinc confmf
4127-])
4128+# BSD make does it like this.
4129+echo '.include "confinc.mk" # ignored' > confmf.BSD
4130+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
4131+echo 'include confinc.mk # ignored' > confmf.GNU
4132+_am_result=no
4133+for s in GNU BSD; do
4134+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
4135+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
4136+ ['0:this is the am__doit target'],
4137+ [AS_CASE([$s],
4138+ [BSD], [am__include='.include' am__quote='"'],
4139+ [am__include='include' am__quote=''])])
4140+ if test "$am__include" != "#"; then
4141+ _am_result="yes ($s style)"
4142+ break
4143+ fi
4144+done
4145+rm -f confinc.* confmf.*
4146+AC_MSG_RESULT([${_am_result}])
4147+AC_SUBST([am__include])])
4148+AC_SUBST([am__quote])])
4149
4150 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
4151
4152-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
4153+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
4154 #
4155 # This file is free software; the Free Software Foundation
4156 # gives unlimited permission to copy and/or distribute it,
4157@@ -1295,7 +1210,7 @@ fi
4158
4159 # Helper functions for option handling. -*- Autoconf -*-
4160
4161-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
4162+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
4163 #
4164 # This file is free software; the Free Software Foundation
4165 # gives unlimited permission to copy and/or distribute it,
4166@@ -1324,7 +1239,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
4167 AC_DEFUN([_AM_IF_OPTION],
4168 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
4169
4170-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
4171+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
4172 #
4173 # This file is free software; the Free Software Foundation
4174 # gives unlimited permission to copy and/or distribute it,
4175@@ -1371,7 +1286,7 @@ AC_LANG_POP([C])])
4176 # For backward compatibility.
4177 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
4178
4179-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
4180+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
4181 #
4182 # This file is free software; the Free Software Foundation
4183 # gives unlimited permission to copy and/or distribute it,
4184@@ -1390,7 +1305,7 @@ AC_DEFUN([AM_RUN_LOG],
4185
4186 # Check to make sure that the build environment is sane. -*- Autoconf -*-
4187
4188-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
4189+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
4190 #
4191 # This file is free software; the Free Software Foundation
4192 # gives unlimited permission to copy and/or distribute it,
4193@@ -1471,7 +1386,7 @@ AC_CONFIG_COMMANDS_PRE(
4194 rm -f conftest.file
4195 ])
4196
4197-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
4198+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
4199 #
4200 # This file is free software; the Free Software Foundation
4201 # gives unlimited permission to copy and/or distribute it,
4202@@ -1531,7 +1446,7 @@ AC_SUBST([AM_BACKSLASH])dnl
4203 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
4204 ])
4205
4206-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
4207+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
4208 #
4209 # This file is free software; the Free Software Foundation
4210 # gives unlimited permission to copy and/or distribute it,
4211@@ -1559,7 +1474,7 @@ fi
4212 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
4213 AC_SUBST([INSTALL_STRIP_PROGRAM])])
4214
4215-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
4216+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
4217 #
4218 # This file is free software; the Free Software Foundation
4219 # gives unlimited permission to copy and/or distribute it,
4220@@ -1578,7 +1493,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
4221
4222 # Check how to create a tarball. -*- Autoconf -*-
4223
4224-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
4225+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
4226 #
4227 # This file is free software; the Free Software Foundation
4228 # gives unlimited permission to copy and/or distribute it,
4229diff --git a/clutter/build/Makefile.in b/clutter/build/Makefile.in
4230index d7be1ec..7fbab51 100644
4231--- a/clutter/build/Makefile.in
4232+++ b/clutter/build/Makefile.in
4233@@ -1,7 +1,7 @@
4234-# Makefile.in generated by automake 1.15.1 from Makefile.am.
4235+# Makefile.in generated by automake 1.16.1 from Makefile.am.
4236 # @configure_input@
4237
4238-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4239+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4240
4241 # This Makefile.in is free software; the Free Software Foundation
4242 # gives unlimited permission to copy and/or distribute it,
4243@@ -140,7 +140,7 @@ am__recursive_targets = \
4244 $(RECURSIVE_CLEAN_TARGETS) \
4245 $(am__extra_recursive_targets)
4246 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
4247- distdir
4248+ distdir distdir-am
4249 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
4250 # Read a list of newline-separated strings from the standard input,
4251 # and print each of them once, without duplicates. Input order is
4252@@ -372,6 +372,7 @@ pdfdir = @pdfdir@
4253 prefix = @prefix@
4254 program_transform_name = @program_transform_name@
4255 psdir = @psdir@
4256+runstatedir = @runstatedir@
4257 sbindir = @sbindir@
4258 sharedstatedir = @sharedstatedir@
4259 srcdir = @srcdir@
4260@@ -401,8 +402,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4261 *config.status*) \
4262 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
4263 *) \
4264- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
4265- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
4266+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
4267+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
4268 esac;
4269
4270 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4271@@ -519,7 +520,10 @@ cscopelist-am: $(am__tagged_files)
4272 distclean-tags:
4273 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4274
4275-distdir: $(DISTFILES)
4276+distdir: $(BUILT_SOURCES)
4277+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
4278+
4279+distdir-am: $(DISTFILES)
4280 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
4281 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
4282 list='$(DISTFILES)'; \
4283diff --git a/clutter/build/autotools/Makefile.in b/clutter/build/autotools/Makefile.in
4284index 098b030..489ce7a 100644
4285--- a/clutter/build/autotools/Makefile.in
4286+++ b/clutter/build/autotools/Makefile.in
4287@@ -1,7 +1,7 @@
4288-# Makefile.in generated by automake 1.15.1 from Makefile.am.
4289+# Makefile.in generated by automake 1.16.1 from Makefile.am.
4290 # @configure_input@
4291
4292-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4293+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4294
4295 # This Makefile.in is free software; the Free Software Foundation
4296 # gives unlimited permission to copy and/or distribute it,
4297@@ -311,6 +311,7 @@ pdfdir = @pdfdir@
4298 prefix = @prefix@
4299 program_transform_name = @program_transform_name@
4300 psdir = @psdir@
4301+runstatedir = @runstatedir@
4302 sbindir = @sbindir@
4303 sharedstatedir = @sharedstatedir@
4304 srcdir = @srcdir@
4305@@ -349,8 +350,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
4306 *config.status*) \
4307 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
4308 *) \
4309- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
4310- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
4311+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
4312+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
4313 esac;
4314
4315 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4316@@ -374,7 +375,10 @@ ctags CTAGS:
4317 cscope cscopelist:
4318
4319
4320-distdir: $(DISTFILES)
4321+distdir: $(BUILT_SOURCES)
4322+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
4323+
4324+distdir-am: $(DISTFILES)
4325 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
4326 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
4327 list='$(DISTFILES)'; \
4328diff --git a/clutter/build/autotools/libtool.m4 b/clutter/build/autotools/libtool.m4
4329index a644432..c81e669 100644
4330--- a/clutter/build/autotools/libtool.m4
4331+++ b/clutter/build/autotools/libtool.m4
4332@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
4333 cat <<_LT_EOF >> "$cfgfile"
4334 #! $SHELL
4335 # Generated automatically by $as_me ($PACKAGE) $VERSION
4336-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
4337 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
4338
4339 # Provide generalized library-building support services.
4340@@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4341 # before this can be enabled.
4342 hardcode_into_libs=yes
4343
4344- # Add ABI-specific directories to the system library path.
4345- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
4346-
4347 # Ideally, we could use ldconfig to report *all* directores which are
4348 # searched for libraries, however this is still not possible. Aside from not
4349 # being certain /sbin/ldconfig is available, command
4350@@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4351 # appending ld.so.conf contents (and includes) to the search path.
4352 if test -f /etc/ld.so.conf; then
4353 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
4354- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
4355+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
4356 fi
4357
4358 # We used to test for /lib/ld.so.1 and disable shared libraries on
4359@@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4360 dynamic_linker='GNU/Linux ld.so'
4361 ;;
4362
4363+netbsdelf*-gnu)
4364+ version_type=linux
4365+ need_lib_prefix=no
4366+ need_version=no
4367+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4368+ soname_spec='${libname}${release}${shared_ext}$major'
4369+ shlibpath_var=LD_LIBRARY_PATH
4370+ shlibpath_overrides_runpath=no
4371+ hardcode_into_libs=yes
4372+ dynamic_linker='NetBSD ld.elf_so'
4373+ ;;
4374+
4375 netbsd*)
4376 version_type=sunos
4377 need_lib_prefix=no
4378@@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4379 lt_cv_deplibs_check_method=pass_all
4380 ;;
4381
4382-netbsd*)
4383+netbsd* | netbsdelf*-gnu)
4384 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4385 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4386 else
4387@@ -4055,7 +4063,8 @@ _LT_EOF
4388 if AC_TRY_EVAL(ac_compile); then
4389 # Now try to grab the symbols.
4390 nlist=conftest.nm
4391- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
4392+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
4393+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
4394 # Try sorting and uniquifying the output.
4395 if sort "$nlist" | uniq > "$nlist"T; then
4396 mv -f "$nlist"T "$nlist"
4397@@ -4427,7 +4436,7 @@ m4_if([$1], [CXX], [
4398 ;;
4399 esac
4400 ;;
4401- netbsd*)
4402+ netbsd* | netbsdelf*-gnu)
4403 ;;
4404 *qnx* | *nto*)
4405 # QNX uses GNU C++, but need to define -shared option too, otherwise
4406@@ -4939,6 +4948,9 @@ m4_if([$1], [CXX], [
4407 ;;
4408 esac
4409 ;;
4410+ linux* | k*bsd*-gnu | gnu*)
4411+ _LT_TAGVAR(link_all_deplibs, $1)=no
4412+ ;;
4413 *)
4414 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4415 ;;
4416@@ -5001,6 +5013,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4417 openbsd* | bitrig*)
4418 with_gnu_ld=no
4419 ;;
4420+ linux* | k*bsd*-gnu | gnu*)
4421+ _LT_TAGVAR(link_all_deplibs, $1)=no
4422+ ;;
4423 esac
4424
4425 _LT_TAGVAR(ld_shlibs, $1)=yes
4426@@ -5255,7 +5270,7 @@ _LT_EOF
4427 fi
4428 ;;
4429
4430- netbsd*)
4431+ netbsd* | netbsdelf*-gnu)
4432 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4433 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4434 wlarc=
4435@@ -5776,6 +5791,7 @@ _LT_EOF
4436 if test yes = "$lt_cv_irix_exported_symbol"; then
4437 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
4438 fi
4439+ _LT_TAGVAR(link_all_deplibs, $1)=no
4440 else
4441 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
4442 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
4443@@ -5797,7 +5813,7 @@ _LT_EOF
4444 esac
4445 ;;
4446
4447- netbsd*)
4448+ netbsd* | netbsdelf*-gnu)
4449 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4450 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
4451 else
4452@@ -6423,7 +6439,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4453 # Commands to make compiler produce verbose output that lists
4454 # what "hidden" libraries, object files and flags are used when
4455 # linking a shared library.
4456- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
4457+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
4458
4459 else
4460 GXX=no
4461@@ -6798,7 +6814,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4462 # explicitly linking system object files so we need to strip them
4463 # from the output so that they don't get included in the library
4464 # dependencies.
4465- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
4466+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
4467 ;;
4468 *)
4469 if test yes = "$GXX"; then
4470@@ -6863,7 +6879,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4471 # explicitly linking system object files so we need to strip them
4472 # from the output so that they don't get included in the library
4473 # dependencies.
4474- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
4475+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
4476 ;;
4477 *)
4478 if test yes = "$GXX"; then
4479@@ -7202,7 +7218,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4480 # Commands to make compiler produce verbose output that lists
4481 # what "hidden" libraries, object files and flags are used when
4482 # linking a shared library.
4483- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
4484+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
4485
4486 else
4487 # FIXME: insert proper C++ library support
4488@@ -7286,7 +7302,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4489 # Commands to make compiler produce verbose output that lists
4490 # what "hidden" libraries, object files and flags are used when
4491 # linking a shared library.
4492- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
4493+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
4494 else
4495 # g++ 2.7 appears to require '-G' NOT '-shared' on this
4496 # platform.
4497@@ -7297,7 +7313,7 @@ if test yes != "$_lt_caught_CXX_error"; then
4498 # Commands to make compiler produce verbose output that lists
4499 # what "hidden" libraries, object files and flags are used when
4500 # linking a shared library.
4501- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
4502+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
4503 fi
4504
4505 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
4506diff --git a/clutter/build/compile b/clutter/build/compile
4507index de0005d..99e5052 100755
4508--- a/clutter/build/compile
4509+++ b/clutter/build/compile
4510@@ -1,9 +1,9 @@
4511-#!/bin/sh
4512+#! /bin/sh
4513 # Wrapper for compilers which do not understand '-c -o'.
4514
4515-scriptversion=2016-01-11.22; # UTC
4516+scriptversion=2018-03-07.03; # UTC
4517
4518-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
4519+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
4520 # Written by Tom Tromey <tromey@cygnus.com>.
4521 #
4522 # This program is free software; you can redistribute it and/or modify
4523@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
4524 # GNU General Public License for more details.
4525 #
4526 # You should have received a copy of the GNU General Public License
4527-# along with this program. If not, see <http://www.gnu.org/licenses/>.
4528+# along with this program. If not, see <https://www.gnu.org/licenses/>.
4529
4530 # As a special exception to the GNU General Public License, if you
4531 # distribute this file as part of a program that contains a
4532@@ -340,7 +340,7 @@ exit $ret
4533 # Local Variables:
4534 # mode: shell-script
4535 # sh-indentation: 2
4536-# eval: (add-hook 'write-file-hooks 'time-stamp)
4537+# eval: (add-hook 'before-save-hook 'time-stamp)
4538 # time-stamp-start: "scriptversion="
4539 # time-stamp-format: "%:y-%02m-%02d.%02H"
4540 # time-stamp-time-zone: "UTC0"
4541diff --git a/clutter/build/config.guess b/clutter/build/config.guess
4542index 717b228..f50dcdb 100755
4543--- a/clutter/build/config.guess
4544+++ b/clutter/build/config.guess
4545@@ -1,8 +1,8 @@
4546-#!/bin/sh
4547+#! /bin/sh
4548 # Attempt to guess a canonical system name.
4549-# Copyright 1992-2017 Free Software Foundation, Inc.
4550+# Copyright 1992-2018 Free Software Foundation, Inc.
4551
4552-timestamp='2017-08-08'
4553+timestamp='2018-02-24'
4554
4555 # This file is free software; you can redistribute it and/or modify it
4556 # under the terms of the GNU General Public License as published by
4557@@ -15,7 +15,7 @@ timestamp='2017-08-08'
4558 # General Public License for more details.
4559 #
4560 # You should have received a copy of the GNU General Public License
4561-# along with this program; if not, see <http://www.gnu.org/licenses/>.
4562+# along with this program; if not, see <https://www.gnu.org/licenses/>.
4563 #
4564 # As a special exception to the GNU General Public License, if you
4565 # distribute this file as part of a program that contains a
4566@@ -27,7 +27,7 @@ timestamp='2017-08-08'
4567 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
4568 #
4569 # You can get the latest version of this script from:
4570-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
4571+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
4572 #
4573 # Please send patches to <config-patches@gnu.org>.
4574
4575@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
4576
4577 Output the configuration name of the system \`$me' is run on.
4578
4579-Operation modes:
4580+Options:
4581 -h, --help print this help, then exit
4582 -t, --time-stamp print date of last modification, then exit
4583 -v, --version print version number, then exit
4584@@ -50,7 +50,7 @@ version="\
4585 GNU config.guess ($timestamp)
4586
4587 Originally written by Per Bothner.
4588-Copyright 1992-2017 Free Software Foundation, Inc.
4589+Copyright 1992-2018 Free Software Foundation, Inc.
4590
4591 This is free software; see the source for copying conditions. There is NO
4592 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
4593@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
4594 dummy=$tmp/dummy ;
4595 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
4596 case $CC_FOR_BUILD,$HOST_CC,$CC in
4597- ,,) echo "int x;" > $dummy.c ;
4598+ ,,) echo "int x;" > "$dummy.c" ;
4599 for c in cc gcc c89 c99 ; do
4600- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
4601+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
4602 CC_FOR_BUILD="$c"; break ;
4603 fi ;
4604 done ;
4605@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
4606 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
4607 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
4608
4609-case "${UNAME_SYSTEM}" in
4610+case "$UNAME_SYSTEM" in
4611 Linux|GNU|GNU/*)
4612 # If the system lacks a compiler, then just pick glibc.
4613 # We could probably try harder.
4614 LIBC=gnu
4615
4616- eval $set_cc_for_build
4617- cat <<-EOF > $dummy.c
4618+ eval "$set_cc_for_build"
4619+ cat <<-EOF > "$dummy.c"
4620 #include <features.h>
4621 #if defined(__UCLIBC__)
4622 LIBC=uclibc
4623@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
4624 LIBC=gnu
4625 #endif
4626 EOF
4627- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
4628+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
4629+
4630+ # If ldd exists, use it to detect musl libc.
4631+ if command -v ldd >/dev/null && \
4632+ ldd --version 2>&1 | grep -q ^musl
4633+ then
4634+ LIBC=musl
4635+ fi
4636 ;;
4637 esac
4638
4639 # Note: order is significant - the case branches are not exclusive.
4640
4641-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4642+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
4643 *:NetBSD:*:*)
4644 # NetBSD (nbsd) targets should (where applicable) match one or
4645 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
4646@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4647 # portion of the name. We always set it to "unknown".
4648 sysctl="sysctl -n hw.machine_arch"
4649 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
4650- /sbin/$sysctl 2>/dev/null || \
4651- /usr/sbin/$sysctl 2>/dev/null || \
4652+ "/sbin/$sysctl" 2>/dev/null || \
4653+ "/usr/sbin/$sysctl" 2>/dev/null || \
4654 echo unknown)`
4655- case "${UNAME_MACHINE_ARCH}" in
4656+ case "$UNAME_MACHINE_ARCH" in
4657 armeb) machine=armeb-unknown ;;
4658 arm*) machine=arm-unknown ;;
4659 sh3el) machine=shl-unknown ;;
4660 sh3eb) machine=sh-unknown ;;
4661 sh5el) machine=sh5le-unknown ;;
4662 earmv*)
4663- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
4664- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
4665- machine=${arch}${endian}-unknown
4666+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
4667+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
4668+ machine="${arch}${endian}"-unknown
4669 ;;
4670- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
4671+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
4672 esac
4673 # The Operating System including object format, if it has switched
4674 # to ELF recently (or will in the future) and ABI.
4675- case "${UNAME_MACHINE_ARCH}" in
4676+ case "$UNAME_MACHINE_ARCH" in
4677 earm*)
4678 os=netbsdelf
4679 ;;
4680 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
4681- eval $set_cc_for_build
4682+ eval "$set_cc_for_build"
4683 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
4684 | grep -q __ELF__
4685 then
4686@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4687 ;;
4688 esac
4689 # Determine ABI tags.
4690- case "${UNAME_MACHINE_ARCH}" in
4691+ case "$UNAME_MACHINE_ARCH" in
4692 earm*)
4693 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
4694- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
4695+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
4696 ;;
4697 esac
4698 # The OS release
4699@@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4700 # thus, need a distinct triplet. However, they do not need
4701 # kernel version information, so it can be replaced with a
4702 # suitable tag, in the style of linux-gnu.
4703- case "${UNAME_VERSION}" in
4704+ case "$UNAME_VERSION" in
4705 Debian*)
4706 release='-gnu'
4707 ;;
4708 *)
4709- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
4710+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
4711 ;;
4712 esac
4713 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
4714 # contains redundant information, the shorter form:
4715 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
4716- echo "${machine}-${os}${release}${abi}"
4717+ echo "$machine-${os}${release}${abi}"
4718 exit ;;
4719 *:Bitrig:*:*)
4720 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
4721- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
4722+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
4723 exit ;;
4724 *:OpenBSD:*:*)
4725 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
4726- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
4727+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
4728 exit ;;
4729 *:LibertyBSD:*:*)
4730 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
4731- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
4732+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
4733+ exit ;;
4734+ *:MidnightBSD:*:*)
4735+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
4736 exit ;;
4737 *:ekkoBSD:*:*)
4738- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
4739+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
4740 exit ;;
4741 *:SolidBSD:*:*)
4742- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
4743+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
4744 exit ;;
4745 macppc:MirBSD:*:*)
4746- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
4747+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
4748 exit ;;
4749 *:MirBSD:*:*)
4750- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
4751+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
4752 exit ;;
4753 *:Sortix:*:*)
4754- echo ${UNAME_MACHINE}-unknown-sortix
4755+ echo "$UNAME_MACHINE"-unknown-sortix
4756 exit ;;
4757 *:Redox:*:*)
4758- echo ${UNAME_MACHINE}-unknown-redox
4759+ echo "$UNAME_MACHINE"-unknown-redox
4760 exit ;;
4761+ mips:OSF1:*.*)
4762+ echo mips-dec-osf1
4763+ exit ;;
4764 alpha:OSF1:*:*)
4765 case $UNAME_RELEASE in
4766 *4.0)
4767@@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4768 # A Tn.n version is a released field test version.
4769 # A Xn.n version is an unreleased experimental baselevel.
4770 # 1.2 uses "1.2" for uname -r.
4771- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
4772+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
4773 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
4774 exitcode=$?
4775 trap '' 0
4776 exit $exitcode ;;
4777- Alpha\ *:Windows_NT*:*)
4778- # How do we know it's Interix rather than the generic POSIX subsystem?
4779- # Should we change UNAME_MACHINE based on the output of uname instead
4780- # of the specific Alpha model?
4781- echo alpha-pc-interix
4782- exit ;;
4783- 21064:Windows_NT:50:3)
4784- echo alpha-dec-winnt3.5
4785- exit ;;
4786 Amiga*:UNIX_System_V:4.0:*)
4787 echo m68k-unknown-sysv4
4788 exit ;;
4789 *:[Aa]miga[Oo][Ss]:*:*)
4790- echo ${UNAME_MACHINE}-unknown-amigaos
4791+ echo "$UNAME_MACHINE"-unknown-amigaos
4792 exit ;;
4793 *:[Mm]orph[Oo][Ss]:*:*)
4794- echo ${UNAME_MACHINE}-unknown-morphos
4795+ echo "$UNAME_MACHINE"-unknown-morphos
4796 exit ;;
4797 *:OS/390:*:*)
4798 echo i370-ibm-openedition
4799@@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4800 echo powerpc-ibm-os400
4801 exit ;;
4802 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
4803- echo arm-acorn-riscix${UNAME_RELEASE}
4804+ echo arm-acorn-riscix"$UNAME_RELEASE"
4805 exit ;;
4806 arm*:riscos:*:*|arm*:RISCOS:*:*)
4807 echo arm-unknown-riscos
4808@@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4809 sparc) echo sparc-icl-nx7; exit ;;
4810 esac ;;
4811 s390x:SunOS:*:*)
4812- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4813+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
4814 exit ;;
4815 sun4H:SunOS:5.*:*)
4816- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4817+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
4818 exit ;;
4819 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
4820- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4821+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
4822 exit ;;
4823 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
4824- echo i386-pc-auroraux${UNAME_RELEASE}
4825+ echo i386-pc-auroraux"$UNAME_RELEASE"
4826 exit ;;
4827 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
4828- eval $set_cc_for_build
4829+ eval "$set_cc_for_build"
4830 SUN_ARCH=i386
4831 # If there is a compiler, see if it is configured for 64-bit objects.
4832 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
4833@@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4834 SUN_ARCH=x86_64
4835 fi
4836 fi
4837- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4838+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
4839 exit ;;
4840 sun4*:SunOS:6*:*)
4841 # According to config.sub, this is the proper way to canonicalize
4842 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
4843 # it's likely to be more like Solaris than SunOS4.
4844- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
4845+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
4846 exit ;;
4847 sun4*:SunOS:*:*)
4848 case "`/usr/bin/arch -k`" in
4849@@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4850 ;;
4851 esac
4852 # Japanese Language versions have a version number like `4.1.3-JL'.
4853- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
4854+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
4855 exit ;;
4856 sun3*:SunOS:*:*)
4857- echo m68k-sun-sunos${UNAME_RELEASE}
4858+ echo m68k-sun-sunos"$UNAME_RELEASE"
4859 exit ;;
4860 sun*:*:4.2BSD:*)
4861 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
4862- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
4863+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
4864 case "`/bin/arch`" in
4865 sun3)
4866- echo m68k-sun-sunos${UNAME_RELEASE}
4867+ echo m68k-sun-sunos"$UNAME_RELEASE"
4868 ;;
4869 sun4)
4870- echo sparc-sun-sunos${UNAME_RELEASE}
4871+ echo sparc-sun-sunos"$UNAME_RELEASE"
4872 ;;
4873 esac
4874 exit ;;
4875 aushp:SunOS:*:*)
4876- echo sparc-auspex-sunos${UNAME_RELEASE}
4877+ echo sparc-auspex-sunos"$UNAME_RELEASE"
4878 exit ;;
4879 # The situation for MiNT is a little confusing. The machine name
4880 # can be virtually everything (everything which is not
4881@@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4882 # MiNT. But MiNT is downward compatible to TOS, so this should
4883 # be no problem.
4884 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
4885- echo m68k-atari-mint${UNAME_RELEASE}
4886+ echo m68k-atari-mint"$UNAME_RELEASE"
4887 exit ;;
4888 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
4889- echo m68k-atari-mint${UNAME_RELEASE}
4890+ echo m68k-atari-mint"$UNAME_RELEASE"
4891 exit ;;
4892 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
4893- echo m68k-atari-mint${UNAME_RELEASE}
4894+ echo m68k-atari-mint"$UNAME_RELEASE"
4895 exit ;;
4896 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
4897- echo m68k-milan-mint${UNAME_RELEASE}
4898+ echo m68k-milan-mint"$UNAME_RELEASE"
4899 exit ;;
4900 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
4901- echo m68k-hades-mint${UNAME_RELEASE}
4902+ echo m68k-hades-mint"$UNAME_RELEASE"
4903 exit ;;
4904 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
4905- echo m68k-unknown-mint${UNAME_RELEASE}
4906+ echo m68k-unknown-mint"$UNAME_RELEASE"
4907 exit ;;
4908 m68k:machten:*:*)
4909- echo m68k-apple-machten${UNAME_RELEASE}
4910+ echo m68k-apple-machten"$UNAME_RELEASE"
4911 exit ;;
4912 powerpc:machten:*:*)
4913- echo powerpc-apple-machten${UNAME_RELEASE}
4914+ echo powerpc-apple-machten"$UNAME_RELEASE"
4915 exit ;;
4916 RISC*:Mach:*:*)
4917 echo mips-dec-mach_bsd4.3
4918 exit ;;
4919 RISC*:ULTRIX:*:*)
4920- echo mips-dec-ultrix${UNAME_RELEASE}
4921+ echo mips-dec-ultrix"$UNAME_RELEASE"
4922 exit ;;
4923 VAX*:ULTRIX*:*:*)
4924- echo vax-dec-ultrix${UNAME_RELEASE}
4925+ echo vax-dec-ultrix"$UNAME_RELEASE"
4926 exit ;;
4927 2020:CLIX:*:* | 2430:CLIX:*:*)
4928- echo clipper-intergraph-clix${UNAME_RELEASE}
4929+ echo clipper-intergraph-clix"$UNAME_RELEASE"
4930 exit ;;
4931 mips:*:*:UMIPS | mips:*:*:RISCos)
4932- eval $set_cc_for_build
4933- sed 's/^ //' << EOF >$dummy.c
4934+ eval "$set_cc_for_build"
4935+ sed 's/^ //' << EOF > "$dummy.c"
4936 #ifdef __cplusplus
4937 #include <stdio.h> /* for printf() prototype */
4938 int main (int argc, char *argv[]) {
4939@@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4940 #endif
4941 #if defined (host_mips) && defined (MIPSEB)
4942 #if defined (SYSTYPE_SYSV)
4943- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
4944+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
4945 #endif
4946 #if defined (SYSTYPE_SVR4)
4947- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
4948+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
4949 #endif
4950 #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
4951- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
4952+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
4953 #endif
4954 #endif
4955 exit (-1);
4956 }
4957 EOF
4958- $CC_FOR_BUILD -o $dummy $dummy.c &&
4959- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
4960- SYSTEM_NAME=`$dummy $dummyarg` &&
4961+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
4962+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
4963+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
4964 { echo "$SYSTEM_NAME"; exit; }
4965- echo mips-mips-riscos${UNAME_RELEASE}
4966+ echo mips-mips-riscos"$UNAME_RELEASE"
4967 exit ;;
4968 Motorola:PowerMAX_OS:*:*)
4969 echo powerpc-motorola-powermax
4970@@ -530,17 +534,17 @@ EOF
4971 AViiON:dgux:*:*)
4972 # DG/UX returns AViiON for all architectures
4973 UNAME_PROCESSOR=`/usr/bin/uname -p`
4974- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
4975+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
4976 then
4977- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
4978- [ ${TARGET_BINARY_INTERFACE}x = x ]
4979+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
4980+ [ "$TARGET_BINARY_INTERFACE"x = x ]
4981 then
4982- echo m88k-dg-dgux${UNAME_RELEASE}
4983+ echo m88k-dg-dgux"$UNAME_RELEASE"
4984 else
4985- echo m88k-dg-dguxbcs${UNAME_RELEASE}
4986+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
4987 fi
4988 else
4989- echo i586-dg-dgux${UNAME_RELEASE}
4990+ echo i586-dg-dgux"$UNAME_RELEASE"
4991 fi
4992 exit ;;
4993 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
4994@@ -557,7 +561,7 @@ EOF
4995 echo m68k-tektronix-bsd
4996 exit ;;
4997 *:IRIX*:*:*)
4998- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
4999+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
5000 exit ;;
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches