Merge ~3v1n0/ubuntu/+source/mutter:upstream/3.28.x into ~ubuntu-desktop/ubuntu/+source/mutter:upstream/3.28.x
- Git
- lp:~3v1n0/ubuntu/+source/mutter
- upstream/3.28.x
- Merge into upstream/3.28.x
Proposed by
Marco Trevisan (Treviño)
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) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+361808@code.launchpad.net |
Commit message
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
1 | diff --git a/Makefile.in b/Makefile.in | |||
2 | index 8569c31..f738308 100644 | |||
3 | --- a/Makefile.in | |||
4 | +++ b/Makefile.in | |||
5 | @@ -1,7 +1,7 @@ | |||
7 | 1 | # Makefile.in generated by automake 1.15.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.16.1 from Makefile.am. |
8 | 2 | # @configure_input@ | 2 | # @configure_input@ |
9 | 3 | 3 | ||
11 | 4 | # Copyright (C) 1994-2017 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2018 Free Software Foundation, Inc. |
12 | 5 | 5 | ||
13 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
14 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
15 | @@ -143,7 +143,7 @@ am__recursive_targets = \ | |||
16 | 143 | $(RECURSIVE_CLEAN_TARGETS) \ | 143 | $(RECURSIVE_CLEAN_TARGETS) \ |
17 | 144 | $(am__extra_recursive_targets) | 144 | $(am__extra_recursive_targets) |
18 | 145 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ | 145 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
20 | 146 | cscope distdir dist dist-all distcheck | 146 | cscope distdir distdir-am dist dist-all distcheck |
21 | 147 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ | 147 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
22 | 148 | $(LISP)config.h.in | 148 | $(LISP)config.h.in |
23 | 149 | # Read a list of newline-separated strings from the standard input, | 149 | # 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 | 176 | $(top_srcdir)/build-aux/missing \ | 176 | $(top_srcdir)/build-aux/missing \ |
26 | 177 | $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \ | 177 | $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \ |
27 | 178 | NEWS build-aux/compile build-aux/config.guess \ | 178 | NEWS build-aux/compile build-aux/config.guess \ |
29 | 179 | build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ | 179 | build-aux/config.rpath build-aux/config.sub \ |
30 | 180 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing | 180 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing |
31 | 181 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 181 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
32 | 182 | distdir = $(PACKAGE)-$(VERSION) | 182 | distdir = $(PACKAGE)-$(VERSION) |
33 | @@ -398,6 +398,7 @@ pdfdir = @pdfdir@ | |||
34 | 398 | prefix = @prefix@ | 398 | prefix = @prefix@ |
35 | 399 | program_transform_name = @program_transform_name@ | 399 | program_transform_name = @program_transform_name@ |
36 | 400 | psdir = @psdir@ | 400 | psdir = @psdir@ |
37 | 401 | runstatedir = @runstatedir@ | ||
38 | 401 | sbindir = @sbindir@ | 402 | sbindir = @sbindir@ |
39 | 402 | sharedstatedir = @sharedstatedir@ | 403 | sharedstatedir = @sharedstatedir@ |
40 | 403 | srcdir = @srcdir@ | 404 | srcdir = @srcdir@ |
41 | @@ -440,8 +441,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
42 | 440 | echo ' $(SHELL) ./config.status'; \ | 441 | echo ' $(SHELL) ./config.status'; \ |
43 | 441 | $(SHELL) ./config.status;; \ | 442 | $(SHELL) ./config.status;; \ |
44 | 442 | *) \ | 443 | *) \ |
47 | 443 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 444 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ |
48 | 444 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 445 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ |
49 | 445 | esac; | 446 | esac; |
50 | 446 | 447 | ||
51 | 447 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 448 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
52 | @@ -585,7 +586,10 @@ distclean-tags: | |||
53 | 585 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 586 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
54 | 586 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | 587 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
55 | 587 | 588 | ||
57 | 588 | distdir: $(DISTFILES) | 589 | distdir: $(BUILT_SOURCES) |
58 | 590 | $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
59 | 591 | |||
60 | 592 | distdir-am: $(DISTFILES) | ||
61 | 589 | $(am__remove_distdir) | 593 | $(am__remove_distdir) |
62 | 590 | test -d "$(distdir)" || mkdir "$(distdir)" | 594 | test -d "$(distdir)" || mkdir "$(distdir)" |
63 | 591 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 595 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
64 | diff --git a/aclocal.m4 b/aclocal.m4 | |||
65 | index 4d8ccdc..f605e15 100644 | |||
66 | --- a/aclocal.m4 | |||
67 | +++ b/aclocal.m4 | |||
68 | @@ -1,6 +1,6 @@ | |||
70 | 1 | # generated automatically by aclocal 1.15.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.16.1 -*- Autoconf -*- |
71 | 2 | 2 | ||
73 | 3 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 3 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
74 | 4 | 4 | ||
75 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
76 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # 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 | 20 | If you have problems, you may need to regenerate the build system entirely. | 20 | If you have problems, you may need to regenerate the build system entirely. |
79 | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
80 | 22 | 22 | ||
82 | 23 | # Copyright (C) 2002-2017 Free Software Foundation, Inc. | 23 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. |
83 | 24 | # | 24 | # |
84 | 25 | # This file is free software; the Free Software Foundation | 25 | # This file is free software; the Free Software Foundation |
85 | 26 | # gives unlimited permission to copy and/or distribute it, | 26 | # 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 | 32 | # generated from the m4 files accompanying Automake X.Y. | 32 | # generated from the m4 files accompanying Automake X.Y. |
88 | 33 | # (This private macro should not be called outside this file.) | 33 | # (This private macro should not be called outside this file.) |
89 | 34 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 34 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
91 | 35 | [am__api_version='1.15' | 35 | [am__api_version='1.16' |
92 | 36 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 36 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
93 | 37 | dnl require some minimum version. Point them to the right macro. | 37 | dnl require some minimum version. Point them to the right macro. |
95 | 38 | m4_if([$1], [1.15.1], [], | 38 | m4_if([$1], [1.16.1], [], |
96 | 39 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 39 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
97 | 40 | ]) | 40 | ]) |
98 | 41 | 41 | ||
99 | @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) | |||
100 | 51 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 51 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
101 | 52 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 52 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
102 | 53 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 53 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
104 | 54 | [AM_AUTOMAKE_VERSION([1.15.1])dnl | 54 | [AM_AUTOMAKE_VERSION([1.16.1])dnl |
105 | 55 | m4_ifndef([AC_AUTOCONF_VERSION], | 55 | m4_ifndef([AC_AUTOCONF_VERSION], |
106 | 56 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 56 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
107 | 57 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 57 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
108 | 58 | 58 | ||
109 | 59 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 59 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
110 | 60 | 60 | ||
112 | 61 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 61 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
113 | 62 | # | 62 | # |
114 | 63 | # This file is free software; the Free Software Foundation | 63 | # This file is free software; the Free Software Foundation |
115 | 64 | # gives unlimited permission to copy and/or distribute it, | 64 | # gives unlimited permission to copy and/or distribute it, |
116 | @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
117 | 110 | 110 | ||
118 | 111 | # AM_CONDITIONAL -*- Autoconf -*- | 111 | # AM_CONDITIONAL -*- Autoconf -*- |
119 | 112 | 112 | ||
121 | 113 | # Copyright (C) 1997-2017 Free Software Foundation, Inc. | 113 | # Copyright (C) 1997-2018 Free Software Foundation, Inc. |
122 | 114 | # | 114 | # |
123 | 115 | # This file is free software; the Free Software Foundation | 115 | # This file is free software; the Free Software Foundation |
124 | 116 | # gives unlimited permission to copy and/or distribute it, | 116 | # gives unlimited permission to copy and/or distribute it, |
125 | @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
126 | 141 | Usually this means the macro was only invoked conditionally.]]) | 141 | Usually this means the macro was only invoked conditionally.]]) |
127 | 142 | fi])]) | 142 | fi])]) |
128 | 143 | 143 | ||
130 | 144 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 144 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
131 | 145 | # | 145 | # |
132 | 146 | # This file is free software; the Free Software Foundation | 146 | # This file is free software; the Free Software Foundation |
133 | 147 | # gives unlimited permission to copy and/or distribute it, | 147 | # gives unlimited permission to copy and/or distribute it, |
134 | @@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | |||
135 | 332 | 332 | ||
136 | 333 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 333 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
137 | 334 | 334 | ||
139 | 335 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 335 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
140 | 336 | # | 336 | # |
141 | 337 | # This file is free software; the Free Software Foundation | 337 | # This file is free software; the Free Software Foundation |
142 | 338 | # gives unlimited permission to copy and/or distribute it, | 338 | # gives unlimited permission to copy and/or distribute it, |
143 | 339 | # with or without modifications, as long as this notice is preserved. | 339 | # with or without modifications, as long as this notice is preserved. |
144 | 340 | 340 | ||
145 | 341 | |||
146 | 342 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 341 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
147 | 343 | # ------------------------------ | 342 | # ------------------------------ |
148 | 344 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 343 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
149 | @@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
150 | 346 | # Older Autoconf quotes --file arguments for eval, but not when files | 345 | # Older Autoconf quotes --file arguments for eval, but not when files |
151 | 347 | # are listed without --file. Let's play safe and only enable the eval | 346 | # are listed without --file. Let's play safe and only enable the eval |
152 | 348 | # if we detect the quoting. | 347 | # if we detect the quoting. |
157 | 349 | case $CONFIG_FILES in | 348 | # TODO: see whether this extra hack can be removed once we start |
158 | 350 | *\'*) eval set x "$CONFIG_FILES" ;; | 349 | # requiring Autoconf 2.70 or later. |
159 | 351 | *) set x $CONFIG_FILES ;; | 350 | AS_CASE([$CONFIG_FILES], |
160 | 352 | esac | 351 | [*\'*], [eval set x "$CONFIG_FILES"], |
161 | 352 | [*], [set x $CONFIG_FILES]) | ||
162 | 353 | shift | 353 | shift |
164 | 354 | for mf | 354 | # Used to flag and report bootstrapping failures. |
165 | 355 | am_rc=0 | ||
166 | 356 | for am_mf | ||
167 | 355 | do | 357 | do |
168 | 356 | # Strip MF so we end up with the name of the file. | 358 | # Strip MF so we end up with the name of the file. |
176 | 357 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 359 | am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` |
177 | 358 | # Check whether this is an Automake generated Makefile or not. | 360 | # Check whether this is an Automake generated Makefile which includes |
178 | 359 | # We used to match only the files named 'Makefile.in', but | 361 | # dependency-tracking related rules and includes. |
179 | 360 | # some people rename them; so instead we look at the file content. | 362 | # Grep'ing the whole file directly is not great: AIX grep has a line |
173 | 361 | # Grep'ing the first line is not enough: some people post-process | ||
174 | 362 | # each Makefile.in and add a new line on top of each file to say so. | ||
175 | 363 | # Grep'ing the whole file is not good either: AIX grep has a line | ||
180 | 364 | # limit of 2048, but all sed's we know have understand at least 4000. | 363 | # limit of 2048, but all sed's we know have understand at least 4000. |
207 | 365 | if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | 364 | sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ |
208 | 366 | dirpart=`AS_DIRNAME("$mf")` | 365 | || continue |
209 | 367 | else | 366 | am_dirpart=`AS_DIRNAME(["$am_mf"])` |
210 | 368 | continue | 367 | am_filepart=`AS_BASENAME(["$am_mf"])` |
211 | 369 | fi | 368 | AM_RUN_LOG([cd "$am_dirpart" \ |
212 | 370 | # Extract the definition of DEPDIR, am__include, and am__quote | 369 | && sed -e '/# am--include-marker/d' "$am_filepart" \ |
213 | 371 | # from the Makefile without running 'make'. | 370 | | $MAKE -f - am--depfiles]) || am_rc=$? |
188 | 372 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
189 | 373 | test -z "$DEPDIR" && continue | ||
190 | 374 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
191 | 375 | test -z "$am__include" && continue | ||
192 | 376 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
193 | 377 | # Find all dependency output files, they are included files with | ||
194 | 378 | # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
195 | 379 | # simplest approach to changing $(DEPDIR) to its actual value in the | ||
196 | 380 | # expansion. | ||
197 | 381 | for file in `sed -n " | ||
198 | 382 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
199 | 383 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
200 | 384 | # Make sure the directory exists. | ||
201 | 385 | test -f "$dirpart/$file" && continue | ||
202 | 386 | fdir=`AS_DIRNAME(["$file"])` | ||
203 | 387 | AS_MKDIR_P([$dirpart/$fdir]) | ||
204 | 388 | # echo "creating $dirpart/$file" | ||
205 | 389 | echo '# dummy' > "$dirpart/$file" | ||
206 | 390 | done | ||
214 | 391 | done | 371 | done |
215 | 372 | if test $am_rc -ne 0; then | ||
216 | 373 | AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments | ||
217 | 374 | for automatic dependency tracking. Try re-running configure with the | ||
218 | 375 | '--disable-dependency-tracking' option to at least be able to build | ||
219 | 376 | the package (albeit without support for automatic dependency tracking).]) | ||
220 | 377 | fi | ||
221 | 378 | AS_UNSET([am_dirpart]) | ||
222 | 379 | AS_UNSET([am_filepart]) | ||
223 | 380 | AS_UNSET([am_mf]) | ||
224 | 381 | AS_UNSET([am_rc]) | ||
225 | 382 | rm -f conftest-deps.mk | ||
226 | 392 | } | 383 | } |
227 | 393 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | 384 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
228 | 394 | 385 | ||
229 | @@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
230 | 397 | # ----------------------------- | 388 | # ----------------------------- |
231 | 398 | # This macro should only be invoked once -- use via AC_REQUIRE. | 389 | # This macro should only be invoked once -- use via AC_REQUIRE. |
232 | 399 | # | 390 | # |
236 | 400 | # This code is only required when automatic dependency tracking | 391 | # This code is only required when automatic dependency tracking is enabled. |
237 | 401 | # is enabled. FIXME. This creates each '.P' file that we will | 392 | # This creates each '.Po' and '.Plo' makefile fragment that we'll need in |
238 | 402 | # need in order to bootstrap the dependency handling code. | 393 | # order to bootstrap the dependency handling code. |
239 | 403 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | 394 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
240 | 404 | [AC_CONFIG_COMMANDS([depfiles], | 395 | [AC_CONFIG_COMMANDS([depfiles], |
241 | 405 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | 396 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
244 | 406 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | 397 | [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) |
243 | 407 | ]) | ||
245 | 408 | 398 | ||
246 | 409 | # Do all the work for Automake. -*- Autoconf -*- | 399 | # Do all the work for Automake. -*- Autoconf -*- |
247 | 410 | 400 | ||
249 | 411 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 401 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
250 | 412 | # | 402 | # |
251 | 413 | # This file is free software; the Free Software Foundation | 403 | # This file is free software; the Free Software Foundation |
252 | 414 | # gives unlimited permission to copy and/or distribute it, | 404 | # gives unlimited permission to copy and/or distribute it, |
253 | @@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | |||
254 | 495 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | 485 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
255 | 496 | # For better backward compatibility. To be removed once Automake 1.9.x | 486 | # For better backward compatibility. To be removed once Automake 1.9.x |
256 | 497 | # dies out for good. For more background, see: | 487 | # dies out for good. For more background, see: |
259 | 498 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | 488 | # <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
260 | 499 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | 489 | # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
261 | 500 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | 490 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
262 | 501 | # We need awk for the "check" target (and possibly the TAP driver). The | 491 | # We need awk for the "check" target (and possibly the TAP driver). The |
263 | 502 | # system "awk" is bad on some platforms. | 492 | # system "awk" is bad on some platforms. |
264 | @@ -563,7 +553,7 @@ END | |||
265 | 563 | Aborting the configuration process, to ensure you take notice of the issue. | 553 | Aborting the configuration process, to ensure you take notice of the issue. |
266 | 564 | 554 | ||
267 | 565 | You can download and install GNU coreutils to get an 'rm' implementation | 555 | You can download and install GNU coreutils to get an 'rm' implementation |
269 | 566 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | 556 | that behaves properly: <https://www.gnu.org/software/coreutils/>. |
270 | 567 | 557 | ||
271 | 568 | If you want to complete the configuration process using your problematic | 558 | If you want to complete the configuration process using your problematic |
272 | 569 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | 559 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
273 | @@ -605,7 +595,7 @@ for _am_header in $config_headers :; do | |||
274 | 605 | done | 595 | done |
275 | 606 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 596 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
276 | 607 | 597 | ||
278 | 608 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 598 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
279 | 609 | # | 599 | # |
280 | 610 | # This file is free software; the Free Software Foundation | 600 | # This file is free software; the Free Software Foundation |
281 | 611 | # gives unlimited permission to copy and/or distribute it, | 601 | # gives unlimited permission to copy and/or distribute it, |
282 | @@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then | |||
283 | 626 | fi | 616 | fi |
284 | 627 | AC_SUBST([install_sh])]) | 617 | AC_SUBST([install_sh])]) |
285 | 628 | 618 | ||
287 | 629 | # Copyright (C) 2003-2017 Free Software Foundation, Inc. | 619 | # Copyright (C) 2003-2018 Free Software Foundation, Inc. |
288 | 630 | # | 620 | # |
289 | 631 | # This file is free software; the Free Software Foundation | 621 | # This file is free software; the Free Software Foundation |
290 | 632 | # gives unlimited permission to copy and/or distribute it, | 622 | # gives unlimited permission to copy and/or distribute it, |
291 | @@ -648,7 +638,7 @@ AC_SUBST([am__leading_dot])]) | |||
292 | 648 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | 638 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
293 | 649 | # From Jim Meyering | 639 | # From Jim Meyering |
294 | 650 | 640 | ||
296 | 651 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 641 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
297 | 652 | # | 642 | # |
298 | 653 | # This file is free software; the Free Software Foundation | 643 | # This file is free software; the Free Software Foundation |
299 | 654 | # gives unlimited permission to copy and/or distribute it, | 644 | # 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 | 683 | 673 | ||
302 | 684 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 674 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
303 | 685 | 675 | ||
305 | 686 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 676 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
306 | 687 | # | 677 | # |
307 | 688 | # This file is free software; the Free Software Foundation | 678 | # This file is free software; the Free Software Foundation |
308 | 689 | # gives unlimited permission to copy and/or distribute it, | 679 | # 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 | 691 | 681 | ||
311 | 692 | # AM_MAKE_INCLUDE() | 682 | # AM_MAKE_INCLUDE() |
312 | 693 | # ----------------- | 683 | # ----------------- |
314 | 694 | # Check to see how make treats includes. | 684 | # Check whether make has an 'include' directive that can support all |
315 | 685 | # the idioms we need for our automatic dependency tracking code. | ||
316 | 695 | AC_DEFUN([AM_MAKE_INCLUDE], | 686 | AC_DEFUN([AM_MAKE_INCLUDE], |
319 | 696 | [am_make=${MAKE-make} | 687 | [AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) |
320 | 697 | cat > confinc << 'END' | 688 | cat > confinc.mk << 'END' |
321 | 698 | am__doit: | 689 | am__doit: |
323 | 699 | @echo this is the am__doit target | 690 | @echo this is the am__doit target >confinc.out |
324 | 700 | .PHONY: am__doit | 691 | .PHONY: am__doit |
325 | 701 | END | 692 | END |
326 | 702 | # If we don't find an include directive, just comment out the code. | ||
327 | 703 | AC_MSG_CHECKING([for style of include used by $am_make]) | ||
328 | 704 | am__include="#" | 693 | am__include="#" |
329 | 705 | am__quote= | 694 | am__quote= |
357 | 706 | _am_result=none | 695 | # BSD make does it like this. |
358 | 707 | # First try GNU make style include. | 696 | echo '.include "confinc.mk" # ignored' > confmf.BSD |
359 | 708 | echo "include confinc" > confmf | 697 | # Other make implementations (GNU, Solaris 10, AIX) do it like this. |
360 | 709 | # Ignore all kinds of additional output from 'make'. | 698 | echo 'include confinc.mk # ignored' > confmf.GNU |
361 | 710 | case `$am_make -s -f confmf 2> /dev/null` in #( | 699 | _am_result=no |
362 | 711 | *the\ am__doit\ target*) | 700 | for s in GNU BSD; do |
363 | 712 | am__include=include | 701 | AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) |
364 | 713 | am__quote= | 702 | AS_CASE([$?:`cat confinc.out 2>/dev/null`], |
365 | 714 | _am_result=GNU | 703 | ['0:this is the am__doit target'], |
366 | 715 | ;; | 704 | [AS_CASE([$s], |
367 | 716 | esac | 705 | [BSD], [am__include='.include' am__quote='"'], |
368 | 717 | # Now try BSD make style include. | 706 | [am__include='include' am__quote=''])]) |
369 | 718 | if test "$am__include" = "#"; then | 707 | if test "$am__include" != "#"; then |
370 | 719 | echo '.include "confinc"' > confmf | 708 | _am_result="yes ($s style)" |
371 | 720 | case `$am_make -s -f confmf 2> /dev/null` in #( | 709 | break |
372 | 721 | *the\ am__doit\ target*) | 710 | fi |
373 | 722 | am__include=.include | 711 | done |
374 | 723 | am__quote="\"" | 712 | rm -f confinc.* confmf.* |
375 | 724 | _am_result=BSD | 713 | AC_MSG_RESULT([${_am_result}]) |
376 | 725 | ;; | 714 | AC_SUBST([am__include])]) |
377 | 726 | esac | 715 | AC_SUBST([am__quote])]) |
351 | 727 | fi | ||
352 | 728 | AC_SUBST([am__include]) | ||
353 | 729 | AC_SUBST([am__quote]) | ||
354 | 730 | AC_MSG_RESULT([$_am_result]) | ||
355 | 731 | rm -f confinc confmf | ||
356 | 732 | ]) | ||
378 | 733 | 716 | ||
379 | 734 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 717 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
380 | 735 | 718 | ||
382 | 736 | # Copyright (C) 1997-2017 Free Software Foundation, Inc. | 719 | # Copyright (C) 1997-2018 Free Software Foundation, Inc. |
383 | 737 | # | 720 | # |
384 | 738 | # This file is free software; the Free Software Foundation | 721 | # This file is free software; the Free Software Foundation |
385 | 739 | # gives unlimited permission to copy and/or distribute it, | 722 | # gives unlimited permission to copy and/or distribute it, |
386 | @@ -772,7 +755,7 @@ fi | |||
387 | 772 | 755 | ||
388 | 773 | # Helper functions for option handling. -*- Autoconf -*- | 756 | # Helper functions for option handling. -*- Autoconf -*- |
389 | 774 | 757 | ||
391 | 775 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 758 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
392 | 776 | # | 759 | # |
393 | 777 | # This file is free software; the Free Software Foundation | 760 | # This file is free software; the Free Software Foundation |
394 | 778 | # gives unlimited permission to copy and/or distribute it, | 761 | # gives unlimited permission to copy and/or distribute it, |
395 | @@ -801,7 +784,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | |||
396 | 801 | AC_DEFUN([_AM_IF_OPTION], | 784 | AC_DEFUN([_AM_IF_OPTION], |
397 | 802 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | 785 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
398 | 803 | 786 | ||
400 | 804 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 787 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
401 | 805 | # | 788 | # |
402 | 806 | # This file is free software; the Free Software Foundation | 789 | # This file is free software; the Free Software Foundation |
403 | 807 | # gives unlimited permission to copy and/or distribute it, | 790 | # gives unlimited permission to copy and/or distribute it, |
404 | @@ -848,7 +831,7 @@ AC_LANG_POP([C])]) | |||
405 | 848 | # For backward compatibility. | 831 | # For backward compatibility. |
406 | 849 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | 832 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
407 | 850 | 833 | ||
409 | 851 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 834 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
410 | 852 | # | 835 | # |
411 | 853 | # This file is free software; the Free Software Foundation | 836 | # This file is free software; the Free Software Foundation |
412 | 854 | # gives unlimited permission to copy and/or distribute it, | 837 | # gives unlimited permission to copy and/or distribute it, |
413 | @@ -867,7 +850,7 @@ AC_DEFUN([AM_RUN_LOG], | |||
414 | 867 | 850 | ||
415 | 868 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 851 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
416 | 869 | 852 | ||
418 | 870 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 853 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
419 | 871 | # | 854 | # |
420 | 872 | # This file is free software; the Free Software Foundation | 855 | # This file is free software; the Free Software Foundation |
421 | 873 | # gives unlimited permission to copy and/or distribute it, | 856 | # gives unlimited permission to copy and/or distribute it, |
422 | @@ -948,7 +931,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
423 | 948 | rm -f conftest.file | 931 | rm -f conftest.file |
424 | 949 | ]) | 932 | ]) |
425 | 950 | 933 | ||
427 | 951 | # Copyright (C) 2009-2017 Free Software Foundation, Inc. | 934 | # Copyright (C) 2009-2018 Free Software Foundation, Inc. |
428 | 952 | # | 935 | # |
429 | 953 | # This file is free software; the Free Software Foundation | 936 | # This file is free software; the Free Software Foundation |
430 | 954 | # gives unlimited permission to copy and/or distribute it, | 937 | # gives unlimited permission to copy and/or distribute it, |
431 | @@ -1008,7 +991,7 @@ AC_SUBST([AM_BACKSLASH])dnl | |||
432 | 1008 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | 991 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
433 | 1009 | ]) | 992 | ]) |
434 | 1010 | 993 | ||
436 | 1011 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 994 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
437 | 1012 | # | 995 | # |
438 | 1013 | # This file is free software; the Free Software Foundation | 996 | # This file is free software; the Free Software Foundation |
439 | 1014 | # gives unlimited permission to copy and/or distribute it, | 997 | # gives unlimited permission to copy and/or distribute it, |
440 | @@ -1036,7 +1019,7 @@ fi | |||
441 | 1036 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 1019 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
442 | 1037 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 1020 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
443 | 1038 | 1021 | ||
445 | 1039 | # Copyright (C) 2006-2017 Free Software Foundation, Inc. | 1022 | # Copyright (C) 2006-2018 Free Software Foundation, Inc. |
446 | 1040 | # | 1023 | # |
447 | 1041 | # This file is free software; the Free Software Foundation | 1024 | # This file is free software; the Free Software Foundation |
448 | 1042 | # gives unlimited permission to copy and/or distribute it, | 1025 | # gives unlimited permission to copy and/or distribute it, |
449 | @@ -1055,7 +1038,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |||
450 | 1055 | 1038 | ||
451 | 1056 | # Check how to create a tarball. -*- Autoconf -*- | 1039 | # Check how to create a tarball. -*- Autoconf -*- |
452 | 1057 | 1040 | ||
454 | 1058 | # Copyright (C) 2004-2017 Free Software Foundation, Inc. | 1041 | # Copyright (C) 2004-2018 Free Software Foundation, Inc. |
455 | 1059 | # | 1042 | # |
456 | 1060 | # This file is free software; the Free Software Foundation | 1043 | # This file is free software; the Free Software Foundation |
457 | 1061 | # gives unlimited permission to copy and/or distribute it, | 1044 | # gives unlimited permission to copy and/or distribute it, |
458 | diff --git a/build-aux/compile b/build-aux/compile | |||
459 | index de0005d..99e5052 100755 | |||
460 | --- a/build-aux/compile | |||
461 | +++ b/build-aux/compile | |||
462 | @@ -1,9 +1,9 @@ | |||
464 | 1 | #!/bin/sh | 1 | #! /bin/sh |
465 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
466 | 3 | 3 | ||
468 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
469 | 5 | 5 | ||
471 | 6 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
472 | 7 | # Written by Tom Tromey <tromey@cygnus.com>. | 7 | # Written by Tom Tromey <tromey@cygnus.com>. |
473 | 8 | # | 8 | # |
474 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
475 | @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC | |||
476 | 17 | # GNU General Public License for more details. | 17 | # GNU General Public License for more details. |
477 | 18 | # | 18 | # |
478 | 19 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
480 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 20 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
481 | 21 | 21 | ||
482 | 22 | # As a special exception to the GNU General Public License, if you | 22 | # As a special exception to the GNU General Public License, if you |
483 | 23 | # distribute this file as part of a program that contains a | 23 | # distribute this file as part of a program that contains a |
484 | @@ -340,7 +340,7 @@ exit $ret | |||
485 | 340 | # Local Variables: | 340 | # Local Variables: |
486 | 341 | # mode: shell-script | 341 | # mode: shell-script |
487 | 342 | # sh-indentation: 2 | 342 | # sh-indentation: 2 |
489 | 343 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 343 | # eval: (add-hook 'before-save-hook 'time-stamp) |
490 | 344 | # time-stamp-start: "scriptversion=" | 344 | # time-stamp-start: "scriptversion=" |
491 | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
492 | 346 | # time-stamp-time-zone: "UTC0" | 346 | # time-stamp-time-zone: "UTC0" |
493 | diff --git a/build-aux/config.guess b/build-aux/config.guess | |||
494 | index 717b228..f50dcdb 100755 | |||
495 | --- a/build-aux/config.guess | |||
496 | +++ b/build-aux/config.guess | |||
497 | @@ -1,8 +1,8 @@ | |||
499 | 1 | #!/bin/sh | 1 | #! /bin/sh |
500 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
502 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
503 | 4 | 4 | ||
505 | 5 | timestamp='2017-08-08' | 5 | timestamp='2018-02-24' |
506 | 6 | 6 | ||
507 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
508 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
509 | @@ -15,7 +15,7 @@ timestamp='2017-08-08' | |||
510 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
511 | 16 | # | 16 | # |
512 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
514 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
515 | 19 | # | 19 | # |
516 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
517 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
518 | @@ -27,7 +27,7 @@ timestamp='2017-08-08' | |||
519 | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
520 | 28 | # | 28 | # |
521 | 29 | # You can get the latest version of this script from: | 29 | # You can get the latest version of this script from: |
523 | 30 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 30 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
524 | 31 | # | 31 | # |
525 | 32 | # Please send patches to <config-patches@gnu.org>. | 32 | # Please send patches to <config-patches@gnu.org>. |
526 | 33 | 33 | ||
527 | @@ -39,7 +39,7 @@ Usage: $0 [OPTION] | |||
528 | 39 | 39 | ||
529 | 40 | Output the configuration name of the system \`$me' is run on. | 40 | Output the configuration name of the system \`$me' is run on. |
530 | 41 | 41 | ||
532 | 42 | Operation modes: | 42 | Options: |
533 | 43 | -h, --help print this help, then exit | 43 | -h, --help print this help, then exit |
534 | 44 | -t, --time-stamp print date of last modification, then exit | 44 | -t, --time-stamp print date of last modification, then exit |
535 | 45 | -v, --version print version number, then exit | 45 | -v, --version print version number, then exit |
536 | @@ -50,7 +50,7 @@ version="\ | |||
537 | 50 | GNU config.guess ($timestamp) | 50 | GNU config.guess ($timestamp) |
538 | 51 | 51 | ||
539 | 52 | Originally written by Per Bothner. | 52 | Originally written by Per Bothner. |
541 | 53 | Copyright 1992-2017 Free Software Foundation, Inc. | 53 | Copyright 1992-2018 Free Software Foundation, Inc. |
542 | 54 | 54 | ||
543 | 55 | This is free software; see the source for copying conditions. There is NO | 55 | This is free software; see the source for copying conditions. There is NO |
544 | 56 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 56 | 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 | 107 | dummy=$tmp/dummy ; | 107 | dummy=$tmp/dummy ; |
547 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
548 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
550 | 110 | ,,) echo "int x;" > $dummy.c ; | 110 | ,,) echo "int x;" > "$dummy.c" ; |
551 | 111 | for c in cc gcc c89 c99 ; do | 111 | for c in cc gcc c89 c99 ; do |
553 | 112 | if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
554 | 113 | CC_FOR_BUILD="$c"; break ; | 113 | CC_FOR_BUILD="$c"; break ; |
555 | 114 | fi ; | 114 | fi ; |
556 | 115 | done ; | 115 | done ; |
557 | @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown | |||
558 | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
559 | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
560 | 134 | 134 | ||
562 | 135 | case "${UNAME_SYSTEM}" in | 135 | case "$UNAME_SYSTEM" in |
563 | 136 | Linux|GNU|GNU/*) | 136 | Linux|GNU|GNU/*) |
564 | 137 | # If the system lacks a compiler, then just pick glibc. | 137 | # If the system lacks a compiler, then just pick glibc. |
565 | 138 | # We could probably try harder. | 138 | # We could probably try harder. |
566 | 139 | LIBC=gnu | 139 | LIBC=gnu |
567 | 140 | 140 | ||
570 | 141 | eval $set_cc_for_build | 141 | eval "$set_cc_for_build" |
571 | 142 | cat <<-EOF > $dummy.c | 142 | cat <<-EOF > "$dummy.c" |
572 | 143 | #include <features.h> | 143 | #include <features.h> |
573 | 144 | #if defined(__UCLIBC__) | 144 | #if defined(__UCLIBC__) |
574 | 145 | LIBC=uclibc | 145 | LIBC=uclibc |
575 | @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) | |||
576 | 149 | LIBC=gnu | 149 | LIBC=gnu |
577 | 150 | #endif | 150 | #endif |
578 | 151 | EOF | 151 | EOF |
580 | 152 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` | 152 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" |
581 | 153 | |||
582 | 154 | # If ldd exists, use it to detect musl libc. | ||
583 | 155 | if command -v ldd >/dev/null && \ | ||
584 | 156 | ldd --version 2>&1 | grep -q ^musl | ||
585 | 157 | then | ||
586 | 158 | LIBC=musl | ||
587 | 159 | fi | ||
588 | 153 | ;; | 160 | ;; |
589 | 154 | esac | 161 | esac |
590 | 155 | 162 | ||
591 | 156 | # Note: order is significant - the case branches are not exclusive. | 163 | # Note: order is significant - the case branches are not exclusive. |
592 | 157 | 164 | ||
594 | 158 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 165 | case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in |
595 | 159 | *:NetBSD:*:*) | 166 | *:NetBSD:*:*) |
596 | 160 | # NetBSD (nbsd) targets should (where applicable) match one or | 167 | # NetBSD (nbsd) targets should (where applicable) match one or |
597 | 161 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, | 168 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
598 | @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
599 | 169 | # portion of the name. We always set it to "unknown". | 176 | # portion of the name. We always set it to "unknown". |
600 | 170 | sysctl="sysctl -n hw.machine_arch" | 177 | sysctl="sysctl -n hw.machine_arch" |
601 | 171 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ | 178 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ |
604 | 172 | /sbin/$sysctl 2>/dev/null || \ | 179 | "/sbin/$sysctl" 2>/dev/null || \ |
605 | 173 | /usr/sbin/$sysctl 2>/dev/null || \ | 180 | "/usr/sbin/$sysctl" 2>/dev/null || \ |
606 | 174 | echo unknown)` | 181 | echo unknown)` |
608 | 175 | case "${UNAME_MACHINE_ARCH}" in | 182 | case "$UNAME_MACHINE_ARCH" in |
609 | 176 | armeb) machine=armeb-unknown ;; | 183 | armeb) machine=armeb-unknown ;; |
610 | 177 | arm*) machine=arm-unknown ;; | 184 | arm*) machine=arm-unknown ;; |
611 | 178 | sh3el) machine=shl-unknown ;; | 185 | sh3el) machine=shl-unknown ;; |
612 | 179 | sh3eb) machine=sh-unknown ;; | 186 | sh3eb) machine=sh-unknown ;; |
613 | 180 | sh5el) machine=sh5le-unknown ;; | 187 | sh5el) machine=sh5le-unknown ;; |
614 | 181 | earmv*) | 188 | earmv*) |
618 | 182 | arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` | 189 | arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
619 | 183 | endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` | 190 | endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` |
620 | 184 | machine=${arch}${endian}-unknown | 191 | machine="${arch}${endian}"-unknown |
621 | 185 | ;; | 192 | ;; |
623 | 186 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 193 | *) machine="$UNAME_MACHINE_ARCH"-unknown ;; |
624 | 187 | esac | 194 | esac |
625 | 188 | # The Operating System including object format, if it has switched | 195 | # The Operating System including object format, if it has switched |
626 | 189 | # to ELF recently (or will in the future) and ABI. | 196 | # to ELF recently (or will in the future) and ABI. |
628 | 190 | case "${UNAME_MACHINE_ARCH}" in | 197 | case "$UNAME_MACHINE_ARCH" in |
629 | 191 | earm*) | 198 | earm*) |
630 | 192 | os=netbsdelf | 199 | os=netbsdelf |
631 | 193 | ;; | 200 | ;; |
632 | 194 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
634 | 195 | eval $set_cc_for_build | 202 | eval "$set_cc_for_build" |
635 | 196 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
636 | 197 | | grep -q __ELF__ | 204 | | grep -q __ELF__ |
637 | 198 | then | 205 | then |
638 | @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
639 | 208 | ;; | 215 | ;; |
640 | 209 | esac | 216 | esac |
641 | 210 | # Determine ABI tags. | 217 | # Determine ABI tags. |
643 | 211 | case "${UNAME_MACHINE_ARCH}" in | 218 | case "$UNAME_MACHINE_ARCH" in |
644 | 212 | earm*) | 219 | earm*) |
645 | 213 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' | 220 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' |
647 | 214 | abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` | 221 | abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` |
648 | 215 | ;; | 222 | ;; |
649 | 216 | esac | 223 | esac |
650 | 217 | # The OS release | 224 | # The OS release |
651 | @@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
652 | 219 | # thus, need a distinct triplet. However, they do not need | 226 | # thus, need a distinct triplet. However, they do not need |
653 | 220 | # kernel version information, so it can be replaced with a | 227 | # kernel version information, so it can be replaced with a |
654 | 221 | # suitable tag, in the style of linux-gnu. | 228 | # suitable tag, in the style of linux-gnu. |
656 | 222 | case "${UNAME_VERSION}" in | 229 | case "$UNAME_VERSION" in |
657 | 223 | Debian*) | 230 | Debian*) |
658 | 224 | release='-gnu' | 231 | release='-gnu' |
659 | 225 | ;; | 232 | ;; |
660 | 226 | *) | 233 | *) |
662 | 227 | release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` | 234 | release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` |
663 | 228 | ;; | 235 | ;; |
664 | 229 | esac | 236 | esac |
665 | 230 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
666 | 231 | # contains redundant information, the shorter form: | 238 | # contains redundant information, the shorter form: |
667 | 232 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
669 | 233 | echo "${machine}-${os}${release}${abi}" | 240 | echo "$machine-${os}${release}${abi}" |
670 | 234 | exit ;; | 241 | exit ;; |
671 | 235 | *:Bitrig:*:*) | 242 | *:Bitrig:*:*) |
672 | 236 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
674 | 237 | echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} | 244 | echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" |
675 | 238 | exit ;; | 245 | exit ;; |
676 | 239 | *:OpenBSD:*:*) | 246 | *:OpenBSD:*:*) |
677 | 240 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` | 247 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
679 | 241 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} | 248 | echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" |
680 | 242 | exit ;; | 249 | exit ;; |
681 | 243 | *:LibertyBSD:*:*) | 250 | *:LibertyBSD:*:*) |
682 | 244 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` | 251 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` |
684 | 245 | echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} | 252 | echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" |
685 | 253 | exit ;; | ||
686 | 254 | *:MidnightBSD:*:*) | ||
687 | 255 | echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" | ||
688 | 246 | exit ;; | 256 | exit ;; |
689 | 247 | *:ekkoBSD:*:*) | 257 | *:ekkoBSD:*:*) |
691 | 248 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | 258 | echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" |
692 | 249 | exit ;; | 259 | exit ;; |
693 | 250 | *:SolidBSD:*:*) | 260 | *:SolidBSD:*:*) |
695 | 251 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | 261 | echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" |
696 | 252 | exit ;; | 262 | exit ;; |
697 | 253 | macppc:MirBSD:*:*) | 263 | macppc:MirBSD:*:*) |
699 | 254 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 264 | echo powerpc-unknown-mirbsd"$UNAME_RELEASE" |
700 | 255 | exit ;; | 265 | exit ;; |
701 | 256 | *:MirBSD:*:*) | 266 | *:MirBSD:*:*) |
703 | 257 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 267 | echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" |
704 | 258 | exit ;; | 268 | exit ;; |
705 | 259 | *:Sortix:*:*) | 269 | *:Sortix:*:*) |
707 | 260 | echo ${UNAME_MACHINE}-unknown-sortix | 270 | echo "$UNAME_MACHINE"-unknown-sortix |
708 | 261 | exit ;; | 271 | exit ;; |
709 | 262 | *:Redox:*:*) | 272 | *:Redox:*:*) |
711 | 263 | echo ${UNAME_MACHINE}-unknown-redox | 273 | echo "$UNAME_MACHINE"-unknown-redox |
712 | 264 | exit ;; | 274 | exit ;; |
713 | 275 | mips:OSF1:*.*) | ||
714 | 276 | echo mips-dec-osf1 | ||
715 | 277 | exit ;; | ||
716 | 265 | alpha:OSF1:*:*) | 278 | alpha:OSF1:*:*) |
717 | 266 | case $UNAME_RELEASE in | 279 | case $UNAME_RELEASE in |
718 | 267 | *4.0) | 280 | *4.0) |
719 | @@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
720 | 313 | # A Tn.n version is a released field test version. | 326 | # A Tn.n version is a released field test version. |
721 | 314 | # A Xn.n version is an unreleased experimental baselevel. | 327 | # A Xn.n version is an unreleased experimental baselevel. |
722 | 315 | # 1.2 uses "1.2" for uname -r. | 328 | # 1.2 uses "1.2" for uname -r. |
724 | 316 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 329 | echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" |
725 | 317 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. | 330 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
726 | 318 | exitcode=$? | 331 | exitcode=$? |
727 | 319 | trap '' 0 | 332 | trap '' 0 |
728 | 320 | exit $exitcode ;; | 333 | exit $exitcode ;; |
729 | 321 | Alpha\ *:Windows_NT*:*) | ||
730 | 322 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
731 | 323 | # Should we change UNAME_MACHINE based on the output of uname instead | ||
732 | 324 | # of the specific Alpha model? | ||
733 | 325 | echo alpha-pc-interix | ||
734 | 326 | exit ;; | ||
735 | 327 | 21064:Windows_NT:50:3) | ||
736 | 328 | echo alpha-dec-winnt3.5 | ||
737 | 329 | exit ;; | ||
738 | 330 | Amiga*:UNIX_System_V:4.0:*) | 334 | Amiga*:UNIX_System_V:4.0:*) |
739 | 331 | echo m68k-unknown-sysv4 | 335 | echo m68k-unknown-sysv4 |
740 | 332 | exit ;; | 336 | exit ;; |
741 | 333 | *:[Aa]miga[Oo][Ss]:*:*) | 337 | *:[Aa]miga[Oo][Ss]:*:*) |
743 | 334 | echo ${UNAME_MACHINE}-unknown-amigaos | 338 | echo "$UNAME_MACHINE"-unknown-amigaos |
744 | 335 | exit ;; | 339 | exit ;; |
745 | 336 | *:[Mm]orph[Oo][Ss]:*:*) | 340 | *:[Mm]orph[Oo][Ss]:*:*) |
747 | 337 | echo ${UNAME_MACHINE}-unknown-morphos | 341 | echo "$UNAME_MACHINE"-unknown-morphos |
748 | 338 | exit ;; | 342 | exit ;; |
749 | 339 | *:OS/390:*:*) | 343 | *:OS/390:*:*) |
750 | 340 | echo i370-ibm-openedition | 344 | echo i370-ibm-openedition |
751 | @@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
752 | 346 | echo powerpc-ibm-os400 | 350 | echo powerpc-ibm-os400 |
753 | 347 | exit ;; | 351 | exit ;; |
754 | 348 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 352 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
756 | 349 | echo arm-acorn-riscix${UNAME_RELEASE} | 353 | echo arm-acorn-riscix"$UNAME_RELEASE" |
757 | 350 | exit ;; | 354 | exit ;; |
758 | 351 | arm*:riscos:*:*|arm*:RISCOS:*:*) | 355 | arm*:riscos:*:*|arm*:RISCOS:*:*) |
759 | 352 | echo arm-unknown-riscos | 356 | echo arm-unknown-riscos |
760 | @@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
761 | 373 | sparc) echo sparc-icl-nx7; exit ;; | 377 | sparc) echo sparc-icl-nx7; exit ;; |
762 | 374 | esac ;; | 378 | esac ;; |
763 | 375 | s390x:SunOS:*:*) | 379 | s390x:SunOS:*:*) |
765 | 376 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 380 | echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
766 | 377 | exit ;; | 381 | exit ;; |
767 | 378 | sun4H:SunOS:5.*:*) | 382 | sun4H:SunOS:5.*:*) |
769 | 379 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 383 | echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
770 | 380 | exit ;; | 384 | exit ;; |
771 | 381 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 385 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
773 | 382 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 386 | echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
774 | 383 | exit ;; | 387 | exit ;; |
775 | 384 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | 388 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
777 | 385 | echo i386-pc-auroraux${UNAME_RELEASE} | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" |
778 | 386 | exit ;; | 390 | exit ;; |
779 | 387 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
781 | 388 | eval $set_cc_for_build | 392 | eval "$set_cc_for_build" |
782 | 389 | SUN_ARCH=i386 | 393 | SUN_ARCH=i386 |
783 | 390 | # If there is a compiler, see if it is configured for 64-bit objects. | 394 | # If there is a compiler, see if it is configured for 64-bit objects. |
784 | 391 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 395 | # 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 | 398 | SUN_ARCH=x86_64 | 402 | SUN_ARCH=x86_64 |
787 | 399 | fi | 403 | fi |
788 | 400 | fi | 404 | fi |
790 | 401 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
791 | 402 | exit ;; | 406 | exit ;; |
792 | 403 | sun4*:SunOS:6*:*) | 407 | sun4*:SunOS:6*:*) |
793 | 404 | # According to config.sub, this is the proper way to canonicalize | 408 | # According to config.sub, this is the proper way to canonicalize |
794 | 405 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but | 409 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
795 | 406 | # it's likely to be more like Solaris than SunOS4. | 410 | # it's likely to be more like Solaris than SunOS4. |
797 | 407 | echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 411 | echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
798 | 408 | exit ;; | 412 | exit ;; |
799 | 409 | sun4*:SunOS:*:*) | 413 | sun4*:SunOS:*:*) |
800 | 410 | case "`/usr/bin/arch -k`" in | 414 | case "`/usr/bin/arch -k`" in |
801 | @@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
802 | 413 | ;; | 417 | ;; |
803 | 414 | esac | 418 | esac |
804 | 415 | # Japanese Language versions have a version number like `4.1.3-JL'. | 419 | # Japanese Language versions have a version number like `4.1.3-JL'. |
806 | 416 | echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` | 420 | echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" |
807 | 417 | exit ;; | 421 | exit ;; |
808 | 418 | sun3*:SunOS:*:*) | 422 | sun3*:SunOS:*:*) |
810 | 419 | echo m68k-sun-sunos${UNAME_RELEASE} | 423 | echo m68k-sun-sunos"$UNAME_RELEASE" |
811 | 420 | exit ;; | 424 | exit ;; |
812 | 421 | sun*:*:4.2BSD:*) | 425 | sun*:*:4.2BSD:*) |
813 | 422 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 426 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
815 | 423 | test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 | 427 | test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 |
816 | 424 | case "`/bin/arch`" in | 428 | case "`/bin/arch`" in |
817 | 425 | sun3) | 429 | sun3) |
819 | 426 | echo m68k-sun-sunos${UNAME_RELEASE} | 430 | echo m68k-sun-sunos"$UNAME_RELEASE" |
820 | 427 | ;; | 431 | ;; |
821 | 428 | sun4) | 432 | sun4) |
823 | 429 | echo sparc-sun-sunos${UNAME_RELEASE} | 433 | echo sparc-sun-sunos"$UNAME_RELEASE" |
824 | 430 | ;; | 434 | ;; |
825 | 431 | esac | 435 | esac |
826 | 432 | exit ;; | 436 | exit ;; |
827 | 433 | aushp:SunOS:*:*) | 437 | aushp:SunOS:*:*) |
829 | 434 | echo sparc-auspex-sunos${UNAME_RELEASE} | 438 | echo sparc-auspex-sunos"$UNAME_RELEASE" |
830 | 435 | exit ;; | 439 | exit ;; |
831 | 436 | # The situation for MiNT is a little confusing. The machine name | 440 | # The situation for MiNT is a little confusing. The machine name |
832 | 437 | # can be virtually everything (everything which is not | 441 | # can be virtually everything (everything which is not |
833 | @@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
834 | 442 | # MiNT. But MiNT is downward compatible to TOS, so this should | 446 | # MiNT. But MiNT is downward compatible to TOS, so this should |
835 | 443 | # be no problem. | 447 | # be no problem. |
836 | 444 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 448 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
838 | 445 | echo m68k-atari-mint${UNAME_RELEASE} | 449 | echo m68k-atari-mint"$UNAME_RELEASE" |
839 | 446 | exit ;; | 450 | exit ;; |
840 | 447 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 451 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
842 | 448 | echo m68k-atari-mint${UNAME_RELEASE} | 452 | echo m68k-atari-mint"$UNAME_RELEASE" |
843 | 449 | exit ;; | 453 | exit ;; |
844 | 450 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 454 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
846 | 451 | echo m68k-atari-mint${UNAME_RELEASE} | 455 | echo m68k-atari-mint"$UNAME_RELEASE" |
847 | 452 | exit ;; | 456 | exit ;; |
848 | 453 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 457 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
850 | 454 | echo m68k-milan-mint${UNAME_RELEASE} | 458 | echo m68k-milan-mint"$UNAME_RELEASE" |
851 | 455 | exit ;; | 459 | exit ;; |
852 | 456 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 460 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
854 | 457 | echo m68k-hades-mint${UNAME_RELEASE} | 461 | echo m68k-hades-mint"$UNAME_RELEASE" |
855 | 458 | exit ;; | 462 | exit ;; |
856 | 459 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 463 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
858 | 460 | echo m68k-unknown-mint${UNAME_RELEASE} | 464 | echo m68k-unknown-mint"$UNAME_RELEASE" |
859 | 461 | exit ;; | 465 | exit ;; |
860 | 462 | m68k:machten:*:*) | 466 | m68k:machten:*:*) |
862 | 463 | echo m68k-apple-machten${UNAME_RELEASE} | 467 | echo m68k-apple-machten"$UNAME_RELEASE" |
863 | 464 | exit ;; | 468 | exit ;; |
864 | 465 | powerpc:machten:*:*) | 469 | powerpc:machten:*:*) |
866 | 466 | echo powerpc-apple-machten${UNAME_RELEASE} | 470 | echo powerpc-apple-machten"$UNAME_RELEASE" |
867 | 467 | exit ;; | 471 | exit ;; |
868 | 468 | RISC*:Mach:*:*) | 472 | RISC*:Mach:*:*) |
869 | 469 | echo mips-dec-mach_bsd4.3 | 473 | echo mips-dec-mach_bsd4.3 |
870 | 470 | exit ;; | 474 | exit ;; |
871 | 471 | RISC*:ULTRIX:*:*) | 475 | RISC*:ULTRIX:*:*) |
873 | 472 | echo mips-dec-ultrix${UNAME_RELEASE} | 476 | echo mips-dec-ultrix"$UNAME_RELEASE" |
874 | 473 | exit ;; | 477 | exit ;; |
875 | 474 | VAX*:ULTRIX*:*:*) | 478 | VAX*:ULTRIX*:*:*) |
877 | 475 | echo vax-dec-ultrix${UNAME_RELEASE} | 479 | echo vax-dec-ultrix"$UNAME_RELEASE" |
878 | 476 | exit ;; | 480 | exit ;; |
879 | 477 | 2020:CLIX:*:* | 2430:CLIX:*:*) | 481 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
881 | 478 | echo clipper-intergraph-clix${UNAME_RELEASE} | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
882 | 479 | exit ;; | 483 | exit ;; |
883 | 480 | mips:*:*:UMIPS | mips:*:*:RISCos) | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) |
886 | 481 | eval $set_cc_for_build | 485 | eval "$set_cc_for_build" |
887 | 482 | sed 's/^ //' << EOF >$dummy.c | 486 | sed 's/^ //' << EOF > "$dummy.c" |
888 | 483 | #ifdef __cplusplus | 487 | #ifdef __cplusplus |
889 | 484 | #include <stdio.h> /* for printf() prototype */ | 488 | #include <stdio.h> /* for printf() prototype */ |
890 | 485 | int main (int argc, char *argv[]) { | 489 | int main (int argc, char *argv[]) { |
891 | @@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
892 | 488 | #endif | 492 | #endif |
893 | 489 | #if defined (host_mips) && defined (MIPSEB) | 493 | #if defined (host_mips) && defined (MIPSEB) |
894 | 490 | #if defined (SYSTYPE_SYSV) | 494 | #if defined (SYSTYPE_SYSV) |
896 | 491 | printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); | 495 | printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); |
897 | 492 | #endif | 496 | #endif |
898 | 493 | #if defined (SYSTYPE_SVR4) | 497 | #if defined (SYSTYPE_SVR4) |
900 | 494 | printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); | 498 | printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); |
901 | 495 | #endif | 499 | #endif |
902 | 496 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) | 500 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
904 | 497 | printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); | 501 | printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); |
905 | 498 | #endif | 502 | #endif |
906 | 499 | #endif | 503 | #endif |
907 | 500 | exit (-1); | 504 | exit (-1); |
908 | 501 | } | 505 | } |
909 | 502 | EOF | 506 | EOF |
913 | 503 | $CC_FOR_BUILD -o $dummy $dummy.c && | 507 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && |
914 | 504 | dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && | 508 | dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && |
915 | 505 | SYSTEM_NAME=`$dummy $dummyarg` && | 509 | SYSTEM_NAME=`"$dummy" "$dummyarg"` && |
916 | 506 | { echo "$SYSTEM_NAME"; exit; } | 510 | { echo "$SYSTEM_NAME"; exit; } |
918 | 507 | echo mips-mips-riscos${UNAME_RELEASE} | 511 | echo mips-mips-riscos"$UNAME_RELEASE" |
919 | 508 | exit ;; | 512 | exit ;; |
920 | 509 | Motorola:PowerMAX_OS:*:*) | 513 | Motorola:PowerMAX_OS:*:*) |
921 | 510 | echo powerpc-motorola-powermax | 514 | echo powerpc-motorola-powermax |
922 | @@ -530,17 +534,17 @@ EOF | |||
923 | 530 | AViiON:dgux:*:*) | 534 | AViiON:dgux:*:*) |
924 | 531 | # DG/UX returns AViiON for all architectures | 535 | # DG/UX returns AViiON for all architectures |
925 | 532 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 536 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
927 | 533 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 537 | if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] |
928 | 534 | then | 538 | then |
931 | 535 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 539 | if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ |
932 | 536 | [ ${TARGET_BINARY_INTERFACE}x = x ] | 540 | [ "$TARGET_BINARY_INTERFACE"x = x ] |
933 | 537 | then | 541 | then |
935 | 538 | echo m88k-dg-dgux${UNAME_RELEASE} | 542 | echo m88k-dg-dgux"$UNAME_RELEASE" |
936 | 539 | else | 543 | else |
938 | 540 | echo m88k-dg-dguxbcs${UNAME_RELEASE} | 544 | echo m88k-dg-dguxbcs"$UNAME_RELEASE" |
939 | 541 | fi | 545 | fi |
940 | 542 | else | 546 | else |
942 | 543 | echo i586-dg-dgux${UNAME_RELEASE} | 547 | echo i586-dg-dgux"$UNAME_RELEASE" |
943 | 544 | fi | 548 | fi |
944 | 545 | exit ;; | 549 | exit ;; |
945 | 546 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 550 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
946 | @@ -557,7 +561,7 @@ EOF | |||
947 | 557 | echo m68k-tektronix-bsd | 561 | echo m68k-tektronix-bsd |
948 | 558 | exit ;; | 562 | exit ;; |
949 | 559 | *:IRIX*:*:*) | 563 | *:IRIX*:*:*) |
951 | 560 | echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` | 564 | echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" |
952 | 561 | exit ;; | 565 | exit ;; |
953 | 562 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. | 566 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
954 | 563 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id | 567 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
955 | @@ -569,14 +573,14 @@ EOF | |||
956 | 569 | if [ -x /usr/bin/oslevel ] ; then | 573 | if [ -x /usr/bin/oslevel ] ; then |
957 | 570 | IBM_REV=`/usr/bin/oslevel` | 574 | IBM_REV=`/usr/bin/oslevel` |
958 | 571 | else | 575 | else |
960 | 572 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 576 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
961 | 573 | fi | 577 | fi |
963 | 574 | echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} | 578 | echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" |
964 | 575 | exit ;; | 579 | exit ;; |
965 | 576 | *:AIX:2:3) | 580 | *:AIX:2:3) |
966 | 577 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | 581 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
969 | 578 | eval $set_cc_for_build | 582 | eval "$set_cc_for_build" |
970 | 579 | sed 's/^ //' << EOF >$dummy.c | 583 | sed 's/^ //' << EOF > "$dummy.c" |
971 | 580 | #include <sys/systemcfg.h> | 584 | #include <sys/systemcfg.h> |
972 | 581 | 585 | ||
973 | 582 | main() | 586 | main() |
974 | @@ -587,7 +591,7 @@ EOF | |||
975 | 587 | exit(0); | 591 | exit(0); |
976 | 588 | } | 592 | } |
977 | 589 | EOF | 593 | EOF |
979 | 590 | if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` | 594 | if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` |
980 | 591 | then | 595 | then |
981 | 592 | echo "$SYSTEM_NAME" | 596 | echo "$SYSTEM_NAME" |
982 | 593 | else | 597 | else |
983 | @@ -601,7 +605,7 @@ EOF | |||
984 | 601 | exit ;; | 605 | exit ;; |
985 | 602 | *:AIX:*:[4567]) | 606 | *:AIX:*:[4567]) |
986 | 603 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 607 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
988 | 604 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 608 | if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then |
989 | 605 | IBM_ARCH=rs6000 | 609 | IBM_ARCH=rs6000 |
990 | 606 | else | 610 | else |
991 | 607 | IBM_ARCH=powerpc | 611 | IBM_ARCH=powerpc |
992 | @@ -610,18 +614,18 @@ EOF | |||
993 | 610 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | | 614 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
994 | 611 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` | 615 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` |
995 | 612 | else | 616 | else |
997 | 613 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} | 617 | IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
998 | 614 | fi | 618 | fi |
1000 | 615 | echo ${IBM_ARCH}-ibm-aix${IBM_REV} | 619 | echo "$IBM_ARCH"-ibm-aix"$IBM_REV" |
1001 | 616 | exit ;; | 620 | exit ;; |
1002 | 617 | *:AIX:*:*) | 621 | *:AIX:*:*) |
1003 | 618 | echo rs6000-ibm-aix | 622 | echo rs6000-ibm-aix |
1004 | 619 | exit ;; | 623 | exit ;; |
1006 | 620 | ibmrt:4.4BSD:*|romp-ibm:BSD:*) | 624 | ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) |
1007 | 621 | echo romp-ibm-bsd4.4 | 625 | echo romp-ibm-bsd4.4 |
1008 | 622 | exit ;; | 626 | exit ;; |
1009 | 623 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and | 627 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
1011 | 624 | echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to | 628 | echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to |
1012 | 625 | exit ;; # report: romp-ibm BSD 4.3 | 629 | exit ;; # report: romp-ibm BSD 4.3 |
1013 | 626 | *:BOSX:*:*) | 630 | *:BOSX:*:*) |
1014 | 627 | echo rs6000-bull-bosx | 631 | echo rs6000-bull-bosx |
1015 | @@ -636,28 +640,28 @@ EOF | |||
1016 | 636 | echo m68k-hp-bsd4.4 | 640 | echo m68k-hp-bsd4.4 |
1017 | 637 | exit ;; | 641 | exit ;; |
1018 | 638 | 9000/[34678]??:HP-UX:*:*) | 642 | 9000/[34678]??:HP-UX:*:*) |
1023 | 639 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 643 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
1024 | 640 | case "${UNAME_MACHINE}" in | 644 | case "$UNAME_MACHINE" in |
1025 | 641 | 9000/31? ) HP_ARCH=m68000 ;; | 645 | 9000/31?) HP_ARCH=m68000 ;; |
1026 | 642 | 9000/[34]?? ) HP_ARCH=m68k ;; | 646 | 9000/[34]??) HP_ARCH=m68k ;; |
1027 | 643 | 9000/[678][0-9][0-9]) | 647 | 9000/[678][0-9][0-9]) |
1028 | 644 | if [ -x /usr/bin/getconf ]; then | 648 | if [ -x /usr/bin/getconf ]; then |
1029 | 645 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 649 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
1030 | 646 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 650 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
1032 | 647 | case "${sc_cpu_version}" in | 651 | case "$sc_cpu_version" in |
1033 | 648 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 | 652 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 |
1034 | 649 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 | 653 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 |
1035 | 650 | 532) # CPU_PA_RISC2_0 | 654 | 532) # CPU_PA_RISC2_0 |
1037 | 651 | case "${sc_kernel_bits}" in | 655 | case "$sc_kernel_bits" in |
1038 | 652 | 32) HP_ARCH=hppa2.0n ;; | 656 | 32) HP_ARCH=hppa2.0n ;; |
1039 | 653 | 64) HP_ARCH=hppa2.0w ;; | 657 | 64) HP_ARCH=hppa2.0w ;; |
1040 | 654 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 | 658 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 |
1041 | 655 | esac ;; | 659 | esac ;; |
1042 | 656 | esac | 660 | esac |
1043 | 657 | fi | 661 | fi |
1047 | 658 | if [ "${HP_ARCH}" = "" ]; then | 662 | if [ "$HP_ARCH" = "" ]; then |
1048 | 659 | eval $set_cc_for_build | 663 | eval "$set_cc_for_build" |
1049 | 660 | sed 's/^ //' << EOF >$dummy.c | 664 | sed 's/^ //' << EOF > "$dummy.c" |
1050 | 661 | 665 | ||
1051 | 662 | #define _HPUX_SOURCE | 666 | #define _HPUX_SOURCE |
1052 | 663 | #include <stdlib.h> | 667 | #include <stdlib.h> |
1053 | @@ -690,13 +694,13 @@ EOF | |||
1054 | 690 | exit (0); | 694 | exit (0); |
1055 | 691 | } | 695 | } |
1056 | 692 | EOF | 696 | EOF |
1058 | 693 | (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 697 | (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` |
1059 | 694 | test -z "$HP_ARCH" && HP_ARCH=hppa | 698 | test -z "$HP_ARCH" && HP_ARCH=hppa |
1060 | 695 | fi ;; | 699 | fi ;; |
1061 | 696 | esac | 700 | esac |
1063 | 697 | if [ ${HP_ARCH} = hppa2.0w ] | 701 | if [ "$HP_ARCH" = hppa2.0w ] |
1064 | 698 | then | 702 | then |
1066 | 699 | eval $set_cc_for_build | 703 | eval "$set_cc_for_build" |
1067 | 700 | 704 | ||
1068 | 701 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating | 705 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
1069 | 702 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler | 706 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
1070 | @@ -715,15 +719,15 @@ EOF | |||
1071 | 715 | HP_ARCH=hppa64 | 719 | HP_ARCH=hppa64 |
1072 | 716 | fi | 720 | fi |
1073 | 717 | fi | 721 | fi |
1075 | 718 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} | 722 | echo "$HP_ARCH"-hp-hpux"$HPUX_REV" |
1076 | 719 | exit ;; | 723 | exit ;; |
1077 | 720 | ia64:HP-UX:*:*) | 724 | ia64:HP-UX:*:*) |
1080 | 721 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` | 725 | HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
1081 | 722 | echo ia64-hp-hpux${HPUX_REV} | 726 | echo ia64-hp-hpux"$HPUX_REV" |
1082 | 723 | exit ;; | 727 | exit ;; |
1083 | 724 | 3050*:HI-UX:*:*) | 728 | 3050*:HI-UX:*:*) |
1086 | 725 | eval $set_cc_for_build | 729 | eval "$set_cc_for_build" |
1087 | 726 | sed 's/^ //' << EOF >$dummy.c | 730 | sed 's/^ //' << EOF > "$dummy.c" |
1088 | 727 | #include <unistd.h> | 731 | #include <unistd.h> |
1089 | 728 | int | 732 | int |
1090 | 729 | main () | 733 | main () |
1091 | @@ -748,11 +752,11 @@ EOF | |||
1092 | 748 | exit (0); | 752 | exit (0); |
1093 | 749 | } | 753 | } |
1094 | 750 | EOF | 754 | EOF |
1096 | 751 | $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && | 755 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && |
1097 | 752 | { echo "$SYSTEM_NAME"; exit; } | 756 | { echo "$SYSTEM_NAME"; exit; } |
1098 | 753 | echo unknown-hitachi-hiuxwe2 | 757 | echo unknown-hitachi-hiuxwe2 |
1099 | 754 | exit ;; | 758 | exit ;; |
1101 | 755 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) | 759 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) |
1102 | 756 | echo hppa1.1-hp-bsd | 760 | echo hppa1.1-hp-bsd |
1103 | 757 | exit ;; | 761 | exit ;; |
1104 | 758 | 9000/8??:4.3bsd:*:*) | 762 | 9000/8??:4.3bsd:*:*) |
1105 | @@ -761,7 +765,7 @@ EOF | |||
1106 | 761 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) | 765 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
1107 | 762 | echo hppa1.0-hp-mpeix | 766 | echo hppa1.0-hp-mpeix |
1108 | 763 | exit ;; | 767 | exit ;; |
1110 | 764 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) | 768 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) |
1111 | 765 | echo hppa1.1-hp-osf | 769 | echo hppa1.1-hp-osf |
1112 | 766 | exit ;; | 770 | exit ;; |
1113 | 767 | hp8??:OSF1:*:*) | 771 | hp8??:OSF1:*:*) |
1114 | @@ -769,9 +773,9 @@ EOF | |||
1115 | 769 | exit ;; | 773 | exit ;; |
1116 | 770 | i*86:OSF1:*:*) | 774 | i*86:OSF1:*:*) |
1117 | 771 | if [ -x /usr/sbin/sysversion ] ; then | 775 | if [ -x /usr/sbin/sysversion ] ; then |
1119 | 772 | echo ${UNAME_MACHINE}-unknown-osf1mk | 776 | echo "$UNAME_MACHINE"-unknown-osf1mk |
1120 | 773 | else | 777 | else |
1122 | 774 | echo ${UNAME_MACHINE}-unknown-osf1 | 778 | echo "$UNAME_MACHINE"-unknown-osf1 |
1123 | 775 | fi | 779 | fi |
1124 | 776 | exit ;; | 780 | exit ;; |
1125 | 777 | parisc*:Lites*:*:*) | 781 | parisc*:Lites*:*:*) |
1126 | @@ -796,128 +800,109 @@ EOF | |||
1127 | 796 | echo c4-convex-bsd | 800 | echo c4-convex-bsd |
1128 | 797 | exit ;; | 801 | exit ;; |
1129 | 798 | CRAY*Y-MP:*:*:*) | 802 | CRAY*Y-MP:*:*:*) |
1131 | 799 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 803 | echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
1132 | 800 | exit ;; | 804 | exit ;; |
1133 | 801 | CRAY*[A-Z]90:*:*:*) | 805 | CRAY*[A-Z]90:*:*:*) |
1135 | 802 | echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | 806 | echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ |
1136 | 803 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ | 807 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
1137 | 804 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ | 808 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
1138 | 805 | -e 's/\.[^.]*$/.X/' | 809 | -e 's/\.[^.]*$/.X/' |
1139 | 806 | exit ;; | 810 | exit ;; |
1140 | 807 | CRAY*TS:*:*:*) | 811 | CRAY*TS:*:*:*) |
1142 | 808 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 812 | echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
1143 | 809 | exit ;; | 813 | exit ;; |
1144 | 810 | CRAY*T3E:*:*:*) | 814 | CRAY*T3E:*:*:*) |
1146 | 811 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 815 | echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
1147 | 812 | exit ;; | 816 | exit ;; |
1148 | 813 | CRAY*SV1:*:*:*) | 817 | CRAY*SV1:*:*:*) |
1150 | 814 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 818 | echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
1151 | 815 | exit ;; | 819 | exit ;; |
1152 | 816 | *:UNICOS/mp:*:*) | 820 | *:UNICOS/mp:*:*) |
1154 | 817 | echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 821 | echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
1155 | 818 | exit ;; | 822 | exit ;; |
1156 | 819 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 823 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
1157 | 820 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 824 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` |
1158 | 821 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 825 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
1160 | 822 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 826 | FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` |
1161 | 823 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 827 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1162 | 824 | exit ;; | 828 | exit ;; |
1163 | 825 | 5000:UNIX_System_V:4.*:*) | 829 | 5000:UNIX_System_V:4.*:*) |
1164 | 826 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` | 830 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
1166 | 827 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` | 831 | FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` |
1167 | 828 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 832 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1168 | 829 | exit ;; | 833 | exit ;; |
1169 | 830 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 834 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
1171 | 831 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 835 | echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" |
1172 | 832 | exit ;; | 836 | exit ;; |
1173 | 833 | sparc*:BSD/OS:*:*) | 837 | sparc*:BSD/OS:*:*) |
1175 | 834 | echo sparc-unknown-bsdi${UNAME_RELEASE} | 838 | echo sparc-unknown-bsdi"$UNAME_RELEASE" |
1176 | 835 | exit ;; | 839 | exit ;; |
1177 | 836 | *:BSD/OS:*:*) | 840 | *:BSD/OS:*:*) |
1179 | 837 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 841 | echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
1180 | 838 | exit ;; | 842 | exit ;; |
1181 | 839 | *:FreeBSD:*:*) | 843 | *:FreeBSD:*:*) |
1182 | 840 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 844 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
1184 | 841 | case ${UNAME_PROCESSOR} in | 845 | case "$UNAME_PROCESSOR" in |
1185 | 842 | amd64) | 846 | amd64) |
1186 | 843 | UNAME_PROCESSOR=x86_64 ;; | 847 | UNAME_PROCESSOR=x86_64 ;; |
1187 | 844 | i386) | 848 | i386) |
1188 | 845 | UNAME_PROCESSOR=i586 ;; | 849 | UNAME_PROCESSOR=i586 ;; |
1189 | 846 | esac | 850 | esac |
1191 | 847 | echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 851 | echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
1192 | 848 | exit ;; | 852 | exit ;; |
1193 | 849 | i*:CYGWIN*:*) | 853 | i*:CYGWIN*:*) |
1195 | 850 | echo ${UNAME_MACHINE}-pc-cygwin | 854 | echo "$UNAME_MACHINE"-pc-cygwin |
1196 | 851 | exit ;; | 855 | exit ;; |
1197 | 852 | *:MINGW64*:*) | 856 | *:MINGW64*:*) |
1199 | 853 | echo ${UNAME_MACHINE}-pc-mingw64 | 857 | echo "$UNAME_MACHINE"-pc-mingw64 |
1200 | 854 | exit ;; | 858 | exit ;; |
1201 | 855 | *:MINGW*:*) | 859 | *:MINGW*:*) |
1203 | 856 | echo ${UNAME_MACHINE}-pc-mingw32 | 860 | echo "$UNAME_MACHINE"-pc-mingw32 |
1204 | 857 | exit ;; | 861 | exit ;; |
1205 | 858 | *:MSYS*:*) | 862 | *:MSYS*:*) |
1211 | 859 | echo ${UNAME_MACHINE}-pc-msys | 863 | echo "$UNAME_MACHINE"-pc-msys |
1207 | 860 | exit ;; | ||
1208 | 861 | i*:windows32*:*) | ||
1209 | 862 | # uname -m includes "-pc" on this system. | ||
1210 | 863 | echo ${UNAME_MACHINE}-mingw32 | ||
1212 | 864 | exit ;; | 864 | exit ;; |
1213 | 865 | i*:PW*:*) | 865 | i*:PW*:*) |
1215 | 866 | echo ${UNAME_MACHINE}-pc-pw32 | 866 | echo "$UNAME_MACHINE"-pc-pw32 |
1216 | 867 | exit ;; | 867 | exit ;; |
1217 | 868 | *:Interix*:*) | 868 | *:Interix*:*) |
1219 | 869 | case ${UNAME_MACHINE} in | 869 | case "$UNAME_MACHINE" in |
1220 | 870 | x86) | 870 | x86) |
1222 | 871 | echo i586-pc-interix${UNAME_RELEASE} | 871 | echo i586-pc-interix"$UNAME_RELEASE" |
1223 | 872 | exit ;; | 872 | exit ;; |
1224 | 873 | authenticamd | genuineintel | EM64T) | 873 | authenticamd | genuineintel | EM64T) |
1226 | 874 | echo x86_64-unknown-interix${UNAME_RELEASE} | 874 | echo x86_64-unknown-interix"$UNAME_RELEASE" |
1227 | 875 | exit ;; | 875 | exit ;; |
1228 | 876 | IA64) | 876 | IA64) |
1230 | 877 | echo ia64-unknown-interix${UNAME_RELEASE} | 877 | echo ia64-unknown-interix"$UNAME_RELEASE" |
1231 | 878 | exit ;; | 878 | exit ;; |
1232 | 879 | esac ;; | 879 | esac ;; |
1233 | 880 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | ||
1234 | 881 | echo i${UNAME_MACHINE}-pc-mks | ||
1235 | 882 | exit ;; | ||
1236 | 883 | 8664:Windows_NT:*) | ||
1237 | 884 | echo x86_64-pc-mks | ||
1238 | 885 | exit ;; | ||
1239 | 886 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | ||
1240 | 887 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
1241 | 888 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | ||
1242 | 889 | # UNAME_MACHINE based on the output of uname instead of i386? | ||
1243 | 890 | echo i586-pc-interix | ||
1244 | 891 | exit ;; | ||
1245 | 892 | i*:UWIN*:*) | 880 | i*:UWIN*:*) |
1247 | 893 | echo ${UNAME_MACHINE}-pc-uwin | 881 | echo "$UNAME_MACHINE"-pc-uwin |
1248 | 894 | exit ;; | 882 | exit ;; |
1249 | 895 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) | 883 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
1250 | 896 | echo x86_64-unknown-cygwin | 884 | echo x86_64-unknown-cygwin |
1251 | 897 | exit ;; | 885 | exit ;; |
1252 | 898 | p*:CYGWIN*:*) | ||
1253 | 899 | echo powerpcle-unknown-cygwin | ||
1254 | 900 | exit ;; | ||
1255 | 901 | prep*:SunOS:5.*:*) | 886 | prep*:SunOS:5.*:*) |
1257 | 902 | echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 887 | echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
1258 | 903 | exit ;; | 888 | exit ;; |
1259 | 904 | *:GNU:*:*) | 889 | *:GNU:*:*) |
1260 | 905 | # the GNU system | 890 | # the GNU system |
1262 | 906 | echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` | 891 | echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" |
1263 | 907 | exit ;; | 892 | exit ;; |
1264 | 908 | *:GNU/*:*:*) | 893 | *:GNU/*:*:*) |
1265 | 909 | # other systems with GNU libc and userland | 894 | # other systems with GNU libc and userland |
1267 | 910 | echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} | 895 | echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
1268 | 911 | exit ;; | 896 | exit ;; |
1269 | 912 | i*86:Minix:*:*) | 897 | i*86:Minix:*:*) |
1271 | 913 | echo ${UNAME_MACHINE}-pc-minix | 898 | echo "$UNAME_MACHINE"-pc-minix |
1272 | 914 | exit ;; | 899 | exit ;; |
1273 | 915 | aarch64:Linux:*:*) | 900 | aarch64:Linux:*:*) |
1275 | 916 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 901 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1276 | 917 | exit ;; | 902 | exit ;; |
1277 | 918 | aarch64_be:Linux:*:*) | 903 | aarch64_be:Linux:*:*) |
1278 | 919 | UNAME_MACHINE=aarch64_be | 904 | UNAME_MACHINE=aarch64_be |
1280 | 920 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 905 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1281 | 921 | exit ;; | 906 | exit ;; |
1282 | 922 | alpha:Linux:*:*) | 907 | alpha:Linux:*:*) |
1283 | 923 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 908 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1284 | @@ -931,63 +916,63 @@ EOF | |||
1285 | 931 | esac | 916 | esac |
1286 | 932 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 917 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
1287 | 933 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi | 918 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi |
1289 | 934 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 919 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1290 | 935 | exit ;; | 920 | exit ;; |
1291 | 936 | arc:Linux:*:* | arceb:Linux:*:*) | 921 | arc:Linux:*:* | arceb:Linux:*:*) |
1293 | 937 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 922 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1294 | 938 | exit ;; | 923 | exit ;; |
1295 | 939 | arm*:Linux:*:*) | 924 | arm*:Linux:*:*) |
1297 | 940 | eval $set_cc_for_build | 925 | eval "$set_cc_for_build" |
1298 | 941 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 926 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1299 | 942 | | grep -q __ARM_EABI__ | 927 | | grep -q __ARM_EABI__ |
1300 | 943 | then | 928 | then |
1302 | 944 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 929 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1303 | 945 | else | 930 | else |
1304 | 946 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | 931 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1305 | 947 | | grep -q __ARM_PCS_VFP | 932 | | grep -q __ARM_PCS_VFP |
1306 | 948 | then | 933 | then |
1308 | 949 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi | 934 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi |
1309 | 950 | else | 935 | else |
1311 | 951 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf | 936 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf |
1312 | 952 | fi | 937 | fi |
1313 | 953 | fi | 938 | fi |
1314 | 954 | exit ;; | 939 | exit ;; |
1315 | 955 | avr32*:Linux:*:*) | 940 | avr32*:Linux:*:*) |
1317 | 956 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 941 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1318 | 957 | exit ;; | 942 | exit ;; |
1319 | 958 | cris:Linux:*:*) | 943 | cris:Linux:*:*) |
1321 | 959 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 944 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
1322 | 960 | exit ;; | 945 | exit ;; |
1323 | 961 | crisv32:Linux:*:*) | 946 | crisv32:Linux:*:*) |
1325 | 962 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} | 947 | echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
1326 | 963 | exit ;; | 948 | exit ;; |
1327 | 964 | e2k:Linux:*:*) | 949 | e2k:Linux:*:*) |
1329 | 965 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 950 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1330 | 966 | exit ;; | 951 | exit ;; |
1331 | 967 | frv:Linux:*:*) | 952 | frv:Linux:*:*) |
1333 | 968 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 953 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1334 | 969 | exit ;; | 954 | exit ;; |
1335 | 970 | hexagon:Linux:*:*) | 955 | hexagon:Linux:*:*) |
1337 | 971 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 956 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1338 | 972 | exit ;; | 957 | exit ;; |
1339 | 973 | i*86:Linux:*:*) | 958 | i*86:Linux:*:*) |
1341 | 974 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 959 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
1342 | 975 | exit ;; | 960 | exit ;; |
1343 | 976 | ia64:Linux:*:*) | 961 | ia64:Linux:*:*) |
1345 | 977 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 962 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1346 | 978 | exit ;; | 963 | exit ;; |
1347 | 979 | k1om:Linux:*:*) | 964 | k1om:Linux:*:*) |
1349 | 980 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 965 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1350 | 981 | exit ;; | 966 | exit ;; |
1351 | 982 | m32r*:Linux:*:*) | 967 | m32r*:Linux:*:*) |
1353 | 983 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 968 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1354 | 984 | exit ;; | 969 | exit ;; |
1355 | 985 | m68*:Linux:*:*) | 970 | m68*:Linux:*:*) |
1357 | 986 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 971 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1358 | 987 | exit ;; | 972 | exit ;; |
1359 | 988 | mips:Linux:*:* | mips64:Linux:*:*) | 973 | mips:Linux:*:* | mips64:Linux:*:*) |
1362 | 989 | eval $set_cc_for_build | 974 | eval "$set_cc_for_build" |
1363 | 990 | sed 's/^ //' << EOF >$dummy.c | 975 | sed 's/^ //' << EOF > "$dummy.c" |
1364 | 991 | #undef CPU | 976 | #undef CPU |
1365 | 992 | #undef ${UNAME_MACHINE} | 977 | #undef ${UNAME_MACHINE} |
1366 | 993 | #undef ${UNAME_MACHINE}el | 978 | #undef ${UNAME_MACHINE}el |
1367 | @@ -1001,70 +986,74 @@ EOF | |||
1368 | 1001 | #endif | 986 | #endif |
1369 | 1002 | #endif | 987 | #endif |
1370 | 1003 | EOF | 988 | EOF |
1373 | 1004 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` | 989 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" |
1374 | 1005 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 990 | test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } |
1375 | 1006 | ;; | 991 | ;; |
1376 | 1007 | mips64el:Linux:*:*) | 992 | mips64el:Linux:*:*) |
1378 | 1008 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 993 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1379 | 1009 | exit ;; | 994 | exit ;; |
1380 | 1010 | openrisc*:Linux:*:*) | 995 | openrisc*:Linux:*:*) |
1382 | 1011 | echo or1k-unknown-linux-${LIBC} | 996 | echo or1k-unknown-linux-"$LIBC" |
1383 | 1012 | exit ;; | 997 | exit ;; |
1384 | 1013 | or32:Linux:*:* | or1k*:Linux:*:*) | 998 | or32:Linux:*:* | or1k*:Linux:*:*) |
1386 | 1014 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 999 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1387 | 1015 | exit ;; | 1000 | exit ;; |
1388 | 1016 | padre:Linux:*:*) | 1001 | padre:Linux:*:*) |
1390 | 1017 | echo sparc-unknown-linux-${LIBC} | 1002 | echo sparc-unknown-linux-"$LIBC" |
1391 | 1018 | exit ;; | 1003 | exit ;; |
1392 | 1019 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 1004 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
1394 | 1020 | echo hppa64-unknown-linux-${LIBC} | 1005 | echo hppa64-unknown-linux-"$LIBC" |
1395 | 1021 | exit ;; | 1006 | exit ;; |
1396 | 1022 | parisc:Linux:*:* | hppa:Linux:*:*) | 1007 | parisc:Linux:*:* | hppa:Linux:*:*) |
1397 | 1023 | # Look for CPU level | 1008 | # Look for CPU level |
1398 | 1024 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 1009 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
1402 | 1025 | PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; | 1010 | PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; |
1403 | 1026 | PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; | 1011 | PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; |
1404 | 1027 | *) echo hppa-unknown-linux-${LIBC} ;; | 1012 | *) echo hppa-unknown-linux-"$LIBC" ;; |
1405 | 1028 | esac | 1013 | esac |
1406 | 1029 | exit ;; | 1014 | exit ;; |
1407 | 1030 | ppc64:Linux:*:*) | 1015 | ppc64:Linux:*:*) |
1409 | 1031 | echo powerpc64-unknown-linux-${LIBC} | 1016 | echo powerpc64-unknown-linux-"$LIBC" |
1410 | 1032 | exit ;; | 1017 | exit ;; |
1411 | 1033 | ppc:Linux:*:*) | 1018 | ppc:Linux:*:*) |
1413 | 1034 | echo powerpc-unknown-linux-${LIBC} | 1019 | echo powerpc-unknown-linux-"$LIBC" |
1414 | 1035 | exit ;; | 1020 | exit ;; |
1415 | 1036 | ppc64le:Linux:*:*) | 1021 | ppc64le:Linux:*:*) |
1417 | 1037 | echo powerpc64le-unknown-linux-${LIBC} | 1022 | echo powerpc64le-unknown-linux-"$LIBC" |
1418 | 1038 | exit ;; | 1023 | exit ;; |
1419 | 1039 | ppcle:Linux:*:*) | 1024 | ppcle:Linux:*:*) |
1421 | 1040 | echo powerpcle-unknown-linux-${LIBC} | 1025 | echo powerpcle-unknown-linux-"$LIBC" |
1422 | 1041 | exit ;; | 1026 | exit ;; |
1423 | 1042 | riscv32:Linux:*:* | riscv64:Linux:*:*) | 1027 | riscv32:Linux:*:* | riscv64:Linux:*:*) |
1425 | 1043 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1028 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1426 | 1044 | exit ;; | 1029 | exit ;; |
1427 | 1045 | s390:Linux:*:* | s390x:Linux:*:*) | 1030 | s390:Linux:*:* | s390x:Linux:*:*) |
1429 | 1046 | echo ${UNAME_MACHINE}-ibm-linux-${LIBC} | 1031 | echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" |
1430 | 1047 | exit ;; | 1032 | exit ;; |
1431 | 1048 | sh64*:Linux:*:*) | 1033 | sh64*:Linux:*:*) |
1433 | 1049 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1034 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1434 | 1050 | exit ;; | 1035 | exit ;; |
1435 | 1051 | sh*:Linux:*:*) | 1036 | sh*:Linux:*:*) |
1437 | 1052 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1037 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1438 | 1053 | exit ;; | 1038 | exit ;; |
1439 | 1054 | sparc:Linux:*:* | sparc64:Linux:*:*) | 1039 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1441 | 1055 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1040 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1442 | 1056 | exit ;; | 1041 | exit ;; |
1443 | 1057 | tile*:Linux:*:*) | 1042 | tile*:Linux:*:*) |
1445 | 1058 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1043 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1446 | 1059 | exit ;; | 1044 | exit ;; |
1447 | 1060 | vax:Linux:*:*) | 1045 | vax:Linux:*:*) |
1449 | 1061 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
1450 | 1062 | exit ;; | 1047 | exit ;; |
1451 | 1063 | x86_64:Linux:*:*) | 1048 | x86_64:Linux:*:*) |
1453 | 1064 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then |
1454 | 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
1455 | 1051 | else | ||
1456 | 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
1457 | 1053 | fi | ||
1458 | 1065 | exit ;; | 1054 | exit ;; |
1459 | 1066 | xtensa*:Linux:*:*) | 1055 | xtensa*:Linux:*:*) |
1461 | 1067 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
1462 | 1068 | exit ;; | 1057 | exit ;; |
1463 | 1069 | i*86:DYNIX/ptx:4*:*) | 1058 | i*86:DYNIX/ptx:4*:*) |
1464 | 1070 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 1059 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1465 | @@ -1078,34 +1067,34 @@ EOF | |||
1466 | 1078 | # I am not positive that other SVR4 systems won't match this, | 1067 | # I am not positive that other SVR4 systems won't match this, |
1467 | 1079 | # I just have to hope. -- rms. | 1068 | # I just have to hope. -- rms. |
1468 | 1080 | # Use sysv4.2uw... so that sysv4* matches it. | 1069 | # Use sysv4.2uw... so that sysv4* matches it. |
1470 | 1081 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1070 | echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" |
1471 | 1082 | exit ;; | 1071 | exit ;; |
1472 | 1083 | i*86:OS/2:*:*) | 1072 | i*86:OS/2:*:*) |
1473 | 1084 | # If we were able to find `uname', then EMX Unix compatibility | 1073 | # If we were able to find `uname', then EMX Unix compatibility |
1474 | 1085 | # is probably installed. | 1074 | # is probably installed. |
1476 | 1086 | echo ${UNAME_MACHINE}-pc-os2-emx | 1075 | echo "$UNAME_MACHINE"-pc-os2-emx |
1477 | 1087 | exit ;; | 1076 | exit ;; |
1478 | 1088 | i*86:XTS-300:*:STOP) | 1077 | i*86:XTS-300:*:STOP) |
1480 | 1089 | echo ${UNAME_MACHINE}-unknown-stop | 1078 | echo "$UNAME_MACHINE"-unknown-stop |
1481 | 1090 | exit ;; | 1079 | exit ;; |
1482 | 1091 | i*86:atheos:*:*) | 1080 | i*86:atheos:*:*) |
1484 | 1092 | echo ${UNAME_MACHINE}-unknown-atheos | 1081 | echo "$UNAME_MACHINE"-unknown-atheos |
1485 | 1093 | exit ;; | 1082 | exit ;; |
1486 | 1094 | i*86:syllable:*:*) | 1083 | i*86:syllable:*:*) |
1488 | 1095 | echo ${UNAME_MACHINE}-pc-syllable | 1084 | echo "$UNAME_MACHINE"-pc-syllable |
1489 | 1096 | exit ;; | 1085 | exit ;; |
1490 | 1097 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) | 1086 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1492 | 1098 | echo i386-unknown-lynxos${UNAME_RELEASE} | 1087 | echo i386-unknown-lynxos"$UNAME_RELEASE" |
1493 | 1099 | exit ;; | 1088 | exit ;; |
1494 | 1100 | i*86:*DOS:*:*) | 1089 | i*86:*DOS:*:*) |
1496 | 1101 | echo ${UNAME_MACHINE}-pc-msdosdjgpp | 1090 | echo "$UNAME_MACHINE"-pc-msdosdjgpp |
1497 | 1102 | exit ;; | 1091 | exit ;; |
1500 | 1103 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) | 1092 | i*86:*:4.*:*) |
1501 | 1104 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` | 1093 | UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` |
1502 | 1105 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then | 1094 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
1504 | 1106 | echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} | 1095 | echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" |
1505 | 1107 | else | 1096 | else |
1507 | 1108 | echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} | 1097 | echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" |
1508 | 1109 | fi | 1098 | fi |
1509 | 1110 | exit ;; | 1099 | exit ;; |
1510 | 1111 | i*86:*:5:[678]*) | 1100 | i*86:*:5:[678]*) |
1511 | @@ -1115,12 +1104,12 @@ EOF | |||
1512 | 1115 | *Pentium) UNAME_MACHINE=i586 ;; | 1104 | *Pentium) UNAME_MACHINE=i586 ;; |
1513 | 1116 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; | 1105 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
1514 | 1117 | esac | 1106 | esac |
1516 | 1118 | echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} | 1107 | echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" |
1517 | 1119 | exit ;; | 1108 | exit ;; |
1518 | 1120 | i*86:*:3.2:*) | 1109 | i*86:*:3.2:*) |
1519 | 1121 | if test -f /usr/options/cb.name; then | 1110 | if test -f /usr/options/cb.name; then |
1520 | 1122 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` | 1111 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
1522 | 1123 | echo ${UNAME_MACHINE}-pc-isc$UNAME_REL | 1112 | echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" |
1523 | 1124 | elif /bin/uname -X 2>/dev/null >/dev/null ; then | 1113 | elif /bin/uname -X 2>/dev/null >/dev/null ; then |
1524 | 1125 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` | 1114 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
1525 | 1126 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 | 1115 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
1526 | @@ -1130,9 +1119,9 @@ EOF | |||
1527 | 1130 | && UNAME_MACHINE=i686 | 1119 | && UNAME_MACHINE=i686 |
1528 | 1131 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ | 1120 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
1529 | 1132 | && UNAME_MACHINE=i686 | 1121 | && UNAME_MACHINE=i686 |
1531 | 1133 | echo ${UNAME_MACHINE}-pc-sco$UNAME_REL | 1122 | echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" |
1532 | 1134 | else | 1123 | else |
1534 | 1135 | echo ${UNAME_MACHINE}-pc-sysv32 | 1124 | echo "$UNAME_MACHINE"-pc-sysv32 |
1535 | 1136 | fi | 1125 | fi |
1536 | 1137 | exit ;; | 1126 | exit ;; |
1537 | 1138 | pc:*:*:*) | 1127 | pc:*:*:*) |
1538 | @@ -1152,9 +1141,9 @@ EOF | |||
1539 | 1152 | exit ;; | 1141 | exit ;; |
1540 | 1153 | i860:*:4.*:*) # i860-SVR4 | 1142 | i860:*:4.*:*) # i860-SVR4 |
1541 | 1154 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then | 1143 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
1543 | 1155 | echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 | 1144 | echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 |
1544 | 1156 | else # Add other i860-SVR4 vendors below as they are discovered. | 1145 | else # Add other i860-SVR4 vendors below as they are discovered. |
1546 | 1157 | echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 | 1146 | echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 |
1547 | 1158 | fi | 1147 | fi |
1548 | 1159 | exit ;; | 1148 | exit ;; |
1549 | 1160 | mini*:CTIX:SYS*5:*) | 1149 | mini*:CTIX:SYS*5:*) |
1550 | @@ -1174,9 +1163,9 @@ EOF | |||
1551 | 1174 | test -r /etc/.relid \ | 1163 | test -r /etc/.relid \ |
1552 | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1164 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1553 | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1165 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1555 | 1177 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1166 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
1556 | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1167 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1558 | 1179 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1168 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
1559 | 1180 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1169 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1560 | 1181 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1170 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1561 | 1182 | && { echo i486-ncr-sysv4; exit; } ;; | 1171 | && { echo i486-ncr-sysv4; exit; } ;; |
1562 | @@ -1185,28 +1174,28 @@ EOF | |||
1563 | 1185 | test -r /etc/.relid \ | 1174 | test -r /etc/.relid \ |
1564 | 1186 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 1175 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1565 | 1187 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1176 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1567 | 1188 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | 1177 | && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
1568 | 1189 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1178 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1570 | 1190 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } | 1179 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } |
1571 | 1191 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ | 1180 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
1573 | 1192 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1181 | && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
1574 | 1193 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1182 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1576 | 1194 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1183 | echo m68k-unknown-lynxos"$UNAME_RELEASE" |
1577 | 1195 | exit ;; | 1184 | exit ;; |
1578 | 1196 | mc68030:UNIX_System_V:4.*:*) | 1185 | mc68030:UNIX_System_V:4.*:*) |
1579 | 1197 | echo m68k-atari-sysv4 | 1186 | echo m68k-atari-sysv4 |
1580 | 1198 | exit ;; | 1187 | exit ;; |
1581 | 1199 | TSUNAMI:LynxOS:2.*:*) | 1188 | TSUNAMI:LynxOS:2.*:*) |
1583 | 1200 | echo sparc-unknown-lynxos${UNAME_RELEASE} | 1189 | echo sparc-unknown-lynxos"$UNAME_RELEASE" |
1584 | 1201 | exit ;; | 1190 | exit ;; |
1585 | 1202 | rs6000:LynxOS:2.*:*) | 1191 | rs6000:LynxOS:2.*:*) |
1587 | 1203 | echo rs6000-unknown-lynxos${UNAME_RELEASE} | 1192 | echo rs6000-unknown-lynxos"$UNAME_RELEASE" |
1588 | 1204 | exit ;; | 1193 | exit ;; |
1589 | 1205 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) | 1194 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1591 | 1206 | echo powerpc-unknown-lynxos${UNAME_RELEASE} | 1195 | echo powerpc-unknown-lynxos"$UNAME_RELEASE" |
1592 | 1207 | exit ;; | 1196 | exit ;; |
1593 | 1208 | SM[BE]S:UNIX_SV:*:*) | 1197 | SM[BE]S:UNIX_SV:*:*) |
1595 | 1209 | echo mips-dde-sysv${UNAME_RELEASE} | 1198 | echo mips-dde-sysv"$UNAME_RELEASE" |
1596 | 1210 | exit ;; | 1199 | exit ;; |
1597 | 1211 | RM*:ReliantUNIX-*:*:*) | 1200 | RM*:ReliantUNIX-*:*:*) |
1598 | 1212 | echo mips-sni-sysv4 | 1201 | echo mips-sni-sysv4 |
1599 | @@ -1217,7 +1206,7 @@ EOF | |||
1600 | 1217 | *:SINIX-*:*:*) | 1206 | *:SINIX-*:*:*) |
1601 | 1218 | if uname -p 2>/dev/null >/dev/null ; then | 1207 | if uname -p 2>/dev/null >/dev/null ; then |
1602 | 1219 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1208 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1604 | 1220 | echo ${UNAME_MACHINE}-sni-sysv4 | 1209 | echo "$UNAME_MACHINE"-sni-sysv4 |
1605 | 1221 | else | 1210 | else |
1606 | 1222 | echo ns32k-sni-sysv | 1211 | echo ns32k-sni-sysv |
1607 | 1223 | fi | 1212 | fi |
1608 | @@ -1237,23 +1226,23 @@ EOF | |||
1609 | 1237 | exit ;; | 1226 | exit ;; |
1610 | 1238 | i*86:VOS:*:*) | 1227 | i*86:VOS:*:*) |
1611 | 1239 | # From Paul.Green@stratus.com. | 1228 | # From Paul.Green@stratus.com. |
1613 | 1240 | echo ${UNAME_MACHINE}-stratus-vos | 1229 | echo "$UNAME_MACHINE"-stratus-vos |
1614 | 1241 | exit ;; | 1230 | exit ;; |
1615 | 1242 | *:VOS:*:*) | 1231 | *:VOS:*:*) |
1616 | 1243 | # From Paul.Green@stratus.com. | 1232 | # From Paul.Green@stratus.com. |
1617 | 1244 | echo hppa1.1-stratus-vos | 1233 | echo hppa1.1-stratus-vos |
1618 | 1245 | exit ;; | 1234 | exit ;; |
1619 | 1246 | mc68*:A/UX:*:*) | 1235 | mc68*:A/UX:*:*) |
1621 | 1247 | echo m68k-apple-aux${UNAME_RELEASE} | 1236 | echo m68k-apple-aux"$UNAME_RELEASE" |
1622 | 1248 | exit ;; | 1237 | exit ;; |
1623 | 1249 | news*:NEWS-OS:6*:*) | 1238 | news*:NEWS-OS:6*:*) |
1624 | 1250 | echo mips-sony-newsos6 | 1239 | echo mips-sony-newsos6 |
1625 | 1251 | exit ;; | 1240 | exit ;; |
1626 | 1252 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1241 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1627 | 1253 | if [ -d /usr/nec ]; then | 1242 | if [ -d /usr/nec ]; then |
1629 | 1254 | echo mips-nec-sysv${UNAME_RELEASE} | 1243 | echo mips-nec-sysv"$UNAME_RELEASE" |
1630 | 1255 | else | 1244 | else |
1632 | 1256 | echo mips-unknown-sysv${UNAME_RELEASE} | 1245 | echo mips-unknown-sysv"$UNAME_RELEASE" |
1633 | 1257 | fi | 1246 | fi |
1634 | 1258 | exit ;; | 1247 | exit ;; |
1635 | 1259 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1248 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1636 | @@ -1272,39 +1261,39 @@ EOF | |||
1637 | 1272 | echo x86_64-unknown-haiku | 1261 | echo x86_64-unknown-haiku |
1638 | 1273 | exit ;; | 1262 | exit ;; |
1639 | 1274 | SX-4:SUPER-UX:*:*) | 1263 | SX-4:SUPER-UX:*:*) |
1641 | 1275 | echo sx4-nec-superux${UNAME_RELEASE} | 1264 | echo sx4-nec-superux"$UNAME_RELEASE" |
1642 | 1276 | exit ;; | 1265 | exit ;; |
1643 | 1277 | SX-5:SUPER-UX:*:*) | 1266 | SX-5:SUPER-UX:*:*) |
1645 | 1278 | echo sx5-nec-superux${UNAME_RELEASE} | 1267 | echo sx5-nec-superux"$UNAME_RELEASE" |
1646 | 1279 | exit ;; | 1268 | exit ;; |
1647 | 1280 | SX-6:SUPER-UX:*:*) | 1269 | SX-6:SUPER-UX:*:*) |
1649 | 1281 | echo sx6-nec-superux${UNAME_RELEASE} | 1270 | echo sx6-nec-superux"$UNAME_RELEASE" |
1650 | 1282 | exit ;; | 1271 | exit ;; |
1651 | 1283 | SX-7:SUPER-UX:*:*) | 1272 | SX-7:SUPER-UX:*:*) |
1653 | 1284 | echo sx7-nec-superux${UNAME_RELEASE} | 1273 | echo sx7-nec-superux"$UNAME_RELEASE" |
1654 | 1285 | exit ;; | 1274 | exit ;; |
1655 | 1286 | SX-8:SUPER-UX:*:*) | 1275 | SX-8:SUPER-UX:*:*) |
1657 | 1287 | echo sx8-nec-superux${UNAME_RELEASE} | 1276 | echo sx8-nec-superux"$UNAME_RELEASE" |
1658 | 1288 | exit ;; | 1277 | exit ;; |
1659 | 1289 | SX-8R:SUPER-UX:*:*) | 1278 | SX-8R:SUPER-UX:*:*) |
1661 | 1290 | echo sx8r-nec-superux${UNAME_RELEASE} | 1279 | echo sx8r-nec-superux"$UNAME_RELEASE" |
1662 | 1291 | exit ;; | 1280 | exit ;; |
1663 | 1292 | SX-ACE:SUPER-UX:*:*) | 1281 | SX-ACE:SUPER-UX:*:*) |
1665 | 1293 | echo sxace-nec-superux${UNAME_RELEASE} | 1282 | echo sxace-nec-superux"$UNAME_RELEASE" |
1666 | 1294 | exit ;; | 1283 | exit ;; |
1667 | 1295 | Power*:Rhapsody:*:*) | 1284 | Power*:Rhapsody:*:*) |
1669 | 1296 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 1285 | echo powerpc-apple-rhapsody"$UNAME_RELEASE" |
1670 | 1297 | exit ;; | 1286 | exit ;; |
1671 | 1298 | *:Rhapsody:*:*) | 1287 | *:Rhapsody:*:*) |
1673 | 1299 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} | 1288 | echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" |
1674 | 1300 | exit ;; | 1289 | exit ;; |
1675 | 1301 | *:Darwin:*:*) | 1290 | *:Darwin:*:*) |
1676 | 1302 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1678 | 1303 | eval $set_cc_for_build | 1292 | eval "$set_cc_for_build" |
1679 | 1304 | if test "$UNAME_PROCESSOR" = unknown ; then | 1293 | if test "$UNAME_PROCESSOR" = unknown ; then |
1680 | 1305 | UNAME_PROCESSOR=powerpc | 1294 | UNAME_PROCESSOR=powerpc |
1681 | 1306 | fi | 1295 | fi |
1683 | 1307 | if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then | 1296 | if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then |
1684 | 1308 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then | 1297 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then |
1685 | 1309 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | 1298 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1686 | 1310 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ | 1299 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1687 | @@ -1332,7 +1321,7 @@ EOF | |||
1688 | 1332 | # that Apple uses in portable devices. | 1321 | # that Apple uses in portable devices. |
1689 | 1333 | UNAME_PROCESSOR=x86_64 | 1322 | UNAME_PROCESSOR=x86_64 |
1690 | 1334 | fi | 1323 | fi |
1692 | 1335 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1324 | echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" |
1693 | 1336 | exit ;; | 1325 | exit ;; |
1694 | 1337 | *:procnto*:*:* | *:QNX:[0123456789]*:*) | 1326 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
1695 | 1338 | UNAME_PROCESSOR=`uname -p` | 1327 | UNAME_PROCESSOR=`uname -p` |
1696 | @@ -1340,22 +1329,25 @@ EOF | |||
1697 | 1340 | UNAME_PROCESSOR=i386 | 1329 | UNAME_PROCESSOR=i386 |
1698 | 1341 | UNAME_MACHINE=pc | 1330 | UNAME_MACHINE=pc |
1699 | 1342 | fi | 1331 | fi |
1701 | 1343 | echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} | 1332 | echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" |
1702 | 1344 | exit ;; | 1333 | exit ;; |
1703 | 1345 | *:QNX:*:4*) | 1334 | *:QNX:*:4*) |
1704 | 1346 | echo i386-pc-qnx | 1335 | echo i386-pc-qnx |
1705 | 1347 | exit ;; | 1336 | exit ;; |
1706 | 1348 | NEO-*:NONSTOP_KERNEL:*:*) | 1337 | NEO-*:NONSTOP_KERNEL:*:*) |
1708 | 1349 | echo neo-tandem-nsk${UNAME_RELEASE} | 1338 | echo neo-tandem-nsk"$UNAME_RELEASE" |
1709 | 1350 | exit ;; | 1339 | exit ;; |
1710 | 1351 | NSE-*:NONSTOP_KERNEL:*:*) | 1340 | NSE-*:NONSTOP_KERNEL:*:*) |
1712 | 1352 | echo nse-tandem-nsk${UNAME_RELEASE} | 1341 | echo nse-tandem-nsk"$UNAME_RELEASE" |
1713 | 1353 | exit ;; | 1342 | exit ;; |
1714 | 1354 | NSR-*:NONSTOP_KERNEL:*:*) | 1343 | NSR-*:NONSTOP_KERNEL:*:*) |
1716 | 1355 | echo nsr-tandem-nsk${UNAME_RELEASE} | 1344 | echo nsr-tandem-nsk"$UNAME_RELEASE" |
1717 | 1345 | exit ;; | ||
1718 | 1346 | NSV-*:NONSTOP_KERNEL:*:*) | ||
1719 | 1347 | echo nsv-tandem-nsk"$UNAME_RELEASE" | ||
1720 | 1356 | exit ;; | 1348 | exit ;; |
1721 | 1357 | NSX-*:NONSTOP_KERNEL:*:*) | 1349 | NSX-*:NONSTOP_KERNEL:*:*) |
1723 | 1358 | echo nsx-tandem-nsk${UNAME_RELEASE} | 1350 | echo nsx-tandem-nsk"$UNAME_RELEASE" |
1724 | 1359 | exit ;; | 1351 | exit ;; |
1725 | 1360 | *:NonStop-UX:*:*) | 1352 | *:NonStop-UX:*:*) |
1726 | 1361 | echo mips-compaq-nonstopux | 1353 | echo mips-compaq-nonstopux |
1727 | @@ -1364,7 +1356,7 @@ EOF | |||
1728 | 1364 | echo bs2000-siemens-sysv | 1356 | echo bs2000-siemens-sysv |
1729 | 1365 | exit ;; | 1357 | exit ;; |
1730 | 1366 | DS/*:UNIX_System_V:*:*) | 1358 | DS/*:UNIX_System_V:*:*) |
1732 | 1367 | echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} | 1359 | echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" |
1733 | 1368 | exit ;; | 1360 | exit ;; |
1734 | 1369 | *:Plan9:*:*) | 1361 | *:Plan9:*:*) |
1735 | 1370 | # "uname -m" is not consistent, so use $cputype instead. 386 | 1362 | # "uname -m" is not consistent, so use $cputype instead. 386 |
1736 | @@ -1375,7 +1367,7 @@ EOF | |||
1737 | 1375 | else | 1367 | else |
1738 | 1376 | UNAME_MACHINE="$cputype" | 1368 | UNAME_MACHINE="$cputype" |
1739 | 1377 | fi | 1369 | fi |
1741 | 1378 | echo ${UNAME_MACHINE}-unknown-plan9 | 1370 | echo "$UNAME_MACHINE"-unknown-plan9 |
1742 | 1379 | exit ;; | 1371 | exit ;; |
1743 | 1380 | *:TOPS-10:*:*) | 1372 | *:TOPS-10:*:*) |
1744 | 1381 | echo pdp10-unknown-tops10 | 1373 | echo pdp10-unknown-tops10 |
1745 | @@ -1396,14 +1388,14 @@ EOF | |||
1746 | 1396 | echo pdp10-unknown-its | 1388 | echo pdp10-unknown-its |
1747 | 1397 | exit ;; | 1389 | exit ;; |
1748 | 1398 | SEI:*:*:SEIUX) | 1390 | SEI:*:*:SEIUX) |
1750 | 1399 | echo mips-sei-seiux${UNAME_RELEASE} | 1391 | echo mips-sei-seiux"$UNAME_RELEASE" |
1751 | 1400 | exit ;; | 1392 | exit ;; |
1752 | 1401 | *:DragonFly:*:*) | 1393 | *:DragonFly:*:*) |
1754 | 1402 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1394 | echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
1755 | 1403 | exit ;; | 1395 | exit ;; |
1756 | 1404 | *:*VMS:*:*) | 1396 | *:*VMS:*:*) |
1757 | 1405 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1397 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1759 | 1406 | case "${UNAME_MACHINE}" in | 1398 | case "$UNAME_MACHINE" in |
1760 | 1407 | A*) echo alpha-dec-vms ; exit ;; | 1399 | A*) echo alpha-dec-vms ; exit ;; |
1761 | 1408 | I*) echo ia64-dec-vms ; exit ;; | 1400 | I*) echo ia64-dec-vms ; exit ;; |
1762 | 1409 | V*) echo vax-dec-vms ; exit ;; | 1401 | V*) echo vax-dec-vms ; exit ;; |
1763 | @@ -1412,32 +1404,44 @@ EOF | |||
1764 | 1412 | echo i386-pc-xenix | 1404 | echo i386-pc-xenix |
1765 | 1413 | exit ;; | 1405 | exit ;; |
1766 | 1414 | i*86:skyos:*:*) | 1406 | i*86:skyos:*:*) |
1768 | 1415 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` | 1407 | echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" |
1769 | 1416 | exit ;; | 1408 | exit ;; |
1770 | 1417 | i*86:rdos:*:*) | 1409 | i*86:rdos:*:*) |
1772 | 1418 | echo ${UNAME_MACHINE}-pc-rdos | 1410 | echo "$UNAME_MACHINE"-pc-rdos |
1773 | 1419 | exit ;; | 1411 | exit ;; |
1774 | 1420 | i*86:AROS:*:*) | 1412 | i*86:AROS:*:*) |
1776 | 1421 | echo ${UNAME_MACHINE}-pc-aros | 1413 | echo "$UNAME_MACHINE"-pc-aros |
1777 | 1422 | exit ;; | 1414 | exit ;; |
1778 | 1423 | x86_64:VMkernel:*:*) | 1415 | x86_64:VMkernel:*:*) |
1780 | 1424 | echo ${UNAME_MACHINE}-unknown-esx | 1416 | echo "$UNAME_MACHINE"-unknown-esx |
1781 | 1425 | exit ;; | 1417 | exit ;; |
1782 | 1426 | amd64:Isilon\ OneFS:*:*) | 1418 | amd64:Isilon\ OneFS:*:*) |
1783 | 1427 | echo x86_64-unknown-onefs | 1419 | echo x86_64-unknown-onefs |
1784 | 1428 | exit ;; | 1420 | exit ;; |
1785 | 1429 | esac | 1421 | esac |
1786 | 1430 | 1422 | ||
1787 | 1423 | echo "$0: unable to guess system type" >&2 | ||
1788 | 1424 | |||
1789 | 1425 | case "$UNAME_MACHINE:$UNAME_SYSTEM" in | ||
1790 | 1426 | mips:Linux | mips64:Linux) | ||
1791 | 1427 | # If we got here on MIPS GNU/Linux, output extra information. | ||
1792 | 1428 | cat >&2 <<EOF | ||
1793 | 1429 | |||
1794 | 1430 | NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize | ||
1795 | 1431 | the system type. Please install a C compiler and try again. | ||
1796 | 1432 | EOF | ||
1797 | 1433 | ;; | ||
1798 | 1434 | esac | ||
1799 | 1435 | |||
1800 | 1431 | cat >&2 <<EOF | 1436 | cat >&2 <<EOF |
1801 | 1432 | $0: unable to guess system type | ||
1802 | 1433 | 1437 | ||
1803 | 1434 | This script (version $timestamp), has failed to recognize the | 1438 | This script (version $timestamp), has failed to recognize the |
1804 | 1435 | operating system you are using. If your script is old, overwrite *all* | 1439 | operating system you are using. If your script is old, overwrite *all* |
1805 | 1436 | copies of config.guess and config.sub with the latest versions from: | 1440 | copies of config.guess and config.sub with the latest versions from: |
1806 | 1437 | 1441 | ||
1808 | 1438 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 1442 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
1809 | 1439 | and | 1443 | and |
1811 | 1440 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 1444 | https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
1812 | 1441 | 1445 | ||
1813 | 1442 | If $0 has already been updated, send the following data and any | 1446 | If $0 has already been updated, send the following data and any |
1814 | 1443 | information you think might be pertinent to config-patches@gnu.org to | 1447 | information you think might be pertinent to config-patches@gnu.org to |
1815 | @@ -1460,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null` | |||
1816 | 1460 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` | 1464 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
1817 | 1461 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` | 1465 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
1818 | 1462 | 1466 | ||
1823 | 1463 | UNAME_MACHINE = ${UNAME_MACHINE} | 1467 | UNAME_MACHINE = "$UNAME_MACHINE" |
1824 | 1464 | UNAME_RELEASE = ${UNAME_RELEASE} | 1468 | UNAME_RELEASE = "$UNAME_RELEASE" |
1825 | 1465 | UNAME_SYSTEM = ${UNAME_SYSTEM} | 1469 | UNAME_SYSTEM = "$UNAME_SYSTEM" |
1826 | 1466 | UNAME_VERSION = ${UNAME_VERSION} | 1470 | UNAME_VERSION = "$UNAME_VERSION" |
1827 | 1467 | EOF | 1471 | EOF |
1828 | 1468 | 1472 | ||
1829 | 1469 | exit 1 | 1473 | exit 1 |
1830 | 1470 | 1474 | ||
1831 | 1471 | # Local variables: | 1475 | # Local variables: |
1833 | 1472 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) |
1834 | 1473 | # time-stamp-start: "timestamp='" | 1477 | # time-stamp-start: "timestamp='" |
1835 | 1474 | # time-stamp-format: "%:y-%02m-%02d" | 1478 | # time-stamp-format: "%:y-%02m-%02d" |
1836 | 1475 | # time-stamp-end: "'" | 1479 | # time-stamp-end: "'" |
1837 | diff --git a/build-aux/config.sub b/build-aux/config.sub | |||
1838 | index f4bafc1..1d8e98b 100755 | |||
1839 | --- a/build-aux/config.sub | |||
1840 | +++ b/build-aux/config.sub | |||
1841 | @@ -1,8 +1,8 @@ | |||
1843 | 1 | #!/bin/sh | 1 | #! /bin/sh |
1844 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
1846 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
1847 | 4 | 4 | ||
1849 | 5 | timestamp='2017-04-02' | 5 | timestamp='2018-02-22' |
1850 | 6 | 6 | ||
1851 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
1852 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
1853 | @@ -15,7 +15,7 @@ timestamp='2017-04-02' | |||
1854 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
1855 | 16 | # | 16 | # |
1856 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
1858 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
1859 | 19 | # | 19 | # |
1860 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
1861 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
1862 | @@ -33,7 +33,7 @@ timestamp='2017-04-02' | |||
1863 | 33 | # Otherwise, we print the canonical config type on stdout and succeed. | 33 | # Otherwise, we print the canonical config type on stdout and succeed. |
1864 | 34 | 34 | ||
1865 | 35 | # You can get the latest version of this script from: | 35 | # You can get the latest version of this script from: |
1867 | 36 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub | 36 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
1868 | 37 | 37 | ||
1869 | 38 | # This file is supposed to be the same for all GNU packages | 38 | # This file is supposed to be the same for all GNU packages |
1870 | 39 | # and recognize all the CPU types, system types and aliases | 39 | # and recognize all the CPU types, system types and aliases |
1871 | @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS | |||
1872 | 57 | 57 | ||
1873 | 58 | Canonicalize a configuration name. | 58 | Canonicalize a configuration name. |
1874 | 59 | 59 | ||
1876 | 60 | Operation modes: | 60 | Options: |
1877 | 61 | -h, --help print this help, then exit | 61 | -h, --help print this help, then exit |
1878 | 62 | -t, --time-stamp print date of last modification, then exit | 62 | -t, --time-stamp print date of last modification, then exit |
1879 | 63 | -v, --version print version number, then exit | 63 | -v, --version print version number, then exit |
1880 | @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." | |||
1881 | 67 | version="\ | 67 | version="\ |
1882 | 68 | GNU config.sub ($timestamp) | 68 | GNU config.sub ($timestamp) |
1883 | 69 | 69 | ||
1885 | 70 | Copyright 1992-2017 Free Software Foundation, Inc. | 70 | Copyright 1992-2018 Free Software Foundation, Inc. |
1886 | 71 | 71 | ||
1887 | 72 | This is free software; see the source for copying conditions. There is NO | 72 | This is free software; see the source for copying conditions. There is NO |
1888 | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 73 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1889 | @@ -94,7 +94,7 @@ while test $# -gt 0 ; do | |||
1890 | 94 | 94 | ||
1891 | 95 | *local*) | 95 | *local*) |
1892 | 96 | # First pass through any local machine types. | 96 | # First pass through any local machine types. |
1894 | 97 | echo $1 | 97 | echo "$1" |
1895 | 98 | exit ;; | 98 | exit ;; |
1896 | 99 | 99 | ||
1897 | 100 | * ) | 100 | * ) |
1898 | @@ -112,7 +112,7 @@ esac | |||
1899 | 112 | 112 | ||
1900 | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 113 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
1901 | 114 | # Here we must recognize all the valid KERNEL-OS combinations. | 114 | # Here we must recognize all the valid KERNEL-OS combinations. |
1903 | 115 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 115 | maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1904 | 116 | case $maybe_os in | 116 | case $maybe_os in |
1905 | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | 117 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1906 | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | 118 | linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1907 | @@ -120,16 +120,16 @@ case $maybe_os in | |||
1908 | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ | 120 | kopensolaris*-gnu* | cloudabi*-eabi* | \ |
1909 | 121 | storm-chaos* | os2-emx* | rtmk-nova*) | 121 | storm-chaos* | os2-emx* | rtmk-nova*) |
1910 | 122 | os=-$maybe_os | 122 | os=-$maybe_os |
1912 | 123 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 123 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1913 | 124 | ;; | 124 | ;; |
1914 | 125 | android-linux) | 125 | android-linux) |
1915 | 126 | os=-linux-android | 126 | os=-linux-android |
1917 | 127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | 127 | basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1918 | 128 | ;; | 128 | ;; |
1919 | 129 | *) | 129 | *) |
1923 | 130 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 130 | basic_machine=`echo "$1" | sed 's/-[^-]*$//'` |
1924 | 131 | if [ $basic_machine != $1 ] | 131 | if [ "$basic_machine" != "$1" ] |
1925 | 132 | then os=`echo $1 | sed 's/.*-/-/'` | 132 | then os=`echo "$1" | sed 's/.*-/-/'` |
1926 | 133 | else os=; fi | 133 | else os=; fi |
1927 | 134 | ;; | 134 | ;; |
1928 | 135 | esac | 135 | esac |
1929 | @@ -178,44 +178,44 @@ case $os in | |||
1930 | 178 | ;; | 178 | ;; |
1931 | 179 | -sco6) | 179 | -sco6) |
1932 | 180 | os=-sco5v6 | 180 | os=-sco5v6 |
1934 | 181 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 181 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1935 | 182 | ;; | 182 | ;; |
1936 | 183 | -sco5) | 183 | -sco5) |
1937 | 184 | os=-sco3.2v5 | 184 | os=-sco3.2v5 |
1939 | 185 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 185 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1940 | 186 | ;; | 186 | ;; |
1941 | 187 | -sco4) | 187 | -sco4) |
1942 | 188 | os=-sco3.2v4 | 188 | os=-sco3.2v4 |
1944 | 189 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 189 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1945 | 190 | ;; | 190 | ;; |
1946 | 191 | -sco3.2.[4-9]*) | 191 | -sco3.2.[4-9]*) |
1947 | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` | 192 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
1949 | 193 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 193 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1950 | 194 | ;; | 194 | ;; |
1951 | 195 | -sco3.2v[4-9]*) | 195 | -sco3.2v[4-9]*) |
1952 | 196 | # Don't forget version if it is 3.2v4 or newer. | 196 | # Don't forget version if it is 3.2v4 or newer. |
1954 | 197 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 197 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1955 | 198 | ;; | 198 | ;; |
1956 | 199 | -sco5v6*) | 199 | -sco5v6*) |
1957 | 200 | # Don't forget version if it is 3.2v4 or newer. | 200 | # Don't forget version if it is 3.2v4 or newer. |
1959 | 201 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 201 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1960 | 202 | ;; | 202 | ;; |
1961 | 203 | -sco*) | 203 | -sco*) |
1962 | 204 | os=-sco3.2v2 | 204 | os=-sco3.2v2 |
1964 | 205 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 205 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1965 | 206 | ;; | 206 | ;; |
1966 | 207 | -udk*) | 207 | -udk*) |
1968 | 208 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 208 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1969 | 209 | ;; | 209 | ;; |
1970 | 210 | -isc) | 210 | -isc) |
1971 | 211 | os=-isc2.2 | 211 | os=-isc2.2 |
1973 | 212 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 212 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1974 | 213 | ;; | 213 | ;; |
1975 | 214 | -clix*) | 214 | -clix*) |
1976 | 215 | basic_machine=clipper-intergraph | 215 | basic_machine=clipper-intergraph |
1977 | 216 | ;; | 216 | ;; |
1978 | 217 | -isc*) | 217 | -isc*) |
1980 | 218 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 218 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
1981 | 219 | ;; | 219 | ;; |
1982 | 220 | -lynx*178) | 220 | -lynx*178) |
1983 | 221 | os=-lynxos178 | 221 | os=-lynxos178 |
1984 | @@ -227,10 +227,7 @@ case $os in | |||
1985 | 227 | os=-lynxos | 227 | os=-lynxos |
1986 | 228 | ;; | 228 | ;; |
1987 | 229 | -ptx*) | 229 | -ptx*) |
1992 | 230 | basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` | 230 | basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` |
1989 | 231 | ;; | ||
1990 | 232 | -windowsnt*) | ||
1991 | 233 | os=`echo $os | sed -e 's/windowsnt/winnt/'` | ||
1993 | 234 | ;; | 231 | ;; |
1994 | 235 | -psos*) | 232 | -psos*) |
1995 | 236 | os=-psos | 233 | os=-psos |
1996 | @@ -299,7 +296,7 @@ case $basic_machine in | |||
1997 | 299 | | nios | nios2 | nios2eb | nios2el \ | 296 | | nios | nios2 | nios2eb | nios2el \ |
1998 | 300 | | ns16k | ns32k \ | 297 | | ns16k | ns32k \ |
1999 | 301 | | open8 | or1k | or1knd | or32 \ | 298 | | open8 | or1k | or1knd | or32 \ |
2001 | 302 | | pdp10 | pdp11 | pj | pjl \ | 299 | | pdp10 | pj | pjl \ |
2002 | 303 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | 300 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
2003 | 304 | | pru \ | 301 | | pru \ |
2004 | 305 | | pyramid \ | 302 | | pyramid \ |
2005 | @@ -316,7 +313,6 @@ case $basic_machine in | |||
2006 | 316 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | 313 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
2007 | 317 | | visium \ | 314 | | visium \ |
2008 | 318 | | wasm32 \ | 315 | | wasm32 \ |
2009 | 319 | | we32k \ | ||
2010 | 320 | | x86 | xc16x | xstormy16 | xtensa \ | 316 | | x86 | xc16x | xstormy16 | xtensa \ |
2011 | 321 | | z8k | z80) | 317 | | z8k | z80) |
2012 | 322 | basic_machine=$basic_machine-unknown | 318 | basic_machine=$basic_machine-unknown |
2013 | @@ -337,7 +333,7 @@ case $basic_machine in | |||
2014 | 337 | basic_machine=$basic_machine-unknown | 333 | basic_machine=$basic_machine-unknown |
2015 | 338 | os=-none | 334 | os=-none |
2016 | 339 | ;; | 335 | ;; |
2018 | 340 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | 336 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) |
2019 | 341 | ;; | 337 | ;; |
2020 | 342 | ms1) | 338 | ms1) |
2021 | 343 | basic_machine=mt-unknown | 339 | basic_machine=mt-unknown |
2022 | @@ -366,7 +362,7 @@ case $basic_machine in | |||
2023 | 366 | ;; | 362 | ;; |
2024 | 367 | # Object if more than one company name word. | 363 | # Object if more than one company name word. |
2025 | 368 | *-*-*) | 364 | *-*-*) |
2027 | 369 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 365 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
2028 | 370 | exit 1 | 366 | exit 1 |
2029 | 371 | ;; | 367 | ;; |
2030 | 372 | # Recognize the basic CPU types with company name. | 368 | # Recognize the basic CPU types with company name. |
2031 | @@ -461,7 +457,7 @@ case $basic_machine in | |||
2032 | 461 | # Recognize the various machine names and aliases which stand | 457 | # Recognize the various machine names and aliases which stand |
2033 | 462 | # for a CPU type and a company and sometimes even an OS. | 458 | # for a CPU type and a company and sometimes even an OS. |
2034 | 463 | 386bsd) | 459 | 386bsd) |
2036 | 464 | basic_machine=i386-unknown | 460 | basic_machine=i386-pc |
2037 | 465 | os=-bsd | 461 | os=-bsd |
2038 | 466 | ;; | 462 | ;; |
2039 | 467 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) | 463 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
2040 | @@ -495,7 +491,7 @@ case $basic_machine in | |||
2041 | 495 | basic_machine=x86_64-pc | 491 | basic_machine=x86_64-pc |
2042 | 496 | ;; | 492 | ;; |
2043 | 497 | amd64-*) | 493 | amd64-*) |
2045 | 498 | basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` | 494 | basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2046 | 499 | ;; | 495 | ;; |
2047 | 500 | amdahl) | 496 | amdahl) |
2048 | 501 | basic_machine=580-amdahl | 497 | basic_machine=580-amdahl |
2049 | @@ -540,7 +536,7 @@ case $basic_machine in | |||
2050 | 540 | os=-linux | 536 | os=-linux |
2051 | 541 | ;; | 537 | ;; |
2052 | 542 | blackfin-*) | 538 | blackfin-*) |
2054 | 543 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` | 539 | basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2055 | 544 | os=-linux | 540 | os=-linux |
2056 | 545 | ;; | 541 | ;; |
2057 | 546 | bluegene*) | 542 | bluegene*) |
2058 | @@ -548,13 +544,13 @@ case $basic_machine in | |||
2059 | 548 | os=-cnk | 544 | os=-cnk |
2060 | 549 | ;; | 545 | ;; |
2061 | 550 | c54x-*) | 546 | c54x-*) |
2063 | 551 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | 547 | basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2064 | 552 | ;; | 548 | ;; |
2065 | 553 | c55x-*) | 549 | c55x-*) |
2067 | 554 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | 550 | basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2068 | 555 | ;; | 551 | ;; |
2069 | 556 | c6x-*) | 552 | c6x-*) |
2071 | 557 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | 553 | basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2072 | 558 | ;; | 554 | ;; |
2073 | 559 | c90) | 555 | c90) |
2074 | 560 | basic_machine=c90-cray | 556 | basic_machine=c90-cray |
2075 | @@ -643,7 +639,7 @@ case $basic_machine in | |||
2076 | 643 | basic_machine=rs6000-bull | 639 | basic_machine=rs6000-bull |
2077 | 644 | os=-bosx | 640 | os=-bosx |
2078 | 645 | ;; | 641 | ;; |
2080 | 646 | dpx2* | dpx2*-bull) | 642 | dpx2*) |
2081 | 647 | basic_machine=m68k-bull | 643 | basic_machine=m68k-bull |
2082 | 648 | os=-sysv3 | 644 | os=-sysv3 |
2083 | 649 | ;; | 645 | ;; |
2084 | @@ -652,7 +648,7 @@ case $basic_machine in | |||
2085 | 652 | os=$os"spe" | 648 | os=$os"spe" |
2086 | 653 | ;; | 649 | ;; |
2087 | 654 | e500v[12]-*) | 650 | e500v[12]-*) |
2089 | 655 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 651 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2090 | 656 | os=$os"spe" | 652 | os=$os"spe" |
2091 | 657 | ;; | 653 | ;; |
2092 | 658 | ebmon29k) | 654 | ebmon29k) |
2093 | @@ -744,9 +740,6 @@ case $basic_machine in | |||
2094 | 744 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) | 740 | hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
2095 | 745 | basic_machine=hppa1.0-hp | 741 | basic_machine=hppa1.0-hp |
2096 | 746 | ;; | 742 | ;; |
2097 | 747 | hppa-next) | ||
2098 | 748 | os=-nextstep3 | ||
2099 | 749 | ;; | ||
2100 | 750 | hppaosf) | 743 | hppaosf) |
2101 | 751 | basic_machine=hppa1.1-hp | 744 | basic_machine=hppa1.1-hp |
2102 | 752 | os=-osf | 745 | os=-osf |
2103 | @@ -759,26 +752,26 @@ case $basic_machine in | |||
2104 | 759 | basic_machine=i370-ibm | 752 | basic_machine=i370-ibm |
2105 | 760 | ;; | 753 | ;; |
2106 | 761 | i*86v32) | 754 | i*86v32) |
2108 | 762 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 755 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
2109 | 763 | os=-sysv32 | 756 | os=-sysv32 |
2110 | 764 | ;; | 757 | ;; |
2111 | 765 | i*86v4*) | 758 | i*86v4*) |
2113 | 766 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 759 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
2114 | 767 | os=-sysv4 | 760 | os=-sysv4 |
2115 | 768 | ;; | 761 | ;; |
2116 | 769 | i*86v) | 762 | i*86v) |
2118 | 770 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 763 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
2119 | 771 | os=-sysv | 764 | os=-sysv |
2120 | 772 | ;; | 765 | ;; |
2121 | 773 | i*86sol2) | 766 | i*86sol2) |
2123 | 774 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 767 | basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` |
2124 | 775 | os=-solaris2 | 768 | os=-solaris2 |
2125 | 776 | ;; | 769 | ;; |
2126 | 777 | i386mach) | 770 | i386mach) |
2127 | 778 | basic_machine=i386-mach | 771 | basic_machine=i386-mach |
2128 | 779 | os=-mach | 772 | os=-mach |
2129 | 780 | ;; | 773 | ;; |
2131 | 781 | i386-vsta | vsta) | 774 | vsta) |
2132 | 782 | basic_machine=i386-unknown | 775 | basic_machine=i386-unknown |
2133 | 783 | os=-vsta | 776 | os=-vsta |
2134 | 784 | ;; | 777 | ;; |
2135 | @@ -797,19 +790,16 @@ case $basic_machine in | |||
2136 | 797 | os=-sysv | 790 | os=-sysv |
2137 | 798 | ;; | 791 | ;; |
2138 | 799 | leon-*|leon[3-9]-*) | 792 | leon-*|leon[3-9]-*) |
2140 | 800 | basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` | 793 | basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` |
2141 | 801 | ;; | 794 | ;; |
2142 | 802 | m68knommu) | 795 | m68knommu) |
2143 | 803 | basic_machine=m68k-unknown | 796 | basic_machine=m68k-unknown |
2144 | 804 | os=-linux | 797 | os=-linux |
2145 | 805 | ;; | 798 | ;; |
2146 | 806 | m68knommu-*) | 799 | m68knommu-*) |
2148 | 807 | basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` | 800 | basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2149 | 808 | os=-linux | 801 | os=-linux |
2150 | 809 | ;; | 802 | ;; |
2151 | 810 | m88k-omron*) | ||
2152 | 811 | basic_machine=m88k-omron | ||
2153 | 812 | ;; | ||
2154 | 813 | magnum | m3230) | 803 | magnum | m3230) |
2155 | 814 | basic_machine=mips-mips | 804 | basic_machine=mips-mips |
2156 | 815 | os=-sysv | 805 | os=-sysv |
2157 | @@ -841,10 +831,10 @@ case $basic_machine in | |||
2158 | 841 | os=-mint | 831 | os=-mint |
2159 | 842 | ;; | 832 | ;; |
2160 | 843 | mips3*-*) | 833 | mips3*-*) |
2162 | 844 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` | 834 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` |
2163 | 845 | ;; | 835 | ;; |
2164 | 846 | mips3*) | 836 | mips3*) |
2166 | 847 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown | 837 | basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown |
2167 | 848 | ;; | 838 | ;; |
2168 | 849 | monitor) | 839 | monitor) |
2169 | 850 | basic_machine=m68k-rom68k | 840 | basic_machine=m68k-rom68k |
2170 | @@ -863,7 +853,7 @@ case $basic_machine in | |||
2171 | 863 | os=-msdos | 853 | os=-msdos |
2172 | 864 | ;; | 854 | ;; |
2173 | 865 | ms1-*) | 855 | ms1-*) |
2175 | 866 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 856 | basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` |
2176 | 867 | ;; | 857 | ;; |
2177 | 868 | msys) | 858 | msys) |
2178 | 869 | basic_machine=i686-pc | 859 | basic_machine=i686-pc |
2179 | @@ -905,7 +895,7 @@ case $basic_machine in | |||
2180 | 905 | basic_machine=v70-nec | 895 | basic_machine=v70-nec |
2181 | 906 | os=-sysv | 896 | os=-sysv |
2182 | 907 | ;; | 897 | ;; |
2184 | 908 | next | m*-next ) | 898 | next | m*-next) |
2185 | 909 | basic_machine=m68k-next | 899 | basic_machine=m68k-next |
2186 | 910 | case $os in | 900 | case $os in |
2187 | 911 | -nextstep* ) | 901 | -nextstep* ) |
2188 | @@ -950,6 +940,9 @@ case $basic_machine in | |||
2189 | 950 | nsr-tandem) | 940 | nsr-tandem) |
2190 | 951 | basic_machine=nsr-tandem | 941 | basic_machine=nsr-tandem |
2191 | 952 | ;; | 942 | ;; |
2192 | 943 | nsv-tandem) | ||
2193 | 944 | basic_machine=nsv-tandem | ||
2194 | 945 | ;; | ||
2195 | 953 | nsx-tandem) | 946 | nsx-tandem) |
2196 | 954 | basic_machine=nsx-tandem | 947 | basic_machine=nsx-tandem |
2197 | 955 | ;; | 948 | ;; |
2198 | @@ -985,7 +978,7 @@ case $basic_machine in | |||
2199 | 985 | os=-linux | 978 | os=-linux |
2200 | 986 | ;; | 979 | ;; |
2201 | 987 | parisc-*) | 980 | parisc-*) |
2203 | 988 | basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` | 981 | basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2204 | 989 | os=-linux | 982 | os=-linux |
2205 | 990 | ;; | 983 | ;; |
2206 | 991 | pbd) | 984 | pbd) |
2207 | @@ -1001,7 +994,7 @@ case $basic_machine in | |||
2208 | 1001 | basic_machine=i386-pc | 994 | basic_machine=i386-pc |
2209 | 1002 | ;; | 995 | ;; |
2210 | 1003 | pc98-*) | 996 | pc98-*) |
2212 | 1004 | basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` | 997 | basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2213 | 1005 | ;; | 998 | ;; |
2214 | 1006 | pentium | p5 | k5 | k6 | nexgen | viac3) | 999 | pentium | p5 | k5 | k6 | nexgen | viac3) |
2215 | 1007 | basic_machine=i586-pc | 1000 | basic_machine=i586-pc |
2216 | @@ -1016,16 +1009,16 @@ case $basic_machine in | |||
2217 | 1016 | basic_machine=i786-pc | 1009 | basic_machine=i786-pc |
2218 | 1017 | ;; | 1010 | ;; |
2219 | 1018 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | 1011 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
2221 | 1019 | basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | 1012 | basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2222 | 1020 | ;; | 1013 | ;; |
2223 | 1021 | pentiumpro-* | p6-* | 6x86-* | athlon-*) | 1014 | pentiumpro-* | p6-* | 6x86-* | athlon-*) |
2225 | 1022 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1015 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2226 | 1023 | ;; | 1016 | ;; |
2227 | 1024 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) | 1017 | pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
2229 | 1025 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 1018 | basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2230 | 1026 | ;; | 1019 | ;; |
2231 | 1027 | pentium4-*) | 1020 | pentium4-*) |
2233 | 1028 | basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` | 1021 | basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2234 | 1029 | ;; | 1022 | ;; |
2235 | 1030 | pn) | 1023 | pn) |
2236 | 1031 | basic_machine=pn-gould | 1024 | basic_machine=pn-gould |
2237 | @@ -1035,23 +1028,23 @@ case $basic_machine in | |||
2238 | 1035 | ppc | ppcbe) basic_machine=powerpc-unknown | 1028 | ppc | ppcbe) basic_machine=powerpc-unknown |
2239 | 1036 | ;; | 1029 | ;; |
2240 | 1037 | ppc-* | ppcbe-*) | 1030 | ppc-* | ppcbe-*) |
2242 | 1038 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 1031 | basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2243 | 1039 | ;; | 1032 | ;; |
2244 | 1040 | ppcle | powerpclittle) | 1033 | ppcle | powerpclittle) |
2245 | 1041 | basic_machine=powerpcle-unknown | 1034 | basic_machine=powerpcle-unknown |
2246 | 1042 | ;; | 1035 | ;; |
2247 | 1043 | ppcle-* | powerpclittle-*) | 1036 | ppcle-* | powerpclittle-*) |
2249 | 1044 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` | 1037 | basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2250 | 1045 | ;; | 1038 | ;; |
2251 | 1046 | ppc64) basic_machine=powerpc64-unknown | 1039 | ppc64) basic_machine=powerpc64-unknown |
2252 | 1047 | ;; | 1040 | ;; |
2254 | 1048 | ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` | 1041 | ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2255 | 1049 | ;; | 1042 | ;; |
2256 | 1050 | ppc64le | powerpc64little) | 1043 | ppc64le | powerpc64little) |
2257 | 1051 | basic_machine=powerpc64le-unknown | 1044 | basic_machine=powerpc64le-unknown |
2258 | 1052 | ;; | 1045 | ;; |
2259 | 1053 | ppc64le-* | powerpc64little-*) | 1046 | ppc64le-* | powerpc64little-*) |
2261 | 1054 | basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` | 1047 | basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2262 | 1055 | ;; | 1048 | ;; |
2263 | 1056 | ps2) | 1049 | ps2) |
2264 | 1057 | basic_machine=i386-ibm | 1050 | basic_machine=i386-ibm |
2265 | @@ -1105,17 +1098,10 @@ case $basic_machine in | |||
2266 | 1105 | sequent) | 1098 | sequent) |
2267 | 1106 | basic_machine=i386-sequent | 1099 | basic_machine=i386-sequent |
2268 | 1107 | ;; | 1100 | ;; |
2269 | 1108 | sh) | ||
2270 | 1109 | basic_machine=sh-hitachi | ||
2271 | 1110 | os=-hms | ||
2272 | 1111 | ;; | ||
2273 | 1112 | sh5el) | 1101 | sh5el) |
2274 | 1113 | basic_machine=sh5le-unknown | 1102 | basic_machine=sh5le-unknown |
2275 | 1114 | ;; | 1103 | ;; |
2280 | 1115 | sh64) | 1104 | simso-wrs) |
2277 | 1116 | basic_machine=sh64-unknown | ||
2278 | 1117 | ;; | ||
2279 | 1118 | sparclite-wrs | simso-wrs) | ||
2281 | 1119 | basic_machine=sparclite-wrs | 1105 | basic_machine=sparclite-wrs |
2282 | 1120 | os=-vxworks | 1106 | os=-vxworks |
2283 | 1121 | ;; | 1107 | ;; |
2284 | @@ -1134,7 +1120,7 @@ case $basic_machine in | |||
2285 | 1134 | os=-sysv4 | 1120 | os=-sysv4 |
2286 | 1135 | ;; | 1121 | ;; |
2287 | 1136 | strongarm-* | thumb-*) | 1122 | strongarm-* | thumb-*) |
2289 | 1137 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | 1123 | basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` |
2290 | 1138 | ;; | 1124 | ;; |
2291 | 1139 | sun2) | 1125 | sun2) |
2292 | 1140 | basic_machine=m68000-sun | 1126 | basic_machine=m68000-sun |
2293 | @@ -1248,9 +1234,6 @@ case $basic_machine in | |||
2294 | 1248 | basic_machine=a29k-wrs | 1234 | basic_machine=a29k-wrs |
2295 | 1249 | os=-vxworks | 1235 | os=-vxworks |
2296 | 1250 | ;; | 1236 | ;; |
2297 | 1251 | wasm32) | ||
2298 | 1252 | basic_machine=wasm32-unknown | ||
2299 | 1253 | ;; | ||
2300 | 1254 | w65*) | 1237 | w65*) |
2301 | 1255 | basic_machine=w65-wdc | 1238 | basic_machine=w65-wdc |
2302 | 1256 | os=-none | 1239 | os=-none |
2303 | @@ -1259,6 +1242,9 @@ case $basic_machine in | |||
2304 | 1259 | basic_machine=hppa1.1-winbond | 1242 | basic_machine=hppa1.1-winbond |
2305 | 1260 | os=-proelf | 1243 | os=-proelf |
2306 | 1261 | ;; | 1244 | ;; |
2307 | 1245 | x64) | ||
2308 | 1246 | basic_machine=x86_64-pc | ||
2309 | 1247 | ;; | ||
2310 | 1262 | xbox) | 1248 | xbox) |
2311 | 1263 | basic_machine=i686-pc | 1249 | basic_machine=i686-pc |
2312 | 1264 | os=-mingw32 | 1250 | os=-mingw32 |
2313 | @@ -1267,20 +1253,12 @@ case $basic_machine in | |||
2314 | 1267 | basic_machine=xps100-honeywell | 1253 | basic_machine=xps100-honeywell |
2315 | 1268 | ;; | 1254 | ;; |
2316 | 1269 | xscale-* | xscalee[bl]-*) | 1255 | xscale-* | xscalee[bl]-*) |
2318 | 1270 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | 1256 | basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` |
2319 | 1271 | ;; | 1257 | ;; |
2320 | 1272 | ymp) | 1258 | ymp) |
2321 | 1273 | basic_machine=ymp-cray | 1259 | basic_machine=ymp-cray |
2322 | 1274 | os=-unicos | 1260 | os=-unicos |
2323 | 1275 | ;; | 1261 | ;; |
2324 | 1276 | z8k-*-coff) | ||
2325 | 1277 | basic_machine=z8k-unknown | ||
2326 | 1278 | os=-sim | ||
2327 | 1279 | ;; | ||
2328 | 1280 | z80-*-coff) | ||
2329 | 1281 | basic_machine=z80-unknown | ||
2330 | 1282 | os=-sim | ||
2331 | 1283 | ;; | ||
2332 | 1284 | none) | 1262 | none) |
2333 | 1285 | basic_machine=none-none | 1263 | basic_machine=none-none |
2334 | 1286 | os=-none | 1264 | os=-none |
2335 | @@ -1309,10 +1287,6 @@ case $basic_machine in | |||
2336 | 1309 | vax) | 1287 | vax) |
2337 | 1310 | basic_machine=vax-dec | 1288 | basic_machine=vax-dec |
2338 | 1311 | ;; | 1289 | ;; |
2339 | 1312 | pdp10) | ||
2340 | 1313 | # there are many clones, so DEC is not a safe bet | ||
2341 | 1314 | basic_machine=pdp10-unknown | ||
2342 | 1315 | ;; | ||
2343 | 1316 | pdp11) | 1290 | pdp11) |
2344 | 1317 | basic_machine=pdp11-dec | 1291 | basic_machine=pdp11-dec |
2345 | 1318 | ;; | 1292 | ;; |
2346 | @@ -1322,9 +1296,6 @@ case $basic_machine in | |||
2347 | 1322 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) | 1296 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
2348 | 1323 | basic_machine=sh-unknown | 1297 | basic_machine=sh-unknown |
2349 | 1324 | ;; | 1298 | ;; |
2350 | 1325 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | ||
2351 | 1326 | basic_machine=sparc-sun | ||
2352 | 1327 | ;; | ||
2353 | 1328 | cydra) | 1299 | cydra) |
2354 | 1329 | basic_machine=cydra-cydrome | 1300 | basic_machine=cydra-cydrome |
2355 | 1330 | ;; | 1301 | ;; |
2356 | @@ -1344,7 +1315,7 @@ case $basic_machine in | |||
2357 | 1344 | # Make sure to match an already-canonicalized machine name. | 1315 | # Make sure to match an already-canonicalized machine name. |
2358 | 1345 | ;; | 1316 | ;; |
2359 | 1346 | *) | 1317 | *) |
2361 | 1347 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 1318 | echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
2362 | 1348 | exit 1 | 1319 | exit 1 |
2363 | 1349 | ;; | 1320 | ;; |
2364 | 1350 | esac | 1321 | esac |
2365 | @@ -1352,10 +1323,10 @@ esac | |||
2366 | 1352 | # Here we canonicalize certain aliases for manufacturers. | 1323 | # Here we canonicalize certain aliases for manufacturers. |
2367 | 1353 | case $basic_machine in | 1324 | case $basic_machine in |
2368 | 1354 | *-digital*) | 1325 | *-digital*) |
2370 | 1355 | basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` | 1326 | basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` |
2371 | 1356 | ;; | 1327 | ;; |
2372 | 1357 | *-commodore*) | 1328 | *-commodore*) |
2374 | 1358 | basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` | 1329 | basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` |
2375 | 1359 | ;; | 1330 | ;; |
2376 | 1360 | *) | 1331 | *) |
2377 | 1361 | ;; | 1332 | ;; |
2378 | @@ -1366,8 +1337,8 @@ esac | |||
2379 | 1366 | if [ x"$os" != x"" ] | 1337 | if [ x"$os" != x"" ] |
2380 | 1367 | then | 1338 | then |
2381 | 1368 | case $os in | 1339 | case $os in |
2384 | 1369 | # First match some system type aliases | 1340 | # First match some system type aliases that might get confused |
2385 | 1370 | # that might get confused with valid system types. | 1341 | # with valid system types. |
2386 | 1371 | # -solaris* is a basic system type, with this one exception. | 1342 | # -solaris* is a basic system type, with this one exception. |
2387 | 1372 | -auroraux) | 1343 | -auroraux) |
2388 | 1373 | os=-auroraux | 1344 | os=-auroraux |
2389 | @@ -1378,18 +1349,19 @@ case $os in | |||
2390 | 1378 | -solaris) | 1349 | -solaris) |
2391 | 1379 | os=-solaris2 | 1350 | os=-solaris2 |
2392 | 1380 | ;; | 1351 | ;; |
2393 | 1381 | -svr4*) | ||
2394 | 1382 | os=-sysv4 | ||
2395 | 1383 | ;; | ||
2396 | 1384 | -unixware*) | 1352 | -unixware*) |
2397 | 1385 | os=-sysv4.2uw | 1353 | os=-sysv4.2uw |
2398 | 1386 | ;; | 1354 | ;; |
2399 | 1387 | -gnu/linux*) | 1355 | -gnu/linux*) |
2400 | 1388 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | 1356 | os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
2401 | 1389 | ;; | 1357 | ;; |
2403 | 1390 | # First accept the basic system types. | 1358 | # es1800 is here to avoid being matched by es* (a different OS) |
2404 | 1359 | -es1800*) | ||
2405 | 1360 | os=-ose | ||
2406 | 1361 | ;; | ||
2407 | 1362 | # Now accept the basic system types. | ||
2408 | 1391 | # The portable systems comes first. | 1363 | # The portable systems comes first. |
2410 | 1392 | # Each alternative MUST END IN A *, to match a version number. | 1364 | # Each alternative MUST end in a * to match a version number. |
2411 | 1393 | # -sysv* is not here because it comes later, after sysvr4. | 1365 | # -sysv* is not here because it comes later, after sysvr4. |
2412 | 1394 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1366 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
2413 | 1395 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1367 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
2414 | @@ -1399,7 +1371,7 @@ case $os in | |||
2415 | 1399 | | -aos* | -aros* | -cloudabi* | -sortix* \ | 1371 | | -aos* | -aros* | -cloudabi* | -sortix* \ |
2416 | 1400 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1372 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
2417 | 1401 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1373 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
2419 | 1402 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1374 | | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ |
2420 | 1403 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | 1375 | | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ |
2421 | 1404 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
2422 | 1405 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
2423 | @@ -1410,14 +1382,15 @@ case $os in | |||
2424 | 1410 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
2425 | 1411 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | 1383 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
2426 | 1412 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | 1384 | | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
2428 | 1413 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1385 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ |
2429 | 1414 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1386 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
2430 | 1415 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1387 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
2431 | 1416 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1388 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
2433 | 1417 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1389 | | -morphos* | -superux* | -rtmk* | -windiss* \ |
2434 | 1418 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1390 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
2435 | 1419 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ | 1391 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ |
2437 | 1420 | | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) | 1392 | | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ |
2438 | 1393 | | -midnightbsd*) | ||
2439 | 1421 | # Remember, each alternative MUST END IN *, to match a version number. | 1394 | # Remember, each alternative MUST END IN *, to match a version number. |
2440 | 1422 | ;; | 1395 | ;; |
2441 | 1423 | -qnx*) | 1396 | -qnx*) |
2442 | @@ -1434,12 +1407,12 @@ case $os in | |||
2443 | 1434 | -nto*) | 1407 | -nto*) |
2444 | 1435 | os=`echo $os | sed -e 's|nto|nto-qnx|'` | 1408 | os=`echo $os | sed -e 's|nto|nto-qnx|'` |
2445 | 1436 | ;; | 1409 | ;; |
2448 | 1437 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | 1410 | -sim | -xray | -os68k* | -v88r* \ |
2449 | 1438 | | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | 1411 | | -windows* | -osx | -abug | -netware* | -os9* \ |
2450 | 1439 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) | 1412 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
2451 | 1440 | ;; | 1413 | ;; |
2452 | 1441 | -mac*) | 1414 | -mac*) |
2454 | 1442 | os=`echo $os | sed -e 's|mac|macos|'` | 1415 | os=`echo "$os" | sed -e 's|mac|macos|'` |
2455 | 1443 | ;; | 1416 | ;; |
2456 | 1444 | -linux-dietlibc) | 1417 | -linux-dietlibc) |
2457 | 1445 | os=-linux-dietlibc | 1418 | os=-linux-dietlibc |
2458 | @@ -1448,10 +1421,10 @@ case $os in | |||
2459 | 1448 | os=`echo $os | sed -e 's|linux|linux-gnu|'` | 1421 | os=`echo $os | sed -e 's|linux|linux-gnu|'` |
2460 | 1449 | ;; | 1422 | ;; |
2461 | 1450 | -sunos5*) | 1423 | -sunos5*) |
2463 | 1451 | os=`echo $os | sed -e 's|sunos5|solaris2|'` | 1424 | os=`echo "$os" | sed -e 's|sunos5|solaris2|'` |
2464 | 1452 | ;; | 1425 | ;; |
2465 | 1453 | -sunos6*) | 1426 | -sunos6*) |
2467 | 1454 | os=`echo $os | sed -e 's|sunos6|solaris3|'` | 1427 | os=`echo "$os" | sed -e 's|sunos6|solaris3|'` |
2468 | 1455 | ;; | 1428 | ;; |
2469 | 1456 | -opened*) | 1429 | -opened*) |
2470 | 1457 | os=-openedition | 1430 | os=-openedition |
2471 | @@ -1462,12 +1435,6 @@ case $os in | |||
2472 | 1462 | -wince*) | 1435 | -wince*) |
2473 | 1463 | os=-wince | 1436 | os=-wince |
2474 | 1464 | ;; | 1437 | ;; |
2475 | 1465 | -osfrose*) | ||
2476 | 1466 | os=-osfrose | ||
2477 | 1467 | ;; | ||
2478 | 1468 | -osf*) | ||
2479 | 1469 | os=-osf | ||
2480 | 1470 | ;; | ||
2481 | 1471 | -utek*) | 1438 | -utek*) |
2482 | 1472 | os=-bsd | 1439 | os=-bsd |
2483 | 1473 | ;; | 1440 | ;; |
2484 | @@ -1492,7 +1459,7 @@ case $os in | |||
2485 | 1492 | -nova*) | 1459 | -nova*) |
2486 | 1493 | os=-rtmk-nova | 1460 | os=-rtmk-nova |
2487 | 1494 | ;; | 1461 | ;; |
2489 | 1495 | -ns2 ) | 1462 | -ns2) |
2490 | 1496 | os=-nextstep2 | 1463 | os=-nextstep2 |
2491 | 1497 | ;; | 1464 | ;; |
2492 | 1498 | -nsk*) | 1465 | -nsk*) |
2493 | @@ -1514,7 +1481,7 @@ case $os in | |||
2494 | 1514 | -oss*) | 1481 | -oss*) |
2495 | 1515 | os=-sysv3 | 1482 | os=-sysv3 |
2496 | 1516 | ;; | 1483 | ;; |
2498 | 1517 | -svr4) | 1484 | -svr4*) |
2499 | 1518 | os=-sysv4 | 1485 | os=-sysv4 |
2500 | 1519 | ;; | 1486 | ;; |
2501 | 1520 | -svr3) | 1487 | -svr3) |
2502 | @@ -1529,24 +1496,28 @@ case $os in | |||
2503 | 1529 | -ose*) | 1496 | -ose*) |
2504 | 1530 | os=-ose | 1497 | os=-ose |
2505 | 1531 | ;; | 1498 | ;; |
2506 | 1532 | -es1800*) | ||
2507 | 1533 | os=-ose | ||
2508 | 1534 | ;; | ||
2509 | 1535 | -xenix) | ||
2510 | 1536 | os=-xenix | ||
2511 | 1537 | ;; | ||
2512 | 1538 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 1499 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
2513 | 1539 | os=-mint | 1500 | os=-mint |
2514 | 1540 | ;; | 1501 | ;; |
2515 | 1541 | -aros*) | ||
2516 | 1542 | os=-aros | ||
2517 | 1543 | ;; | ||
2518 | 1544 | -zvmoe) | 1502 | -zvmoe) |
2519 | 1545 | os=-zvmoe | 1503 | os=-zvmoe |
2520 | 1546 | ;; | 1504 | ;; |
2521 | 1547 | -dicos*) | 1505 | -dicos*) |
2522 | 1548 | os=-dicos | 1506 | os=-dicos |
2523 | 1549 | ;; | 1507 | ;; |
2524 | 1508 | -pikeos*) | ||
2525 | 1509 | # Until real need of OS specific support for | ||
2526 | 1510 | # particular features comes up, bare metal | ||
2527 | 1511 | # configurations are quite functional. | ||
2528 | 1512 | case $basic_machine in | ||
2529 | 1513 | arm*) | ||
2530 | 1514 | os=-eabi | ||
2531 | 1515 | ;; | ||
2532 | 1516 | *) | ||
2533 | 1517 | os=-elf | ||
2534 | 1518 | ;; | ||
2535 | 1519 | esac | ||
2536 | 1520 | ;; | ||
2537 | 1550 | -nacl*) | 1521 | -nacl*) |
2538 | 1551 | ;; | 1522 | ;; |
2539 | 1552 | -ios) | 1523 | -ios) |
2540 | @@ -1556,7 +1527,7 @@ case $os in | |||
2541 | 1556 | *) | 1527 | *) |
2542 | 1557 | # Get rid of the `-' at the beginning of $os. | 1528 | # Get rid of the `-' at the beginning of $os. |
2543 | 1558 | os=`echo $os | sed 's/[^-]*-//'` | 1529 | os=`echo $os | sed 's/[^-]*-//'` |
2545 | 1559 | echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 | 1530 | echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 |
2546 | 1560 | exit 1 | 1531 | exit 1 |
2547 | 1561 | ;; | 1532 | ;; |
2548 | 1562 | esac | 1533 | esac |
2549 | @@ -1652,9 +1623,6 @@ case $basic_machine in | |||
2550 | 1652 | *-be) | 1623 | *-be) |
2551 | 1653 | os=-beos | 1624 | os=-beos |
2552 | 1654 | ;; | 1625 | ;; |
2553 | 1655 | *-haiku) | ||
2554 | 1656 | os=-haiku | ||
2555 | 1657 | ;; | ||
2556 | 1658 | *-ibm) | 1626 | *-ibm) |
2557 | 1659 | os=-aix | 1627 | os=-aix |
2558 | 1660 | ;; | 1628 | ;; |
2559 | @@ -1694,7 +1662,7 @@ case $basic_machine in | |||
2560 | 1694 | m88k-omron*) | 1662 | m88k-omron*) |
2561 | 1695 | os=-luna | 1663 | os=-luna |
2562 | 1696 | ;; | 1664 | ;; |
2564 | 1697 | *-next ) | 1665 | *-next) |
2565 | 1698 | os=-nextstep | 1666 | os=-nextstep |
2566 | 1699 | ;; | 1667 | ;; |
2567 | 1700 | *-sequent) | 1668 | *-sequent) |
2568 | @@ -1709,9 +1677,6 @@ case $basic_machine in | |||
2569 | 1709 | i370-*) | 1677 | i370-*) |
2570 | 1710 | os=-mvs | 1678 | os=-mvs |
2571 | 1711 | ;; | 1679 | ;; |
2572 | 1712 | *-next) | ||
2573 | 1713 | os=-nextstep3 | ||
2574 | 1714 | ;; | ||
2575 | 1715 | *-gould) | 1680 | *-gould) |
2576 | 1716 | os=-sysv | 1681 | os=-sysv |
2577 | 1717 | ;; | 1682 | ;; |
2578 | @@ -1821,15 +1786,15 @@ case $basic_machine in | |||
2579 | 1821 | vendor=stratus | 1786 | vendor=stratus |
2580 | 1822 | ;; | 1787 | ;; |
2581 | 1823 | esac | 1788 | esac |
2583 | 1824 | basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` | 1789 | basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` |
2584 | 1825 | ;; | 1790 | ;; |
2585 | 1826 | esac | 1791 | esac |
2586 | 1827 | 1792 | ||
2588 | 1828 | echo $basic_machine$os | 1793 | echo "$basic_machine$os" |
2589 | 1829 | exit | 1794 | exit |
2590 | 1830 | 1795 | ||
2591 | 1831 | # Local variables: | 1796 | # Local variables: |
2593 | 1832 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 1797 | # eval: (add-hook 'write-file-functions 'time-stamp) |
2594 | 1833 | # time-stamp-start: "timestamp='" | 1798 | # time-stamp-start: "timestamp='" |
2595 | 1834 | # time-stamp-format: "%:y-%02m-%02d" | 1799 | # time-stamp-format: "%:y-%02m-%02d" |
2596 | 1835 | # time-stamp-end: "'" | 1800 | # time-stamp-end: "'" |
2597 | diff --git a/build-aux/depcomp b/build-aux/depcomp | |||
2598 | index 30379e2..65cbf70 100755 | |||
2599 | --- a/build-aux/depcomp | |||
2600 | +++ b/build-aux/depcomp | |||
2601 | @@ -1,9 +1,9 @@ | |||
2603 | 1 | #!/bin/sh | 1 | #! /bin/sh |
2604 | 2 | # depcomp - compile a program generating dependencies as side-effects | 2 | # depcomp - compile a program generating dependencies as side-effects |
2605 | 3 | 3 | ||
2607 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
2608 | 5 | 5 | ||
2610 | 6 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
2611 | 7 | 7 | ||
2612 | 8 | # This program is free software; you can redistribute it and/or modify | 8 | # This program is free software; you can redistribute it and/or modify |
2613 | 9 | # it under the terms of the GNU General Public License as published by | 9 | # 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 | 16 | # GNU General Public License for more details. | 16 | # GNU General Public License for more details. |
2616 | 17 | 17 | ||
2617 | 18 | # You should have received a copy of the GNU General Public License | 18 | # You should have received a copy of the GNU General Public License |
2619 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
2620 | 20 | 20 | ||
2621 | 21 | # As a special exception to the GNU General Public License, if you | 21 | # As a special exception to the GNU General Public License, if you |
2622 | 22 | # distribute this file as part of a program that contains a | 22 | # distribute this file as part of a program that contains a |
2623 | @@ -783,7 +783,7 @@ exit 0 | |||
2624 | 783 | # Local Variables: | 783 | # Local Variables: |
2625 | 784 | # mode: shell-script | 784 | # mode: shell-script |
2626 | 785 | # sh-indentation: 2 | 785 | # sh-indentation: 2 |
2628 | 786 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 786 | # eval: (add-hook 'before-save-hook 'time-stamp) |
2629 | 787 | # time-stamp-start: "scriptversion=" | 787 | # time-stamp-start: "scriptversion=" |
2630 | 788 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 788 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
2631 | 789 | # time-stamp-time-zone: "UTC0" | 789 | # time-stamp-time-zone: "UTC0" |
2632 | diff --git a/build-aux/install-sh b/build-aux/install-sh | |||
2633 | index 0360b79..8175c64 100755 | |||
2634 | --- a/build-aux/install-sh | |||
2635 | +++ b/build-aux/install-sh | |||
2636 | @@ -1,7 +1,7 @@ | |||
2637 | 1 | #!/bin/sh | 1 | #!/bin/sh |
2638 | 2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
2639 | 3 | 3 | ||
2641 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2018-03-11.20; # UTC |
2642 | 5 | 5 | ||
2643 | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
2644 | 7 | # later released in X11R6 (xc/config/util/install.sh) with the | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
2645 | @@ -271,15 +271,18 @@ do | |||
2646 | 271 | fi | 271 | fi |
2647 | 272 | dst=$dst_arg | 272 | dst=$dst_arg |
2648 | 273 | 273 | ||
2651 | 274 | # If destination is a directory, append the input filename; won't work | 274 | # If destination is a directory, append the input filename. |
2650 | 275 | # if double slashes aren't ignored. | ||
2652 | 276 | if test -d "$dst"; then | 275 | if test -d "$dst"; then |
2653 | 277 | if test "$is_target_a_directory" = never; then | 276 | if test "$is_target_a_directory" = never; then |
2654 | 278 | echo "$0: $dst_arg: Is a directory" >&2 | 277 | echo "$0: $dst_arg: Is a directory" >&2 |
2655 | 279 | exit 1 | 278 | exit 1 |
2656 | 280 | fi | 279 | fi |
2657 | 281 | dstdir=$dst | 280 | dstdir=$dst |
2659 | 282 | dst=$dstdir/`basename "$src"` | 281 | dstbase=`basename "$src"` |
2660 | 282 | case $dst in | ||
2661 | 283 | */) dst=$dst$dstbase;; | ||
2662 | 284 | *) dst=$dst/$dstbase;; | ||
2663 | 285 | esac | ||
2664 | 283 | dstdir_status=0 | 286 | dstdir_status=0 |
2665 | 284 | else | 287 | else |
2666 | 285 | dstdir=`dirname "$dst"` | 288 | dstdir=`dirname "$dst"` |
2667 | @@ -288,6 +291,11 @@ do | |||
2668 | 288 | fi | 291 | fi |
2669 | 289 | fi | 292 | fi |
2670 | 290 | 293 | ||
2671 | 294 | case $dstdir in | ||
2672 | 295 | */) dstdirslash=$dstdir;; | ||
2673 | 296 | *) dstdirslash=$dstdir/;; | ||
2674 | 297 | esac | ||
2675 | 298 | |||
2676 | 291 | obsolete_mkdir_used=false | 299 | obsolete_mkdir_used=false |
2677 | 292 | 300 | ||
2678 | 293 | if test $dstdir_status != 0; then | 301 | if test $dstdir_status != 0; then |
2679 | @@ -324,34 +332,43 @@ do | |||
2680 | 324 | # is incompatible with FreeBSD 'install' when (umask & 300) != 0. | 332 | # is incompatible with FreeBSD 'install' when (umask & 300) != 0. |
2681 | 325 | ;; | 333 | ;; |
2682 | 326 | *) | 334 | *) |
2683 | 335 | # Note that $RANDOM variable is not portable (e.g. dash); Use it | ||
2684 | 336 | # here however when possible just to lower collision chance. | ||
2685 | 327 | tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ | 337 | tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ |
2686 | 328 | trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 | ||
2687 | 329 | 338 | ||
2688 | 339 | trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 | ||
2689 | 340 | |||
2690 | 341 | # Because "mkdir -p" follows existing symlinks and we likely work | ||
2691 | 342 | # directly in world-writeable /tmp, make sure that the '$tmpdir' | ||
2692 | 343 | # directory is successfully created first before we actually test | ||
2693 | 344 | # 'mkdir -p' feature. | ||
2694 | 330 | if (umask $mkdir_umask && | 345 | if (umask $mkdir_umask && |
2696 | 331 | exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 | 346 | $mkdirprog $mkdir_mode "$tmpdir" && |
2697 | 347 | exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 | ||
2698 | 332 | then | 348 | then |
2699 | 333 | if test -z "$dir_arg" || { | 349 | if test -z "$dir_arg" || { |
2700 | 334 | # Check for POSIX incompatibilities with -m. | 350 | # Check for POSIX incompatibilities with -m. |
2701 | 335 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or | 351 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
2702 | 336 | # other-writable bit of parent directory when it shouldn't. | 352 | # other-writable bit of parent directory when it shouldn't. |
2703 | 337 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. | 353 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
2705 | 338 | ls_ld_tmpdir=`ls -ld "$tmpdir"` | 354 | test_tmpdir="$tmpdir/a" |
2706 | 355 | ls_ld_tmpdir=`ls -ld "$test_tmpdir"` | ||
2707 | 339 | case $ls_ld_tmpdir in | 356 | case $ls_ld_tmpdir in |
2708 | 340 | d????-?r-*) different_mode=700;; | 357 | d????-?r-*) different_mode=700;; |
2709 | 341 | d????-?--*) different_mode=755;; | 358 | d????-?--*) different_mode=755;; |
2710 | 342 | *) false;; | 359 | *) false;; |
2711 | 343 | esac && | 360 | esac && |
2714 | 344 | $mkdirprog -m$different_mode -p -- "$tmpdir" && { | 361 | $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { |
2715 | 345 | ls_ld_tmpdir_1=`ls -ld "$tmpdir"` | 362 | ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` |
2716 | 346 | test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" | 363 | test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" |
2717 | 347 | } | 364 | } |
2718 | 348 | } | 365 | } |
2719 | 349 | then posix_mkdir=: | 366 | then posix_mkdir=: |
2720 | 350 | fi | 367 | fi |
2722 | 351 | rmdir "$tmpdir/d" "$tmpdir" | 368 | rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" |
2723 | 352 | else | 369 | else |
2724 | 353 | # Remove any dirs left behind by ancient mkdir implementations. | 370 | # Remove any dirs left behind by ancient mkdir implementations. |
2726 | 354 | rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null | 371 | rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null |
2727 | 355 | fi | 372 | fi |
2728 | 356 | trap '' 0;; | 373 | trap '' 0;; |
2729 | 357 | esac;; | 374 | esac;; |
2730 | @@ -427,8 +444,8 @@ do | |||
2731 | 427 | else | 444 | else |
2732 | 428 | 445 | ||
2733 | 429 | # Make a couple of temp file names in the proper directory. | 446 | # Make a couple of temp file names in the proper directory. |
2736 | 430 | dsttmp=$dstdir/_inst.$$_ | 447 | dsttmp=${dstdirslash}_inst.$$_ |
2737 | 431 | rmtmp=$dstdir/_rm.$$_ | 448 | rmtmp=${dstdirslash}_rm.$$_ |
2738 | 432 | 449 | ||
2739 | 433 | # Trap to clean up those temp files at exit. | 450 | # Trap to clean up those temp files at exit. |
2740 | 434 | trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 | 451 | trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 |
2741 | @@ -493,7 +510,7 @@ do | |||
2742 | 493 | done | 510 | done |
2743 | 494 | 511 | ||
2744 | 495 | # Local variables: | 512 | # Local variables: |
2746 | 496 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 513 | # eval: (add-hook 'before-save-hook 'time-stamp) |
2747 | 497 | # time-stamp-start: "scriptversion=" | 514 | # time-stamp-start: "scriptversion=" |
2748 | 498 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 515 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
2749 | 499 | # time-stamp-time-zone: "UTC0" | 516 | # time-stamp-time-zone: "UTC0" |
2750 | diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh | |||
2751 | index 30be9c8..617dde4 100644 | |||
2752 | --- a/build-aux/ltmain.sh | |||
2753 | +++ b/build-aux/ltmain.sh | |||
2754 | @@ -31,7 +31,7 @@ | |||
2755 | 31 | 31 | ||
2756 | 32 | PROGRAM=libtool | 32 | PROGRAM=libtool |
2757 | 33 | PACKAGE=libtool | 33 | PACKAGE=libtool |
2759 | 34 | VERSION=2.4.6 | 34 | VERSION="2.4.6 Debian-2.4.6-8" |
2760 | 35 | package_revision=2.4.6 | 35 | package_revision=2.4.6 |
2761 | 36 | 36 | ||
2762 | 37 | 37 | ||
2763 | @@ -1370,7 +1370,7 @@ func_lt_ver () | |||
2764 | 1370 | #! /bin/sh | 1370 | #! /bin/sh |
2765 | 1371 | 1371 | ||
2766 | 1372 | # Set a version string for this script. | 1372 | # Set a version string for this script. |
2768 | 1373 | scriptversion=2014-01-07.03; # UTC | 1373 | scriptversion=2015-10-07.11; # UTC |
2769 | 1374 | 1374 | ||
2770 | 1375 | # A portable, pluggable option parser for Bourne shell. | 1375 | # A portable, pluggable option parser for Bourne shell. |
2771 | 1376 | # Written by Gary V. Vaughan, 2010 | 1376 | # Written by Gary V. Vaughan, 2010 |
2772 | @@ -1530,6 +1530,8 @@ func_run_hooks () | |||
2773 | 1530 | { | 1530 | { |
2774 | 1531 | $debug_cmd | 1531 | $debug_cmd |
2775 | 1532 | 1532 | ||
2776 | 1533 | _G_rc_run_hooks=false | ||
2777 | 1534 | |||
2778 | 1533 | case " $hookable_fns " in | 1535 | case " $hookable_fns " in |
2779 | 1534 | *" $1 "*) ;; | 1536 | *" $1 "*) ;; |
2780 | 1535 | *) func_fatal_error "'$1' does not support hook funcions.n" ;; | 1537 | *) func_fatal_error "'$1' does not support hook funcions.n" ;; |
2781 | @@ -1538,16 +1540,16 @@ func_run_hooks () | |||
2782 | 1538 | eval _G_hook_fns=\$$1_hooks; shift | 1540 | eval _G_hook_fns=\$$1_hooks; shift |
2783 | 1539 | 1541 | ||
2784 | 1540 | for _G_hook in $_G_hook_fns; do | 1542 | for _G_hook in $_G_hook_fns; do |
2791 | 1541 | eval $_G_hook '"$@"' | 1543 | if eval $_G_hook '"$@"'; then |
2792 | 1542 | 1544 | # store returned options list back into positional | |
2793 | 1543 | # store returned options list back into positional | 1545 | # parameters for next 'cmd' execution. |
2794 | 1544 | # parameters for next 'cmd' execution. | 1546 | eval _G_hook_result=\$${_G_hook}_result |
2795 | 1545 | eval _G_hook_result=\$${_G_hook}_result | 1547 | eval set dummy "$_G_hook_result"; shift |
2796 | 1546 | eval set dummy "$_G_hook_result"; shift | 1548 | _G_rc_run_hooks=: |
2797 | 1549 | fi | ||
2798 | 1547 | done | 1550 | done |
2799 | 1548 | 1551 | ||
2802 | 1549 | func_quote_for_eval ${1+"$@"} | 1552 | $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result |
2801 | 1550 | func_run_hooks_result=$func_quote_for_eval_result | ||
2803 | 1551 | } | 1553 | } |
2804 | 1552 | 1554 | ||
2805 | 1553 | 1555 | ||
2806 | @@ -1557,10 +1559,16 @@ func_run_hooks () | |||
2807 | 1557 | ## --------------- ## | 1559 | ## --------------- ## |
2808 | 1558 | 1560 | ||
2809 | 1559 | # In order to add your own option parsing hooks, you must accept the | 1561 | # In order to add your own option parsing hooks, you must accept the |
2812 | 1560 | # full positional parameter list in your hook function, remove any | 1562 | # full positional parameter list in your hook function, you may remove/edit |
2813 | 1561 | # options that you action, and then pass back the remaining unprocessed | 1563 | # any options that you action, and then pass back the remaining unprocessed |
2814 | 1562 | # options in '<hooked_function_name>_result', escaped suitably for | 1564 | # options in '<hooked_function_name>_result', escaped suitably for |
2816 | 1563 | # 'eval'. Like this: | 1565 | # 'eval'. In this case you also must return $EXIT_SUCCESS to let the |
2817 | 1566 | # hook's caller know that it should pay attention to | ||
2818 | 1567 | # '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that | ||
2819 | 1568 | # arguments are left untouched by the hook and therefore caller will ignore the | ||
2820 | 1569 | # result variable. | ||
2821 | 1570 | # | ||
2822 | 1571 | # Like this: | ||
2823 | 1564 | # | 1572 | # |
2824 | 1565 | # my_options_prep () | 1573 | # my_options_prep () |
2825 | 1566 | # { | 1574 | # { |
2826 | @@ -1570,9 +1578,11 @@ func_run_hooks () | |||
2827 | 1570 | # usage_message=$usage_message' | 1578 | # usage_message=$usage_message' |
2828 | 1571 | # -s, --silent don'\''t print informational messages | 1579 | # -s, --silent don'\''t print informational messages |
2829 | 1572 | # ' | 1580 | # ' |
2833 | 1573 | # | 1581 | # # No change in '$@' (ignored completely by this hook). There is |
2834 | 1574 | # func_quote_for_eval ${1+"$@"} | 1582 | # # no need to do the equivalent (but slower) action: |
2835 | 1575 | # my_options_prep_result=$func_quote_for_eval_result | 1583 | # # func_quote_for_eval ${1+"$@"} |
2836 | 1584 | # # my_options_prep_result=$func_quote_for_eval_result | ||
2837 | 1585 | # false | ||
2838 | 1576 | # } | 1586 | # } |
2839 | 1577 | # func_add_hook func_options_prep my_options_prep | 1587 | # func_add_hook func_options_prep my_options_prep |
2840 | 1578 | # | 1588 | # |
2841 | @@ -1581,25 +1591,37 @@ func_run_hooks () | |||
2842 | 1581 | # { | 1591 | # { |
2843 | 1582 | # $debug_cmd | 1592 | # $debug_cmd |
2844 | 1583 | # | 1593 | # |
2845 | 1594 | # args_changed=false | ||
2846 | 1595 | # | ||
2847 | 1584 | # # Note that for efficiency, we parse as many options as we can | 1596 | # # Note that for efficiency, we parse as many options as we can |
2848 | 1585 | # # recognise in a loop before passing the remainder back to the | 1597 | # # recognise in a loop before passing the remainder back to the |
2849 | 1586 | # # caller on the first unrecognised argument we encounter. | 1598 | # # caller on the first unrecognised argument we encounter. |
2850 | 1587 | # while test $# -gt 0; do | 1599 | # while test $# -gt 0; do |
2851 | 1588 | # opt=$1; shift | 1600 | # opt=$1; shift |
2852 | 1589 | # case $opt in | 1601 | # case $opt in |
2854 | 1590 | # --silent|-s) opt_silent=: ;; | 1602 | # --silent|-s) opt_silent=: |
2855 | 1603 | # args_changed=: | ||
2856 | 1604 | # ;; | ||
2857 | 1591 | # # Separate non-argument short options: | 1605 | # # Separate non-argument short options: |
2858 | 1592 | # -s*) func_split_short_opt "$_G_opt" | 1606 | # -s*) func_split_short_opt "$_G_opt" |
2859 | 1593 | # set dummy "$func_split_short_opt_name" \ | 1607 | # set dummy "$func_split_short_opt_name" \ |
2860 | 1594 | # "-$func_split_short_opt_arg" ${1+"$@"} | 1608 | # "-$func_split_short_opt_arg" ${1+"$@"} |
2861 | 1595 | # shift | 1609 | # shift |
2862 | 1610 | # args_changed=: | ||
2863 | 1596 | # ;; | 1611 | # ;; |
2865 | 1597 | # *) set dummy "$_G_opt" "$*"; shift; break ;; | 1612 | # *) # Make sure the first unrecognised option "$_G_opt" |
2866 | 1613 | # # is added back to "$@", we could need that later | ||
2867 | 1614 | # # if $args_changed is true. | ||
2868 | 1615 | # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | ||
2869 | 1598 | # esac | 1616 | # esac |
2870 | 1599 | # done | 1617 | # done |
2871 | 1600 | # | 1618 | # |
2874 | 1601 | # func_quote_for_eval ${1+"$@"} | 1619 | # if $args_changed; then |
2875 | 1602 | # my_silent_option_result=$func_quote_for_eval_result | 1620 | # func_quote_for_eval ${1+"$@"} |
2876 | 1621 | # my_silent_option_result=$func_quote_for_eval_result | ||
2877 | 1622 | # fi | ||
2878 | 1623 | # | ||
2879 | 1624 | # $args_changed | ||
2880 | 1603 | # } | 1625 | # } |
2881 | 1604 | # func_add_hook func_parse_options my_silent_option | 1626 | # func_add_hook func_parse_options my_silent_option |
2882 | 1605 | # | 1627 | # |
2883 | @@ -1611,16 +1633,32 @@ func_run_hooks () | |||
2884 | 1611 | # $opt_silent && $opt_verbose && func_fatal_help "\ | 1633 | # $opt_silent && $opt_verbose && func_fatal_help "\ |
2885 | 1612 | # '--silent' and '--verbose' options are mutually exclusive." | 1634 | # '--silent' and '--verbose' options are mutually exclusive." |
2886 | 1613 | # | 1635 | # |
2889 | 1614 | # func_quote_for_eval ${1+"$@"} | 1636 | # false |
2888 | 1615 | # my_option_validation_result=$func_quote_for_eval_result | ||
2890 | 1616 | # } | 1637 | # } |
2891 | 1617 | # func_add_hook func_validate_options my_option_validation | 1638 | # func_add_hook func_validate_options my_option_validation |
2892 | 1618 | # | 1639 | # |
2894 | 1619 | # You'll alse need to manually amend $usage_message to reflect the extra | 1640 | # You'll also need to manually amend $usage_message to reflect the extra |
2895 | 1620 | # options you parse. It's preferable to append if you can, so that | 1641 | # options you parse. It's preferable to append if you can, so that |
2896 | 1621 | # multiple option parsing hooks can be added safely. | 1642 | # multiple option parsing hooks can be added safely. |
2897 | 1622 | 1643 | ||
2898 | 1623 | 1644 | ||
2899 | 1645 | # func_options_finish [ARG]... | ||
2900 | 1646 | # ---------------------------- | ||
2901 | 1647 | # Finishing the option parse loop (call 'func_options' hooks ATM). | ||
2902 | 1648 | func_options_finish () | ||
2903 | 1649 | { | ||
2904 | 1650 | $debug_cmd | ||
2905 | 1651 | |||
2906 | 1652 | _G_func_options_finish_exit=false | ||
2907 | 1653 | if func_run_hooks func_options ${1+"$@"}; then | ||
2908 | 1654 | func_options_finish_result=$func_run_hooks_result | ||
2909 | 1655 | _G_func_options_finish_exit=: | ||
2910 | 1656 | fi | ||
2911 | 1657 | |||
2912 | 1658 | $_G_func_options_finish_exit | ||
2913 | 1659 | } | ||
2914 | 1660 | |||
2915 | 1661 | |||
2916 | 1624 | # func_options [ARG]... | 1662 | # func_options [ARG]... |
2917 | 1625 | # --------------------- | 1663 | # --------------------- |
2918 | 1626 | # All the functions called inside func_options are hookable. See the | 1664 | # All the functions called inside func_options are hookable. See the |
2919 | @@ -1630,17 +1668,28 @@ func_options () | |||
2920 | 1630 | { | 1668 | { |
2921 | 1631 | $debug_cmd | 1669 | $debug_cmd |
2922 | 1632 | 1670 | ||
2928 | 1633 | func_options_prep ${1+"$@"} | 1671 | _G_rc_options=false |
2929 | 1634 | eval func_parse_options \ | 1672 | |
2930 | 1635 | ${func_options_prep_result+"$func_options_prep_result"} | 1673 | for my_func in options_prep parse_options validate_options options_finish |
2931 | 1636 | eval func_validate_options \ | 1674 | do |
2932 | 1637 | ${func_parse_options_result+"$func_parse_options_result"} | 1675 | if eval func_$my_func '${1+"$@"}'; then |
2933 | 1676 | eval _G_res_var='$'"func_${my_func}_result" | ||
2934 | 1677 | eval set dummy "$_G_res_var" ; shift | ||
2935 | 1678 | _G_rc_options=: | ||
2936 | 1679 | fi | ||
2937 | 1680 | done | ||
2938 | 1638 | 1681 | ||
2941 | 1639 | eval func_run_hooks func_options \ | 1682 | # Save modified positional parameters for caller. As a top-level |
2942 | 1640 | ${func_validate_options_result+"$func_validate_options_result"} | 1683 | # options-parser function we always need to set the 'func_options_result' |
2943 | 1684 | # variable (regardless the $_G_rc_options value). | ||
2944 | 1685 | if $_G_rc_options; then | ||
2945 | 1686 | func_options_result=$_G_res_var | ||
2946 | 1687 | else | ||
2947 | 1688 | func_quote_for_eval ${1+"$@"} | ||
2948 | 1689 | func_options_result=$func_quote_for_eval_result | ||
2949 | 1690 | fi | ||
2950 | 1641 | 1691 | ||
2953 | 1642 | # save modified positional parameters for caller | 1692 | $_G_rc_options |
2952 | 1643 | func_options_result=$func_run_hooks_result | ||
2954 | 1644 | } | 1693 | } |
2955 | 1645 | 1694 | ||
2956 | 1646 | 1695 | ||
2957 | @@ -1649,9 +1698,9 @@ func_options () | |||
2958 | 1649 | # All initialisations required before starting the option parse loop. | 1698 | # All initialisations required before starting the option parse loop. |
2959 | 1650 | # Note that when calling hook functions, we pass through the list of | 1699 | # Note that when calling hook functions, we pass through the list of |
2960 | 1651 | # positional parameters. If a hook function modifies that list, and | 1700 | # positional parameters. If a hook function modifies that list, and |
2962 | 1652 | # needs to propogate that back to rest of this script, then the complete | 1701 | # needs to propagate that back to rest of this script, then the complete |
2963 | 1653 | # modified list must be put in 'func_run_hooks_result' before | 1702 | # modified list must be put in 'func_run_hooks_result' before |
2965 | 1654 | # returning. | 1703 | # returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). |
2966 | 1655 | func_hookable func_options_prep | 1704 | func_hookable func_options_prep |
2967 | 1656 | func_options_prep () | 1705 | func_options_prep () |
2968 | 1657 | { | 1706 | { |
2969 | @@ -1661,10 +1710,14 @@ func_options_prep () | |||
2970 | 1661 | opt_verbose=false | 1710 | opt_verbose=false |
2971 | 1662 | opt_warning_types= | 1711 | opt_warning_types= |
2972 | 1663 | 1712 | ||
2974 | 1664 | func_run_hooks func_options_prep ${1+"$@"} | 1713 | _G_rc_options_prep=false |
2975 | 1714 | if func_run_hooks func_options_prep ${1+"$@"}; then | ||
2976 | 1715 | _G_rc_options_prep=: | ||
2977 | 1716 | # save modified positional parameters for caller | ||
2978 | 1717 | func_options_prep_result=$func_run_hooks_result | ||
2979 | 1718 | fi | ||
2980 | 1665 | 1719 | ||
2983 | 1666 | # save modified positional parameters for caller | 1720 | $_G_rc_options_prep |
2982 | 1667 | func_options_prep_result=$func_run_hooks_result | ||
2984 | 1668 | } | 1721 | } |
2985 | 1669 | 1722 | ||
2986 | 1670 | 1723 | ||
2987 | @@ -1678,18 +1731,20 @@ func_parse_options () | |||
2988 | 1678 | 1731 | ||
2989 | 1679 | func_parse_options_result= | 1732 | func_parse_options_result= |
2990 | 1680 | 1733 | ||
2991 | 1734 | _G_rc_parse_options=false | ||
2992 | 1681 | # this just eases exit handling | 1735 | # this just eases exit handling |
2993 | 1682 | while test $# -gt 0; do | 1736 | while test $# -gt 0; do |
2994 | 1683 | # Defer to hook functions for initial option parsing, so they | 1737 | # Defer to hook functions for initial option parsing, so they |
2995 | 1684 | # get priority in the event of reusing an option name. | 1738 | # get priority in the event of reusing an option name. |
3000 | 1685 | func_run_hooks func_parse_options ${1+"$@"} | 1739 | if func_run_hooks func_parse_options ${1+"$@"}; then |
3001 | 1686 | 1740 | eval set dummy "$func_run_hooks_result"; shift | |
3002 | 1687 | # Adjust func_parse_options positional parameters to match | 1741 | _G_rc_parse_options=: |
3003 | 1688 | eval set dummy "$func_run_hooks_result"; shift | 1742 | fi |
3004 | 1689 | 1743 | ||
3005 | 1690 | # Break out of the loop if we already parsed every option. | 1744 | # Break out of the loop if we already parsed every option. |
3006 | 1691 | test $# -gt 0 || break | 1745 | test $# -gt 0 || break |
3007 | 1692 | 1746 | ||
3008 | 1747 | _G_match_parse_options=: | ||
3009 | 1693 | _G_opt=$1 | 1748 | _G_opt=$1 |
3010 | 1694 | shift | 1749 | shift |
3011 | 1695 | case $_G_opt in | 1750 | case $_G_opt in |
3012 | @@ -1704,7 +1759,10 @@ func_parse_options () | |||
3013 | 1704 | ;; | 1759 | ;; |
3014 | 1705 | 1760 | ||
3015 | 1706 | --warnings|--warning|-W) | 1761 | --warnings|--warning|-W) |
3017 | 1707 | test $# = 0 && func_missing_arg $_G_opt && break | 1762 | if test $# = 0 && func_missing_arg $_G_opt; then |
3018 | 1763 | _G_rc_parse_options=: | ||
3019 | 1764 | break | ||
3020 | 1765 | fi | ||
3021 | 1708 | case " $warning_categories $1" in | 1766 | case " $warning_categories $1" in |
3022 | 1709 | *" $1 "*) | 1767 | *" $1 "*) |
3023 | 1710 | # trailing space prevents matching last $1 above | 1768 | # trailing space prevents matching last $1 above |
3024 | @@ -1757,15 +1815,25 @@ func_parse_options () | |||
3025 | 1757 | shift | 1815 | shift |
3026 | 1758 | ;; | 1816 | ;; |
3027 | 1759 | 1817 | ||
3029 | 1760 | --) break ;; | 1818 | --) _G_rc_parse_options=: ; break ;; |
3030 | 1761 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; | 1819 | -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; |
3032 | 1762 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | 1820 | *) set dummy "$_G_opt" ${1+"$@"}; shift |
3033 | 1821 | _G_match_parse_options=false | ||
3034 | 1822 | break | ||
3035 | 1823 | ;; | ||
3036 | 1763 | esac | 1824 | esac |
3037 | 1825 | |||
3038 | 1826 | $_G_match_parse_options && _G_rc_parse_options=: | ||
3039 | 1764 | done | 1827 | done |
3040 | 1765 | 1828 | ||
3044 | 1766 | # save modified positional parameters for caller | 1829 | |
3045 | 1767 | func_quote_for_eval ${1+"$@"} | 1830 | if $_G_rc_parse_options; then |
3046 | 1768 | func_parse_options_result=$func_quote_for_eval_result | 1831 | # save modified positional parameters for caller |
3047 | 1832 | func_quote_for_eval ${1+"$@"} | ||
3048 | 1833 | func_parse_options_result=$func_quote_for_eval_result | ||
3049 | 1834 | fi | ||
3050 | 1835 | |||
3051 | 1836 | $_G_rc_parse_options | ||
3052 | 1769 | } | 1837 | } |
3053 | 1770 | 1838 | ||
3054 | 1771 | 1839 | ||
3055 | @@ -1778,16 +1846,21 @@ func_validate_options () | |||
3056 | 1778 | { | 1846 | { |
3057 | 1779 | $debug_cmd | 1847 | $debug_cmd |
3058 | 1780 | 1848 | ||
3059 | 1849 | _G_rc_validate_options=false | ||
3060 | 1850 | |||
3061 | 1781 | # Display all warnings if -W was not given. | 1851 | # Display all warnings if -W was not given. |
3062 | 1782 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" | 1852 | test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" |
3063 | 1783 | 1853 | ||
3065 | 1784 | func_run_hooks func_validate_options ${1+"$@"} | 1854 | if func_run_hooks func_validate_options ${1+"$@"}; then |
3066 | 1855 | # save modified positional parameters for caller | ||
3067 | 1856 | func_validate_options_result=$func_run_hooks_result | ||
3068 | 1857 | _G_rc_validate_options=: | ||
3069 | 1858 | fi | ||
3070 | 1785 | 1859 | ||
3071 | 1786 | # Bail if the options were screwed! | 1860 | # Bail if the options were screwed! |
3072 | 1787 | $exit_cmd $EXIT_FAILURE | 1861 | $exit_cmd $EXIT_FAILURE |
3073 | 1788 | 1862 | ||
3076 | 1789 | # save modified positional parameters for caller | 1863 | $_G_rc_validate_options |
3075 | 1790 | func_validate_options_result=$func_run_hooks_result | ||
3077 | 1791 | } | 1864 | } |
3078 | 1792 | 1865 | ||
3079 | 1793 | 1866 | ||
3080 | @@ -2068,12 +2141,12 @@ include the following information: | |||
3081 | 2068 | compiler: $LTCC | 2141 | compiler: $LTCC |
3082 | 2069 | compiler flags: $LTCFLAGS | 2142 | compiler flags: $LTCFLAGS |
3083 | 2070 | linker: $LD (gnu? $with_gnu_ld) | 2143 | linker: $LD (gnu? $with_gnu_ld) |
3085 | 2071 | version: $progname (GNU libtool) 2.4.6 | 2144 | version: $progname $scriptversion Debian-2.4.6-8 |
3086 | 2072 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | 2145 | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` |
3087 | 2073 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | 2146 | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` |
3088 | 2074 | 2147 | ||
3089 | 2075 | Report bugs to <bug-libtool@gnu.org>. | 2148 | Report bugs to <bug-libtool@gnu.org>. |
3091 | 2076 | GNU libtool home page: <http://www.gnu.org/software/libtool/>. | 2149 | GNU libtool home page: <http://www.gnu.org/s/libtool/>. |
3092 | 2077 | General help using GNU software: <http://www.gnu.org/gethelp/>." | 2150 | General help using GNU software: <http://www.gnu.org/gethelp/>." |
3093 | 2078 | exit 0 | 2151 | exit 0 |
3094 | 2079 | } | 2152 | } |
3095 | @@ -2270,6 +2343,8 @@ libtool_options_prep () | |||
3096 | 2270 | nonopt= | 2343 | nonopt= |
3097 | 2271 | preserve_args= | 2344 | preserve_args= |
3098 | 2272 | 2345 | ||
3099 | 2346 | _G_rc_lt_options_prep=: | ||
3100 | 2347 | |||
3101 | 2273 | # Shorthand for --mode=foo, only valid as the first argument | 2348 | # Shorthand for --mode=foo, only valid as the first argument |
3102 | 2274 | case $1 in | 2349 | case $1 in |
3103 | 2275 | clean|clea|cle|cl) | 2350 | clean|clea|cle|cl) |
3104 | @@ -2293,11 +2368,18 @@ libtool_options_prep () | |||
3105 | 2293 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | 2368 | uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
3106 | 2294 | shift; set dummy --mode uninstall ${1+"$@"}; shift | 2369 | shift; set dummy --mode uninstall ${1+"$@"}; shift |
3107 | 2295 | ;; | 2370 | ;; |
3108 | 2371 | *) | ||
3109 | 2372 | _G_rc_lt_options_prep=false | ||
3110 | 2373 | ;; | ||
3111 | 2296 | esac | 2374 | esac |
3112 | 2297 | 2375 | ||
3116 | 2298 | # Pass back the list of options. | 2376 | if $_G_rc_lt_options_prep; then |
3117 | 2299 | func_quote_for_eval ${1+"$@"} | 2377 | # Pass back the list of options. |
3118 | 2300 | libtool_options_prep_result=$func_quote_for_eval_result | 2378 | func_quote_for_eval ${1+"$@"} |
3119 | 2379 | libtool_options_prep_result=$func_quote_for_eval_result | ||
3120 | 2380 | fi | ||
3121 | 2381 | |||
3122 | 2382 | $_G_rc_lt_options_prep | ||
3123 | 2301 | } | 2383 | } |
3124 | 2302 | func_add_hook func_options_prep libtool_options_prep | 2384 | func_add_hook func_options_prep libtool_options_prep |
3125 | 2303 | 2385 | ||
3126 | @@ -2309,9 +2391,12 @@ libtool_parse_options () | |||
3127 | 2309 | { | 2391 | { |
3128 | 2310 | $debug_cmd | 2392 | $debug_cmd |
3129 | 2311 | 2393 | ||
3130 | 2394 | _G_rc_lt_parse_options=false | ||
3131 | 2395 | |||
3132 | 2312 | # Perform our own loop to consume as many options as possible in | 2396 | # Perform our own loop to consume as many options as possible in |
3133 | 2313 | # each iteration. | 2397 | # each iteration. |
3134 | 2314 | while test $# -gt 0; do | 2398 | while test $# -gt 0; do |
3135 | 2399 | _G_match_lt_parse_options=: | ||
3136 | 2315 | _G_opt=$1 | 2400 | _G_opt=$1 |
3137 | 2316 | shift | 2401 | shift |
3138 | 2317 | case $_G_opt in | 2402 | case $_G_opt in |
3139 | @@ -2386,15 +2471,22 @@ libtool_parse_options () | |||
3140 | 2386 | func_append preserve_args " $_G_opt" | 2471 | func_append preserve_args " $_G_opt" |
3141 | 2387 | ;; | 2472 | ;; |
3142 | 2388 | 2473 | ||
3145 | 2389 | # An option not handled by this hook function: | 2474 | # An option not handled by this hook function: |
3146 | 2390 | *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; | 2475 | *) set dummy "$_G_opt" ${1+"$@"} ; shift |
3147 | 2476 | _G_match_lt_parse_options=false | ||
3148 | 2477 | break | ||
3149 | 2478 | ;; | ||
3150 | 2391 | esac | 2479 | esac |
3151 | 2480 | $_G_match_lt_parse_options && _G_rc_lt_parse_options=: | ||
3152 | 2392 | done | 2481 | done |
3153 | 2393 | 2482 | ||
3154 | 2483 | if $_G_rc_lt_parse_options; then | ||
3155 | 2484 | # save modified positional parameters for caller | ||
3156 | 2485 | func_quote_for_eval ${1+"$@"} | ||
3157 | 2486 | libtool_parse_options_result=$func_quote_for_eval_result | ||
3158 | 2487 | fi | ||
3159 | 2394 | 2488 | ||
3163 | 2395 | # save modified positional parameters for caller | 2489 | $_G_rc_lt_parse_options |
3161 | 2396 | func_quote_for_eval ${1+"$@"} | ||
3162 | 2397 | libtool_parse_options_result=$func_quote_for_eval_result | ||
3164 | 2398 | } | 2490 | } |
3165 | 2399 | func_add_hook func_parse_options libtool_parse_options | 2491 | func_add_hook func_parse_options libtool_parse_options |
3166 | 2400 | 2492 | ||
3167 | @@ -7274,10 +7366,11 @@ func_mode_link () | |||
3168 | 7274 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | 7366 | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
3169 | 7275 | # -specs=* GCC specs files | 7367 | # -specs=* GCC specs files |
3170 | 7276 | # -stdlib=* select c++ std lib with clang | 7368 | # -stdlib=* select c++ std lib with clang |
3171 | 7369 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
3172 | 7277 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 7370 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
3173 | 7278 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 7371 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
3174 | 7279 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 7372 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
3176 | 7280 | -specs=*) | 7373 | -specs=*|-fsanitize=*) |
3177 | 7281 | func_quote_for_eval "$arg" | 7374 | func_quote_for_eval "$arg" |
3178 | 7282 | arg=$func_quote_for_eval_result | 7375 | arg=$func_quote_for_eval_result |
3179 | 7283 | func_append compile_command " $arg" | 7376 | func_append compile_command " $arg" |
3180 | @@ -7570,7 +7663,10 @@ func_mode_link () | |||
3181 | 7570 | case $pass in | 7663 | case $pass in |
3182 | 7571 | dlopen) libs=$dlfiles ;; | 7664 | dlopen) libs=$dlfiles ;; |
3183 | 7572 | dlpreopen) libs=$dlprefiles ;; | 7665 | dlpreopen) libs=$dlprefiles ;; |
3185 | 7573 | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; | 7666 | link) |
3186 | 7667 | libs="$deplibs %DEPLIBS%" | ||
3187 | 7668 | test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | ||
3188 | 7669 | ;; | ||
3189 | 7574 | esac | 7670 | esac |
3190 | 7575 | fi | 7671 | fi |
3191 | 7576 | if test lib,dlpreopen = "$linkmode,$pass"; then | 7672 | if test lib,dlpreopen = "$linkmode,$pass"; then |
3192 | @@ -7889,19 +7985,19 @@ func_mode_link () | |||
3193 | 7889 | # It is a libtool convenience library, so add in its objects. | 7985 | # It is a libtool convenience library, so add in its objects. |
3194 | 7890 | func_append convenience " $ladir/$objdir/$old_library" | 7986 | func_append convenience " $ladir/$objdir/$old_library" |
3195 | 7891 | func_append old_convenience " $ladir/$objdir/$old_library" | 7987 | func_append old_convenience " $ladir/$objdir/$old_library" |
3196 | 7988 | tmp_libs= | ||
3197 | 7989 | for deplib in $dependency_libs; do | ||
3198 | 7990 | deplibs="$deplib $deplibs" | ||
3199 | 7991 | if $opt_preserve_dup_deps; then | ||
3200 | 7992 | case "$tmp_libs " in | ||
3201 | 7993 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
3202 | 7994 | esac | ||
3203 | 7995 | fi | ||
3204 | 7996 | func_append tmp_libs " $deplib" | ||
3205 | 7997 | done | ||
3206 | 7892 | elif test prog != "$linkmode" && test lib != "$linkmode"; then | 7998 | elif test prog != "$linkmode" && test lib != "$linkmode"; then |
3207 | 7893 | func_fatal_error "'$lib' is not a convenience library" | 7999 | func_fatal_error "'$lib' is not a convenience library" |
3208 | 7894 | fi | 8000 | fi |
3209 | 7895 | tmp_libs= | ||
3210 | 7896 | for deplib in $dependency_libs; do | ||
3211 | 7897 | deplibs="$deplib $deplibs" | ||
3212 | 7898 | if $opt_preserve_dup_deps; then | ||
3213 | 7899 | case "$tmp_libs " in | ||
3214 | 7900 | *" $deplib "*) func_append specialdeplibs " $deplib" ;; | ||
3215 | 7901 | esac | ||
3216 | 7902 | fi | ||
3217 | 7903 | func_append tmp_libs " $deplib" | ||
3218 | 7904 | done | ||
3219 | 7905 | continue | 8001 | continue |
3220 | 7906 | fi # $pass = conv | 8002 | fi # $pass = conv |
3221 | 7907 | 8003 | ||
3222 | @@ -8825,6 +8921,9 @@ func_mode_link () | |||
3223 | 8825 | revision=$number_minor | 8921 | revision=$number_minor |
3224 | 8826 | lt_irix_increment=no | 8922 | lt_irix_increment=no |
3225 | 8827 | ;; | 8923 | ;; |
3226 | 8924 | *) | ||
3227 | 8925 | func_fatal_configuration "$modename: unknown library version type '$version_type'" | ||
3228 | 8926 | ;; | ||
3229 | 8828 | esac | 8927 | esac |
3230 | 8829 | ;; | 8928 | ;; |
3231 | 8830 | no) | 8929 | no) |
3232 | diff --git a/build-aux/missing b/build-aux/missing | |||
3233 | index b7e571e..625aeb1 100755 | |||
3234 | --- a/build-aux/missing | |||
3235 | +++ b/build-aux/missing | |||
3236 | @@ -1,9 +1,9 @@ | |||
3238 | 1 | #!/bin/sh | 1 | #! /bin/sh |
3239 | 2 | # Common wrapper for a few potentially missing GNU programs. | 2 | # Common wrapper for a few potentially missing GNU programs. |
3240 | 3 | 3 | ||
3242 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
3243 | 5 | 5 | ||
3245 | 6 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
3246 | 7 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | 7 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
3247 | 8 | 8 | ||
3248 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
3249 | @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC | |||
3250 | 17 | # GNU General Public License for more details. | 17 | # GNU General Public License for more details. |
3251 | 18 | 18 | ||
3252 | 19 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
3254 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 20 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
3255 | 21 | 21 | ||
3256 | 22 | # As a special exception to the GNU General Public License, if you | 22 | # As a special exception to the GNU General Public License, if you |
3257 | 23 | # distribute this file as part of a program that contains a | 23 | # distribute this file as part of a program that contains a |
3258 | @@ -101,9 +101,9 @@ else | |||
3259 | 101 | exit $st | 101 | exit $st |
3260 | 102 | fi | 102 | fi |
3261 | 103 | 103 | ||
3265 | 104 | perl_URL=http://www.perl.org/ | 104 | perl_URL=https://www.perl.org/ |
3266 | 105 | flex_URL=http://flex.sourceforge.net/ | 105 | flex_URL=https://github.com/westes/flex |
3267 | 106 | gnu_software_URL=http://www.gnu.org/software | 106 | gnu_software_URL=https://www.gnu.org/software |
3268 | 107 | 107 | ||
3269 | 108 | program_details () | 108 | program_details () |
3270 | 109 | { | 109 | { |
3271 | @@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ | |||
3272 | 207 | exit $st | 207 | exit $st |
3273 | 208 | 208 | ||
3274 | 209 | # Local variables: | 209 | # Local variables: |
3276 | 210 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 210 | # eval: (add-hook 'before-save-hook 'time-stamp) |
3277 | 211 | # time-stamp-start: "scriptversion=" | 211 | # time-stamp-start: "scriptversion=" |
3278 | 212 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 212 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
3279 | 213 | # time-stamp-time-zone: "UTC0" | 213 | # time-stamp-time-zone: "UTC0" |
3280 | diff --git a/clutter/Makefile.in b/clutter/Makefile.in | |||
3281 | index 0827a9c..fd88e85 100644 | |||
3282 | --- a/clutter/Makefile.in | |||
3283 | +++ b/clutter/Makefile.in | |||
3284 | @@ -1,7 +1,7 @@ | |||
3286 | 1 | # Makefile.in generated by automake 1.15.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.16.1 from Makefile.am. |
3287 | 2 | # @configure_input@ | 2 | # @configure_input@ |
3288 | 3 | 3 | ||
3290 | 4 | # Copyright (C) 1994-2017 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2018 Free Software Foundation, Inc. |
3291 | 5 | 5 | ||
3292 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
3293 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
3294 | @@ -144,7 +144,7 @@ am__recursive_targets = \ | |||
3295 | 144 | $(RECURSIVE_CLEAN_TARGETS) \ | 144 | $(RECURSIVE_CLEAN_TARGETS) \ |
3296 | 145 | $(am__extra_recursive_targets) | 145 | $(am__extra_recursive_targets) |
3297 | 146 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ | 146 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
3299 | 147 | cscope distdir dist dist-all distcheck | 147 | cscope distdir distdir-am dist dist-all distcheck |
3300 | 148 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | 148 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
3301 | 149 | # Read a list of newline-separated strings from the standard input, | 149 | # Read a list of newline-separated strings from the standard input, |
3302 | 150 | # and print each of them once, without duplicates. Input order is | 150 | # and print each of them once, without duplicates. Input order is |
3303 | @@ -394,6 +394,7 @@ pdfdir = @pdfdir@ | |||
3304 | 394 | prefix = @prefix@ | 394 | prefix = @prefix@ |
3305 | 395 | program_transform_name = @program_transform_name@ | 395 | program_transform_name = @program_transform_name@ |
3306 | 396 | psdir = @psdir@ | 396 | psdir = @psdir@ |
3307 | 397 | runstatedir = @runstatedir@ | ||
3308 | 397 | sbindir = @sbindir@ | 398 | sbindir = @sbindir@ |
3309 | 398 | sharedstatedir = @sharedstatedir@ | 399 | sharedstatedir = @sharedstatedir@ |
3310 | 399 | srcdir = @srcdir@ | 400 | srcdir = @srcdir@ |
3311 | @@ -437,8 +438,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
3312 | 437 | echo ' $(SHELL) ./config.status'; \ | 438 | echo ' $(SHELL) ./config.status'; \ |
3313 | 438 | $(SHELL) ./config.status;; \ | 439 | $(SHELL) ./config.status;; \ |
3314 | 439 | *) \ | 440 | *) \ |
3317 | 440 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 441 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ |
3318 | 441 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 442 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ |
3319 | 442 | esac; | 443 | esac; |
3320 | 443 | 444 | ||
3321 | 444 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 445 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
3322 | @@ -565,7 +566,10 @@ distclean-tags: | |||
3323 | 565 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 566 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
3324 | 566 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | 567 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
3325 | 567 | 568 | ||
3327 | 568 | distdir: $(DISTFILES) | 569 | distdir: $(BUILT_SOURCES) |
3328 | 570 | $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
3329 | 571 | |||
3330 | 572 | distdir-am: $(DISTFILES) | ||
3331 | 569 | $(am__remove_distdir) | 573 | $(am__remove_distdir) |
3332 | 570 | test -d "$(distdir)" || mkdir "$(distdir)" | 574 | test -d "$(distdir)" || mkdir "$(distdir)" |
3333 | 571 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 575 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
3334 | diff --git a/clutter/aclocal.m4 b/clutter/aclocal.m4 | |||
3335 | index 56e90b0..24c7061 100644 | |||
3336 | --- a/clutter/aclocal.m4 | |||
3337 | +++ b/clutter/aclocal.m4 | |||
3338 | @@ -1,6 +1,6 @@ | |||
3340 | 1 | # generated automatically by aclocal 1.15.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.16.1 -*- Autoconf -*- |
3341 | 2 | 2 | ||
3343 | 3 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 3 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
3344 | 4 | 4 | ||
3345 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
3346 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # 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 | 20 | If you have problems, you may need to regenerate the build system entirely. | 20 | If you have problems, you may need to regenerate the build system entirely. |
3349 | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
3350 | 22 | 22 | ||
3353 | 23 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 23 | # Configure paths for GLIB |
3354 | 24 | # serial 11 (pkg-config-0.29.1) | 24 | # Owen Taylor 1997-2001 |
3355 | 25 | |||
3356 | 26 | # Increment this whenever this file is changed. | ||
3357 | 27 | #serial 1 | ||
3358 | 28 | |||
3359 | 29 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
3360 | 30 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
3361 | 31 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
3362 | 32 | dnl | ||
3363 | 33 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
3364 | 34 | [dnl | ||
3365 | 35 | dnl Get the cflags and libraries from pkg-config | ||
3366 | 36 | dnl | ||
3367 | 37 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
3368 | 38 | , enable_glibtest=yes) | ||
3369 | 39 | |||
3370 | 40 | pkg_config_args=glib-2.0 | ||
3371 | 41 | for module in . $4 | ||
3372 | 42 | do | ||
3373 | 43 | case "$module" in | ||
3374 | 44 | gmodule) | ||
3375 | 45 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
3376 | 46 | ;; | ||
3377 | 47 | gmodule-no-export) | ||
3378 | 48 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
3379 | 49 | ;; | ||
3380 | 50 | gobject) | ||
3381 | 51 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
3382 | 52 | ;; | ||
3383 | 53 | gthread) | ||
3384 | 54 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
3385 | 55 | ;; | ||
3386 | 56 | gio*) | ||
3387 | 57 | pkg_config_args="$pkg_config_args $module-2.0" | ||
3388 | 58 | ;; | ||
3389 | 59 | esac | ||
3390 | 60 | done | ||
3391 | 61 | |||
3392 | 62 | PKG_PROG_PKG_CONFIG([0.16]) | ||
3393 | 63 | |||
3394 | 64 | no_glib="" | ||
3395 | 65 | |||
3396 | 66 | if test "x$PKG_CONFIG" = x ; then | ||
3397 | 67 | no_glib=yes | ||
3398 | 68 | PKG_CONFIG=no | ||
3399 | 69 | fi | ||
3400 | 70 | |||
3401 | 71 | min_glib_version=ifelse([$1], ,2.0.0,$1) | ||
3402 | 72 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
3403 | 73 | |||
3404 | 74 | if test x$PKG_CONFIG != xno ; then | ||
3405 | 75 | ## don't try to run the test against uninstalled libtool libs | ||
3406 | 76 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
3407 | 77 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
3408 | 78 | enable_glibtest=no | ||
3409 | 79 | fi | ||
3410 | 80 | |||
3411 | 81 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
3412 | 82 | : | ||
3413 | 83 | else | ||
3414 | 84 | no_glib=yes | ||
3415 | 85 | fi | ||
3416 | 86 | fi | ||
3417 | 87 | |||
3418 | 88 | if test x"$no_glib" = x ; then | ||
3419 | 89 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | ||
3420 | 90 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | ||
3421 | 91 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | ||
3422 | 92 | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` | ||
3423 | 93 | |||
3424 | 94 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | ||
3425 | 95 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | ||
3426 | 96 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3427 | 97 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
3428 | 98 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3429 | 99 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
3430 | 100 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3431 | 101 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
3432 | 102 | if test "x$enable_glibtest" = "xyes" ; then | ||
3433 | 103 | ac_save_CFLAGS="$CFLAGS" | ||
3434 | 104 | ac_save_LIBS="$LIBS" | ||
3435 | 105 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3436 | 106 | LIBS="$GLIB_LIBS $LIBS" | ||
3437 | 107 | dnl | ||
3438 | 108 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
3439 | 109 | dnl checks the results of pkg-config to some extent) | ||
3440 | 110 | dnl | ||
3441 | 111 | rm -f conf.glibtest | ||
3442 | 112 | AC_TRY_RUN([ | ||
3443 | 113 | #include <glib.h> | ||
3444 | 114 | #include <stdio.h> | ||
3445 | 115 | #include <stdlib.h> | ||
3446 | 116 | |||
3447 | 117 | int | ||
3448 | 118 | main (void) | ||
3449 | 119 | { | ||
3450 | 120 | unsigned int major, minor, micro; | ||
3451 | 121 | |||
3452 | 122 | fclose (fopen ("conf.glibtest", "w")); | ||
3453 | 123 | |||
3454 | 124 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
3455 | 125 | printf("%s, bad version string\n", "$min_glib_version"); | ||
3456 | 126 | exit(1); | ||
3457 | 127 | } | ||
3458 | 128 | |||
3459 | 129 | if ((glib_major_version != $glib_config_major_version) || | ||
3460 | 130 | (glib_minor_version != $glib_config_minor_version) || | ||
3461 | 131 | (glib_micro_version != $glib_config_micro_version)) | ||
3462 | 132 | { | ||
3463 | 133 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
3464 | 134 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
3465 | 135 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3466 | 136 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
3467 | 137 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
3468 | 138 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
3469 | 139 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
3470 | 140 | printf("*** required on your system.\n"); | ||
3471 | 141 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
3472 | 142 | printf("*** to point to the correct configuration files\n"); | ||
3473 | 143 | } | ||
3474 | 144 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
3475 | 145 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
3476 | 146 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
3477 | 147 | { | ||
3478 | 148 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
3479 | 149 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
3480 | 150 | printf("*** library (version %d.%d.%d)\n", | ||
3481 | 151 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3482 | 152 | } | ||
3483 | 153 | else | ||
3484 | 154 | { | ||
3485 | 155 | if ((glib_major_version > major) || | ||
3486 | 156 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
3487 | 157 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
3488 | 158 | { | ||
3489 | 159 | return 0; | ||
3490 | 160 | } | ||
3491 | 161 | else | ||
3492 | 162 | { | ||
3493 | 163 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
3494 | 164 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3495 | 165 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
3496 | 166 | major, minor, micro); | ||
3497 | 167 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
3498 | 168 | printf("***\n"); | ||
3499 | 169 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
3500 | 170 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
3501 | 171 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
3502 | 172 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
3503 | 173 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
3504 | 174 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
3505 | 175 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
3506 | 176 | } | ||
3507 | 177 | } | ||
3508 | 178 | return 1; | ||
3509 | 179 | } | ||
3510 | 180 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
3511 | 181 | CFLAGS="$ac_save_CFLAGS" | ||
3512 | 182 | LIBS="$ac_save_LIBS" | ||
3513 | 183 | fi | ||
3514 | 184 | fi | ||
3515 | 185 | if test "x$no_glib" = x ; then | ||
3516 | 186 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
3517 | 187 | ifelse([$2], , :, [$2]) | ||
3518 | 188 | else | ||
3519 | 189 | AC_MSG_RESULT(no) | ||
3520 | 190 | if test "$PKG_CONFIG" = "no" ; then | ||
3521 | 191 | echo "*** A new enough version of pkg-config was not found." | ||
3522 | 192 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
3523 | 193 | else | ||
3524 | 194 | if test -f conf.glibtest ; then | ||
3525 | 195 | : | ||
3526 | 196 | else | ||
3527 | 197 | echo "*** Could not run GLIB test program, checking why..." | ||
3528 | 198 | ac_save_CFLAGS="$CFLAGS" | ||
3529 | 199 | ac_save_LIBS="$LIBS" | ||
3530 | 200 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3531 | 201 | LIBS="$LIBS $GLIB_LIBS" | ||
3532 | 202 | AC_TRY_LINK([ | ||
3533 | 203 | #include <glib.h> | ||
3534 | 204 | #include <stdio.h> | ||
3535 | 205 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
3536 | 206 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
3537 | 207 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
3538 | 208 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
3539 | 209 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
3540 | 210 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
3541 | 211 | echo "*** is required on your system" | ||
3542 | 212 | echo "***" | ||
3543 | 213 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
3544 | 214 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
3545 | 215 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
3546 | 216 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
3547 | 217 | CFLAGS="$ac_save_CFLAGS" | ||
3548 | 218 | LIBS="$ac_save_LIBS" | ||
3549 | 219 | fi | ||
3550 | 220 | fi | ||
3551 | 221 | GLIB_CFLAGS="" | ||
3552 | 222 | GLIB_LIBS="" | ||
3553 | 223 | GLIB_GENMARSHAL="" | ||
3554 | 224 | GOBJECT_QUERY="" | ||
3555 | 225 | GLIB_MKENUMS="" | ||
3556 | 226 | GLIB_COMPILE_RESOURCES="" | ||
3557 | 227 | ifelse([$3], , :, [$3]) | ||
3558 | 228 | fi | ||
3559 | 229 | AC_SUBST(GLIB_CFLAGS) | ||
3560 | 230 | AC_SUBST(GLIB_LIBS) | ||
3561 | 231 | AC_SUBST(GLIB_GENMARSHAL) | ||
3562 | 232 | AC_SUBST(GOBJECT_QUERY) | ||
3563 | 233 | AC_SUBST(GLIB_MKENUMS) | ||
3564 | 234 | AC_SUBST(GLIB_COMPILE_RESOURCES) | ||
3565 | 235 | rm -f conf.glibtest | ||
3566 | 236 | ]) | ||
3567 | 25 | 237 | ||
3568 | 238 | dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
3569 | 239 | dnl serial 11 (pkg-config-0.29.1) | ||
3570 | 240 | dnl | ||
3571 | 26 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 241 | dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
3572 | 27 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | 242 | dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> |
3573 | 28 | dnl | 243 | dnl |
3574 | @@ -296,290 +511,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) | |||
3575 | 296 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | 511 | AS_VAR_IF([$1], [""], [$5], [$4])dnl |
3576 | 297 | ])dnl PKG_CHECK_VAR | 512 | ])dnl PKG_CHECK_VAR |
3577 | 298 | 513 | ||
3862 | 299 | dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | 514 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. |
3579 | 300 | dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||
3580 | 301 | dnl [DESCRIPTION], [DEFAULT]) | ||
3581 | 302 | dnl ------------------------------------------ | ||
3582 | 303 | dnl | ||
3583 | 304 | dnl Prepare a "--with-" configure option using the lowercase | ||
3584 | 305 | dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||
3585 | 306 | dnl PKG_CHECK_MODULES in a single macro. | ||
3586 | 307 | AC_DEFUN([PKG_WITH_MODULES], | ||
3587 | 308 | [ | ||
3588 | 309 | m4_pushdef([with_arg], m4_tolower([$1])) | ||
3589 | 310 | |||
3590 | 311 | m4_pushdef([description], | ||
3591 | 312 | [m4_default([$5], [build with ]with_arg[ support])]) | ||
3592 | 313 | |||
3593 | 314 | m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||
3594 | 315 | m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||
3595 | 316 | m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||
3596 | 317 | |||
3597 | 318 | m4_case(def_arg, | ||
3598 | 319 | [yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||
3599 | 320 | [m4_pushdef([with_without],[--with-]with_arg)]) | ||
3600 | 321 | |||
3601 | 322 | AC_ARG_WITH(with_arg, | ||
3602 | 323 | AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||
3603 | 324 | [AS_TR_SH([with_]with_arg)=def_arg]) | ||
3604 | 325 | |||
3605 | 326 | AS_CASE([$AS_TR_SH([with_]with_arg)], | ||
3606 | 327 | [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||
3607 | 328 | [auto],[PKG_CHECK_MODULES([$1],[$2], | ||
3608 | 329 | [m4_n([def_action_if_found]) $3], | ||
3609 | 330 | [m4_n([def_action_if_not_found]) $4])]) | ||
3610 | 331 | |||
3611 | 332 | m4_popdef([with_arg]) | ||
3612 | 333 | m4_popdef([description]) | ||
3613 | 334 | m4_popdef([def_arg]) | ||
3614 | 335 | |||
3615 | 336 | ])dnl PKG_WITH_MODULES | ||
3616 | 337 | |||
3617 | 338 | dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
3618 | 339 | dnl [DESCRIPTION], [DEFAULT]) | ||
3619 | 340 | dnl ----------------------------------------------- | ||
3620 | 341 | dnl | ||
3621 | 342 | dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||
3622 | 343 | dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||
3623 | 344 | AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||
3624 | 345 | [ | ||
3625 | 346 | PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||
3626 | 347 | |||
3627 | 348 | AM_CONDITIONAL([HAVE_][$1], | ||
3628 | 349 | [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||
3629 | 350 | ])dnl PKG_HAVE_WITH_MODULES | ||
3630 | 351 | |||
3631 | 352 | dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
3632 | 353 | dnl [DESCRIPTION], [DEFAULT]) | ||
3633 | 354 | dnl ------------------------------------------------------ | ||
3634 | 355 | dnl | ||
3635 | 356 | dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||
3636 | 357 | dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||
3637 | 358 | dnl and preprocessor variable. | ||
3638 | 359 | AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||
3639 | 360 | [ | ||
3640 | 361 | PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||
3641 | 362 | |||
3642 | 363 | AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||
3643 | 364 | [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||
3644 | 365 | ])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||
3645 | 366 | |||
3646 | 367 | # Configure paths for GLIB | ||
3647 | 368 | # Owen Taylor 1997-2001 | ||
3648 | 369 | |||
3649 | 370 | # Increment this whenever this file is changed. | ||
3650 | 371 | #serial 1 | ||
3651 | 372 | |||
3652 | 373 | dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) | ||
3653 | 374 | dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, | ||
3654 | 375 | dnl gthread, or gio is specified in MODULES, pass to pkg-config | ||
3655 | 376 | dnl | ||
3656 | 377 | AC_DEFUN([AM_PATH_GLIB_2_0], | ||
3657 | 378 | [dnl | ||
3658 | 379 | dnl Get the cflags and libraries from pkg-config | ||
3659 | 380 | dnl | ||
3660 | 381 | AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], | ||
3661 | 382 | , enable_glibtest=yes) | ||
3662 | 383 | |||
3663 | 384 | pkg_config_args=glib-2.0 | ||
3664 | 385 | for module in . $4 | ||
3665 | 386 | do | ||
3666 | 387 | case "$module" in | ||
3667 | 388 | gmodule) | ||
3668 | 389 | pkg_config_args="$pkg_config_args gmodule-2.0" | ||
3669 | 390 | ;; | ||
3670 | 391 | gmodule-no-export) | ||
3671 | 392 | pkg_config_args="$pkg_config_args gmodule-no-export-2.0" | ||
3672 | 393 | ;; | ||
3673 | 394 | gobject) | ||
3674 | 395 | pkg_config_args="$pkg_config_args gobject-2.0" | ||
3675 | 396 | ;; | ||
3676 | 397 | gthread) | ||
3677 | 398 | pkg_config_args="$pkg_config_args gthread-2.0" | ||
3678 | 399 | ;; | ||
3679 | 400 | gio*) | ||
3680 | 401 | pkg_config_args="$pkg_config_args $module-2.0" | ||
3681 | 402 | ;; | ||
3682 | 403 | esac | ||
3683 | 404 | done | ||
3684 | 405 | |||
3685 | 406 | PKG_PROG_PKG_CONFIG([0.16]) | ||
3686 | 407 | |||
3687 | 408 | no_glib="" | ||
3688 | 409 | |||
3689 | 410 | if test "x$PKG_CONFIG" = x ; then | ||
3690 | 411 | no_glib=yes | ||
3691 | 412 | PKG_CONFIG=no | ||
3692 | 413 | fi | ||
3693 | 414 | |||
3694 | 415 | min_glib_version=ifelse([$1], ,2.0.0,$1) | ||
3695 | 416 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | ||
3696 | 417 | |||
3697 | 418 | if test x$PKG_CONFIG != xno ; then | ||
3698 | 419 | ## don't try to run the test against uninstalled libtool libs | ||
3699 | 420 | if $PKG_CONFIG --uninstalled $pkg_config_args; then | ||
3700 | 421 | echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | ||
3701 | 422 | enable_glibtest=no | ||
3702 | 423 | fi | ||
3703 | 424 | |||
3704 | 425 | if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | ||
3705 | 426 | : | ||
3706 | 427 | else | ||
3707 | 428 | no_glib=yes | ||
3708 | 429 | fi | ||
3709 | 430 | fi | ||
3710 | 431 | |||
3711 | 432 | if test x"$no_glib" = x ; then | ||
3712 | 433 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | ||
3713 | 434 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | ||
3714 | 435 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | ||
3715 | 436 | GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` | ||
3716 | 437 | |||
3717 | 438 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | ||
3718 | 439 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | ||
3719 | 440 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3720 | 441 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
3721 | 442 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3722 | 443 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
3723 | 444 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | ||
3724 | 445 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
3725 | 446 | if test "x$enable_glibtest" = "xyes" ; then | ||
3726 | 447 | ac_save_CFLAGS="$CFLAGS" | ||
3727 | 448 | ac_save_LIBS="$LIBS" | ||
3728 | 449 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3729 | 450 | LIBS="$GLIB_LIBS $LIBS" | ||
3730 | 451 | dnl | ||
3731 | 452 | dnl Now check if the installed GLIB is sufficiently new. (Also sanity | ||
3732 | 453 | dnl checks the results of pkg-config to some extent) | ||
3733 | 454 | dnl | ||
3734 | 455 | rm -f conf.glibtest | ||
3735 | 456 | AC_TRY_RUN([ | ||
3736 | 457 | #include <glib.h> | ||
3737 | 458 | #include <stdio.h> | ||
3738 | 459 | #include <stdlib.h> | ||
3739 | 460 | |||
3740 | 461 | int | ||
3741 | 462 | main (void) | ||
3742 | 463 | { | ||
3743 | 464 | unsigned int major, minor, micro; | ||
3744 | 465 | |||
3745 | 466 | fclose (fopen ("conf.glibtest", "w")); | ||
3746 | 467 | |||
3747 | 468 | if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { | ||
3748 | 469 | printf("%s, bad version string\n", "$min_glib_version"); | ||
3749 | 470 | exit(1); | ||
3750 | 471 | } | ||
3751 | 472 | |||
3752 | 473 | if ((glib_major_version != $glib_config_major_version) || | ||
3753 | 474 | (glib_minor_version != $glib_config_minor_version) || | ||
3754 | 475 | (glib_micro_version != $glib_config_micro_version)) | ||
3755 | 476 | { | ||
3756 | 477 | printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", | ||
3757 | 478 | $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, | ||
3758 | 479 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3759 | 480 | printf ("*** was found! If pkg-config was correct, then it is best\n"); | ||
3760 | 481 | printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); | ||
3761 | 482 | printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); | ||
3762 | 483 | printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); | ||
3763 | 484 | printf("*** required on your system.\n"); | ||
3764 | 485 | printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); | ||
3765 | 486 | printf("*** to point to the correct configuration files\n"); | ||
3766 | 487 | } | ||
3767 | 488 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || | ||
3768 | 489 | (glib_minor_version != GLIB_MINOR_VERSION) || | ||
3769 | 490 | (glib_micro_version != GLIB_MICRO_VERSION)) | ||
3770 | 491 | { | ||
3771 | 492 | printf("*** GLIB header files (version %d.%d.%d) do not match\n", | ||
3772 | 493 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | ||
3773 | 494 | printf("*** library (version %d.%d.%d)\n", | ||
3774 | 495 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3775 | 496 | } | ||
3776 | 497 | else | ||
3777 | 498 | { | ||
3778 | 499 | if ((glib_major_version > major) || | ||
3779 | 500 | ((glib_major_version == major) && (glib_minor_version > minor)) || | ||
3780 | 501 | ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) | ||
3781 | 502 | { | ||
3782 | 503 | return 0; | ||
3783 | 504 | } | ||
3784 | 505 | else | ||
3785 | 506 | { | ||
3786 | 507 | printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", | ||
3787 | 508 | glib_major_version, glib_minor_version, glib_micro_version); | ||
3788 | 509 | printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", | ||
3789 | 510 | major, minor, micro); | ||
3790 | 511 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | ||
3791 | 512 | printf("***\n"); | ||
3792 | 513 | printf("*** If you have already installed a sufficiently new version, this error\n"); | ||
3793 | 514 | printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); | ||
3794 | 515 | printf("*** being found. The easiest way to fix this is to remove the old version\n"); | ||
3795 | 516 | printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); | ||
3796 | 517 | printf("*** correct copy of pkg-config. (In this case, you will have to\n"); | ||
3797 | 518 | printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); | ||
3798 | 519 | printf("*** so that the correct libraries are found at run-time))\n"); | ||
3799 | 520 | } | ||
3800 | 521 | } | ||
3801 | 522 | return 1; | ||
3802 | 523 | } | ||
3803 | 524 | ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
3804 | 525 | CFLAGS="$ac_save_CFLAGS" | ||
3805 | 526 | LIBS="$ac_save_LIBS" | ||
3806 | 527 | fi | ||
3807 | 528 | fi | ||
3808 | 529 | if test "x$no_glib" = x ; then | ||
3809 | 530 | AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) | ||
3810 | 531 | ifelse([$2], , :, [$2]) | ||
3811 | 532 | else | ||
3812 | 533 | AC_MSG_RESULT(no) | ||
3813 | 534 | if test "$PKG_CONFIG" = "no" ; then | ||
3814 | 535 | echo "*** A new enough version of pkg-config was not found." | ||
3815 | 536 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" | ||
3816 | 537 | else | ||
3817 | 538 | if test -f conf.glibtest ; then | ||
3818 | 539 | : | ||
3819 | 540 | else | ||
3820 | 541 | echo "*** Could not run GLIB test program, checking why..." | ||
3821 | 542 | ac_save_CFLAGS="$CFLAGS" | ||
3822 | 543 | ac_save_LIBS="$LIBS" | ||
3823 | 544 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
3824 | 545 | LIBS="$LIBS $GLIB_LIBS" | ||
3825 | 546 | AC_TRY_LINK([ | ||
3826 | 547 | #include <glib.h> | ||
3827 | 548 | #include <stdio.h> | ||
3828 | 549 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], | ||
3829 | 550 | [ echo "*** The test program compiled, but did not run. This usually means" | ||
3830 | 551 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
3831 | 552 | echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" | ||
3832 | 553 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
3833 | 554 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
3834 | 555 | echo "*** is required on your system" | ||
3835 | 556 | echo "***" | ||
3836 | 557 | echo "*** If you have an old version installed, it is best to remove it, although" | ||
3837 | 558 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], | ||
3838 | 559 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
3839 | 560 | echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) | ||
3840 | 561 | CFLAGS="$ac_save_CFLAGS" | ||
3841 | 562 | LIBS="$ac_save_LIBS" | ||
3842 | 563 | fi | ||
3843 | 564 | fi | ||
3844 | 565 | GLIB_CFLAGS="" | ||
3845 | 566 | GLIB_LIBS="" | ||
3846 | 567 | GLIB_GENMARSHAL="" | ||
3847 | 568 | GOBJECT_QUERY="" | ||
3848 | 569 | GLIB_MKENUMS="" | ||
3849 | 570 | GLIB_COMPILE_RESOURCES="" | ||
3850 | 571 | ifelse([$3], , :, [$3]) | ||
3851 | 572 | fi | ||
3852 | 573 | AC_SUBST(GLIB_CFLAGS) | ||
3853 | 574 | AC_SUBST(GLIB_LIBS) | ||
3854 | 575 | AC_SUBST(GLIB_GENMARSHAL) | ||
3855 | 576 | AC_SUBST(GOBJECT_QUERY) | ||
3856 | 577 | AC_SUBST(GLIB_MKENUMS) | ||
3857 | 578 | AC_SUBST(GLIB_COMPILE_RESOURCES) | ||
3858 | 579 | rm -f conf.glibtest | ||
3859 | 580 | ]) | ||
3860 | 581 | |||
3861 | 582 | # Copyright (C) 2002-2017 Free Software Foundation, Inc. | ||
3863 | 583 | # | 515 | # |
3864 | 584 | # This file is free software; the Free Software Foundation | 516 | # This file is free software; the Free Software Foundation |
3865 | 585 | # gives unlimited permission to copy and/or distribute it, | 517 | # gives unlimited permission to copy and/or distribute it, |
3866 | @@ -591,10 +523,10 @@ main (void) | |||
3867 | 591 | # generated from the m4 files accompanying Automake X.Y. | 523 | # generated from the m4 files accompanying Automake X.Y. |
3868 | 592 | # (This private macro should not be called outside this file.) | 524 | # (This private macro should not be called outside this file.) |
3869 | 593 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 525 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
3871 | 594 | [am__api_version='1.15' | 526 | [am__api_version='1.16' |
3872 | 595 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 527 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
3873 | 596 | dnl require some minimum version. Point them to the right macro. | 528 | dnl require some minimum version. Point them to the right macro. |
3875 | 597 | m4_if([$1], [1.15.1], [], | 529 | m4_if([$1], [1.16.1], [], |
3876 | 598 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 530 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
3877 | 599 | ]) | 531 | ]) |
3878 | 600 | 532 | ||
3879 | @@ -610,14 +542,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) | |||
3880 | 610 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 542 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
3881 | 611 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 543 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
3882 | 612 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 544 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
3884 | 613 | [AM_AUTOMAKE_VERSION([1.15.1])dnl | 545 | [AM_AUTOMAKE_VERSION([1.16.1])dnl |
3885 | 614 | m4_ifndef([AC_AUTOCONF_VERSION], | 546 | m4_ifndef([AC_AUTOCONF_VERSION], |
3886 | 615 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 547 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
3887 | 616 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 548 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
3888 | 617 | 549 | ||
3889 | 618 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 550 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
3890 | 619 | 551 | ||
3892 | 620 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 552 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
3893 | 621 | # | 553 | # |
3894 | 622 | # This file is free software; the Free Software Foundation | 554 | # This file is free software; the Free Software Foundation |
3895 | 623 | # gives unlimited permission to copy and/or distribute it, | 555 | # gives unlimited permission to copy and/or distribute it, |
3896 | @@ -669,7 +601,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
3897 | 669 | 601 | ||
3898 | 670 | # AM_CONDITIONAL -*- Autoconf -*- | 602 | # AM_CONDITIONAL -*- Autoconf -*- |
3899 | 671 | 603 | ||
3901 | 672 | # Copyright (C) 1997-2017 Free Software Foundation, Inc. | 604 | # Copyright (C) 1997-2018 Free Software Foundation, Inc. |
3902 | 673 | # | 605 | # |
3903 | 674 | # This file is free software; the Free Software Foundation | 606 | # This file is free software; the Free Software Foundation |
3904 | 675 | # gives unlimited permission to copy and/or distribute it, | 607 | # gives unlimited permission to copy and/or distribute it, |
3905 | @@ -700,7 +632,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
3906 | 700 | Usually this means the macro was only invoked conditionally.]]) | 632 | Usually this means the macro was only invoked conditionally.]]) |
3907 | 701 | fi])]) | 633 | fi])]) |
3908 | 702 | 634 | ||
3910 | 703 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 635 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
3911 | 704 | # | 636 | # |
3912 | 705 | # This file is free software; the Free Software Foundation | 637 | # This file is free software; the Free Software Foundation |
3913 | 706 | # gives unlimited permission to copy and/or distribute it, | 638 | # gives unlimited permission to copy and/or distribute it, |
3914 | @@ -891,13 +823,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl | |||
3915 | 891 | 823 | ||
3916 | 892 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 824 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
3917 | 893 | 825 | ||
3919 | 894 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 826 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
3920 | 895 | # | 827 | # |
3921 | 896 | # This file is free software; the Free Software Foundation | 828 | # This file is free software; the Free Software Foundation |
3922 | 897 | # gives unlimited permission to copy and/or distribute it, | 829 | # gives unlimited permission to copy and/or distribute it, |
3923 | 898 | # with or without modifications, as long as this notice is preserved. | 830 | # with or without modifications, as long as this notice is preserved. |
3924 | 899 | 831 | ||
3925 | 900 | |||
3926 | 901 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 832 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
3927 | 902 | # ------------------------------ | 833 | # ------------------------------ |
3928 | 903 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 834 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
3929 | @@ -905,49 +836,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
3930 | 905 | # Older Autoconf quotes --file arguments for eval, but not when files | 836 | # Older Autoconf quotes --file arguments for eval, but not when files |
3931 | 906 | # are listed without --file. Let's play safe and only enable the eval | 837 | # are listed without --file. Let's play safe and only enable the eval |
3932 | 907 | # if we detect the quoting. | 838 | # if we detect the quoting. |
3937 | 908 | case $CONFIG_FILES in | 839 | # TODO: see whether this extra hack can be removed once we start |
3938 | 909 | *\'*) eval set x "$CONFIG_FILES" ;; | 840 | # requiring Autoconf 2.70 or later. |
3939 | 910 | *) set x $CONFIG_FILES ;; | 841 | AS_CASE([$CONFIG_FILES], |
3940 | 911 | esac | 842 | [*\'*], [eval set x "$CONFIG_FILES"], |
3941 | 843 | [*], [set x $CONFIG_FILES]) | ||
3942 | 912 | shift | 844 | shift |
3944 | 913 | for mf | 845 | # Used to flag and report bootstrapping failures. |
3945 | 846 | am_rc=0 | ||
3946 | 847 | for am_mf | ||
3947 | 914 | do | 848 | do |
3948 | 915 | # Strip MF so we end up with the name of the file. | 849 | # Strip MF so we end up with the name of the file. |
3956 | 916 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 850 | am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` |
3957 | 917 | # Check whether this is an Automake generated Makefile or not. | 851 | # Check whether this is an Automake generated Makefile which includes |
3958 | 918 | # We used to match only the files named 'Makefile.in', but | 852 | # dependency-tracking related rules and includes. |
3959 | 919 | # some people rename them; so instead we look at the file content. | 853 | # Grep'ing the whole file directly is not great: AIX grep has a line |
3953 | 920 | # Grep'ing the first line is not enough: some people post-process | ||
3954 | 921 | # each Makefile.in and add a new line on top of each file to say so. | ||
3955 | 922 | # Grep'ing the whole file is not good either: AIX grep has a line | ||
3960 | 923 | # limit of 2048, but all sed's we know have understand at least 4000. | 854 | # limit of 2048, but all sed's we know have understand at least 4000. |
3987 | 924 | if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | 855 | sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ |
3988 | 925 | dirpart=`AS_DIRNAME("$mf")` | 856 | || continue |
3989 | 926 | else | 857 | am_dirpart=`AS_DIRNAME(["$am_mf"])` |
3990 | 927 | continue | 858 | am_filepart=`AS_BASENAME(["$am_mf"])` |
3991 | 928 | fi | 859 | AM_RUN_LOG([cd "$am_dirpart" \ |
3992 | 929 | # Extract the definition of DEPDIR, am__include, and am__quote | 860 | && sed -e '/# am--include-marker/d' "$am_filepart" \ |
3993 | 930 | # from the Makefile without running 'make'. | 861 | | $MAKE -f - am--depfiles]) || am_rc=$? |
3968 | 931 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | ||
3969 | 932 | test -z "$DEPDIR" && continue | ||
3970 | 933 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
3971 | 934 | test -z "$am__include" && continue | ||
3972 | 935 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
3973 | 936 | # Find all dependency output files, they are included files with | ||
3974 | 937 | # $(DEPDIR) in their names. We invoke sed twice because it is the | ||
3975 | 938 | # simplest approach to changing $(DEPDIR) to its actual value in the | ||
3976 | 939 | # expansion. | ||
3977 | 940 | for file in `sed -n " | ||
3978 | 941 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
3979 | 942 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | ||
3980 | 943 | # Make sure the directory exists. | ||
3981 | 944 | test -f "$dirpart/$file" && continue | ||
3982 | 945 | fdir=`AS_DIRNAME(["$file"])` | ||
3983 | 946 | AS_MKDIR_P([$dirpart/$fdir]) | ||
3984 | 947 | # echo "creating $dirpart/$file" | ||
3985 | 948 | echo '# dummy' > "$dirpart/$file" | ||
3986 | 949 | done | ||
3994 | 950 | done | 862 | done |
3995 | 863 | if test $am_rc -ne 0; then | ||
3996 | 864 | AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments | ||
3997 | 865 | for automatic dependency tracking. Try re-running configure with the | ||
3998 | 866 | '--disable-dependency-tracking' option to at least be able to build | ||
3999 | 867 | the package (albeit without support for automatic dependency tracking).]) | ||
4000 | 868 | fi | ||
4001 | 869 | AS_UNSET([am_dirpart]) | ||
4002 | 870 | AS_UNSET([am_filepart]) | ||
4003 | 871 | AS_UNSET([am_mf]) | ||
4004 | 872 | AS_UNSET([am_rc]) | ||
4005 | 873 | rm -f conftest-deps.mk | ||
4006 | 951 | } | 874 | } |
4007 | 952 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | 875 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
4008 | 953 | 876 | ||
4009 | @@ -956,18 +879,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
4010 | 956 | # ----------------------------- | 879 | # ----------------------------- |
4011 | 957 | # This macro should only be invoked once -- use via AC_REQUIRE. | 880 | # This macro should only be invoked once -- use via AC_REQUIRE. |
4012 | 958 | # | 881 | # |
4016 | 959 | # This code is only required when automatic dependency tracking | 882 | # This code is only required when automatic dependency tracking is enabled. |
4017 | 960 | # is enabled. FIXME. This creates each '.P' file that we will | 883 | # This creates each '.Po' and '.Plo' makefile fragment that we'll need in |
4018 | 961 | # need in order to bootstrap the dependency handling code. | 884 | # order to bootstrap the dependency handling code. |
4019 | 962 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | 885 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
4020 | 963 | [AC_CONFIG_COMMANDS([depfiles], | 886 | [AC_CONFIG_COMMANDS([depfiles], |
4021 | 964 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], | 887 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
4024 | 965 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | 888 | [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) |
4023 | 966 | ]) | ||
4025 | 967 | 889 | ||
4026 | 968 | # Do all the work for Automake. -*- Autoconf -*- | 890 | # Do all the work for Automake. -*- Autoconf -*- |
4027 | 969 | 891 | ||
4029 | 970 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 892 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
4030 | 971 | # | 893 | # |
4031 | 972 | # This file is free software; the Free Software Foundation | 894 | # This file is free software; the Free Software Foundation |
4032 | 973 | # gives unlimited permission to copy and/or distribute it, | 895 | # gives unlimited permission to copy and/or distribute it, |
4033 | @@ -1054,8 +976,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | |||
4034 | 1054 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | 976 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
4035 | 1055 | # For better backward compatibility. To be removed once Automake 1.9.x | 977 | # For better backward compatibility. To be removed once Automake 1.9.x |
4036 | 1056 | # dies out for good. For more background, see: | 978 | # dies out for good. For more background, see: |
4039 | 1057 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | 979 | # <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
4040 | 1058 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | 980 | # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
4041 | 1059 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | 981 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
4042 | 1060 | # We need awk for the "check" target (and possibly the TAP driver). The | 982 | # We need awk for the "check" target (and possibly the TAP driver). The |
4043 | 1061 | # system "awk" is bad on some platforms. | 983 | # system "awk" is bad on some platforms. |
4044 | @@ -1122,7 +1044,7 @@ END | |||
4045 | 1122 | Aborting the configuration process, to ensure you take notice of the issue. | 1044 | Aborting the configuration process, to ensure you take notice of the issue. |
4046 | 1123 | 1045 | ||
4047 | 1124 | You can download and install GNU coreutils to get an 'rm' implementation | 1046 | You can download and install GNU coreutils to get an 'rm' implementation |
4049 | 1125 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | 1047 | that behaves properly: <https://www.gnu.org/software/coreutils/>. |
4050 | 1126 | 1048 | ||
4051 | 1127 | If you want to complete the configuration process using your problematic | 1049 | If you want to complete the configuration process using your problematic |
4052 | 1128 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | 1050 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
4053 | @@ -1164,7 +1086,7 @@ for _am_header in $config_headers :; do | |||
4054 | 1164 | done | 1086 | done |
4055 | 1165 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 1087 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
4056 | 1166 | 1088 | ||
4058 | 1167 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1089 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
4059 | 1168 | # | 1090 | # |
4060 | 1169 | # This file is free software; the Free Software Foundation | 1091 | # This file is free software; the Free Software Foundation |
4061 | 1170 | # gives unlimited permission to copy and/or distribute it, | 1092 | # gives unlimited permission to copy and/or distribute it, |
4062 | @@ -1185,7 +1107,7 @@ if test x"${install_sh+set}" != xset; then | |||
4063 | 1185 | fi | 1107 | fi |
4064 | 1186 | AC_SUBST([install_sh])]) | 1108 | AC_SUBST([install_sh])]) |
4065 | 1187 | 1109 | ||
4067 | 1188 | # Copyright (C) 2003-2017 Free Software Foundation, Inc. | 1110 | # Copyright (C) 2003-2018 Free Software Foundation, Inc. |
4068 | 1189 | # | 1111 | # |
4069 | 1190 | # This file is free software; the Free Software Foundation | 1112 | # This file is free software; the Free Software Foundation |
4070 | 1191 | # gives unlimited permission to copy and/or distribute it, | 1113 | # gives unlimited permission to copy and/or distribute it, |
4071 | @@ -1206,7 +1128,7 @@ AC_SUBST([am__leading_dot])]) | |||
4072 | 1206 | 1128 | ||
4073 | 1207 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 1129 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
4074 | 1208 | 1130 | ||
4076 | 1209 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1131 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
4077 | 1210 | # | 1132 | # |
4078 | 1211 | # This file is free software; the Free Software Foundation | 1133 | # This file is free software; the Free Software Foundation |
4079 | 1212 | # gives unlimited permission to copy and/or distribute it, | 1134 | # gives unlimited permission to copy and/or distribute it, |
4080 | @@ -1214,49 +1136,42 @@ AC_SUBST([am__leading_dot])]) | |||
4081 | 1214 | 1136 | ||
4082 | 1215 | # AM_MAKE_INCLUDE() | 1137 | # AM_MAKE_INCLUDE() |
4083 | 1216 | # ----------------- | 1138 | # ----------------- |
4085 | 1217 | # Check to see how make treats includes. | 1139 | # Check whether make has an 'include' directive that can support all |
4086 | 1140 | # the idioms we need for our automatic dependency tracking code. | ||
4087 | 1218 | AC_DEFUN([AM_MAKE_INCLUDE], | 1141 | AC_DEFUN([AM_MAKE_INCLUDE], |
4090 | 1219 | [am_make=${MAKE-make} | 1142 | [AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) |
4091 | 1220 | cat > confinc << 'END' | 1143 | cat > confinc.mk << 'END' |
4092 | 1221 | am__doit: | 1144 | am__doit: |
4094 | 1222 | @echo this is the am__doit target | 1145 | @echo this is the am__doit target >confinc.out |
4095 | 1223 | .PHONY: am__doit | 1146 | .PHONY: am__doit |
4096 | 1224 | END | 1147 | END |
4097 | 1225 | # If we don't find an include directive, just comment out the code. | ||
4098 | 1226 | AC_MSG_CHECKING([for style of include used by $am_make]) | ||
4099 | 1227 | am__include="#" | 1148 | am__include="#" |
4100 | 1228 | am__quote= | 1149 | am__quote= |
4128 | 1229 | _am_result=none | 1150 | # BSD make does it like this. |
4129 | 1230 | # First try GNU make style include. | 1151 | echo '.include "confinc.mk" # ignored' > confmf.BSD |
4130 | 1231 | echo "include confinc" > confmf | 1152 | # Other make implementations (GNU, Solaris 10, AIX) do it like this. |
4131 | 1232 | # Ignore all kinds of additional output from 'make'. | 1153 | echo 'include confinc.mk # ignored' > confmf.GNU |
4132 | 1233 | case `$am_make -s -f confmf 2> /dev/null` in #( | 1154 | _am_result=no |
4133 | 1234 | *the\ am__doit\ target*) | 1155 | for s in GNU BSD; do |
4134 | 1235 | am__include=include | 1156 | AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) |
4135 | 1236 | am__quote= | 1157 | AS_CASE([$?:`cat confinc.out 2>/dev/null`], |
4136 | 1237 | _am_result=GNU | 1158 | ['0:this is the am__doit target'], |
4137 | 1238 | ;; | 1159 | [AS_CASE([$s], |
4138 | 1239 | esac | 1160 | [BSD], [am__include='.include' am__quote='"'], |
4139 | 1240 | # Now try BSD make style include. | 1161 | [am__include='include' am__quote=''])]) |
4140 | 1241 | if test "$am__include" = "#"; then | 1162 | if test "$am__include" != "#"; then |
4141 | 1242 | echo '.include "confinc"' > confmf | 1163 | _am_result="yes ($s style)" |
4142 | 1243 | case `$am_make -s -f confmf 2> /dev/null` in #( | 1164 | break |
4143 | 1244 | *the\ am__doit\ target*) | 1165 | fi |
4144 | 1245 | am__include=.include | 1166 | done |
4145 | 1246 | am__quote="\"" | 1167 | rm -f confinc.* confmf.* |
4146 | 1247 | _am_result=BSD | 1168 | AC_MSG_RESULT([${_am_result}]) |
4147 | 1248 | ;; | 1169 | AC_SUBST([am__include])]) |
4148 | 1249 | esac | 1170 | AC_SUBST([am__quote])]) |
4122 | 1250 | fi | ||
4123 | 1251 | AC_SUBST([am__include]) | ||
4124 | 1252 | AC_SUBST([am__quote]) | ||
4125 | 1253 | AC_MSG_RESULT([$_am_result]) | ||
4126 | 1254 | rm -f confinc confmf | ||
4127 | 1255 | ]) | ||
4149 | 1256 | 1171 | ||
4150 | 1257 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 1172 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
4151 | 1258 | 1173 | ||
4153 | 1259 | # Copyright (C) 1997-2017 Free Software Foundation, Inc. | 1174 | # Copyright (C) 1997-2018 Free Software Foundation, Inc. |
4154 | 1260 | # | 1175 | # |
4155 | 1261 | # This file is free software; the Free Software Foundation | 1176 | # This file is free software; the Free Software Foundation |
4156 | 1262 | # gives unlimited permission to copy and/or distribute it, | 1177 | # gives unlimited permission to copy and/or distribute it, |
4157 | @@ -1295,7 +1210,7 @@ fi | |||
4158 | 1295 | 1210 | ||
4159 | 1296 | # Helper functions for option handling. -*- Autoconf -*- | 1211 | # Helper functions for option handling. -*- Autoconf -*- |
4160 | 1297 | 1212 | ||
4162 | 1298 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1213 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
4163 | 1299 | # | 1214 | # |
4164 | 1300 | # This file is free software; the Free Software Foundation | 1215 | # This file is free software; the Free Software Foundation |
4165 | 1301 | # gives unlimited permission to copy and/or distribute it, | 1216 | # gives unlimited permission to copy and/or distribute it, |
4166 | @@ -1324,7 +1239,7 @@ AC_DEFUN([_AM_SET_OPTIONS], | |||
4167 | 1324 | AC_DEFUN([_AM_IF_OPTION], | 1239 | AC_DEFUN([_AM_IF_OPTION], |
4168 | 1325 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | 1240 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
4169 | 1326 | 1241 | ||
4171 | 1327 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 1242 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
4172 | 1328 | # | 1243 | # |
4173 | 1329 | # This file is free software; the Free Software Foundation | 1244 | # This file is free software; the Free Software Foundation |
4174 | 1330 | # gives unlimited permission to copy and/or distribute it, | 1245 | # gives unlimited permission to copy and/or distribute it, |
4175 | @@ -1371,7 +1286,7 @@ AC_LANG_POP([C])]) | |||
4176 | 1371 | # For backward compatibility. | 1286 | # For backward compatibility. |
4177 | 1372 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | 1287 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
4178 | 1373 | 1288 | ||
4180 | 1374 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1289 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
4181 | 1375 | # | 1290 | # |
4182 | 1376 | # This file is free software; the Free Software Foundation | 1291 | # This file is free software; the Free Software Foundation |
4183 | 1377 | # gives unlimited permission to copy and/or distribute it, | 1292 | # gives unlimited permission to copy and/or distribute it, |
4184 | @@ -1390,7 +1305,7 @@ AC_DEFUN([AM_RUN_LOG], | |||
4185 | 1390 | 1305 | ||
4186 | 1391 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 1306 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
4187 | 1392 | 1307 | ||
4189 | 1393 | # Copyright (C) 1996-2017 Free Software Foundation, Inc. | 1308 | # Copyright (C) 1996-2018 Free Software Foundation, Inc. |
4190 | 1394 | # | 1309 | # |
4191 | 1395 | # This file is free software; the Free Software Foundation | 1310 | # This file is free software; the Free Software Foundation |
4192 | 1396 | # gives unlimited permission to copy and/or distribute it, | 1311 | # gives unlimited permission to copy and/or distribute it, |
4193 | @@ -1471,7 +1386,7 @@ AC_CONFIG_COMMANDS_PRE( | |||
4194 | 1471 | rm -f conftest.file | 1386 | rm -f conftest.file |
4195 | 1472 | ]) | 1387 | ]) |
4196 | 1473 | 1388 | ||
4198 | 1474 | # Copyright (C) 2009-2017 Free Software Foundation, Inc. | 1389 | # Copyright (C) 2009-2018 Free Software Foundation, Inc. |
4199 | 1475 | # | 1390 | # |
4200 | 1476 | # This file is free software; the Free Software Foundation | 1391 | # This file is free software; the Free Software Foundation |
4201 | 1477 | # gives unlimited permission to copy and/or distribute it, | 1392 | # gives unlimited permission to copy and/or distribute it, |
4202 | @@ -1531,7 +1446,7 @@ AC_SUBST([AM_BACKSLASH])dnl | |||
4203 | 1531 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | 1446 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
4204 | 1532 | ]) | 1447 | ]) |
4205 | 1533 | 1448 | ||
4207 | 1534 | # Copyright (C) 2001-2017 Free Software Foundation, Inc. | 1449 | # Copyright (C) 2001-2018 Free Software Foundation, Inc. |
4208 | 1535 | # | 1450 | # |
4209 | 1536 | # This file is free software; the Free Software Foundation | 1451 | # This file is free software; the Free Software Foundation |
4210 | 1537 | # gives unlimited permission to copy and/or distribute it, | 1452 | # gives unlimited permission to copy and/or distribute it, |
4211 | @@ -1559,7 +1474,7 @@ fi | |||
4212 | 1559 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 1474 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
4213 | 1560 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 1475 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
4214 | 1561 | 1476 | ||
4216 | 1562 | # Copyright (C) 2006-2017 Free Software Foundation, Inc. | 1477 | # Copyright (C) 2006-2018 Free Software Foundation, Inc. |
4217 | 1563 | # | 1478 | # |
4218 | 1564 | # This file is free software; the Free Software Foundation | 1479 | # This file is free software; the Free Software Foundation |
4219 | 1565 | # gives unlimited permission to copy and/or distribute it, | 1480 | # gives unlimited permission to copy and/or distribute it, |
4220 | @@ -1578,7 +1493,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |||
4221 | 1578 | 1493 | ||
4222 | 1579 | # Check how to create a tarball. -*- Autoconf -*- | 1494 | # Check how to create a tarball. -*- Autoconf -*- |
4223 | 1580 | 1495 | ||
4225 | 1581 | # Copyright (C) 2004-2017 Free Software Foundation, Inc. | 1496 | # Copyright (C) 2004-2018 Free Software Foundation, Inc. |
4226 | 1582 | # | 1497 | # |
4227 | 1583 | # This file is free software; the Free Software Foundation | 1498 | # This file is free software; the Free Software Foundation |
4228 | 1584 | # gives unlimited permission to copy and/or distribute it, | 1499 | # gives unlimited permission to copy and/or distribute it, |
4229 | diff --git a/clutter/build/Makefile.in b/clutter/build/Makefile.in | |||
4230 | index d7be1ec..7fbab51 100644 | |||
4231 | --- a/clutter/build/Makefile.in | |||
4232 | +++ b/clutter/build/Makefile.in | |||
4233 | @@ -1,7 +1,7 @@ | |||
4235 | 1 | # Makefile.in generated by automake 1.15.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.16.1 from Makefile.am. |
4236 | 2 | # @configure_input@ | 2 | # @configure_input@ |
4237 | 3 | 3 | ||
4239 | 4 | # Copyright (C) 1994-2017 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2018 Free Software Foundation, Inc. |
4240 | 5 | 5 | ||
4241 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
4242 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
4243 | @@ -140,7 +140,7 @@ am__recursive_targets = \ | |||
4244 | 140 | $(RECURSIVE_CLEAN_TARGETS) \ | 140 | $(RECURSIVE_CLEAN_TARGETS) \ |
4245 | 141 | $(am__extra_recursive_targets) | 141 | $(am__extra_recursive_targets) |
4246 | 142 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ | 142 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
4248 | 143 | distdir | 143 | distdir distdir-am |
4249 | 144 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | 144 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4250 | 145 | # Read a list of newline-separated strings from the standard input, | 145 | # Read a list of newline-separated strings from the standard input, |
4251 | 146 | # and print each of them once, without duplicates. Input order is | 146 | # and print each of them once, without duplicates. Input order is |
4252 | @@ -372,6 +372,7 @@ pdfdir = @pdfdir@ | |||
4253 | 372 | prefix = @prefix@ | 372 | prefix = @prefix@ |
4254 | 373 | program_transform_name = @program_transform_name@ | 373 | program_transform_name = @program_transform_name@ |
4255 | 374 | psdir = @psdir@ | 374 | psdir = @psdir@ |
4256 | 375 | runstatedir = @runstatedir@ | ||
4257 | 375 | sbindir = @sbindir@ | 376 | sbindir = @sbindir@ |
4258 | 376 | sharedstatedir = @sharedstatedir@ | 377 | sharedstatedir = @sharedstatedir@ |
4259 | 377 | srcdir = @srcdir@ | 378 | srcdir = @srcdir@ |
4260 | @@ -401,8 +402,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
4261 | 401 | *config.status*) \ | 402 | *config.status*) \ |
4262 | 402 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | 403 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
4263 | 403 | *) \ | 404 | *) \ |
4266 | 404 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | 405 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ |
4267 | 405 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | 406 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ |
4268 | 406 | esac; | 407 | esac; |
4269 | 407 | 408 | ||
4270 | 408 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 409 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
4271 | @@ -519,7 +520,10 @@ cscopelist-am: $(am__tagged_files) | |||
4272 | 519 | distclean-tags: | 520 | distclean-tags: |
4273 | 520 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 521 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
4274 | 521 | 522 | ||
4276 | 522 | distdir: $(DISTFILES) | 523 | distdir: $(BUILT_SOURCES) |
4277 | 524 | $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
4278 | 525 | |||
4279 | 526 | distdir-am: $(DISTFILES) | ||
4280 | 523 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 527 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4281 | 524 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 528 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4282 | 525 | list='$(DISTFILES)'; \ | 529 | list='$(DISTFILES)'; \ |
4283 | diff --git a/clutter/build/autotools/Makefile.in b/clutter/build/autotools/Makefile.in | |||
4284 | index 098b030..489ce7a 100644 | |||
4285 | --- a/clutter/build/autotools/Makefile.in | |||
4286 | +++ b/clutter/build/autotools/Makefile.in | |||
4287 | @@ -1,7 +1,7 @@ | |||
4289 | 1 | # Makefile.in generated by automake 1.15.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.16.1 from Makefile.am. |
4290 | 2 | # @configure_input@ | 2 | # @configure_input@ |
4291 | 3 | 3 | ||
4293 | 4 | # Copyright (C) 1994-2017 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2018 Free Software Foundation, Inc. |
4294 | 5 | 5 | ||
4295 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
4296 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
4297 | @@ -311,6 +311,7 @@ pdfdir = @pdfdir@ | |||
4298 | 311 | prefix = @prefix@ | 311 | prefix = @prefix@ |
4299 | 312 | program_transform_name = @program_transform_name@ | 312 | program_transform_name = @program_transform_name@ |
4300 | 313 | psdir = @psdir@ | 313 | psdir = @psdir@ |
4301 | 314 | runstatedir = @runstatedir@ | ||
4302 | 314 | sbindir = @sbindir@ | 315 | sbindir = @sbindir@ |
4303 | 315 | sharedstatedir = @sharedstatedir@ | 316 | sharedstatedir = @sharedstatedir@ |
4304 | 316 | srcdir = @srcdir@ | 317 | srcdir = @srcdir@ |
4305 | @@ -349,8 +350,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
4306 | 349 | *config.status*) \ | 350 | *config.status*) \ |
4307 | 350 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | 351 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
4308 | 351 | *) \ | 352 | *) \ |
4311 | 352 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | 353 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ |
4312 | 353 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | 354 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ |
4313 | 354 | esac; | 355 | esac; |
4314 | 355 | 356 | ||
4315 | 356 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 357 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
4316 | @@ -374,7 +375,10 @@ ctags CTAGS: | |||
4317 | 374 | cscope cscopelist: | 375 | cscope cscopelist: |
4318 | 375 | 376 | ||
4319 | 376 | 377 | ||
4321 | 377 | distdir: $(DISTFILES) | 378 | distdir: $(BUILT_SOURCES) |
4322 | 379 | $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
4323 | 380 | |||
4324 | 381 | distdir-am: $(DISTFILES) | ||
4325 | 378 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 382 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4326 | 379 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 383 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
4327 | 380 | list='$(DISTFILES)'; \ | 384 | list='$(DISTFILES)'; \ |
4328 | diff --git a/clutter/build/autotools/libtool.m4 b/clutter/build/autotools/libtool.m4 | |||
4329 | index 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 | 728 | cat <<_LT_EOF >> "$cfgfile" | 728 | cat <<_LT_EOF >> "$cfgfile" |
4334 | 729 | #! $SHELL | 729 | #! $SHELL |
4335 | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION | 730 | # Generated automatically by $as_me ($PACKAGE) $VERSION |
4336 | 731 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | ||
4337 | 732 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 731 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4338 | 733 | 732 | ||
4339 | 734 | # Provide generalized library-building support services. | 733 | # Provide generalized library-building support services. |
4340 | @@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4341 | 2867 | # before this can be enabled. | 2866 | # before this can be enabled. |
4342 | 2868 | hardcode_into_libs=yes | 2867 | hardcode_into_libs=yes |
4343 | 2869 | 2868 | ||
4344 | 2870 | # Add ABI-specific directories to the system library path. | ||
4345 | 2871 | sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" | ||
4346 | 2872 | |||
4347 | 2873 | # Ideally, we could use ldconfig to report *all* directores which are | 2869 | # Ideally, we could use ldconfig to report *all* directores which are |
4348 | 2874 | # searched for libraries, however this is still not possible. Aside from not | 2870 | # searched for libraries, however this is still not possible. Aside from not |
4349 | 2875 | # being certain /sbin/ldconfig is available, command | 2871 | # being certain /sbin/ldconfig is available, command |
4350 | @@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4351 | 2878 | # appending ld.so.conf contents (and includes) to the search path. | 2874 | # appending ld.so.conf contents (and includes) to the search path. |
4352 | 2879 | if test -f /etc/ld.so.conf; then | 2875 | if test -f /etc/ld.so.conf; then |
4353 | 2880 | 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' ' '` | 2876 | 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' ' '` |
4355 | 2881 | sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" | 2877 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4356 | 2882 | fi | 2878 | fi |
4357 | 2883 | 2879 | ||
4358 | 2884 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 2880 | # 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 | 2890 | dynamic_linker='GNU/Linux ld.so' | 2886 | dynamic_linker='GNU/Linux ld.so' |
4361 | 2891 | ;; | 2887 | ;; |
4362 | 2892 | 2888 | ||
4363 | 2889 | netbsdelf*-gnu) | ||
4364 | 2890 | version_type=linux | ||
4365 | 2891 | need_lib_prefix=no | ||
4366 | 2892 | need_version=no | ||
4367 | 2893 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
4368 | 2894 | soname_spec='${libname}${release}${shared_ext}$major' | ||
4369 | 2895 | shlibpath_var=LD_LIBRARY_PATH | ||
4370 | 2896 | shlibpath_overrides_runpath=no | ||
4371 | 2897 | hardcode_into_libs=yes | ||
4372 | 2898 | dynamic_linker='NetBSD ld.elf_so' | ||
4373 | 2899 | ;; | ||
4374 | 2900 | |||
4375 | 2893 | netbsd*) | 2901 | netbsd*) |
4376 | 2894 | version_type=sunos | 2902 | version_type=sunos |
4377 | 2895 | need_lib_prefix=no | 2903 | need_lib_prefix=no |
4378 | @@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
4379 | 3549 | lt_cv_deplibs_check_method=pass_all | 3557 | lt_cv_deplibs_check_method=pass_all |
4380 | 3550 | ;; | 3558 | ;; |
4381 | 3551 | 3559 | ||
4383 | 3552 | netbsd*) | 3560 | netbsd* | netbsdelf*-gnu) |
4384 | 3553 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3561 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
4385 | 3554 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3562 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
4386 | 3555 | else | 3563 | else |
4387 | @@ -4055,7 +4063,8 @@ _LT_EOF | |||
4388 | 4055 | if AC_TRY_EVAL(ac_compile); then | 4063 | if AC_TRY_EVAL(ac_compile); then |
4389 | 4056 | # Now try to grab the symbols. | 4064 | # Now try to grab the symbols. |
4390 | 4057 | nlist=conftest.nm | 4065 | nlist=conftest.nm |
4392 | 4058 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then | 4066 | $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD |
4393 | 4067 | if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then | ||
4394 | 4059 | # Try sorting and uniquifying the output. | 4068 | # Try sorting and uniquifying the output. |
4395 | 4060 | if sort "$nlist" | uniq > "$nlist"T; then | 4069 | if sort "$nlist" | uniq > "$nlist"T; then |
4396 | 4061 | mv -f "$nlist"T "$nlist" | 4070 | mv -f "$nlist"T "$nlist" |
4397 | @@ -4427,7 +4436,7 @@ m4_if([$1], [CXX], [ | |||
4398 | 4427 | ;; | 4436 | ;; |
4399 | 4428 | esac | 4437 | esac |
4400 | 4429 | ;; | 4438 | ;; |
4402 | 4430 | netbsd*) | 4439 | netbsd* | netbsdelf*-gnu) |
4403 | 4431 | ;; | 4440 | ;; |
4404 | 4432 | *qnx* | *nto*) | 4441 | *qnx* | *nto*) |
4405 | 4433 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 4442 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
4406 | @@ -4939,6 +4948,9 @@ m4_if([$1], [CXX], [ | |||
4407 | 4939 | ;; | 4948 | ;; |
4408 | 4940 | esac | 4949 | esac |
4409 | 4941 | ;; | 4950 | ;; |
4410 | 4951 | linux* | k*bsd*-gnu | gnu*) | ||
4411 | 4952 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4412 | 4953 | ;; | ||
4413 | 4942 | *) | 4954 | *) |
4414 | 4943 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4955 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4415 | 4944 | ;; | 4956 | ;; |
4416 | @@ -5001,6 +5013,9 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4417 | 5001 | openbsd* | bitrig*) | 5013 | openbsd* | bitrig*) |
4418 | 5002 | with_gnu_ld=no | 5014 | with_gnu_ld=no |
4419 | 5003 | ;; | 5015 | ;; |
4420 | 5016 | linux* | k*bsd*-gnu | gnu*) | ||
4421 | 5017 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4422 | 5018 | ;; | ||
4423 | 5004 | esac | 5019 | esac |
4424 | 5005 | 5020 | ||
4425 | 5006 | _LT_TAGVAR(ld_shlibs, $1)=yes | 5021 | _LT_TAGVAR(ld_shlibs, $1)=yes |
4426 | @@ -5255,7 +5270,7 @@ _LT_EOF | |||
4427 | 5255 | fi | 5270 | fi |
4428 | 5256 | ;; | 5271 | ;; |
4429 | 5257 | 5272 | ||
4431 | 5258 | netbsd*) | 5273 | netbsd* | netbsdelf*-gnu) |
4432 | 5259 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5274 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4433 | 5260 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5275 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4434 | 5261 | wlarc= | 5276 | wlarc= |
4435 | @@ -5776,6 +5791,7 @@ _LT_EOF | |||
4436 | 5776 | if test yes = "$lt_cv_irix_exported_symbol"; then | 5791 | if test yes = "$lt_cv_irix_exported_symbol"; then |
4437 | 5777 | _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' | 5792 | _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 | 5778 | fi | 5793 | fi |
4439 | 5794 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4440 | 5779 | else | 5795 | else |
4441 | 5780 | _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' | 5796 | _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 | 5781 | _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' | 5797 | _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 | 5797 | esac | 5813 | esac |
4445 | 5798 | ;; | 5814 | ;; |
4446 | 5799 | 5815 | ||
4448 | 5800 | netbsd*) | 5816 | netbsd* | netbsdelf*-gnu) |
4449 | 5801 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5817 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4450 | 5802 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 5818 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4451 | 5803 | else | 5819 | else |
4452 | @@ -6423,7 +6439,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4453 | 6423 | # Commands to make compiler produce verbose output that lists | 6439 | # Commands to make compiler produce verbose output that lists |
4454 | 6424 | # what "hidden" libraries, object files and flags are used when | 6440 | # what "hidden" libraries, object files and flags are used when |
4455 | 6425 | # linking a shared library. | 6441 | # linking a shared library. |
4457 | 6426 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 6442 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
4458 | 6427 | 6443 | ||
4459 | 6428 | else | 6444 | else |
4460 | 6429 | GXX=no | 6445 | GXX=no |
4461 | @@ -6798,7 +6814,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4462 | 6798 | # explicitly linking system object files so we need to strip them | 6814 | # explicitly linking system object files so we need to strip them |
4463 | 6799 | # from the output so that they don't get included in the library | 6815 | # from the output so that they don't get included in the library |
4464 | 6800 | # dependencies. | 6816 | # dependencies. |
4466 | 6801 | 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"' | 6817 | 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 | 6802 | ;; | 6818 | ;; |
4468 | 6803 | *) | 6819 | *) |
4469 | 6804 | if test yes = "$GXX"; then | 6820 | if test yes = "$GXX"; then |
4470 | @@ -6863,7 +6879,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4471 | 6863 | # explicitly linking system object files so we need to strip them | 6879 | # explicitly linking system object files so we need to strip them |
4472 | 6864 | # from the output so that they don't get included in the library | 6880 | # from the output so that they don't get included in the library |
4473 | 6865 | # dependencies. | 6881 | # dependencies. |
4475 | 6866 | 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"' | 6882 | 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 | 6867 | ;; | 6883 | ;; |
4477 | 6868 | *) | 6884 | *) |
4478 | 6869 | if test yes = "$GXX"; then | 6885 | if test yes = "$GXX"; then |
4479 | @@ -7202,7 +7218,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4480 | 7202 | # Commands to make compiler produce verbose output that lists | 7218 | # Commands to make compiler produce verbose output that lists |
4481 | 7203 | # what "hidden" libraries, object files and flags are used when | 7219 | # what "hidden" libraries, object files and flags are used when |
4482 | 7204 | # linking a shared library. | 7220 | # linking a shared library. |
4484 | 7205 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7221 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
4485 | 7206 | 7222 | ||
4486 | 7207 | else | 7223 | else |
4487 | 7208 | # FIXME: insert proper C++ library support | 7224 | # FIXME: insert proper C++ library support |
4488 | @@ -7286,7 +7302,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4489 | 7286 | # Commands to make compiler produce verbose output that lists | 7302 | # Commands to make compiler produce verbose output that lists |
4490 | 7287 | # what "hidden" libraries, object files and flags are used when | 7303 | # what "hidden" libraries, object files and flags are used when |
4491 | 7288 | # linking a shared library. | 7304 | # linking a shared library. |
4493 | 7289 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7305 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
4494 | 7290 | else | 7306 | else |
4495 | 7291 | # g++ 2.7 appears to require '-G' NOT '-shared' on this | 7307 | # g++ 2.7 appears to require '-G' NOT '-shared' on this |
4496 | 7292 | # platform. | 7308 | # platform. |
4497 | @@ -7297,7 +7313,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
4498 | 7297 | # Commands to make compiler produce verbose output that lists | 7313 | # Commands to make compiler produce verbose output that lists |
4499 | 7298 | # what "hidden" libraries, object files and flags are used when | 7314 | # what "hidden" libraries, object files and flags are used when |
4500 | 7299 | # linking a shared library. | 7315 | # linking a shared library. |
4502 | 7300 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7316 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
4503 | 7301 | fi | 7317 | fi |
4504 | 7302 | 7318 | ||
4505 | 7303 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' | 7319 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' |
4506 | diff --git a/clutter/build/compile b/clutter/build/compile | |||
4507 | index de0005d..99e5052 100755 | |||
4508 | --- a/clutter/build/compile | |||
4509 | +++ b/clutter/build/compile | |||
4510 | @@ -1,9 +1,9 @@ | |||
4512 | 1 | #!/bin/sh | 1 | #! /bin/sh |
4513 | 2 | # Wrapper for compilers which do not understand '-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
4514 | 3 | 3 | ||
4516 | 4 | scriptversion=2016-01-11.22; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
4517 | 5 | 5 | ||
4519 | 6 | # Copyright (C) 1999-2017 Free Software Foundation, Inc. | 6 | # Copyright (C) 1999-2018 Free Software Foundation, Inc. |
4520 | 7 | # Written by Tom Tromey <tromey@cygnus.com>. | 7 | # Written by Tom Tromey <tromey@cygnus.com>. |
4521 | 8 | # | 8 | # |
4522 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
4523 | @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC | |||
4524 | 17 | # GNU General Public License for more details. | 17 | # GNU General Public License for more details. |
4525 | 18 | # | 18 | # |
4526 | 19 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
4528 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 20 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
4529 | 21 | 21 | ||
4530 | 22 | # As a special exception to the GNU General Public License, if you | 22 | # As a special exception to the GNU General Public License, if you |
4531 | 23 | # distribute this file as part of a program that contains a | 23 | # distribute this file as part of a program that contains a |
4532 | @@ -340,7 +340,7 @@ exit $ret | |||
4533 | 340 | # Local Variables: | 340 | # Local Variables: |
4534 | 341 | # mode: shell-script | 341 | # mode: shell-script |
4535 | 342 | # sh-indentation: 2 | 342 | # sh-indentation: 2 |
4537 | 343 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 343 | # eval: (add-hook 'before-save-hook 'time-stamp) |
4538 | 344 | # time-stamp-start: "scriptversion=" | 344 | # time-stamp-start: "scriptversion=" |
4539 | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 345 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
4540 | 346 | # time-stamp-time-zone: "UTC0" | 346 | # time-stamp-time-zone: "UTC0" |
4541 | diff --git a/clutter/build/config.guess b/clutter/build/config.guess | |||
4542 | index 717b228..f50dcdb 100755 | |||
4543 | --- a/clutter/build/config.guess | |||
4544 | +++ b/clutter/build/config.guess | |||
4545 | @@ -1,8 +1,8 @@ | |||
4547 | 1 | #!/bin/sh | 1 | #! /bin/sh |
4548 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
4550 | 3 | # Copyright 1992-2017 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
4551 | 4 | 4 | ||
4553 | 5 | timestamp='2017-08-08' | 5 | timestamp='2018-02-24' |
4554 | 6 | 6 | ||
4555 | 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
4556 | 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
4557 | @@ -15,7 +15,7 @@ timestamp='2017-08-08' | |||
4558 | 15 | # General Public License for more details. | 15 | # General Public License for more details. |
4559 | 16 | # | 16 | # |
4560 | 17 | # You should have received a copy of the GNU General Public License | 17 | # You should have received a copy of the GNU General Public License |
4562 | 18 | # along with this program; if not, see <http://www.gnu.org/licenses/>. | 18 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
4563 | 19 | # | 19 | # |
4564 | 20 | # As a special exception to the GNU General Public License, if you | 20 | # As a special exception to the GNU General Public License, if you |
4565 | 21 | # distribute this file as part of a program that contains a | 21 | # distribute this file as part of a program that contains a |
4566 | @@ -27,7 +27,7 @@ timestamp='2017-08-08' | |||
4567 | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. | 27 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
4568 | 28 | # | 28 | # |
4569 | 29 | # You can get the latest version of this script from: | 29 | # You can get the latest version of this script from: |
4571 | 30 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess | 30 | # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
4572 | 31 | # | 31 | # |
4573 | 32 | # Please send patches to <config-patches@gnu.org>. | 32 | # Please send patches to <config-patches@gnu.org>. |
4574 | 33 | 33 | ||
4575 | @@ -39,7 +39,7 @@ Usage: $0 [OPTION] | |||
4576 | 39 | 39 | ||
4577 | 40 | Output the configuration name of the system \`$me' is run on. | 40 | Output the configuration name of the system \`$me' is run on. |
4578 | 41 | 41 | ||
4580 | 42 | Operation modes: | 42 | Options: |
4581 | 43 | -h, --help print this help, then exit | 43 | -h, --help print this help, then exit |
4582 | 44 | -t, --time-stamp print date of last modification, then exit | 44 | -t, --time-stamp print date of last modification, then exit |
4583 | 45 | -v, --version print version number, then exit | 45 | -v, --version print version number, then exit |
4584 | @@ -50,7 +50,7 @@ version="\ | |||
4585 | 50 | GNU config.guess ($timestamp) | 50 | GNU config.guess ($timestamp) |
4586 | 51 | 51 | ||
4587 | 52 | Originally written by Per Bothner. | 52 | Originally written by Per Bothner. |
4589 | 53 | Copyright 1992-2017 Free Software Foundation, Inc. | 53 | Copyright 1992-2018 Free Software Foundation, Inc. |
4590 | 54 | 54 | ||
4591 | 55 | This is free software; see the source for copying conditions. There is NO | 55 | This is free software; see the source for copying conditions. There is NO |
4592 | 56 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 56 | 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 | 107 | dummy=$tmp/dummy ; | 107 | dummy=$tmp/dummy ; |
4595 | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
4596 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
4598 | 110 | ,,) echo "int x;" > $dummy.c ; | 110 | ,,) echo "int x;" > "$dummy.c" ; |
4599 | 111 | for c in cc gcc c89 c99 ; do | 111 | for c in cc gcc c89 c99 ; do |
4601 | 112 | if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | 112 | if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
4602 | 113 | CC_FOR_BUILD="$c"; break ; | 113 | CC_FOR_BUILD="$c"; break ; |
4603 | 114 | fi ; | 114 | fi ; |
4604 | 115 | done ; | 115 | done ; |
4605 | @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown | |||
4606 | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 132 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
4607 | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 133 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
4608 | 134 | 134 | ||
4610 | 135 | case "${UNAME_SYSTEM}" in | 135 | case "$UNAME_SYSTEM" in |
4611 | 136 | Linux|GNU|GNU/*) | 136 | Linux|GNU|GNU/*) |
4612 | 137 | # If the system lacks a compiler, then just pick glibc. | 137 | # If the system lacks a compiler, then just pick glibc. |
4613 | 138 | # We could probably try harder. | 138 | # We could probably try harder. |
4614 | 139 | LIBC=gnu | 139 | LIBC=gnu |
4615 | 140 | 140 | ||
4618 | 141 | eval $set_cc_for_build | 141 | eval "$set_cc_for_build" |
4619 | 142 | cat <<-EOF > $dummy.c | 142 | cat <<-EOF > "$dummy.c" |
4620 | 143 | #include <features.h> | 143 | #include <features.h> |
4621 | 144 | #if defined(__UCLIBC__) | 144 | #if defined(__UCLIBC__) |
4622 | 145 | LIBC=uclibc | 145 | LIBC=uclibc |
4623 | @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) | |||
4624 | 149 | LIBC=gnu | 149 | LIBC=gnu |
4625 | 150 | #endif | 150 | #endif |
4626 | 151 | EOF | 151 | EOF |
4628 | 152 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` | 152 | eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" |
4629 | 153 | |||
4630 | 154 | # If ldd exists, use it to detect musl libc. | ||
4631 | 155 | if command -v ldd >/dev/null && \ | ||
4632 | 156 | ldd --version 2>&1 | grep -q ^musl | ||
4633 | 157 | then | ||
4634 | 158 | LIBC=musl | ||
4635 | 159 | fi | ||
4636 | 153 | ;; | 160 | ;; |
4637 | 154 | esac | 161 | esac |
4638 | 155 | 162 | ||
4639 | 156 | # Note: order is significant - the case branches are not exclusive. | 163 | # Note: order is significant - the case branches are not exclusive. |
4640 | 157 | 164 | ||
4642 | 158 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 165 | case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in |
4643 | 159 | *:NetBSD:*:*) | 166 | *:NetBSD:*:*) |
4644 | 160 | # NetBSD (nbsd) targets should (where applicable) match one or | 167 | # NetBSD (nbsd) targets should (where applicable) match one or |
4645 | 161 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, | 168 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
4646 | @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4647 | 169 | # portion of the name. We always set it to "unknown". | 176 | # portion of the name. We always set it to "unknown". |
4648 | 170 | sysctl="sysctl -n hw.machine_arch" | 177 | sysctl="sysctl -n hw.machine_arch" |
4649 | 171 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ | 178 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ |
4652 | 172 | /sbin/$sysctl 2>/dev/null || \ | 179 | "/sbin/$sysctl" 2>/dev/null || \ |
4653 | 173 | /usr/sbin/$sysctl 2>/dev/null || \ | 180 | "/usr/sbin/$sysctl" 2>/dev/null || \ |
4654 | 174 | echo unknown)` | 181 | echo unknown)` |
4656 | 175 | case "${UNAME_MACHINE_ARCH}" in | 182 | case "$UNAME_MACHINE_ARCH" in |
4657 | 176 | armeb) machine=armeb-unknown ;; | 183 | armeb) machine=armeb-unknown ;; |
4658 | 177 | arm*) machine=arm-unknown ;; | 184 | arm*) machine=arm-unknown ;; |
4659 | 178 | sh3el) machine=shl-unknown ;; | 185 | sh3el) machine=shl-unknown ;; |
4660 | 179 | sh3eb) machine=sh-unknown ;; | 186 | sh3eb) machine=sh-unknown ;; |
4661 | 180 | sh5el) machine=sh5le-unknown ;; | 187 | sh5el) machine=sh5le-unknown ;; |
4662 | 181 | earmv*) | 188 | earmv*) |
4666 | 182 | arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` | 189 | arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
4667 | 183 | endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` | 190 | endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` |
4668 | 184 | machine=${arch}${endian}-unknown | 191 | machine="${arch}${endian}"-unknown |
4669 | 185 | ;; | 192 | ;; |
4671 | 186 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 193 | *) machine="$UNAME_MACHINE_ARCH"-unknown ;; |
4672 | 187 | esac | 194 | esac |
4673 | 188 | # The Operating System including object format, if it has switched | 195 | # The Operating System including object format, if it has switched |
4674 | 189 | # to ELF recently (or will in the future) and ABI. | 196 | # to ELF recently (or will in the future) and ABI. |
4676 | 190 | case "${UNAME_MACHINE_ARCH}" in | 197 | case "$UNAME_MACHINE_ARCH" in |
4677 | 191 | earm*) | 198 | earm*) |
4678 | 192 | os=netbsdelf | 199 | os=netbsdelf |
4679 | 193 | ;; | 200 | ;; |
4680 | 194 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 201 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
4682 | 195 | eval $set_cc_for_build | 202 | eval "$set_cc_for_build" |
4683 | 196 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 203 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4684 | 197 | | grep -q __ELF__ | 204 | | grep -q __ELF__ |
4685 | 198 | then | 205 | then |
4686 | @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4687 | 208 | ;; | 215 | ;; |
4688 | 209 | esac | 216 | esac |
4689 | 210 | # Determine ABI tags. | 217 | # Determine ABI tags. |
4691 | 211 | case "${UNAME_MACHINE_ARCH}" in | 218 | case "$UNAME_MACHINE_ARCH" in |
4692 | 212 | earm*) | 219 | earm*) |
4693 | 213 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' | 220 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' |
4695 | 214 | abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` | 221 | abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` |
4696 | 215 | ;; | 222 | ;; |
4697 | 216 | esac | 223 | esac |
4698 | 217 | # The OS release | 224 | # The OS release |
4699 | @@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4700 | 219 | # thus, need a distinct triplet. However, they do not need | 226 | # thus, need a distinct triplet. However, they do not need |
4701 | 220 | # kernel version information, so it can be replaced with a | 227 | # kernel version information, so it can be replaced with a |
4702 | 221 | # suitable tag, in the style of linux-gnu. | 228 | # suitable tag, in the style of linux-gnu. |
4704 | 222 | case "${UNAME_VERSION}" in | 229 | case "$UNAME_VERSION" in |
4705 | 223 | Debian*) | 230 | Debian*) |
4706 | 224 | release='-gnu' | 231 | release='-gnu' |
4707 | 225 | ;; | 232 | ;; |
4708 | 226 | *) | 233 | *) |
4710 | 227 | release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` | 234 | release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` |
4711 | 228 | ;; | 235 | ;; |
4712 | 229 | esac | 236 | esac |
4713 | 230 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 237 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
4714 | 231 | # contains redundant information, the shorter form: | 238 | # contains redundant information, the shorter form: |
4715 | 232 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 239 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
4717 | 233 | echo "${machine}-${os}${release}${abi}" | 240 | echo "$machine-${os}${release}${abi}" |
4718 | 234 | exit ;; | 241 | exit ;; |
4719 | 235 | *:Bitrig:*:*) | 242 | *:Bitrig:*:*) |
4720 | 236 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` | 243 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
4722 | 237 | echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} | 244 | echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" |
4723 | 238 | exit ;; | 245 | exit ;; |
4724 | 239 | *:OpenBSD:*:*) | 246 | *:OpenBSD:*:*) |
4725 | 240 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` | 247 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
4727 | 241 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} | 248 | echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" |
4728 | 242 | exit ;; | 249 | exit ;; |
4729 | 243 | *:LibertyBSD:*:*) | 250 | *:LibertyBSD:*:*) |
4730 | 244 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` | 251 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` |
4732 | 245 | echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} | 252 | echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" |
4733 | 253 | exit ;; | ||
4734 | 254 | *:MidnightBSD:*:*) | ||
4735 | 255 | echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" | ||
4736 | 246 | exit ;; | 256 | exit ;; |
4737 | 247 | *:ekkoBSD:*:*) | 257 | *:ekkoBSD:*:*) |
4739 | 248 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | 258 | echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" |
4740 | 249 | exit ;; | 259 | exit ;; |
4741 | 250 | *:SolidBSD:*:*) | 260 | *:SolidBSD:*:*) |
4743 | 251 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | 261 | echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" |
4744 | 252 | exit ;; | 262 | exit ;; |
4745 | 253 | macppc:MirBSD:*:*) | 263 | macppc:MirBSD:*:*) |
4747 | 254 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 264 | echo powerpc-unknown-mirbsd"$UNAME_RELEASE" |
4748 | 255 | exit ;; | 265 | exit ;; |
4749 | 256 | *:MirBSD:*:*) | 266 | *:MirBSD:*:*) |
4751 | 257 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 267 | echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" |
4752 | 258 | exit ;; | 268 | exit ;; |
4753 | 259 | *:Sortix:*:*) | 269 | *:Sortix:*:*) |
4755 | 260 | echo ${UNAME_MACHINE}-unknown-sortix | 270 | echo "$UNAME_MACHINE"-unknown-sortix |
4756 | 261 | exit ;; | 271 | exit ;; |
4757 | 262 | *:Redox:*:*) | 272 | *:Redox:*:*) |
4759 | 263 | echo ${UNAME_MACHINE}-unknown-redox | 273 | echo "$UNAME_MACHINE"-unknown-redox |
4760 | 264 | exit ;; | 274 | exit ;; |
4761 | 275 | mips:OSF1:*.*) | ||
4762 | 276 | echo mips-dec-osf1 | ||
4763 | 277 | exit ;; | ||
4764 | 265 | alpha:OSF1:*:*) | 278 | alpha:OSF1:*:*) |
4765 | 266 | case $UNAME_RELEASE in | 279 | case $UNAME_RELEASE in |
4766 | 267 | *4.0) | 280 | *4.0) |
4767 | @@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4768 | 313 | # A Tn.n version is a released field test version. | 326 | # A Tn.n version is a released field test version. |
4769 | 314 | # A Xn.n version is an unreleased experimental baselevel. | 327 | # A Xn.n version is an unreleased experimental baselevel. |
4770 | 315 | # 1.2 uses "1.2" for uname -r. | 328 | # 1.2 uses "1.2" for uname -r. |
4772 | 316 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` | 329 | echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" |
4773 | 317 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. | 330 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
4774 | 318 | exitcode=$? | 331 | exitcode=$? |
4775 | 319 | trap '' 0 | 332 | trap '' 0 |
4776 | 320 | exit $exitcode ;; | 333 | exit $exitcode ;; |
4777 | 321 | Alpha\ *:Windows_NT*:*) | ||
4778 | 322 | # How do we know it's Interix rather than the generic POSIX subsystem? | ||
4779 | 323 | # Should we change UNAME_MACHINE based on the output of uname instead | ||
4780 | 324 | # of the specific Alpha model? | ||
4781 | 325 | echo alpha-pc-interix | ||
4782 | 326 | exit ;; | ||
4783 | 327 | 21064:Windows_NT:50:3) | ||
4784 | 328 | echo alpha-dec-winnt3.5 | ||
4785 | 329 | exit ;; | ||
4786 | 330 | Amiga*:UNIX_System_V:4.0:*) | 334 | Amiga*:UNIX_System_V:4.0:*) |
4787 | 331 | echo m68k-unknown-sysv4 | 335 | echo m68k-unknown-sysv4 |
4788 | 332 | exit ;; | 336 | exit ;; |
4789 | 333 | *:[Aa]miga[Oo][Ss]:*:*) | 337 | *:[Aa]miga[Oo][Ss]:*:*) |
4791 | 334 | echo ${UNAME_MACHINE}-unknown-amigaos | 338 | echo "$UNAME_MACHINE"-unknown-amigaos |
4792 | 335 | exit ;; | 339 | exit ;; |
4793 | 336 | *:[Mm]orph[Oo][Ss]:*:*) | 340 | *:[Mm]orph[Oo][Ss]:*:*) |
4795 | 337 | echo ${UNAME_MACHINE}-unknown-morphos | 341 | echo "$UNAME_MACHINE"-unknown-morphos |
4796 | 338 | exit ;; | 342 | exit ;; |
4797 | 339 | *:OS/390:*:*) | 343 | *:OS/390:*:*) |
4798 | 340 | echo i370-ibm-openedition | 344 | echo i370-ibm-openedition |
4799 | @@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4800 | 346 | echo powerpc-ibm-os400 | 350 | echo powerpc-ibm-os400 |
4801 | 347 | exit ;; | 351 | exit ;; |
4802 | 348 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 352 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
4804 | 349 | echo arm-acorn-riscix${UNAME_RELEASE} | 353 | echo arm-acorn-riscix"$UNAME_RELEASE" |
4805 | 350 | exit ;; | 354 | exit ;; |
4806 | 351 | arm*:riscos:*:*|arm*:RISCOS:*:*) | 355 | arm*:riscos:*:*|arm*:RISCOS:*:*) |
4807 | 352 | echo arm-unknown-riscos | 356 | echo arm-unknown-riscos |
4808 | @@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4809 | 373 | sparc) echo sparc-icl-nx7; exit ;; | 377 | sparc) echo sparc-icl-nx7; exit ;; |
4810 | 374 | esac ;; | 378 | esac ;; |
4811 | 375 | s390x:SunOS:*:*) | 379 | s390x:SunOS:*:*) |
4813 | 376 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 380 | echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
4814 | 377 | exit ;; | 381 | exit ;; |
4815 | 378 | sun4H:SunOS:5.*:*) | 382 | sun4H:SunOS:5.*:*) |
4817 | 379 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 383 | echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
4818 | 380 | exit ;; | 384 | exit ;; |
4819 | 381 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 385 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
4821 | 382 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 386 | echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
4822 | 383 | exit ;; | 387 | exit ;; |
4823 | 384 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | 388 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
4825 | 385 | echo i386-pc-auroraux${UNAME_RELEASE} | 389 | echo i386-pc-auroraux"$UNAME_RELEASE" |
4826 | 386 | exit ;; | 390 | exit ;; |
4827 | 387 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 391 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
4829 | 388 | eval $set_cc_for_build | 392 | eval "$set_cc_for_build" |
4830 | 389 | SUN_ARCH=i386 | 393 | SUN_ARCH=i386 |
4831 | 390 | # If there is a compiler, see if it is configured for 64-bit objects. | 394 | # If there is a compiler, see if it is configured for 64-bit objects. |
4832 | 391 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | 395 | # 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 | 398 | SUN_ARCH=x86_64 | 402 | SUN_ARCH=x86_64 |
4835 | 399 | fi | 403 | fi |
4836 | 400 | fi | 404 | fi |
4838 | 401 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 405 | echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
4839 | 402 | exit ;; | 406 | exit ;; |
4840 | 403 | sun4*:SunOS:6*:*) | 407 | sun4*:SunOS:6*:*) |
4841 | 404 | # According to config.sub, this is the proper way to canonicalize | 408 | # According to config.sub, this is the proper way to canonicalize |
4842 | 405 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but | 409 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
4843 | 406 | # it's likely to be more like Solaris than SunOS4. | 410 | # it's likely to be more like Solaris than SunOS4. |
4845 | 407 | echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 411 | echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
4846 | 408 | exit ;; | 412 | exit ;; |
4847 | 409 | sun4*:SunOS:*:*) | 413 | sun4*:SunOS:*:*) |
4848 | 410 | case "`/usr/bin/arch -k`" in | 414 | case "`/usr/bin/arch -k`" in |
4849 | @@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4850 | 413 | ;; | 417 | ;; |
4851 | 414 | esac | 418 | esac |
4852 | 415 | # Japanese Language versions have a version number like `4.1.3-JL'. | 419 | # Japanese Language versions have a version number like `4.1.3-JL'. |
4854 | 416 | echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` | 420 | echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" |
4855 | 417 | exit ;; | 421 | exit ;; |
4856 | 418 | sun3*:SunOS:*:*) | 422 | sun3*:SunOS:*:*) |
4858 | 419 | echo m68k-sun-sunos${UNAME_RELEASE} | 423 | echo m68k-sun-sunos"$UNAME_RELEASE" |
4859 | 420 | exit ;; | 424 | exit ;; |
4860 | 421 | sun*:*:4.2BSD:*) | 425 | sun*:*:4.2BSD:*) |
4861 | 422 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 426 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
4863 | 423 | test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 | 427 | test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 |
4864 | 424 | case "`/bin/arch`" in | 428 | case "`/bin/arch`" in |
4865 | 425 | sun3) | 429 | sun3) |
4867 | 426 | echo m68k-sun-sunos${UNAME_RELEASE} | 430 | echo m68k-sun-sunos"$UNAME_RELEASE" |
4868 | 427 | ;; | 431 | ;; |
4869 | 428 | sun4) | 432 | sun4) |
4871 | 429 | echo sparc-sun-sunos${UNAME_RELEASE} | 433 | echo sparc-sun-sunos"$UNAME_RELEASE" |
4872 | 430 | ;; | 434 | ;; |
4873 | 431 | esac | 435 | esac |
4874 | 432 | exit ;; | 436 | exit ;; |
4875 | 433 | aushp:SunOS:*:*) | 437 | aushp:SunOS:*:*) |
4877 | 434 | echo sparc-auspex-sunos${UNAME_RELEASE} | 438 | echo sparc-auspex-sunos"$UNAME_RELEASE" |
4878 | 435 | exit ;; | 439 | exit ;; |
4879 | 436 | # The situation for MiNT is a little confusing. The machine name | 440 | # The situation for MiNT is a little confusing. The machine name |
4880 | 437 | # can be virtually everything (everything which is not | 441 | # can be virtually everything (everything which is not |
4881 | @@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4882 | 442 | # MiNT. But MiNT is downward compatible to TOS, so this should | 446 | # MiNT. But MiNT is downward compatible to TOS, so this should |
4883 | 443 | # be no problem. | 447 | # be no problem. |
4884 | 444 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 448 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
4886 | 445 | echo m68k-atari-mint${UNAME_RELEASE} | 449 | echo m68k-atari-mint"$UNAME_RELEASE" |
4887 | 446 | exit ;; | 450 | exit ;; |
4888 | 447 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 451 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
4890 | 448 | echo m68k-atari-mint${UNAME_RELEASE} | 452 | echo m68k-atari-mint"$UNAME_RELEASE" |
4891 | 449 | exit ;; | 453 | exit ;; |
4892 | 450 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 454 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
4894 | 451 | echo m68k-atari-mint${UNAME_RELEASE} | 455 | echo m68k-atari-mint"$UNAME_RELEASE" |
4895 | 452 | exit ;; | 456 | exit ;; |
4896 | 453 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 457 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
4898 | 454 | echo m68k-milan-mint${UNAME_RELEASE} | 458 | echo m68k-milan-mint"$UNAME_RELEASE" |
4899 | 455 | exit ;; | 459 | exit ;; |
4900 | 456 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 460 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
4902 | 457 | echo m68k-hades-mint${UNAME_RELEASE} | 461 | echo m68k-hades-mint"$UNAME_RELEASE" |
4903 | 458 | exit ;; | 462 | exit ;; |
4904 | 459 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 463 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
4906 | 460 | echo m68k-unknown-mint${UNAME_RELEASE} | 464 | echo m68k-unknown-mint"$UNAME_RELEASE" |
4907 | 461 | exit ;; | 465 | exit ;; |
4908 | 462 | m68k:machten:*:*) | 466 | m68k:machten:*:*) |
4910 | 463 | echo m68k-apple-machten${UNAME_RELEASE} | 467 | echo m68k-apple-machten"$UNAME_RELEASE" |
4911 | 464 | exit ;; | 468 | exit ;; |
4912 | 465 | powerpc:machten:*:*) | 469 | powerpc:machten:*:*) |
4914 | 466 | echo powerpc-apple-machten${UNAME_RELEASE} | 470 | echo powerpc-apple-machten"$UNAME_RELEASE" |
4915 | 467 | exit ;; | 471 | exit ;; |
4916 | 468 | RISC*:Mach:*:*) | 472 | RISC*:Mach:*:*) |
4917 | 469 | echo mips-dec-mach_bsd4.3 | 473 | echo mips-dec-mach_bsd4.3 |
4918 | 470 | exit ;; | 474 | exit ;; |
4919 | 471 | RISC*:ULTRIX:*:*) | 475 | RISC*:ULTRIX:*:*) |
4921 | 472 | echo mips-dec-ultrix${UNAME_RELEASE} | 476 | echo mips-dec-ultrix"$UNAME_RELEASE" |
4922 | 473 | exit ;; | 477 | exit ;; |
4923 | 474 | VAX*:ULTRIX*:*:*) | 478 | VAX*:ULTRIX*:*:*) |
4925 | 475 | echo vax-dec-ultrix${UNAME_RELEASE} | 479 | echo vax-dec-ultrix"$UNAME_RELEASE" |
4926 | 476 | exit ;; | 480 | exit ;; |
4927 | 477 | 2020:CLIX:*:* | 2430:CLIX:*:*) | 481 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
4929 | 478 | echo clipper-intergraph-clix${UNAME_RELEASE} | 482 | echo clipper-intergraph-clix"$UNAME_RELEASE" |
4930 | 479 | exit ;; | 483 | exit ;; |
4931 | 480 | mips:*:*:UMIPS | mips:*:*:RISCos) | 484 | mips:*:*:UMIPS | mips:*:*:RISCos) |
4934 | 481 | eval $set_cc_for_build | 485 | eval "$set_cc_for_build" |
4935 | 482 | sed 's/^ //' << EOF >$dummy.c | 486 | sed 's/^ //' << EOF > "$dummy.c" |
4936 | 483 | #ifdef __cplusplus | 487 | #ifdef __cplusplus |
4937 | 484 | #include <stdio.h> /* for printf() prototype */ | 488 | #include <stdio.h> /* for printf() prototype */ |
4938 | 485 | int main (int argc, char *argv[]) { | 489 | int main (int argc, char *argv[]) { |
4939 | @@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
4940 | 488 | #endif | 492 | #endif |
4941 | 489 | #if defined (host_mips) && defined (MIPSEB) | 493 | #if defined (host_mips) && defined (MIPSEB) |
4942 | 490 | #if defined (SYSTYPE_SYSV) | 494 | #if defined (SYSTYPE_SYSV) |
4944 | 491 | printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); | 495 | printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); |
4945 | 492 | #endif | 496 | #endif |
4946 | 493 | #if defined (SYSTYPE_SVR4) | 497 | #if defined (SYSTYPE_SVR4) |
4948 | 494 | printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); | 498 | printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); |
4949 | 495 | #endif | 499 | #endif |
4950 | 496 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) | 500 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
4952 | 497 | printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); | 501 | printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); |
4953 | 498 | #endif | 502 | #endif |
4954 | 499 | #endif | 503 | #endif |
4955 | 500 | exit (-1); | 504 | exit (-1); |
4956 | 501 | } | 505 | } |
4957 | 502 | EOF | 506 | EOF |
4961 | 503 | $CC_FOR_BUILD -o $dummy $dummy.c && | 507 | $CC_FOR_BUILD -o "$dummy" "$dummy.c" && |
4962 | 504 | dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && | 508 | dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && |
4963 | 505 | SYSTEM_NAME=`$dummy $dummyarg` && | 509 | SYSTEM_NAME=`"$dummy" "$dummyarg"` && |
4964 | 506 | { echo "$SYSTEM_NAME"; exit; } | 510 | { echo "$SYSTEM_NAME"; exit; } |
4966 | 507 | echo mips-mips-riscos${UNAME_RELEASE} | 511 | echo mips-mips-riscos"$UNAME_RELEASE" |
4967 | 508 | exit ;; | 512 | exit ;; |
4968 | 509 | Motorola:PowerMAX_OS:*:*) | 513 | Motorola:PowerMAX_OS:*:*) |
4969 | 510 | echo powerpc-motorola-powermax | 514 | echo powerpc-motorola-powermax |
4970 | @@ -530,17 +534,17 @@ EOF | |||
4971 | 530 | AViiON:dgux:*:*) | 534 | AViiON:dgux:*:*) |
4972 | 531 | # DG/UX returns AViiON for all architectures | 535 | # DG/UX returns AViiON for all architectures |
4973 | 532 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 536 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
4975 | 533 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 537 | if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] |
4976 | 534 | then | 538 | then |
4979 | 535 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 539 | if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ |
4980 | 536 | [ ${TARGET_BINARY_INTERFACE}x = x ] | 540 | [ "$TARGET_BINARY_INTERFACE"x = x ] |
4981 | 537 | then | 541 | then |
4983 | 538 | echo m88k-dg-dgux${UNAME_RELEASE} | 542 | echo m88k-dg-dgux"$UNAME_RELEASE" |
4984 | 539 | else | 543 | else |
4986 | 540 | echo m88k-dg-dguxbcs${UNAME_RELEASE} | 544 | echo m88k-dg-dguxbcs"$UNAME_RELEASE" |
4987 | 541 | fi | 545 | fi |
4988 | 542 | else | 546 | else |
4990 | 543 | echo i586-dg-dgux${UNAME_RELEASE} | 547 | echo i586-dg-dgux"$UNAME_RELEASE" |
4991 | 544 | fi | 548 | fi |
4992 | 545 | exit ;; | 549 | exit ;; |
4993 | 546 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 550 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
4994 | @@ -557,7 +561,7 @@ EOF | |||
4995 | 557 | echo m68k-tektronix-bsd | 561 | echo m68k-tektronix-bsd |
4996 | 558 | exit ;; | 562 | exit ;; |
4997 | 559 | *:IRIX*:*:*) | 563 | *:IRIX*:*:*) |
4999 | 560 | echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` | 564 | echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" |
5000 | 561 | exit ;; | 565 | exit ;; |
The diff has been truncated for viewing.