Ubuntu
libindicator package

Merge lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream into lp:~ubuntu-desktop/libindicator/ubuntu

  1. Precise (12.04)
  2. upstream
  3. Merge into ubuntu
Proposed by Charles Kerr
Status: Merged
Merged at revision: 393
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Merge into: lp:~ubuntu-desktop/libindicator/ubuntu
Diff against target: 13521 lines (+39/-13315)
14 files modified
ChangeLog (+12/-0)
INSTALL (+7/-2)
Makefile.in (+1/-3)
compile (+0/-143)
config.guess (+0/-1502)
config.sub (+0/-1714)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+7/-0)
depcomp (+0/-630)
install-sh (+0/-520)
libindicator/indicator-image-helper.c (+1/-1)
ltmain.sh (+0/-8413)
missing (+0/-376)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+101594@code.launchpad.net

Description of the change

libindicator 0.5.0

  * Better handling of invalid images in image_helper_update() (LP: #946408)

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=== modified file 'ChangeLog'
2--- ChangeLog 2012-04-04 19:35:30 +0000
3+++ ChangeLog 2012-04-11 15:58:20 +0000
4@@ -1,5 +1,17 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-04-11 Charles Kerr <charles.kerr@canonical.com>
8+
9+ 0.5.0
10+
11+2012-04-11 Charles Kerr <charles.kerr@canonical.com>
12+
13+ merge lp:~charlesk/libindicator/lp-946408 to safeguard against invalid images being passed to indicator_image_helper_update()
14+
15+2012-04-11 Charles Kerr <charles.kerr@canonical.com>
16+
17+ in indicator_image_helper_update(), test the image argument with GTK_IS_IMAGE before using it.
18+
19 2012-04-04 Ted Gould <ted@gould.cx>
20
21 0.4.95
22
23=== modified file 'INSTALL'
24--- INSTALL 2012-04-04 19:34:11 +0000
25+++ INSTALL 2012-04-11 15:58:20 +0000
26@@ -1,8 +1,8 @@
27 Installation Instructions
28 *************************
29
30-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
31-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
32+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
33+Inc.
34
35 Copying and distribution of this file, with or without modification,
36 are permitted in any medium without royalty provided the copyright
37@@ -226,6 +226,11 @@
38
39 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
40
41+ HP-UX `make' updates targets which have the same time stamps as
42+their prerequisites, which makes it generally unusable when shipped
43+generated files such as `configure' are involved. Use GNU `make'
44+instead.
45+
46 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
47 parse its `<wchar.h>' header file. The option `-nodtk' can be used as
48 a workaround. If GNU CC is not installed, it is therefore recommended
49
50=== modified file 'Makefile.in'
51--- Makefile.in 2012-04-04 19:35:30 +0000
52+++ Makefile.in 2012-04-11 15:58:20 +0000
53@@ -43,9 +43,7 @@
54 $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
55 AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \
56 build-aux/config.guess build-aux/config.sub build-aux/depcomp \
57- build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
58- compile config.guess config.sub depcomp install-sh ltmain.sh \
59- missing
60+ build-aux/install-sh build-aux/ltmain.sh build-aux/missing
61 subdir = .
62 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
64
65=== removed file 'compile'
66--- compile 2012-04-04 19:34:11 +0000
67+++ compile 1970-01-01 00:00:00 +0000
68@@ -1,143 +0,0 @@
69-#! /bin/sh
70-# Wrapper for compilers which do not understand `-c -o'.
71-
72-scriptversion=2009-10-06.20; # UTC
73-
74-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
75-# Foundation, Inc.
76-# Written by Tom Tromey <tromey@cygnus.com>.
77-#
78-# This program is free software; you can redistribute it and/or modify
79-# it under the terms of the GNU General Public License as published by
80-# the Free Software Foundation; either version 2, or (at your option)
81-# any later version.
82-#
83-# This program is distributed in the hope that it will be useful,
84-# but WITHOUT ANY WARRANTY; without even the implied warranty of
85-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
86-# GNU General Public License for more details.
87-#
88-# You should have received a copy of the GNU General Public License
89-# along with this program. If not, see <http://www.gnu.org/licenses/>.
90-
91-# As a special exception to the GNU General Public License, if you
92-# distribute this file as part of a program that contains a
93-# configuration script generated by Autoconf, you may include it under
94-# the same distribution terms that you use for the rest of that program.
95-
96-# This file is maintained in Automake, please report
97-# bugs to <bug-automake@gnu.org> or send patches to
98-# <automake-patches@gnu.org>.
99-
100-case $1 in
101- '')
102- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
103- exit 1;
104- ;;
105- -h | --h*)
106- cat <<\EOF
107-Usage: compile [--help] [--version] PROGRAM [ARGS]
108-
109-Wrapper for compilers which do not understand `-c -o'.
110-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
111-arguments, and rename the output as expected.
112-
113-If you are trying to build a whole package this is not the
114-right script to run: please start by reading the file `INSTALL'.
115-
116-Report bugs to <bug-automake@gnu.org>.
117-EOF
118- exit $?
119- ;;
120- -v | --v*)
121- echo "compile $scriptversion"
122- exit $?
123- ;;
124-esac
125-
126-ofile=
127-cfile=
128-eat=
129-
130-for arg
131-do
132- if test -n "$eat"; then
133- eat=
134- else
135- case $1 in
136- -o)
137- # configure might choose to run compile as `compile cc -o foo foo.c'.
138- # So we strip `-o arg' only if arg is an object.
139- eat=1
140- case $2 in
141- *.o | *.obj)
142- ofile=$2
143- ;;
144- *)
145- set x "$@" -o "$2"
146- shift
147- ;;
148- esac
149- ;;
150- *.c)
151- cfile=$1
152- set x "$@" "$1"
153- shift
154- ;;
155- *)
156- set x "$@" "$1"
157- shift
158- ;;
159- esac
160- fi
161- shift
162-done
163-
164-if test -z "$ofile" || test -z "$cfile"; then
165- # If no `-o' option was seen then we might have been invoked from a
166- # pattern rule where we don't need one. That is ok -- this is a
167- # normal compilation that the losing compiler can handle. If no
168- # `.c' file was seen then we are probably linking. That is also
169- # ok.
170- exec "$@"
171-fi
172-
173-# Name of file we expect compiler to create.
174-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
175-
176-# Create the lock directory.
177-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
178-# that we are using for the .o file. Also, base the name on the expected
179-# object file name, since that is what matters with a parallel build.
180-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
181-while true; do
182- if mkdir "$lockdir" >/dev/null 2>&1; then
183- break
184- fi
185- sleep 1
186-done
187-# FIXME: race condition here if user kills between mkdir and trap.
188-trap "rmdir '$lockdir'; exit 1" 1 2 15
189-
190-# Run the compile.
191-"$@"
192-ret=$?
193-
194-if test -f "$cofile"; then
195- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
196-elif test -f "${cofile}bj"; then
197- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
198-fi
199-
200-rmdir "$lockdir"
201-exit $ret
202-
203-# Local Variables:
204-# mode: shell-script
205-# sh-indentation: 2
206-# eval: (add-hook 'write-file-hooks 'time-stamp)
207-# time-stamp-start: "scriptversion="
208-# time-stamp-format: "%:y-%02m-%02d.%02H"
209-# time-stamp-time-zone: "UTC"
210-# time-stamp-end: "; # UTC"
211-# End:
212
213=== removed file 'config.guess'
214--- config.guess 2012-04-04 19:34:11 +0000
215+++ config.guess 1970-01-01 00:00:00 +0000
216@@ -1,1502 +0,0 @@
217-#! /bin/sh
218-# Attempt to guess a canonical system name.
219-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
220-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
221-# Free Software Foundation, Inc.
222-
223-timestamp='2009-12-30'
224-
225-# This file is free software; you can redistribute it and/or modify it
226-# under the terms of the GNU General Public License as published by
227-# the Free Software Foundation; either version 2 of the License, or
228-# (at your option) any later version.
229-#
230-# This program is distributed in the hope that it will be useful, but
231-# WITHOUT ANY WARRANTY; without even the implied warranty of
232-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
233-# General Public License for more details.
234-#
235-# You should have received a copy of the GNU General Public License
236-# along with this program; if not, write to the Free Software
237-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
238-# 02110-1301, USA.
239-#
240-# As a special exception to the GNU General Public License, if you
241-# distribute this file as part of a program that contains a
242-# configuration script generated by Autoconf, you may include it under
243-# the same distribution terms that you use for the rest of that program.
244-
245-
246-# Originally written by Per Bothner. Please send patches (context
247-# diff format) to <config-patches@gnu.org> and include a ChangeLog
248-# entry.
249-#
250-# This script attempts to guess a canonical system name similar to
251-# config.sub. If it succeeds, it prints the system name on stdout, and
252-# exits with 0. Otherwise, it exits with 1.
253-#
254-# You can get the latest version of this script from:
255-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
256-
257-me=`echo "$0" | sed -e 's,.*/,,'`
258-
259-usage="\
260-Usage: $0 [OPTION]
261-
262-Output the configuration name of the system \`$me' is run on.
263-
264-Operation modes:
265- -h, --help print this help, then exit
266- -t, --time-stamp print date of last modification, then exit
267- -v, --version print version number, then exit
268-
269-Report bugs and patches to <config-patches@gnu.org>."
270-
271-version="\
272-GNU config.guess ($timestamp)
273-
274-Originally written by Per Bothner.
275-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
276-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
277-Software Foundation, Inc.
278-
279-This is free software; see the source for copying conditions. There is NO
280-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
281-
282-help="
283-Try \`$me --help' for more information."
284-
285-# Parse command line
286-while test $# -gt 0 ; do
287- case $1 in
288- --time-stamp | --time* | -t )
289- echo "$timestamp" ; exit ;;
290- --version | -v )
291- echo "$version" ; exit ;;
292- --help | --h* | -h )
293- echo "$usage"; exit ;;
294- -- ) # Stop option processing
295- shift; break ;;
296- - ) # Use stdin as input.
297- break ;;
298- -* )
299- echo "$me: invalid option $1$help" >&2
300- exit 1 ;;
301- * )
302- break ;;
303- esac
304-done
305-
306-if test $# != 0; then
307- echo "$me: too many arguments$help" >&2
308- exit 1
309-fi
310-
311-trap 'exit 1' 1 2 15
312-
313-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
314-# compiler to aid in system detection is discouraged as it requires
315-# temporary files to be created and, as you can see below, it is a
316-# headache to deal with in a portable fashion.
317-
318-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
319-# use `HOST_CC' if defined, but it is deprecated.
320-
321-# Portable tmp directory creation inspired by the Autoconf team.
322-
323-set_cc_for_build='
324-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
325-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
326-: ${TMPDIR=/tmp} ;
327- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
328- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
329- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
330- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
331-dummy=$tmp/dummy ;
332-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
333-case $CC_FOR_BUILD,$HOST_CC,$CC in
334- ,,) echo "int x;" > $dummy.c ;
335- for c in cc gcc c89 c99 ; do
336- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
337- CC_FOR_BUILD="$c"; break ;
338- fi ;
339- done ;
340- if test x"$CC_FOR_BUILD" = x ; then
341- CC_FOR_BUILD=no_compiler_found ;
342- fi
343- ;;
344- ,,*) CC_FOR_BUILD=$CC ;;
345- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
346-esac ; set_cc_for_build= ;'
347-
348-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
349-# (ghazi@noc.rutgers.edu 1994-08-24)
350-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
351- PATH=$PATH:/.attbin ; export PATH
352-fi
353-
354-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
355-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
356-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
357-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
358-
359-# Note: order is significant - the case branches are not exclusive.
360-
361-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
362- *:NetBSD:*:*)
363- # NetBSD (nbsd) targets should (where applicable) match one or
364- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
365- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
366- # switched to ELF, *-*-netbsd* would select the old
367- # object file format. This provides both forward
368- # compatibility and a consistent mechanism for selecting the
369- # object file format.
370- #
371- # Note: NetBSD doesn't particularly care about the vendor
372- # portion of the name. We always set it to "unknown".
373- sysctl="sysctl -n hw.machine_arch"
374- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
375- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
376- case "${UNAME_MACHINE_ARCH}" in
377- armeb) machine=armeb-unknown ;;
378- arm*) machine=arm-unknown ;;
379- sh3el) machine=shl-unknown ;;
380- sh3eb) machine=sh-unknown ;;
381- sh5el) machine=sh5le-unknown ;;
382- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
383- esac
384- # The Operating System including object format, if it has switched
385- # to ELF recently, or will in the future.
386- case "${UNAME_MACHINE_ARCH}" in
387- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
388- eval $set_cc_for_build
389- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
390- | grep -q __ELF__
391- then
392- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
393- # Return netbsd for either. FIX?
394- os=netbsd
395- else
396- os=netbsdelf
397- fi
398- ;;
399- *)
400- os=netbsd
401- ;;
402- esac
403- # The OS release
404- # Debian GNU/NetBSD machines have a different userland, and
405- # thus, need a distinct triplet. However, they do not need
406- # kernel version information, so it can be replaced with a
407- # suitable tag, in the style of linux-gnu.
408- case "${UNAME_VERSION}" in
409- Debian*)
410- release='-gnu'
411- ;;
412- *)
413- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
414- ;;
415- esac
416- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
417- # contains redundant information, the shorter form:
418- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
419- echo "${machine}-${os}${release}"
420- exit ;;
421- *:OpenBSD:*:*)
422- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
423- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
424- exit ;;
425- *:ekkoBSD:*:*)
426- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
427- exit ;;
428- *:SolidBSD:*:*)
429- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
430- exit ;;
431- macppc:MirBSD:*:*)
432- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
433- exit ;;
434- *:MirBSD:*:*)
435- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
436- exit ;;
437- alpha:OSF1:*:*)
438- case $UNAME_RELEASE in
439- *4.0)
440- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
441- ;;
442- *5.*)
443- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
444- ;;
445- esac
446- # According to Compaq, /usr/sbin/psrinfo has been available on
447- # OSF/1 and Tru64 systems produced since 1995. I hope that
448- # covers most systems running today. This code pipes the CPU
449- # types through head -n 1, so we only detect the type of CPU 0.
450- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
451- case "$ALPHA_CPU_TYPE" in
452- "EV4 (21064)")
453- UNAME_MACHINE="alpha" ;;
454- "EV4.5 (21064)")
455- UNAME_MACHINE="alpha" ;;
456- "LCA4 (21066/21068)")
457- UNAME_MACHINE="alpha" ;;
458- "EV5 (21164)")
459- UNAME_MACHINE="alphaev5" ;;
460- "EV5.6 (21164A)")
461- UNAME_MACHINE="alphaev56" ;;
462- "EV5.6 (21164PC)")
463- UNAME_MACHINE="alphapca56" ;;
464- "EV5.7 (21164PC)")
465- UNAME_MACHINE="alphapca57" ;;
466- "EV6 (21264)")
467- UNAME_MACHINE="alphaev6" ;;
468- "EV6.7 (21264A)")
469- UNAME_MACHINE="alphaev67" ;;
470- "EV6.8CB (21264C)")
471- UNAME_MACHINE="alphaev68" ;;
472- "EV6.8AL (21264B)")
473- UNAME_MACHINE="alphaev68" ;;
474- "EV6.8CX (21264D)")
475- UNAME_MACHINE="alphaev68" ;;
476- "EV6.9A (21264/EV69A)")
477- UNAME_MACHINE="alphaev69" ;;
478- "EV7 (21364)")
479- UNAME_MACHINE="alphaev7" ;;
480- "EV7.9 (21364A)")
481- UNAME_MACHINE="alphaev79" ;;
482- esac
483- # A Pn.n version is a patched version.
484- # A Vn.n version is a released version.
485- # A Tn.n version is a released field test version.
486- # A Xn.n version is an unreleased experimental baselevel.
487- # 1.2 uses "1.2" for uname -r.
488- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
489- exit ;;
490- Alpha\ *:Windows_NT*:*)
491- # How do we know it's Interix rather than the generic POSIX subsystem?
492- # Should we change UNAME_MACHINE based on the output of uname instead
493- # of the specific Alpha model?
494- echo alpha-pc-interix
495- exit ;;
496- 21064:Windows_NT:50:3)
497- echo alpha-dec-winnt3.5
498- exit ;;
499- Amiga*:UNIX_System_V:4.0:*)
500- echo m68k-unknown-sysv4
501- exit ;;
502- *:[Aa]miga[Oo][Ss]:*:*)
503- echo ${UNAME_MACHINE}-unknown-amigaos
504- exit ;;
505- *:[Mm]orph[Oo][Ss]:*:*)
506- echo ${UNAME_MACHINE}-unknown-morphos
507- exit ;;
508- *:OS/390:*:*)
509- echo i370-ibm-openedition
510- exit ;;
511- *:z/VM:*:*)
512- echo s390-ibm-zvmoe
513- exit ;;
514- *:OS400:*:*)
515- echo powerpc-ibm-os400
516- exit ;;
517- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
518- echo arm-acorn-riscix${UNAME_RELEASE}
519- exit ;;
520- arm:riscos:*:*|arm:RISCOS:*:*)
521- echo arm-unknown-riscos
522- exit ;;
523- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
524- echo hppa1.1-hitachi-hiuxmpp
525- exit ;;
526- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
527- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
528- if test "`(/bin/universe) 2>/dev/null`" = att ; then
529- echo pyramid-pyramid-sysv3
530- else
531- echo pyramid-pyramid-bsd
532- fi
533- exit ;;
534- NILE*:*:*:dcosx)
535- echo pyramid-pyramid-svr4
536- exit ;;
537- DRS?6000:unix:4.0:6*)
538- echo sparc-icl-nx6
539- exit ;;
540- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
541- case `/usr/bin/uname -p` in
542- sparc) echo sparc-icl-nx7; exit ;;
543- esac ;;
544- s390x:SunOS:*:*)
545- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
546- exit ;;
547- sun4H:SunOS:5.*:*)
548- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
549- exit ;;
550- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
551- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
552- exit ;;
553- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
554- echo i386-pc-auroraux${UNAME_RELEASE}
555- exit ;;
556- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
557- eval $set_cc_for_build
558- SUN_ARCH="i386"
559- # If there is a compiler, see if it is configured for 64-bit objects.
560- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
561- # This test works for both compilers.
562- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
563- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
564- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
565- grep IS_64BIT_ARCH >/dev/null
566- then
567- SUN_ARCH="x86_64"
568- fi
569- fi
570- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
571- exit ;;
572- sun4*:SunOS:6*:*)
573- # According to config.sub, this is the proper way to canonicalize
574- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
575- # it's likely to be more like Solaris than SunOS4.
576- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
577- exit ;;
578- sun4*:SunOS:*:*)
579- case "`/usr/bin/arch -k`" in
580- Series*|S4*)
581- UNAME_RELEASE=`uname -v`
582- ;;
583- esac
584- # Japanese Language versions have a version number like `4.1.3-JL'.
585- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
586- exit ;;
587- sun3*:SunOS:*:*)
588- echo m68k-sun-sunos${UNAME_RELEASE}
589- exit ;;
590- sun*:*:4.2BSD:*)
591- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
592- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
593- case "`/bin/arch`" in
594- sun3)
595- echo m68k-sun-sunos${UNAME_RELEASE}
596- ;;
597- sun4)
598- echo sparc-sun-sunos${UNAME_RELEASE}
599- ;;
600- esac
601- exit ;;
602- aushp:SunOS:*:*)
603- echo sparc-auspex-sunos${UNAME_RELEASE}
604- exit ;;
605- # The situation for MiNT is a little confusing. The machine name
606- # can be virtually everything (everything which is not
607- # "atarist" or "atariste" at least should have a processor
608- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
609- # to the lowercase version "mint" (or "freemint"). Finally
610- # the system name "TOS" denotes a system which is actually not
611- # MiNT. But MiNT is downward compatible to TOS, so this should
612- # be no problem.
613- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
614- echo m68k-atari-mint${UNAME_RELEASE}
615- exit ;;
616- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
617- echo m68k-atari-mint${UNAME_RELEASE}
618- exit ;;
619- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
620- echo m68k-atari-mint${UNAME_RELEASE}
621- exit ;;
622- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
623- echo m68k-milan-mint${UNAME_RELEASE}
624- exit ;;
625- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
626- echo m68k-hades-mint${UNAME_RELEASE}
627- exit ;;
628- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
629- echo m68k-unknown-mint${UNAME_RELEASE}
630- exit ;;
631- m68k:machten:*:*)
632- echo m68k-apple-machten${UNAME_RELEASE}
633- exit ;;
634- powerpc:machten:*:*)
635- echo powerpc-apple-machten${UNAME_RELEASE}
636- exit ;;
637- RISC*:Mach:*:*)
638- echo mips-dec-mach_bsd4.3
639- exit ;;
640- RISC*:ULTRIX:*:*)
641- echo mips-dec-ultrix${UNAME_RELEASE}
642- exit ;;
643- VAX*:ULTRIX*:*:*)
644- echo vax-dec-ultrix${UNAME_RELEASE}
645- exit ;;
646- 2020:CLIX:*:* | 2430:CLIX:*:*)
647- echo clipper-intergraph-clix${UNAME_RELEASE}
648- exit ;;
649- mips:*:*:UMIPS | mips:*:*:RISCos)
650- eval $set_cc_for_build
651- sed 's/^ //' << EOF >$dummy.c
652-#ifdef __cplusplus
653-#include <stdio.h> /* for printf() prototype */
654- int main (int argc, char *argv[]) {
655-#else
656- int main (argc, argv) int argc; char *argv[]; {
657-#endif
658- #if defined (host_mips) && defined (MIPSEB)
659- #if defined (SYSTYPE_SYSV)
660- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
661- #endif
662- #if defined (SYSTYPE_SVR4)
663- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
664- #endif
665- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
666- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
667- #endif
668- #endif
669- exit (-1);
670- }
671-EOF
672- $CC_FOR_BUILD -o $dummy $dummy.c &&
673- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
674- SYSTEM_NAME=`$dummy $dummyarg` &&
675- { echo "$SYSTEM_NAME"; exit; }
676- echo mips-mips-riscos${UNAME_RELEASE}
677- exit ;;
678- Motorola:PowerMAX_OS:*:*)
679- echo powerpc-motorola-powermax
680- exit ;;
681- Motorola:*:4.3:PL8-*)
682- echo powerpc-harris-powermax
683- exit ;;
684- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
685- echo powerpc-harris-powermax
686- exit ;;
687- Night_Hawk:Power_UNIX:*:*)
688- echo powerpc-harris-powerunix
689- exit ;;
690- m88k:CX/UX:7*:*)
691- echo m88k-harris-cxux7
692- exit ;;
693- m88k:*:4*:R4*)
694- echo m88k-motorola-sysv4
695- exit ;;
696- m88k:*:3*:R3*)
697- echo m88k-motorola-sysv3
698- exit ;;
699- AViiON:dgux:*:*)
700- # DG/UX returns AViiON for all architectures
701- UNAME_PROCESSOR=`/usr/bin/uname -p`
702- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
703- then
704- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
705- [ ${TARGET_BINARY_INTERFACE}x = x ]
706- then
707- echo m88k-dg-dgux${UNAME_RELEASE}
708- else
709- echo m88k-dg-dguxbcs${UNAME_RELEASE}
710- fi
711- else
712- echo i586-dg-dgux${UNAME_RELEASE}
713- fi
714- exit ;;
715- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
716- echo m88k-dolphin-sysv3
717- exit ;;
718- M88*:*:R3*:*)
719- # Delta 88k system running SVR3
720- echo m88k-motorola-sysv3
721- exit ;;
722- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
723- echo m88k-tektronix-sysv3
724- exit ;;
725- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
726- echo m68k-tektronix-bsd
727- exit ;;
728- *:IRIX*:*:*)
729- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
730- exit ;;
731- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
732- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
733- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
734- i*86:AIX:*:*)
735- echo i386-ibm-aix
736- exit ;;
737- ia64:AIX:*:*)
738- if [ -x /usr/bin/oslevel ] ; then
739- IBM_REV=`/usr/bin/oslevel`
740- else
741- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
742- fi
743- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
744- exit ;;
745- *:AIX:2:3)
746- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
747- eval $set_cc_for_build
748- sed 's/^ //' << EOF >$dummy.c
749- #include <sys/systemcfg.h>
750-
751- main()
752- {
753- if (!__power_pc())
754- exit(1);
755- puts("powerpc-ibm-aix3.2.5");
756- exit(0);
757- }
758-EOF
759- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
760- then
761- echo "$SYSTEM_NAME"
762- else
763- echo rs6000-ibm-aix3.2.5
764- fi
765- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
766- echo rs6000-ibm-aix3.2.4
767- else
768- echo rs6000-ibm-aix3.2
769- fi
770- exit ;;
771- *:AIX:*:[456])
772- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
773- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
774- IBM_ARCH=rs6000
775- else
776- IBM_ARCH=powerpc
777- fi
778- if [ -x /usr/bin/oslevel ] ; then
779- IBM_REV=`/usr/bin/oslevel`
780- else
781- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
782- fi
783- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
784- exit ;;
785- *:AIX:*:*)
786- echo rs6000-ibm-aix
787- exit ;;
788- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
789- echo romp-ibm-bsd4.4
790- exit ;;
791- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
792- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
793- exit ;; # report: romp-ibm BSD 4.3
794- *:BOSX:*:*)
795- echo rs6000-bull-bosx
796- exit ;;
797- DPX/2?00:B.O.S.:*:*)
798- echo m68k-bull-sysv3
799- exit ;;
800- 9000/[34]??:4.3bsd:1.*:*)
801- echo m68k-hp-bsd
802- exit ;;
803- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
804- echo m68k-hp-bsd4.4
805- exit ;;
806- 9000/[34678]??:HP-UX:*:*)
807- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
808- case "${UNAME_MACHINE}" in
809- 9000/31? ) HP_ARCH=m68000 ;;
810- 9000/[34]?? ) HP_ARCH=m68k ;;
811- 9000/[678][0-9][0-9])
812- if [ -x /usr/bin/getconf ]; then
813- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
814- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
815- case "${sc_cpu_version}" in
816- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
817- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
818- 532) # CPU_PA_RISC2_0
819- case "${sc_kernel_bits}" in
820- 32) HP_ARCH="hppa2.0n" ;;
821- 64) HP_ARCH="hppa2.0w" ;;
822- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
823- esac ;;
824- esac
825- fi
826- if [ "${HP_ARCH}" = "" ]; then
827- eval $set_cc_for_build
828- sed 's/^ //' << EOF >$dummy.c
829-
830- #define _HPUX_SOURCE
831- #include <stdlib.h>
832- #include <unistd.h>
833-
834- int main ()
835- {
836- #if defined(_SC_KERNEL_BITS)
837- long bits = sysconf(_SC_KERNEL_BITS);
838- #endif
839- long cpu = sysconf (_SC_CPU_VERSION);
840-
841- switch (cpu)
842- {
843- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
844- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
845- case CPU_PA_RISC2_0:
846- #if defined(_SC_KERNEL_BITS)
847- switch (bits)
848- {
849- case 64: puts ("hppa2.0w"); break;
850- case 32: puts ("hppa2.0n"); break;
851- default: puts ("hppa2.0"); break;
852- } break;
853- #else /* !defined(_SC_KERNEL_BITS) */
854- puts ("hppa2.0"); break;
855- #endif
856- default: puts ("hppa1.0"); break;
857- }
858- exit (0);
859- }
860-EOF
861- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
862- test -z "$HP_ARCH" && HP_ARCH=hppa
863- fi ;;
864- esac
865- if [ ${HP_ARCH} = "hppa2.0w" ]
866- then
867- eval $set_cc_for_build
868-
869- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
870- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
871- # generating 64-bit code. GNU and HP use different nomenclature:
872- #
873- # $ CC_FOR_BUILD=cc ./config.guess
874- # => hppa2.0w-hp-hpux11.23
875- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
876- # => hppa64-hp-hpux11.23
877-
878- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
879- grep -q __LP64__
880- then
881- HP_ARCH="hppa2.0w"
882- else
883- HP_ARCH="hppa64"
884- fi
885- fi
886- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
887- exit ;;
888- ia64:HP-UX:*:*)
889- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
890- echo ia64-hp-hpux${HPUX_REV}
891- exit ;;
892- 3050*:HI-UX:*:*)
893- eval $set_cc_for_build
894- sed 's/^ //' << EOF >$dummy.c
895- #include <unistd.h>
896- int
897- main ()
898- {
899- long cpu = sysconf (_SC_CPU_VERSION);
900- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
901- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
902- results, however. */
903- if (CPU_IS_PA_RISC (cpu))
904- {
905- switch (cpu)
906- {
907- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
908- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
909- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
910- default: puts ("hppa-hitachi-hiuxwe2"); break;
911- }
912- }
913- else if (CPU_IS_HP_MC68K (cpu))
914- puts ("m68k-hitachi-hiuxwe2");
915- else puts ("unknown-hitachi-hiuxwe2");
916- exit (0);
917- }
918-EOF
919- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
920- { echo "$SYSTEM_NAME"; exit; }
921- echo unknown-hitachi-hiuxwe2
922- exit ;;
923- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
924- echo hppa1.1-hp-bsd
925- exit ;;
926- 9000/8??:4.3bsd:*:*)
927- echo hppa1.0-hp-bsd
928- exit ;;
929- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
930- echo hppa1.0-hp-mpeix
931- exit ;;
932- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
933- echo hppa1.1-hp-osf
934- exit ;;
935- hp8??:OSF1:*:*)
936- echo hppa1.0-hp-osf
937- exit ;;
938- i*86:OSF1:*:*)
939- if [ -x /usr/sbin/sysversion ] ; then
940- echo ${UNAME_MACHINE}-unknown-osf1mk
941- else
942- echo ${UNAME_MACHINE}-unknown-osf1
943- fi
944- exit ;;
945- parisc*:Lites*:*:*)
946- echo hppa1.1-hp-lites
947- exit ;;
948- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
949- echo c1-convex-bsd
950- exit ;;
951- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
952- if getsysinfo -f scalar_acc
953- then echo c32-convex-bsd
954- else echo c2-convex-bsd
955- fi
956- exit ;;
957- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
958- echo c34-convex-bsd
959- exit ;;
960- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
961- echo c38-convex-bsd
962- exit ;;
963- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
964- echo c4-convex-bsd
965- exit ;;
966- CRAY*Y-MP:*:*:*)
967- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
968- exit ;;
969- CRAY*[A-Z]90:*:*:*)
970- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
971- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
972- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
973- -e 's/\.[^.]*$/.X/'
974- exit ;;
975- CRAY*TS:*:*:*)
976- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
977- exit ;;
978- CRAY*T3E:*:*:*)
979- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
980- exit ;;
981- CRAY*SV1:*:*:*)
982- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
983- exit ;;
984- *:UNICOS/mp:*:*)
985- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
986- exit ;;
987- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
988- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
989- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
990- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
991- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
992- exit ;;
993- 5000:UNIX_System_V:4.*:*)
994- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
995- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
996- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
997- exit ;;
998- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
999- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
1000- exit ;;
1001- sparc*:BSD/OS:*:*)
1002- echo sparc-unknown-bsdi${UNAME_RELEASE}
1003- exit ;;
1004- *:BSD/OS:*:*)
1005- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
1006- exit ;;
1007- *:FreeBSD:*:*)
1008- case ${UNAME_MACHINE} in
1009- pc98)
1010- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1011- amd64)
1012- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1013- *)
1014- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1015- esac
1016- exit ;;
1017- i*:CYGWIN*:*)
1018- echo ${UNAME_MACHINE}-pc-cygwin
1019- exit ;;
1020- *:MINGW*:*)
1021- echo ${UNAME_MACHINE}-pc-mingw32
1022- exit ;;
1023- i*:windows32*:*)
1024- # uname -m includes "-pc" on this system.
1025- echo ${UNAME_MACHINE}-mingw32
1026- exit ;;
1027- i*:PW*:*)
1028- echo ${UNAME_MACHINE}-pc-pw32
1029- exit ;;
1030- *:Interix*:*)
1031- case ${UNAME_MACHINE} in
1032- x86)
1033- echo i586-pc-interix${UNAME_RELEASE}
1034- exit ;;
1035- authenticamd | genuineintel | EM64T)
1036- echo x86_64-unknown-interix${UNAME_RELEASE}
1037- exit ;;
1038- IA64)
1039- echo ia64-unknown-interix${UNAME_RELEASE}
1040- exit ;;
1041- esac ;;
1042- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
1043- echo i${UNAME_MACHINE}-pc-mks
1044- exit ;;
1045- 8664:Windows_NT:*)
1046- echo x86_64-pc-mks
1047- exit ;;
1048- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
1049- # How do we know it's Interix rather than the generic POSIX subsystem?
1050- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
1051- # UNAME_MACHINE based on the output of uname instead of i386?
1052- echo i586-pc-interix
1053- exit ;;
1054- i*:UWIN*:*)
1055- echo ${UNAME_MACHINE}-pc-uwin
1056- exit ;;
1057- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
1058- echo x86_64-unknown-cygwin
1059- exit ;;
1060- p*:CYGWIN*:*)
1061- echo powerpcle-unknown-cygwin
1062- exit ;;
1063- prep*:SunOS:5.*:*)
1064- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1065- exit ;;
1066- *:GNU:*:*)
1067- # the GNU system
1068- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
1069- exit ;;
1070- *:GNU/*:*:*)
1071- # other systems with GNU libc and userland
1072- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
1073- exit ;;
1074- i*86:Minix:*:*)
1075- echo ${UNAME_MACHINE}-pc-minix
1076- exit ;;
1077- alpha:Linux:*:*)
1078- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
1079- EV5) UNAME_MACHINE=alphaev5 ;;
1080- EV56) UNAME_MACHINE=alphaev56 ;;
1081- PCA56) UNAME_MACHINE=alphapca56 ;;
1082- PCA57) UNAME_MACHINE=alphapca56 ;;
1083- EV6) UNAME_MACHINE=alphaev6 ;;
1084- EV67) UNAME_MACHINE=alphaev67 ;;
1085- EV68*) UNAME_MACHINE=alphaev68 ;;
1086- esac
1087- objdump --private-headers /bin/sh | grep -q ld.so.1
1088- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
1089- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
1090- exit ;;
1091- arm*:Linux:*:*)
1092- eval $set_cc_for_build
1093- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
1094- | grep -q __ARM_EABI__
1095- then
1096- echo ${UNAME_MACHINE}-unknown-linux-gnu
1097- else
1098- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
1099- fi
1100- exit ;;
1101- avr32*:Linux:*:*)
1102- echo ${UNAME_MACHINE}-unknown-linux-gnu
1103- exit ;;
1104- cris:Linux:*:*)
1105- echo cris-axis-linux-gnu
1106- exit ;;
1107- crisv32:Linux:*:*)
1108- echo crisv32-axis-linux-gnu
1109- exit ;;
1110- frv:Linux:*:*)
1111- echo frv-unknown-linux-gnu
1112- exit ;;
1113- i*86:Linux:*:*)
1114- LIBC=gnu
1115- eval $set_cc_for_build
1116- sed 's/^ //' << EOF >$dummy.c
1117- #ifdef __dietlibc__
1118- LIBC=dietlibc
1119- #endif
1120-EOF
1121- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
1122- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1123- exit ;;
1124- ia64:Linux:*:*)
1125- echo ${UNAME_MACHINE}-unknown-linux-gnu
1126- exit ;;
1127- m32r*:Linux:*:*)
1128- echo ${UNAME_MACHINE}-unknown-linux-gnu
1129- exit ;;
1130- m68*:Linux:*:*)
1131- echo ${UNAME_MACHINE}-unknown-linux-gnu
1132- exit ;;
1133- mips:Linux:*:* | mips64:Linux:*:*)
1134- eval $set_cc_for_build
1135- sed 's/^ //' << EOF >$dummy.c
1136- #undef CPU
1137- #undef ${UNAME_MACHINE}
1138- #undef ${UNAME_MACHINE}el
1139- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
1140- CPU=${UNAME_MACHINE}el
1141- #else
1142- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
1143- CPU=${UNAME_MACHINE}
1144- #else
1145- CPU=
1146- #endif
1147- #endif
1148-EOF
1149- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
1150- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
1151- ;;
1152- or32:Linux:*:*)
1153- echo or32-unknown-linux-gnu
1154- exit ;;
1155- padre:Linux:*:*)
1156- echo sparc-unknown-linux-gnu
1157- exit ;;
1158- parisc64:Linux:*:* | hppa64:Linux:*:*)
1159- echo hppa64-unknown-linux-gnu
1160- exit ;;
1161- parisc:Linux:*:* | hppa:Linux:*:*)
1162- # Look for CPU level
1163- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
1164- PA7*) echo hppa1.1-unknown-linux-gnu ;;
1165- PA8*) echo hppa2.0-unknown-linux-gnu ;;
1166- *) echo hppa-unknown-linux-gnu ;;
1167- esac
1168- exit ;;
1169- ppc64:Linux:*:*)
1170- echo powerpc64-unknown-linux-gnu
1171- exit ;;
1172- ppc:Linux:*:*)
1173- echo powerpc-unknown-linux-gnu
1174- exit ;;
1175- s390:Linux:*:* | s390x:Linux:*:*)
1176- echo ${UNAME_MACHINE}-ibm-linux
1177- exit ;;
1178- sh64*:Linux:*:*)
1179- echo ${UNAME_MACHINE}-unknown-linux-gnu
1180- exit ;;
1181- sh*:Linux:*:*)
1182- echo ${UNAME_MACHINE}-unknown-linux-gnu
1183- exit ;;
1184- sparc:Linux:*:* | sparc64:Linux:*:*)
1185- echo ${UNAME_MACHINE}-unknown-linux-gnu
1186- exit ;;
1187- vax:Linux:*:*)
1188- echo ${UNAME_MACHINE}-dec-linux-gnu
1189- exit ;;
1190- x86_64:Linux:*:*)
1191- echo x86_64-unknown-linux-gnu
1192- exit ;;
1193- xtensa*:Linux:*:*)
1194- echo ${UNAME_MACHINE}-unknown-linux-gnu
1195- exit ;;
1196- i*86:DYNIX/ptx:4*:*)
1197- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1198- # earlier versions are messed up and put the nodename in both
1199- # sysname and nodename.
1200- echo i386-sequent-sysv4
1201- exit ;;
1202- i*86:UNIX_SV:4.2MP:2.*)
1203- # Unixware is an offshoot of SVR4, but it has its own version
1204- # number series starting with 2...
1205- # I am not positive that other SVR4 systems won't match this,
1206- # I just have to hope. -- rms.
1207- # Use sysv4.2uw... so that sysv4* matches it.
1208- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1209- exit ;;
1210- i*86:OS/2:*:*)
1211- # If we were able to find `uname', then EMX Unix compatibility
1212- # is probably installed.
1213- echo ${UNAME_MACHINE}-pc-os2-emx
1214- exit ;;
1215- i*86:XTS-300:*:STOP)
1216- echo ${UNAME_MACHINE}-unknown-stop
1217- exit ;;
1218- i*86:atheos:*:*)
1219- echo ${UNAME_MACHINE}-unknown-atheos
1220- exit ;;
1221- i*86:syllable:*:*)
1222- echo ${UNAME_MACHINE}-pc-syllable
1223- exit ;;
1224- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1225- echo i386-unknown-lynxos${UNAME_RELEASE}
1226- exit ;;
1227- i*86:*DOS:*:*)
1228- echo ${UNAME_MACHINE}-pc-msdosdjgpp
1229- exit ;;
1230- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1231- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1232- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1233- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
1234- else
1235- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1236- fi
1237- exit ;;
1238- i*86:*:5:[678]*)
1239- # UnixWare 7.x, OpenUNIX and OpenServer 6.
1240- case `/bin/uname -X | grep "^Machine"` in
1241- *486*) UNAME_MACHINE=i486 ;;
1242- *Pentium) UNAME_MACHINE=i586 ;;
1243- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1244- esac
1245- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1246- exit ;;
1247- i*86:*:3.2:*)
1248- if test -f /usr/options/cb.name; then
1249- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1250- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1251- elif /bin/uname -X 2>/dev/null >/dev/null ; then
1252- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1253- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
1254- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
1255- && UNAME_MACHINE=i586
1256- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
1257- && UNAME_MACHINE=i686
1258- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1259- && UNAME_MACHINE=i686
1260- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1261- else
1262- echo ${UNAME_MACHINE}-pc-sysv32
1263- fi
1264- exit ;;
1265- pc:*:*:*)
1266- # Left here for compatibility:
1267- # uname -m prints for DJGPP always 'pc', but it prints nothing about
1268- # the processor, so we play safe by assuming i586.
1269- # Note: whatever this is, it MUST be the same as what config.sub
1270- # prints for the "djgpp" host, or else GDB configury will decide that
1271- # this is a cross-build.
1272- echo i586-pc-msdosdjgpp
1273- exit ;;
1274- Intel:Mach:3*:*)
1275- echo i386-pc-mach3
1276- exit ;;
1277- paragon:*:*:*)
1278- echo i860-intel-osf1
1279- exit ;;
1280- i860:*:4.*:*) # i860-SVR4
1281- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1282- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1283- else # Add other i860-SVR4 vendors below as they are discovered.
1284- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
1285- fi
1286- exit ;;
1287- mini*:CTIX:SYS*5:*)
1288- # "miniframe"
1289- echo m68010-convergent-sysv
1290- exit ;;
1291- mc68k:UNIX:SYSTEM5:3.51m)
1292- echo m68k-convergent-sysv
1293- exit ;;
1294- M680?0:D-NIX:5.3:*)
1295- echo m68k-diab-dnix
1296- exit ;;
1297- M68*:*:R3V[5678]*:*)
1298- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1299- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1300- OS_REL=''
1301- test -r /etc/.relid \
1302- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1303- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1304- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1305- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1306- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1307- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1308- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1309- && { echo i486-ncr-sysv4; exit; } ;;
1310- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1311- OS_REL='.3'
1312- test -r /etc/.relid \
1313- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1314- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1315- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1316- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1317- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1318- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1319- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1320- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1321- echo m68k-unknown-lynxos${UNAME_RELEASE}
1322- exit ;;
1323- mc68030:UNIX_System_V:4.*:*)
1324- echo m68k-atari-sysv4
1325- exit ;;
1326- TSUNAMI:LynxOS:2.*:*)
1327- echo sparc-unknown-lynxos${UNAME_RELEASE}
1328- exit ;;
1329- rs6000:LynxOS:2.*:*)
1330- echo rs6000-unknown-lynxos${UNAME_RELEASE}
1331- exit ;;
1332- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1333- echo powerpc-unknown-lynxos${UNAME_RELEASE}
1334- exit ;;
1335- SM[BE]S:UNIX_SV:*:*)
1336- echo mips-dde-sysv${UNAME_RELEASE}
1337- exit ;;
1338- RM*:ReliantUNIX-*:*:*)
1339- echo mips-sni-sysv4
1340- exit ;;
1341- RM*:SINIX-*:*:*)
1342- echo mips-sni-sysv4
1343- exit ;;
1344- *:SINIX-*:*:*)
1345- if uname -p 2>/dev/null >/dev/null ; then
1346- UNAME_MACHINE=`(uname -p) 2>/dev/null`
1347- echo ${UNAME_MACHINE}-sni-sysv4
1348- else
1349- echo ns32k-sni-sysv
1350- fi
1351- exit ;;
1352- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1353- # says <Richard.M.Bartel@ccMail.Census.GOV>
1354- echo i586-unisys-sysv4
1355- exit ;;
1356- *:UNIX_System_V:4*:FTX*)
1357- # From Gerald Hewes <hewes@openmarket.com>.
1358- # How about differentiating between stratus architectures? -djm
1359- echo hppa1.1-stratus-sysv4
1360- exit ;;
1361- *:*:*:FTX*)
1362- # From seanf@swdc.stratus.com.
1363- echo i860-stratus-sysv4
1364- exit ;;
1365- i*86:VOS:*:*)
1366- # From Paul.Green@stratus.com.
1367- echo ${UNAME_MACHINE}-stratus-vos
1368- exit ;;
1369- *:VOS:*:*)
1370- # From Paul.Green@stratus.com.
1371- echo hppa1.1-stratus-vos
1372- exit ;;
1373- mc68*:A/UX:*:*)
1374- echo m68k-apple-aux${UNAME_RELEASE}
1375- exit ;;
1376- news*:NEWS-OS:6*:*)
1377- echo mips-sony-newsos6
1378- exit ;;
1379- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1380- if [ -d /usr/nec ]; then
1381- echo mips-nec-sysv${UNAME_RELEASE}
1382- else
1383- echo mips-unknown-sysv${UNAME_RELEASE}
1384- fi
1385- exit ;;
1386- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1387- echo powerpc-be-beos
1388- exit ;;
1389- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1390- echo powerpc-apple-beos
1391- exit ;;
1392- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1393- echo i586-pc-beos
1394- exit ;;
1395- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1396- echo i586-pc-haiku
1397- exit ;;
1398- SX-4:SUPER-UX:*:*)
1399- echo sx4-nec-superux${UNAME_RELEASE}
1400- exit ;;
1401- SX-5:SUPER-UX:*:*)
1402- echo sx5-nec-superux${UNAME_RELEASE}
1403- exit ;;
1404- SX-6:SUPER-UX:*:*)
1405- echo sx6-nec-superux${UNAME_RELEASE}
1406- exit ;;
1407- SX-7:SUPER-UX:*:*)
1408- echo sx7-nec-superux${UNAME_RELEASE}
1409- exit ;;
1410- SX-8:SUPER-UX:*:*)
1411- echo sx8-nec-superux${UNAME_RELEASE}
1412- exit ;;
1413- SX-8R:SUPER-UX:*:*)
1414- echo sx8r-nec-superux${UNAME_RELEASE}
1415- exit ;;
1416- Power*:Rhapsody:*:*)
1417- echo powerpc-apple-rhapsody${UNAME_RELEASE}
1418- exit ;;
1419- *:Rhapsody:*:*)
1420- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1421- exit ;;
1422- *:Darwin:*:*)
1423- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1424- case $UNAME_PROCESSOR in
1425- i386)
1426- eval $set_cc_for_build
1427- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1428- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1429- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1430- grep IS_64BIT_ARCH >/dev/null
1431- then
1432- UNAME_PROCESSOR="x86_64"
1433- fi
1434- fi ;;
1435- unknown) UNAME_PROCESSOR=powerpc ;;
1436- esac
1437- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1438- exit ;;
1439- *:procnto*:*:* | *:QNX:[0123456789]*:*)
1440- UNAME_PROCESSOR=`uname -p`
1441- if test "$UNAME_PROCESSOR" = "x86"; then
1442- UNAME_PROCESSOR=i386
1443- UNAME_MACHINE=pc
1444- fi
1445- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1446- exit ;;
1447- *:QNX:*:4*)
1448- echo i386-pc-qnx
1449- exit ;;
1450- NSE-?:NONSTOP_KERNEL:*:*)
1451- echo nse-tandem-nsk${UNAME_RELEASE}
1452- exit ;;
1453- NSR-?:NONSTOP_KERNEL:*:*)
1454- echo nsr-tandem-nsk${UNAME_RELEASE}
1455- exit ;;
1456- *:NonStop-UX:*:*)
1457- echo mips-compaq-nonstopux
1458- exit ;;
1459- BS2000:POSIX*:*:*)
1460- echo bs2000-siemens-sysv
1461- exit ;;
1462- DS/*:UNIX_System_V:*:*)
1463- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1464- exit ;;
1465- *:Plan9:*:*)
1466- # "uname -m" is not consistent, so use $cputype instead. 386
1467- # is converted to i386 for consistency with other x86
1468- # operating systems.
1469- if test "$cputype" = "386"; then
1470- UNAME_MACHINE=i386
1471- else
1472- UNAME_MACHINE="$cputype"
1473- fi
1474- echo ${UNAME_MACHINE}-unknown-plan9
1475- exit ;;
1476- *:TOPS-10:*:*)
1477- echo pdp10-unknown-tops10
1478- exit ;;
1479- *:TENEX:*:*)
1480- echo pdp10-unknown-tenex
1481- exit ;;
1482- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1483- echo pdp10-dec-tops20
1484- exit ;;
1485- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1486- echo pdp10-xkl-tops20
1487- exit ;;
1488- *:TOPS-20:*:*)
1489- echo pdp10-unknown-tops20
1490- exit ;;
1491- *:ITS:*:*)
1492- echo pdp10-unknown-its
1493- exit ;;
1494- SEI:*:*:SEIUX)
1495- echo mips-sei-seiux${UNAME_RELEASE}
1496- exit ;;
1497- *:DragonFly:*:*)
1498- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1499- exit ;;
1500- *:*VMS:*:*)
1501- UNAME_MACHINE=`(uname -p) 2>/dev/null`
1502- case "${UNAME_MACHINE}" in
1503- A*) echo alpha-dec-vms ; exit ;;
1504- I*) echo ia64-dec-vms ; exit ;;
1505- V*) echo vax-dec-vms ; exit ;;
1506- esac ;;
1507- *:XENIX:*:SysV)
1508- echo i386-pc-xenix
1509- exit ;;
1510- i*86:skyos:*:*)
1511- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1512- exit ;;
1513- i*86:rdos:*:*)
1514- echo ${UNAME_MACHINE}-pc-rdos
1515- exit ;;
1516- i*86:AROS:*:*)
1517- echo ${UNAME_MACHINE}-pc-aros
1518- exit ;;
1519-esac
1520-
1521-#echo '(No uname command or uname output not recognized.)' 1>&2
1522-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1523-
1524-eval $set_cc_for_build
1525-cat >$dummy.c <<EOF
1526-#ifdef _SEQUENT_
1527-# include <sys/types.h>
1528-# include <sys/utsname.h>
1529-#endif
1530-main ()
1531-{
1532-#if defined (sony)
1533-#if defined (MIPSEB)
1534- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1535- I don't know.... */
1536- printf ("mips-sony-bsd\n"); exit (0);
1537-#else
1538-#include <sys/param.h>
1539- printf ("m68k-sony-newsos%s\n",
1540-#ifdef NEWSOS4
1541- "4"
1542-#else
1543- ""
1544-#endif
1545- ); exit (0);
1546-#endif
1547-#endif
1548-
1549-#if defined (__arm) && defined (__acorn) && defined (__unix)
1550- printf ("arm-acorn-riscix\n"); exit (0);
1551-#endif
1552-
1553-#if defined (hp300) && !defined (hpux)
1554- printf ("m68k-hp-bsd\n"); exit (0);
1555-#endif
1556-
1557-#if defined (NeXT)
1558-#if !defined (__ARCHITECTURE__)
1559-#define __ARCHITECTURE__ "m68k"
1560-#endif
1561- int version;
1562- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1563- if (version < 4)
1564- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1565- else
1566- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1567- exit (0);
1568-#endif
1569-
1570-#if defined (MULTIMAX) || defined (n16)
1571-#if defined (UMAXV)
1572- printf ("ns32k-encore-sysv\n"); exit (0);
1573-#else
1574-#if defined (CMU)
1575- printf ("ns32k-encore-mach\n"); exit (0);
1576-#else
1577- printf ("ns32k-encore-bsd\n"); exit (0);
1578-#endif
1579-#endif
1580-#endif
1581-
1582-#if defined (__386BSD__)
1583- printf ("i386-pc-bsd\n"); exit (0);
1584-#endif
1585-
1586-#if defined (sequent)
1587-#if defined (i386)
1588- printf ("i386-sequent-dynix\n"); exit (0);
1589-#endif
1590-#if defined (ns32000)
1591- printf ("ns32k-sequent-dynix\n"); exit (0);
1592-#endif
1593-#endif
1594-
1595-#if defined (_SEQUENT_)
1596- struct utsname un;
1597-
1598- uname(&un);
1599-
1600- if (strncmp(un.version, "V2", 2) == 0) {
1601- printf ("i386-sequent-ptx2\n"); exit (0);
1602- }
1603- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1604- printf ("i386-sequent-ptx1\n"); exit (0);
1605- }
1606- printf ("i386-sequent-ptx\n"); exit (0);
1607-
1608-#endif
1609-
1610-#if defined (vax)
1611-# if !defined (ultrix)
1612-# include <sys/param.h>
1613-# if defined (BSD)
1614-# if BSD == 43
1615- printf ("vax-dec-bsd4.3\n"); exit (0);
1616-# else
1617-# if BSD == 199006
1618- printf ("vax-dec-bsd4.3reno\n"); exit (0);
1619-# else
1620- printf ("vax-dec-bsd\n"); exit (0);
1621-# endif
1622-# endif
1623-# else
1624- printf ("vax-dec-bsd\n"); exit (0);
1625-# endif
1626-# else
1627- printf ("vax-dec-ultrix\n"); exit (0);
1628-# endif
1629-#endif
1630-
1631-#if defined (alliant) && defined (i860)
1632- printf ("i860-alliant-bsd\n"); exit (0);
1633-#endif
1634-
1635- exit (1);
1636-}
1637-EOF
1638-
1639-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1640- { echo "$SYSTEM_NAME"; exit; }
1641-
1642-# Apollos put the system type in the environment.
1643-
1644-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1645-
1646-# Convex versions that predate uname can use getsysinfo(1)
1647-
1648-if [ -x /usr/convex/getsysinfo ]
1649-then
1650- case `getsysinfo -f cpu_type` in
1651- c1*)
1652- echo c1-convex-bsd
1653- exit ;;
1654- c2*)
1655- if getsysinfo -f scalar_acc
1656- then echo c32-convex-bsd
1657- else echo c2-convex-bsd
1658- fi
1659- exit ;;
1660- c34*)
1661- echo c34-convex-bsd
1662- exit ;;
1663- c38*)
1664- echo c38-convex-bsd
1665- exit ;;
1666- c4*)
1667- echo c4-convex-bsd
1668- exit ;;
1669- esac
1670-fi
1671-
1672-cat >&2 <<EOF
1673-$0: unable to guess system type
1674-
1675-This script, last modified $timestamp, has failed to recognize
1676-the operating system you are using. It is advised that you
1677-download the most up to date version of the config scripts from
1678-
1679- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1680-and
1681- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1682-
1683-If the version you run ($0) is already up to date, please
1684-send the following data and any information you think might be
1685-pertinent to <config-patches@gnu.org> in order to provide the needed
1686-information to handle your system.
1687-
1688-config.guess timestamp = $timestamp
1689-
1690-uname -m = `(uname -m) 2>/dev/null || echo unknown`
1691-uname -r = `(uname -r) 2>/dev/null || echo unknown`
1692-uname -s = `(uname -s) 2>/dev/null || echo unknown`
1693-uname -v = `(uname -v) 2>/dev/null || echo unknown`
1694-
1695-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
1696-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
1697-
1698-hostinfo = `(hostinfo) 2>/dev/null`
1699-/bin/universe = `(/bin/universe) 2>/dev/null`
1700-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
1701-/bin/arch = `(/bin/arch) 2>/dev/null`
1702-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1703-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1704-
1705-UNAME_MACHINE = ${UNAME_MACHINE}
1706-UNAME_RELEASE = ${UNAME_RELEASE}
1707-UNAME_SYSTEM = ${UNAME_SYSTEM}
1708-UNAME_VERSION = ${UNAME_VERSION}
1709-EOF
1710-
1711-exit 1
1712-
1713-# Local variables:
1714-# eval: (add-hook 'write-file-hooks 'time-stamp)
1715-# time-stamp-start: "timestamp='"
1716-# time-stamp-format: "%:y-%02m-%02d"
1717-# time-stamp-end: "'"
1718-# End:
1719
1720=== removed file 'config.sub'
1721--- config.sub 2012-04-04 19:34:11 +0000
1722+++ config.sub 1970-01-01 00:00:00 +0000
1723@@ -1,1714 +0,0 @@
1724-#! /bin/sh
1725-# Configuration validation subroutine script.
1726-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1727-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
1728-# Free Software Foundation, Inc.
1729-
1730-timestamp='2010-01-22'
1731-
1732-# This file is (in principle) common to ALL GNU software.
1733-# The presence of a machine in this file suggests that SOME GNU software
1734-# can handle that machine. It does not imply ALL GNU software can.
1735-#
1736-# This file is free software; you can redistribute it and/or modify
1737-# it under the terms of the GNU General Public License as published by
1738-# the Free Software Foundation; either version 2 of the License, or
1739-# (at your option) any later version.
1740-#
1741-# This program is distributed in the hope that it will be useful,
1742-# but WITHOUT ANY WARRANTY; without even the implied warranty of
1743-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1744-# GNU General Public License for more details.
1745-#
1746-# You should have received a copy of the GNU General Public License
1747-# along with this program; if not, write to the Free Software
1748-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
1749-# 02110-1301, USA.
1750-#
1751-# As a special exception to the GNU General Public License, if you
1752-# distribute this file as part of a program that contains a
1753-# configuration script generated by Autoconf, you may include it under
1754-# the same distribution terms that you use for the rest of that program.
1755-
1756-
1757-# Please send patches to <config-patches@gnu.org>. Submit a context
1758-# diff and a properly formatted GNU ChangeLog entry.
1759-#
1760-# Configuration subroutine to validate and canonicalize a configuration type.
1761-# Supply the specified configuration type as an argument.
1762-# If it is invalid, we print an error message on stderr and exit with code 1.
1763-# Otherwise, we print the canonical config type on stdout and succeed.
1764-
1765-# You can get the latest version of this script from:
1766-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1767-
1768-# This file is supposed to be the same for all GNU packages
1769-# and recognize all the CPU types, system types and aliases
1770-# that are meaningful with *any* GNU software.
1771-# Each package is responsible for reporting which valid configurations
1772-# it does not support. The user should be able to distinguish
1773-# a failure to support a valid configuration from a meaningless
1774-# configuration.
1775-
1776-# The goal of this file is to map all the various variations of a given
1777-# machine specification into a single specification in the form:
1778-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
1779-# or in some cases, the newer four-part form:
1780-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
1781-# It is wrong to echo any other type of specification.
1782-
1783-me=`echo "$0" | sed -e 's,.*/,,'`
1784-
1785-usage="\
1786-Usage: $0 [OPTION] CPU-MFR-OPSYS
1787- $0 [OPTION] ALIAS
1788-
1789-Canonicalize a configuration name.
1790-
1791-Operation modes:
1792- -h, --help print this help, then exit
1793- -t, --time-stamp print date of last modification, then exit
1794- -v, --version print version number, then exit
1795-
1796-Report bugs and patches to <config-patches@gnu.org>."
1797-
1798-version="\
1799-GNU config.sub ($timestamp)
1800-
1801-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
1802-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
1803-Software Foundation, Inc.
1804-
1805-This is free software; see the source for copying conditions. There is NO
1806-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1807-
1808-help="
1809-Try \`$me --help' for more information."
1810-
1811-# Parse command line
1812-while test $# -gt 0 ; do
1813- case $1 in
1814- --time-stamp | --time* | -t )
1815- echo "$timestamp" ; exit ;;
1816- --version | -v )
1817- echo "$version" ; exit ;;
1818- --help | --h* | -h )
1819- echo "$usage"; exit ;;
1820- -- ) # Stop option processing
1821- shift; break ;;
1822- - ) # Use stdin as input.
1823- break ;;
1824- -* )
1825- echo "$me: invalid option $1$help"
1826- exit 1 ;;
1827-
1828- *local*)
1829- # First pass through any local machine types.
1830- echo $1
1831- exit ;;
1832-
1833- * )
1834- break ;;
1835- esac
1836-done
1837-
1838-case $# in
1839- 0) echo "$me: missing argument$help" >&2
1840- exit 1;;
1841- 1) ;;
1842- *) echo "$me: too many arguments$help" >&2
1843- exit 1;;
1844-esac
1845-
1846-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1847-# Here we must recognize all the valid KERNEL-OS combinations.
1848-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1849-case $maybe_os in
1850- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
1851- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
1852- kopensolaris*-gnu* | \
1853- storm-chaos* | os2-emx* | rtmk-nova*)
1854- os=-$maybe_os
1855- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1856- ;;
1857- *)
1858- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1859- if [ $basic_machine != $1 ]
1860- then os=`echo $1 | sed 's/.*-/-/'`
1861- else os=; fi
1862- ;;
1863-esac
1864-
1865-### Let's recognize common machines as not being operating systems so
1866-### that things like config.sub decstation-3100 work. We also
1867-### recognize some manufacturers as not being operating systems, so we
1868-### can provide default operating systems below.
1869-case $os in
1870- -sun*os*)
1871- # Prevent following clause from handling this invalid input.
1872- ;;
1873- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
1874- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
1875- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
1876- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1877- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1878- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1879- -apple | -axis | -knuth | -cray | -microblaze)
1880- os=
1881- basic_machine=$1
1882- ;;
1883- -bluegene*)
1884- os=-cnk
1885- ;;
1886- -sim | -cisco | -oki | -wec | -winbond)
1887- os=
1888- basic_machine=$1
1889- ;;
1890- -scout)
1891- ;;
1892- -wrs)
1893- os=-vxworks
1894- basic_machine=$1
1895- ;;
1896- -chorusos*)
1897- os=-chorusos
1898- basic_machine=$1
1899- ;;
1900- -chorusrdb)
1901- os=-chorusrdb
1902- basic_machine=$1
1903- ;;
1904- -hiux*)
1905- os=-hiuxwe2
1906- ;;
1907- -sco6)
1908- os=-sco5v6
1909- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1910- ;;
1911- -sco5)
1912- os=-sco3.2v5
1913- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1914- ;;
1915- -sco4)
1916- os=-sco3.2v4
1917- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1918- ;;
1919- -sco3.2.[4-9]*)
1920- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
1921- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1922- ;;
1923- -sco3.2v[4-9]*)
1924- # Don't forget version if it is 3.2v4 or newer.
1925- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1926- ;;
1927- -sco5v6*)
1928- # Don't forget version if it is 3.2v4 or newer.
1929- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1930- ;;
1931- -sco*)
1932- os=-sco3.2v2
1933- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1934- ;;
1935- -udk*)
1936- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1937- ;;
1938- -isc)
1939- os=-isc2.2
1940- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1941- ;;
1942- -clix*)
1943- basic_machine=clipper-intergraph
1944- ;;
1945- -isc*)
1946- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1947- ;;
1948- -lynx*)
1949- os=-lynxos
1950- ;;
1951- -ptx*)
1952- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
1953- ;;
1954- -windowsnt*)
1955- os=`echo $os | sed -e 's/windowsnt/winnt/'`
1956- ;;
1957- -psos*)
1958- os=-psos
1959- ;;
1960- -mint | -mint[0-9]*)
1961- basic_machine=m68k-atari
1962- os=-mint
1963- ;;
1964-esac
1965-
1966-# Decode aliases for certain CPU-COMPANY combinations.
1967-case $basic_machine in
1968- # Recognize the basic CPU types without company name.
1969- # Some are omitted here because they have special meanings below.
1970- 1750a | 580 \
1971- | a29k \
1972- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1973- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1974- | am33_2.0 \
1975- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1976- | bfin \
1977- | c4x | clipper \
1978- | d10v | d30v | dlx | dsp16xx \
1979- | fido | fr30 | frv \
1980- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1981- | i370 | i860 | i960 | ia64 \
1982- | ip2k | iq2000 \
1983- | lm32 \
1984- | m32c | m32r | m32rle | m68000 | m68k | m88k \
1985- | maxq | mb | microblaze | mcore | mep | metag \
1986- | mips | mipsbe | mipseb | mipsel | mipsle \
1987- | mips16 \
1988- | mips64 | mips64el \
1989- | mips64octeon | mips64octeonel \
1990- | mips64orion | mips64orionel \
1991- | mips64r5900 | mips64r5900el \
1992- | mips64vr | mips64vrel \
1993- | mips64vr4100 | mips64vr4100el \
1994- | mips64vr4300 | mips64vr4300el \
1995- | mips64vr5000 | mips64vr5000el \
1996- | mips64vr5900 | mips64vr5900el \
1997- | mipsisa32 | mipsisa32el \
1998- | mipsisa32r2 | mipsisa32r2el \
1999- | mipsisa64 | mipsisa64el \
2000- | mipsisa64r2 | mipsisa64r2el \
2001- | mipsisa64sb1 | mipsisa64sb1el \
2002- | mipsisa64sr71k | mipsisa64sr71kel \
2003- | mipstx39 | mipstx39el \
2004- | mn10200 | mn10300 \
2005- | moxie \
2006- | mt \
2007- | msp430 \
2008- | nios | nios2 \
2009- | ns16k | ns32k \
2010- | or32 \
2011- | pdp10 | pdp11 | pj | pjl \
2012- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
2013- | pyramid \
2014- | rx \
2015- | score \
2016- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
2017- | sh64 | sh64le \
2018- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
2019- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
2020- | spu | strongarm \
2021- | tahoe | thumb | tic4x | tic80 | tron \
2022- | ubicom32 \
2023- | v850 | v850e \
2024- | we32k \
2025- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
2026- | z8k | z80)
2027- basic_machine=$basic_machine-unknown
2028- ;;
2029- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
2030- # Motorola 68HC11/12.
2031- basic_machine=$basic_machine-unknown
2032- os=-none
2033- ;;
2034- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
2035- ;;
2036- ms1)
2037- basic_machine=mt-unknown
2038- ;;
2039-
2040- # We use `pc' rather than `unknown'
2041- # because (1) that's what they normally are, and
2042- # (2) the word "unknown" tends to confuse beginning users.
2043- i*86 | x86_64)
2044- basic_machine=$basic_machine-pc
2045- ;;
2046- # Object if more than one company name word.
2047- *-*-*)
2048- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
2049- exit 1
2050- ;;
2051- # Recognize the basic CPU types with company name.
2052- 580-* \
2053- | a29k-* \
2054- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
2055- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
2056- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
2057- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2058- | avr-* | avr32-* \
2059- | bfin-* | bs2000-* \
2060- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
2061- | clipper-* | craynv-* | cydra-* \
2062- | d10v-* | d30v-* | dlx-* \
2063- | elxsi-* \
2064- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
2065- | h8300-* | h8500-* \
2066- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
2067- | i*86-* | i860-* | i960-* | ia64-* \
2068- | ip2k-* | iq2000-* \
2069- | lm32-* \
2070- | m32c-* | m32r-* | m32rle-* \
2071- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2072- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
2073- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2074- | mips16-* \
2075- | mips64-* | mips64el-* \
2076- | mips64octeon-* | mips64octeonel-* \
2077- | mips64orion-* | mips64orionel-* \
2078- | mips64r5900-* | mips64r5900el-* \
2079- | mips64vr-* | mips64vrel-* \
2080- | mips64vr4100-* | mips64vr4100el-* \
2081- | mips64vr4300-* | mips64vr4300el-* \
2082- | mips64vr5000-* | mips64vr5000el-* \
2083- | mips64vr5900-* | mips64vr5900el-* \
2084- | mipsisa32-* | mipsisa32el-* \
2085- | mipsisa32r2-* | mipsisa32r2el-* \
2086- | mipsisa64-* | mipsisa64el-* \
2087- | mipsisa64r2-* | mipsisa64r2el-* \
2088- | mipsisa64sb1-* | mipsisa64sb1el-* \
2089- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
2090- | mipstx39-* | mipstx39el-* \
2091- | mmix-* \
2092- | mt-* \
2093- | msp430-* \
2094- | nios-* | nios2-* \
2095- | none-* | np1-* | ns16k-* | ns32k-* \
2096- | orion-* \
2097- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
2098- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
2099- | pyramid-* \
2100- | romp-* | rs6000-* | rx-* \
2101- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
2102- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
2103- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
2104- | sparclite-* \
2105- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
2106- | tahoe-* | thumb-* \
2107- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
2108- | tile-* | tilegx-* \
2109- | tron-* \
2110- | ubicom32-* \
2111- | v850-* | v850e-* | vax-* \
2112- | we32k-* \
2113- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
2114- | xstormy16-* | xtensa*-* \
2115- | ymp-* \
2116- | z8k-* | z80-*)
2117- ;;
2118- # Recognize the basic CPU types without company name, with glob match.
2119- xtensa*)
2120- basic_machine=$basic_machine-unknown
2121- ;;
2122- # Recognize the various machine names and aliases which stand
2123- # for a CPU type and a company and sometimes even an OS.
2124- 386bsd)
2125- basic_machine=i386-unknown
2126- os=-bsd
2127- ;;
2128- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
2129- basic_machine=m68000-att
2130- ;;
2131- 3b*)
2132- basic_machine=we32k-att
2133- ;;
2134- a29khif)
2135- basic_machine=a29k-amd
2136- os=-udi
2137- ;;
2138- abacus)
2139- basic_machine=abacus-unknown
2140- ;;
2141- adobe68k)
2142- basic_machine=m68010-adobe
2143- os=-scout
2144- ;;
2145- alliant | fx80)
2146- basic_machine=fx80-alliant
2147- ;;
2148- altos | altos3068)
2149- basic_machine=m68k-altos
2150- ;;
2151- am29k)
2152- basic_machine=a29k-none
2153- os=-bsd
2154- ;;
2155- amd64)
2156- basic_machine=x86_64-pc
2157- ;;
2158- amd64-*)
2159- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
2160- ;;
2161- amdahl)
2162- basic_machine=580-amdahl
2163- os=-sysv
2164- ;;
2165- amiga | amiga-*)
2166- basic_machine=m68k-unknown
2167- ;;
2168- amigaos | amigados)
2169- basic_machine=m68k-unknown
2170- os=-amigaos
2171- ;;
2172- amigaunix | amix)
2173- basic_machine=m68k-unknown
2174- os=-sysv4
2175- ;;
2176- apollo68)
2177- basic_machine=m68k-apollo
2178- os=-sysv
2179- ;;
2180- apollo68bsd)
2181- basic_machine=m68k-apollo
2182- os=-bsd
2183- ;;
2184- aros)
2185- basic_machine=i386-pc
2186- os=-aros
2187- ;;
2188- aux)
2189- basic_machine=m68k-apple
2190- os=-aux
2191- ;;
2192- balance)
2193- basic_machine=ns32k-sequent
2194- os=-dynix
2195- ;;
2196- blackfin)
2197- basic_machine=bfin-unknown
2198- os=-linux
2199- ;;
2200- blackfin-*)
2201- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2202- os=-linux
2203- ;;
2204- bluegene*)
2205- basic_machine=powerpc-ibm
2206- os=-cnk
2207- ;;
2208- c90)
2209- basic_machine=c90-cray
2210- os=-unicos
2211- ;;
2212- cegcc)
2213- basic_machine=arm-unknown
2214- os=-cegcc
2215- ;;
2216- convex-c1)
2217- basic_machine=c1-convex
2218- os=-bsd
2219- ;;
2220- convex-c2)
2221- basic_machine=c2-convex
2222- os=-bsd
2223- ;;
2224- convex-c32)
2225- basic_machine=c32-convex
2226- os=-bsd
2227- ;;
2228- convex-c34)
2229- basic_machine=c34-convex
2230- os=-bsd
2231- ;;
2232- convex-c38)
2233- basic_machine=c38-convex
2234- os=-bsd
2235- ;;
2236- cray | j90)
2237- basic_machine=j90-cray
2238- os=-unicos
2239- ;;
2240- craynv)
2241- basic_machine=craynv-cray
2242- os=-unicosmp
2243- ;;
2244- cr16)
2245- basic_machine=cr16-unknown
2246- os=-elf
2247- ;;
2248- crds | unos)
2249- basic_machine=m68k-crds
2250- ;;
2251- crisv32 | crisv32-* | etraxfs*)
2252- basic_machine=crisv32-axis
2253- ;;
2254- cris | cris-* | etrax*)
2255- basic_machine=cris-axis
2256- ;;
2257- crx)
2258- basic_machine=crx-unknown
2259- os=-elf
2260- ;;
2261- da30 | da30-*)
2262- basic_machine=m68k-da30
2263- ;;
2264- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
2265- basic_machine=mips-dec
2266- ;;
2267- decsystem10* | dec10*)
2268- basic_machine=pdp10-dec
2269- os=-tops10
2270- ;;
2271- decsystem20* | dec20*)
2272- basic_machine=pdp10-dec
2273- os=-tops20
2274- ;;
2275- delta | 3300 | motorola-3300 | motorola-delta \
2276- | 3300-motorola | delta-motorola)
2277- basic_machine=m68k-motorola
2278- ;;
2279- delta88)
2280- basic_machine=m88k-motorola
2281- os=-sysv3
2282- ;;
2283- dicos)
2284- basic_machine=i686-pc
2285- os=-dicos
2286- ;;
2287- djgpp)
2288- basic_machine=i586-pc
2289- os=-msdosdjgpp
2290- ;;
2291- dpx20 | dpx20-*)
2292- basic_machine=rs6000-bull
2293- os=-bosx
2294- ;;
2295- dpx2* | dpx2*-bull)
2296- basic_machine=m68k-bull
2297- os=-sysv3
2298- ;;
2299- ebmon29k)
2300- basic_machine=a29k-amd
2301- os=-ebmon
2302- ;;
2303- elxsi)
2304- basic_machine=elxsi-elxsi
2305- os=-bsd
2306- ;;
2307- encore | umax | mmax)
2308- basic_machine=ns32k-encore
2309- ;;
2310- es1800 | OSE68k | ose68k | ose | OSE)
2311- basic_machine=m68k-ericsson
2312- os=-ose
2313- ;;
2314- fx2800)
2315- basic_machine=i860-alliant
2316- ;;
2317- genix)
2318- basic_machine=ns32k-ns
2319- ;;
2320- gmicro)
2321- basic_machine=tron-gmicro
2322- os=-sysv
2323- ;;
2324- go32)
2325- basic_machine=i386-pc
2326- os=-go32
2327- ;;
2328- h3050r* | hiux*)
2329- basic_machine=hppa1.1-hitachi
2330- os=-hiuxwe2
2331- ;;
2332- h8300hms)
2333- basic_machine=h8300-hitachi
2334- os=-hms
2335- ;;
2336- h8300xray)
2337- basic_machine=h8300-hitachi
2338- os=-xray
2339- ;;
2340- h8500hms)
2341- basic_machine=h8500-hitachi
2342- os=-hms
2343- ;;
2344- harris)
2345- basic_machine=m88k-harris
2346- os=-sysv3
2347- ;;
2348- hp300-*)
2349- basic_machine=m68k-hp
2350- ;;
2351- hp300bsd)
2352- basic_machine=m68k-hp
2353- os=-bsd
2354- ;;
2355- hp300hpux)
2356- basic_machine=m68k-hp
2357- os=-hpux
2358- ;;
2359- hp3k9[0-9][0-9] | hp9[0-9][0-9])
2360- basic_machine=hppa1.0-hp
2361- ;;
2362- hp9k2[0-9][0-9] | hp9k31[0-9])
2363- basic_machine=m68000-hp
2364- ;;
2365- hp9k3[2-9][0-9])
2366- basic_machine=m68k-hp
2367- ;;
2368- hp9k6[0-9][0-9] | hp6[0-9][0-9])
2369- basic_machine=hppa1.0-hp
2370- ;;
2371- hp9k7[0-79][0-9] | hp7[0-79][0-9])
2372- basic_machine=hppa1.1-hp
2373- ;;
2374- hp9k78[0-9] | hp78[0-9])
2375- # FIXME: really hppa2.0-hp
2376- basic_machine=hppa1.1-hp
2377- ;;
2378- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
2379- # FIXME: really hppa2.0-hp
2380- basic_machine=hppa1.1-hp
2381- ;;
2382- hp9k8[0-9][13679] | hp8[0-9][13679])
2383- basic_machine=hppa1.1-hp
2384- ;;
2385- hp9k8[0-9][0-9] | hp8[0-9][0-9])
2386- basic_machine=hppa1.0-hp
2387- ;;
2388- hppa-next)
2389- os=-nextstep3
2390- ;;
2391- hppaosf)
2392- basic_machine=hppa1.1-hp
2393- os=-osf
2394- ;;
2395- hppro)
2396- basic_machine=hppa1.1-hp
2397- os=-proelf
2398- ;;
2399- i370-ibm* | ibm*)
2400- basic_machine=i370-ibm
2401- ;;
2402-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
2403- i*86v32)
2404- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2405- os=-sysv32
2406- ;;
2407- i*86v4*)
2408- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2409- os=-sysv4
2410- ;;
2411- i*86v)
2412- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2413- os=-sysv
2414- ;;
2415- i*86sol2)
2416- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2417- os=-solaris2
2418- ;;
2419- i386mach)
2420- basic_machine=i386-mach
2421- os=-mach
2422- ;;
2423- i386-vsta | vsta)
2424- basic_machine=i386-unknown
2425- os=-vsta
2426- ;;
2427- iris | iris4d)
2428- basic_machine=mips-sgi
2429- case $os in
2430- -irix*)
2431- ;;
2432- *)
2433- os=-irix4
2434- ;;
2435- esac
2436- ;;
2437- isi68 | isi)
2438- basic_machine=m68k-isi
2439- os=-sysv
2440- ;;
2441- m68knommu)
2442- basic_machine=m68k-unknown
2443- os=-linux
2444- ;;
2445- m68knommu-*)
2446- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
2447- os=-linux
2448- ;;
2449- m88k-omron*)
2450- basic_machine=m88k-omron
2451- ;;
2452- magnum | m3230)
2453- basic_machine=mips-mips
2454- os=-sysv
2455- ;;
2456- merlin)
2457- basic_machine=ns32k-utek
2458- os=-sysv
2459- ;;
2460- microblaze)
2461- basic_machine=microblaze-xilinx
2462- ;;
2463- mingw32)
2464- basic_machine=i386-pc
2465- os=-mingw32
2466- ;;
2467- mingw32ce)
2468- basic_machine=arm-unknown
2469- os=-mingw32ce
2470- ;;
2471- miniframe)
2472- basic_machine=m68000-convergent
2473- ;;
2474- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
2475- basic_machine=m68k-atari
2476- os=-mint
2477- ;;
2478- mips3*-*)
2479- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2480- ;;
2481- mips3*)
2482- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
2483- ;;
2484- monitor)
2485- basic_machine=m68k-rom68k
2486- os=-coff
2487- ;;
2488- morphos)
2489- basic_machine=powerpc-unknown
2490- os=-morphos
2491- ;;
2492- msdos)
2493- basic_machine=i386-pc
2494- os=-msdos
2495- ;;
2496- ms1-*)
2497- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
2498- ;;
2499- mvs)
2500- basic_machine=i370-ibm
2501- os=-mvs
2502- ;;
2503- ncr3000)
2504- basic_machine=i486-ncr
2505- os=-sysv4
2506- ;;
2507- netbsd386)
2508- basic_machine=i386-unknown
2509- os=-netbsd
2510- ;;
2511- netwinder)
2512- basic_machine=armv4l-rebel
2513- os=-linux
2514- ;;
2515- news | news700 | news800 | news900)
2516- basic_machine=m68k-sony
2517- os=-newsos
2518- ;;
2519- news1000)
2520- basic_machine=m68030-sony
2521- os=-newsos
2522- ;;
2523- news-3600 | risc-news)
2524- basic_machine=mips-sony
2525- os=-newsos
2526- ;;
2527- necv70)
2528- basic_machine=v70-nec
2529- os=-sysv
2530- ;;
2531- next | m*-next )
2532- basic_machine=m68k-next
2533- case $os in
2534- -nextstep* )
2535- ;;
2536- -ns2*)
2537- os=-nextstep2
2538- ;;
2539- *)
2540- os=-nextstep3
2541- ;;
2542- esac
2543- ;;
2544- nh3000)
2545- basic_machine=m68k-harris
2546- os=-cxux
2547- ;;
2548- nh[45]000)
2549- basic_machine=m88k-harris
2550- os=-cxux
2551- ;;
2552- nindy960)
2553- basic_machine=i960-intel
2554- os=-nindy
2555- ;;
2556- mon960)
2557- basic_machine=i960-intel
2558- os=-mon960
2559- ;;
2560- nonstopux)
2561- basic_machine=mips-compaq
2562- os=-nonstopux
2563- ;;
2564- np1)
2565- basic_machine=np1-gould
2566- ;;
2567- nsr-tandem)
2568- basic_machine=nsr-tandem
2569- ;;
2570- op50n-* | op60c-*)
2571- basic_machine=hppa1.1-oki
2572- os=-proelf
2573- ;;
2574- openrisc | openrisc-*)
2575- basic_machine=or32-unknown
2576- ;;
2577- os400)
2578- basic_machine=powerpc-ibm
2579- os=-os400
2580- ;;
2581- OSE68000 | ose68000)
2582- basic_machine=m68000-ericsson
2583- os=-ose
2584- ;;
2585- os68k)
2586- basic_machine=m68k-none
2587- os=-os68k
2588- ;;
2589- pa-hitachi)
2590- basic_machine=hppa1.1-hitachi
2591- os=-hiuxwe2
2592- ;;
2593- paragon)
2594- basic_machine=i860-intel
2595- os=-osf
2596- ;;
2597- parisc)
2598- basic_machine=hppa-unknown
2599- os=-linux
2600- ;;
2601- parisc-*)
2602- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
2603- os=-linux
2604- ;;
2605- pbd)
2606- basic_machine=sparc-tti
2607- ;;
2608- pbb)
2609- basic_machine=m68k-tti
2610- ;;
2611- pc532 | pc532-*)
2612- basic_machine=ns32k-pc532
2613- ;;
2614- pc98)
2615- basic_machine=i386-pc
2616- ;;
2617- pc98-*)
2618- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
2619- ;;
2620- pentium | p5 | k5 | k6 | nexgen | viac3)
2621- basic_machine=i586-pc
2622- ;;
2623- pentiumpro | p6 | 6x86 | athlon | athlon_*)
2624- basic_machine=i686-pc
2625- ;;
2626- pentiumii | pentium2 | pentiumiii | pentium3)
2627- basic_machine=i686-pc
2628- ;;
2629- pentium4)
2630- basic_machine=i786-pc
2631- ;;
2632- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2633- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2634- ;;
2635- pentiumpro-* | p6-* | 6x86-* | athlon-*)
2636- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2637- ;;
2638- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
2639- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2640- ;;
2641- pentium4-*)
2642- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
2643- ;;
2644- pn)
2645- basic_machine=pn-gould
2646- ;;
2647- power) basic_machine=power-ibm
2648- ;;
2649- ppc) basic_machine=powerpc-unknown
2650- ;;
2651- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2652- ;;
2653- ppcle | powerpclittle | ppc-le | powerpc-little)
2654- basic_machine=powerpcle-unknown
2655- ;;
2656- ppcle-* | powerpclittle-*)
2657- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2658- ;;
2659- ppc64) basic_machine=powerpc64-unknown
2660- ;;
2661- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2662- ;;
2663- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
2664- basic_machine=powerpc64le-unknown
2665- ;;
2666- ppc64le-* | powerpc64little-*)
2667- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2668- ;;
2669- ps2)
2670- basic_machine=i386-ibm
2671- ;;
2672- pw32)
2673- basic_machine=i586-unknown
2674- os=-pw32
2675- ;;
2676- rdos)
2677- basic_machine=i386-pc
2678- os=-rdos
2679- ;;
2680- rom68k)
2681- basic_machine=m68k-rom68k
2682- os=-coff
2683- ;;
2684- rm[46]00)
2685- basic_machine=mips-siemens
2686- ;;
2687- rtpc | rtpc-*)
2688- basic_machine=romp-ibm
2689- ;;
2690- s390 | s390-*)
2691- basic_machine=s390-ibm
2692- ;;
2693- s390x | s390x-*)
2694- basic_machine=s390x-ibm
2695- ;;
2696- sa29200)
2697- basic_machine=a29k-amd
2698- os=-udi
2699- ;;
2700- sb1)
2701- basic_machine=mipsisa64sb1-unknown
2702- ;;
2703- sb1el)
2704- basic_machine=mipsisa64sb1el-unknown
2705- ;;
2706- sde)
2707- basic_machine=mipsisa32-sde
2708- os=-elf
2709- ;;
2710- sei)
2711- basic_machine=mips-sei
2712- os=-seiux
2713- ;;
2714- sequent)
2715- basic_machine=i386-sequent
2716- ;;
2717- sh)
2718- basic_machine=sh-hitachi
2719- os=-hms
2720- ;;
2721- sh5el)
2722- basic_machine=sh5le-unknown
2723- ;;
2724- sh64)
2725- basic_machine=sh64-unknown
2726- ;;
2727- sparclite-wrs | simso-wrs)
2728- basic_machine=sparclite-wrs
2729- os=-vxworks
2730- ;;
2731- sps7)
2732- basic_machine=m68k-bull
2733- os=-sysv2
2734- ;;
2735- spur)
2736- basic_machine=spur-unknown
2737- ;;
2738- st2000)
2739- basic_machine=m68k-tandem
2740- ;;
2741- stratus)
2742- basic_machine=i860-stratus
2743- os=-sysv4
2744- ;;
2745- sun2)
2746- basic_machine=m68000-sun
2747- ;;
2748- sun2os3)
2749- basic_machine=m68000-sun
2750- os=-sunos3
2751- ;;
2752- sun2os4)
2753- basic_machine=m68000-sun
2754- os=-sunos4
2755- ;;
2756- sun3os3)
2757- basic_machine=m68k-sun
2758- os=-sunos3
2759- ;;
2760- sun3os4)
2761- basic_machine=m68k-sun
2762- os=-sunos4
2763- ;;
2764- sun4os3)
2765- basic_machine=sparc-sun
2766- os=-sunos3
2767- ;;
2768- sun4os4)
2769- basic_machine=sparc-sun
2770- os=-sunos4
2771- ;;
2772- sun4sol2)
2773- basic_machine=sparc-sun
2774- os=-solaris2
2775- ;;
2776- sun3 | sun3-*)
2777- basic_machine=m68k-sun
2778- ;;
2779- sun4)
2780- basic_machine=sparc-sun
2781- ;;
2782- sun386 | sun386i | roadrunner)
2783- basic_machine=i386-sun
2784- ;;
2785- sv1)
2786- basic_machine=sv1-cray
2787- os=-unicos
2788- ;;
2789- symmetry)
2790- basic_machine=i386-sequent
2791- os=-dynix
2792- ;;
2793- t3e)
2794- basic_machine=alphaev5-cray
2795- os=-unicos
2796- ;;
2797- t90)
2798- basic_machine=t90-cray
2799- os=-unicos
2800- ;;
2801- tic54x | c54x*)
2802- basic_machine=tic54x-unknown
2803- os=-coff
2804- ;;
2805- tic55x | c55x*)
2806- basic_machine=tic55x-unknown
2807- os=-coff
2808- ;;
2809- tic6x | c6x*)
2810- basic_machine=tic6x-unknown
2811- os=-coff
2812- ;;
2813- # This must be matched before tile*.
2814- tilegx*)
2815- basic_machine=tilegx-unknown
2816- os=-linux-gnu
2817- ;;
2818- tile*)
2819- basic_machine=tile-unknown
2820- os=-linux-gnu
2821- ;;
2822- tx39)
2823- basic_machine=mipstx39-unknown
2824- ;;
2825- tx39el)
2826- basic_machine=mipstx39el-unknown
2827- ;;
2828- toad1)
2829- basic_machine=pdp10-xkl
2830- os=-tops20
2831- ;;
2832- tower | tower-32)
2833- basic_machine=m68k-ncr
2834- ;;
2835- tpf)
2836- basic_machine=s390x-ibm
2837- os=-tpf
2838- ;;
2839- udi29k)
2840- basic_machine=a29k-amd
2841- os=-udi
2842- ;;
2843- ultra3)
2844- basic_machine=a29k-nyu
2845- os=-sym1
2846- ;;
2847- v810 | necv810)
2848- basic_machine=v810-nec
2849- os=-none
2850- ;;
2851- vaxv)
2852- basic_machine=vax-dec
2853- os=-sysv
2854- ;;
2855- vms)
2856- basic_machine=vax-dec
2857- os=-vms
2858- ;;
2859- vpp*|vx|vx-*)
2860- basic_machine=f301-fujitsu
2861- ;;
2862- vxworks960)
2863- basic_machine=i960-wrs
2864- os=-vxworks
2865- ;;
2866- vxworks68)
2867- basic_machine=m68k-wrs
2868- os=-vxworks
2869- ;;
2870- vxworks29k)
2871- basic_machine=a29k-wrs
2872- os=-vxworks
2873- ;;
2874- w65*)
2875- basic_machine=w65-wdc
2876- os=-none
2877- ;;
2878- w89k-*)
2879- basic_machine=hppa1.1-winbond
2880- os=-proelf
2881- ;;
2882- xbox)
2883- basic_machine=i686-pc
2884- os=-mingw32
2885- ;;
2886- xps | xps100)
2887- basic_machine=xps100-honeywell
2888- ;;
2889- ymp)
2890- basic_machine=ymp-cray
2891- os=-unicos
2892- ;;
2893- z8k-*-coff)
2894- basic_machine=z8k-unknown
2895- os=-sim
2896- ;;
2897- z80-*-coff)
2898- basic_machine=z80-unknown
2899- os=-sim
2900- ;;
2901- none)
2902- basic_machine=none-none
2903- os=-none
2904- ;;
2905-
2906-# Here we handle the default manufacturer of certain CPU types. It is in
2907-# some cases the only manufacturer, in others, it is the most popular.
2908- w89k)
2909- basic_machine=hppa1.1-winbond
2910- ;;
2911- op50n)
2912- basic_machine=hppa1.1-oki
2913- ;;
2914- op60c)
2915- basic_machine=hppa1.1-oki
2916- ;;
2917- romp)
2918- basic_machine=romp-ibm
2919- ;;
2920- mmix)
2921- basic_machine=mmix-knuth
2922- ;;
2923- rs6000)
2924- basic_machine=rs6000-ibm
2925- ;;
2926- vax)
2927- basic_machine=vax-dec
2928- ;;
2929- pdp10)
2930- # there are many clones, so DEC is not a safe bet
2931- basic_machine=pdp10-unknown
2932- ;;
2933- pdp11)
2934- basic_machine=pdp11-dec
2935- ;;
2936- we32k)
2937- basic_machine=we32k-att
2938- ;;
2939- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2940- basic_machine=sh-unknown
2941- ;;
2942- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
2943- basic_machine=sparc-sun
2944- ;;
2945- cydra)
2946- basic_machine=cydra-cydrome
2947- ;;
2948- orion)
2949- basic_machine=orion-highlevel
2950- ;;
2951- orion105)
2952- basic_machine=clipper-highlevel
2953- ;;
2954- mac | mpw | mac-mpw)
2955- basic_machine=m68k-apple
2956- ;;
2957- pmac | pmac-mpw)
2958- basic_machine=powerpc-apple
2959- ;;
2960- *-unknown)
2961- # Make sure to match an already-canonicalized machine name.
2962- ;;
2963- *)
2964- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
2965- exit 1
2966- ;;
2967-esac
2968-
2969-# Here we canonicalize certain aliases for manufacturers.
2970-case $basic_machine in
2971- *-digital*)
2972- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
2973- ;;
2974- *-commodore*)
2975- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
2976- ;;
2977- *)
2978- ;;
2979-esac
2980-
2981-# Decode manufacturer-specific aliases for certain operating systems.
2982-
2983-if [ x"$os" != x"" ]
2984-then
2985-case $os in
2986- # First match some system type aliases
2987- # that might get confused with valid system types.
2988- # -solaris* is a basic system type, with this one exception.
2989- -auroraux)
2990- os=-auroraux
2991- ;;
2992- -solaris1 | -solaris1.*)
2993- os=`echo $os | sed -e 's|solaris1|sunos4|'`
2994- ;;
2995- -solaris)
2996- os=-solaris2
2997- ;;
2998- -svr4*)
2999- os=-sysv4
3000- ;;
3001- -unixware*)
3002- os=-sysv4.2uw
3003- ;;
3004- -gnu/linux*)
3005- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
3006- ;;
3007- # First accept the basic system types.
3008- # The portable systems comes first.
3009- # Each alternative MUST END IN A *, to match a version number.
3010- # -sysv* is not here because it comes later, after sysvr4.
3011- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
3012- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
3013- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
3014- | -sym* | -kopensolaris* \
3015- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
3016- | -aos* | -aros* \
3017- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
3018- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
3019- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
3020- | -openbsd* | -solidbsd* \
3021- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
3022- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
3023- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
3024- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
3025- | -chorusos* | -chorusrdb* | -cegcc* \
3026- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
3027- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
3028- | -uxpv* | -beos* | -mpeix* | -udk* \
3029- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
3030- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
3031- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
3032- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
3033- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
3034- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
3035- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
3036- # Remember, each alternative MUST END IN *, to match a version number.
3037- ;;
3038- -qnx*)
3039- case $basic_machine in
3040- x86-* | i*86-*)
3041- ;;
3042- *)
3043- os=-nto$os
3044- ;;
3045- esac
3046- ;;
3047- -nto-qnx*)
3048- ;;
3049- -nto*)
3050- os=`echo $os | sed -e 's|nto|nto-qnx|'`
3051- ;;
3052- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
3053- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
3054- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
3055- ;;
3056- -mac*)
3057- os=`echo $os | sed -e 's|mac|macos|'`
3058- ;;
3059- -linux-dietlibc)
3060- os=-linux-dietlibc
3061- ;;
3062- -linux*)
3063- os=`echo $os | sed -e 's|linux|linux-gnu|'`
3064- ;;
3065- -sunos5*)
3066- os=`echo $os | sed -e 's|sunos5|solaris2|'`
3067- ;;
3068- -sunos6*)
3069- os=`echo $os | sed -e 's|sunos6|solaris3|'`
3070- ;;
3071- -opened*)
3072- os=-openedition
3073- ;;
3074- -os400*)
3075- os=-os400
3076- ;;
3077- -wince*)
3078- os=-wince
3079- ;;
3080- -osfrose*)
3081- os=-osfrose
3082- ;;
3083- -osf*)
3084- os=-osf
3085- ;;
3086- -utek*)
3087- os=-bsd
3088- ;;
3089- -dynix*)
3090- os=-bsd
3091- ;;
3092- -acis*)
3093- os=-aos
3094- ;;
3095- -atheos*)
3096- os=-atheos
3097- ;;
3098- -syllable*)
3099- os=-syllable
3100- ;;
3101- -386bsd)
3102- os=-bsd
3103- ;;
3104- -ctix* | -uts*)
3105- os=-sysv
3106- ;;
3107- -nova*)
3108- os=-rtmk-nova
3109- ;;
3110- -ns2 )
3111- os=-nextstep2
3112- ;;
3113- -nsk*)
3114- os=-nsk
3115- ;;
3116- # Preserve the version number of sinix5.
3117- -sinix5.*)
3118- os=`echo $os | sed -e 's|sinix|sysv|'`
3119- ;;
3120- -sinix*)
3121- os=-sysv4
3122- ;;
3123- -tpf*)
3124- os=-tpf
3125- ;;
3126- -triton*)
3127- os=-sysv3
3128- ;;
3129- -oss*)
3130- os=-sysv3
3131- ;;
3132- -svr4)
3133- os=-sysv4
3134- ;;
3135- -svr3)
3136- os=-sysv3
3137- ;;
3138- -sysvr4)
3139- os=-sysv4
3140- ;;
3141- # This must come after -sysvr4.
3142- -sysv*)
3143- ;;
3144- -ose*)
3145- os=-ose
3146- ;;
3147- -es1800*)
3148- os=-ose
3149- ;;
3150- -xenix)
3151- os=-xenix
3152- ;;
3153- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3154- os=-mint
3155- ;;
3156- -aros*)
3157- os=-aros
3158- ;;
3159- -kaos*)
3160- os=-kaos
3161- ;;
3162- -zvmoe)
3163- os=-zvmoe
3164- ;;
3165- -dicos*)
3166- os=-dicos
3167- ;;
3168- -nacl*)
3169- ;;
3170- -none)
3171- ;;
3172- *)
3173- # Get rid of the `-' at the beginning of $os.
3174- os=`echo $os | sed 's/[^-]*-//'`
3175- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
3176- exit 1
3177- ;;
3178-esac
3179-else
3180-
3181-# Here we handle the default operating systems that come with various machines.
3182-# The value should be what the vendor currently ships out the door with their
3183-# machine or put another way, the most popular os provided with the machine.
3184-
3185-# Note that if you're going to try to match "-MANUFACTURER" here (say,
3186-# "-sun"), then you have to tell the case statement up towards the top
3187-# that MANUFACTURER isn't an operating system. Otherwise, code above
3188-# will signal an error saying that MANUFACTURER isn't an operating
3189-# system, and we'll never get to this point.
3190-
3191-case $basic_machine in
3192- score-*)
3193- os=-elf
3194- ;;
3195- spu-*)
3196- os=-elf
3197- ;;
3198- *-acorn)
3199- os=-riscix1.2
3200- ;;
3201- arm*-rebel)
3202- os=-linux
3203- ;;
3204- arm*-semi)
3205- os=-aout
3206- ;;
3207- c4x-* | tic4x-*)
3208- os=-coff
3209- ;;
3210- # This must come before the *-dec entry.
3211- pdp10-*)
3212- os=-tops20
3213- ;;
3214- pdp11-*)
3215- os=-none
3216- ;;
3217- *-dec | vax-*)
3218- os=-ultrix4.2
3219- ;;
3220- m68*-apollo)
3221- os=-domain
3222- ;;
3223- i386-sun)
3224- os=-sunos4.0.2
3225- ;;
3226- m68000-sun)
3227- os=-sunos3
3228- # This also exists in the configure program, but was not the
3229- # default.
3230- # os=-sunos4
3231- ;;
3232- m68*-cisco)
3233- os=-aout
3234- ;;
3235- mep-*)
3236- os=-elf
3237- ;;
3238- mips*-cisco)
3239- os=-elf
3240- ;;
3241- mips*-*)
3242- os=-elf
3243- ;;
3244- or32-*)
3245- os=-coff
3246- ;;
3247- *-tti) # must be before sparc entry or we get the wrong os.
3248- os=-sysv3
3249- ;;
3250- sparc-* | *-sun)
3251- os=-sunos4.1.1
3252- ;;
3253- *-be)
3254- os=-beos
3255- ;;
3256- *-haiku)
3257- os=-haiku
3258- ;;
3259- *-ibm)
3260- os=-aix
3261- ;;
3262- *-knuth)
3263- os=-mmixware
3264- ;;
3265- *-wec)
3266- os=-proelf
3267- ;;
3268- *-winbond)
3269- os=-proelf
3270- ;;
3271- *-oki)
3272- os=-proelf
3273- ;;
3274- *-hp)
3275- os=-hpux
3276- ;;
3277- *-hitachi)
3278- os=-hiux
3279- ;;
3280- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
3281- os=-sysv
3282- ;;
3283- *-cbm)
3284- os=-amigaos
3285- ;;
3286- *-dg)
3287- os=-dgux
3288- ;;
3289- *-dolphin)
3290- os=-sysv3
3291- ;;
3292- m68k-ccur)
3293- os=-rtu
3294- ;;
3295- m88k-omron*)
3296- os=-luna
3297- ;;
3298- *-next )
3299- os=-nextstep
3300- ;;
3301- *-sequent)
3302- os=-ptx
3303- ;;
3304- *-crds)
3305- os=-unos
3306- ;;
3307- *-ns)
3308- os=-genix
3309- ;;
3310- i370-*)
3311- os=-mvs
3312- ;;
3313- *-next)
3314- os=-nextstep3
3315- ;;
3316- *-gould)
3317- os=-sysv
3318- ;;
3319- *-highlevel)
3320- os=-bsd
3321- ;;
3322- *-encore)
3323- os=-bsd
3324- ;;
3325- *-sgi)
3326- os=-irix
3327- ;;
3328- *-siemens)
3329- os=-sysv4
3330- ;;
3331- *-masscomp)
3332- os=-rtu
3333- ;;
3334- f30[01]-fujitsu | f700-fujitsu)
3335- os=-uxpv
3336- ;;
3337- *-rom68k)
3338- os=-coff
3339- ;;
3340- *-*bug)
3341- os=-coff
3342- ;;
3343- *-apple)
3344- os=-macos
3345- ;;
3346- *-atari*)
3347- os=-mint
3348- ;;
3349- *)
3350- os=-none
3351- ;;
3352-esac
3353-fi
3354-
3355-# Here we handle the case where we know the os, and the CPU type, but not the
3356-# manufacturer. We pick the logical manufacturer.
3357-vendor=unknown
3358-case $basic_machine in
3359- *-unknown)
3360- case $os in
3361- -riscix*)
3362- vendor=acorn
3363- ;;
3364- -sunos*)
3365- vendor=sun
3366- ;;
3367- -cnk*|-aix*)
3368- vendor=ibm
3369- ;;
3370- -beos*)
3371- vendor=be
3372- ;;
3373- -hpux*)
3374- vendor=hp
3375- ;;
3376- -mpeix*)
3377- vendor=hp
3378- ;;
3379- -hiux*)
3380- vendor=hitachi
3381- ;;
3382- -unos*)
3383- vendor=crds
3384- ;;
3385- -dgux*)
3386- vendor=dg
3387- ;;
3388- -luna*)
3389- vendor=omron
3390- ;;
3391- -genix*)
3392- vendor=ns
3393- ;;
3394- -mvs* | -opened*)
3395- vendor=ibm
3396- ;;
3397- -os400*)
3398- vendor=ibm
3399- ;;
3400- -ptx*)
3401- vendor=sequent
3402- ;;
3403- -tpf*)
3404- vendor=ibm
3405- ;;
3406- -vxsim* | -vxworks* | -windiss*)
3407- vendor=wrs
3408- ;;
3409- -aux*)
3410- vendor=apple
3411- ;;
3412- -hms*)
3413- vendor=hitachi
3414- ;;
3415- -mpw* | -macos*)
3416- vendor=apple
3417- ;;
3418- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3419- vendor=atari
3420- ;;
3421- -vos*)
3422- vendor=stratus
3423- ;;
3424- esac
3425- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
3426- ;;
3427-esac
3428-
3429-echo $basic_machine$os
3430-exit
3431-
3432-# Local variables:
3433-# eval: (add-hook 'write-file-hooks 'time-stamp)
3434-# time-stamp-start: "timestamp='"
3435-# time-stamp-format: "%:y-%02m-%02d"
3436-# time-stamp-end: "'"
3437-# End:
3438
3439=== modified file 'configure'
3440--- configure 2012-04-04 19:35:30 +0000
3441+++ configure 2012-04-11 15:58:20 +0000
3442@@ -1,6 +1,6 @@
3443 #! /bin/sh
3444 # Guess values for system-dependent variables and create Makefiles.
3445-# Generated by GNU Autoconf 2.68 for libindicator 0.4.95.
3446+# Generated by GNU Autoconf 2.68 for libindicator 0.5.0.
3447 #
3448 # Report bugs to <http://bugs.launchpad.net/libindicator>.
3449 #
3450@@ -570,8 +570,8 @@
3451 # Identity of this package.
3452 PACKAGE_NAME='libindicator'
3453 PACKAGE_TARNAME='libindicator'
3454-PACKAGE_VERSION='0.4.95'
3455-PACKAGE_STRING='libindicator 0.4.95'
3456+PACKAGE_VERSION='0.5.0'
3457+PACKAGE_STRING='libindicator 0.5.0'
3458 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator'
3459 PACKAGE_URL='http://launchpad.net/libindicator'
3460
3461@@ -1337,7 +1337,7 @@
3462 # Omit some internal or obsolete options to make the list less imposing.
3463 # This message is too long to be a string in the A/UX 3.1 sh.
3464 cat <<_ACEOF
3465-\`configure' configures libindicator 0.4.95 to adapt to many kinds of systems.
3466+\`configure' configures libindicator 0.5.0 to adapt to many kinds of systems.
3467
3468 Usage: $0 [OPTION]... [VAR=VALUE]...
3469
3470@@ -1407,7 +1407,7 @@
3471
3472 if test -n "$ac_init_help"; then
3473 case $ac_init_help in
3474- short | recursive ) echo "Configuration of libindicator 0.4.95:";;
3475+ short | recursive ) echo "Configuration of libindicator 0.5.0:";;
3476 esac
3477 cat <<\_ACEOF
3478
3479@@ -1527,7 +1527,7 @@
3480 test -n "$ac_init_help" && exit $ac_status
3481 if $ac_init_version; then
3482 cat <<\_ACEOF
3483-libindicator configure 0.4.95
3484+libindicator configure 0.5.0
3485 generated by GNU Autoconf 2.68
3486
3487 Copyright (C) 2010 Free Software Foundation, Inc.
3488@@ -1805,7 +1805,7 @@
3489 This file contains any messages produced by compilers while
3490 running configure, to aid debugging if configure makes a mistake.
3491
3492-It was created by libindicator $as_me 0.4.95, which was
3493+It was created by libindicator $as_me 0.5.0, which was
3494 generated by GNU Autoconf 2.68. Invocation command line was
3495
3496 $ $0 $@
3497@@ -2628,7 +2628,7 @@
3498
3499 # Define the identity of the package.
3500 PACKAGE='libindicator'
3501- VERSION='0.4.95'
3502+ VERSION='0.5.0'
3503
3504
3505 cat >>confdefs.h <<_ACEOF
3506@@ -13081,7 +13081,7 @@
3507 # report actual input values of CONFIG_FILES etc. instead of their
3508 # values after options handling.
3509 ac_log="
3510-This file was extended by libindicator $as_me 0.4.95, which was
3511+This file was extended by libindicator $as_me 0.5.0, which was
3512 generated by GNU Autoconf 2.68. Invocation command line was
3513
3514 CONFIG_FILES = $CONFIG_FILES
3515@@ -13148,7 +13148,7 @@
3516 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3517 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
3518 ac_cs_version="\\
3519-libindicator config.status 0.4.95
3520+libindicator config.status 0.5.0
3521 configured by $0, generated by GNU Autoconf 2.68,
3522 with options \\"\$ac_cs_config\\"
3523
3524
3525=== modified file 'configure.ac'
3526--- configure.ac 2012-04-04 19:35:30 +0000
3527+++ configure.ac 2012-04-11 15:58:20 +0000
3528@@ -1,5 +1,5 @@
3529 AC_INIT([libindicator],
3530- [0.4.95],
3531+ [0.5.0],
3532 [http://bugs.launchpad.net/libindicator],
3533 [libindicator],
3534 [http://launchpad.net/libindicator])
3535
3536=== modified file 'debian/changelog'
3537--- debian/changelog 2012-04-05 10:44:30 +0000
3538+++ debian/changelog 2012-04-11 15:58:20 +0000
3539@@ -1,3 +1,10 @@
3540+libindicator (0.5.0-0ubuntu1~ppa1) precise; urgency=low
3541+
3542+ * New upstream release.
3543+ * Validate images in image_helper_update() (LP: #946408)
3544+
3545+ -- Charles Kerr <charles.kerr@canonical.com> Wed, 11 Apr 2012 10:54:42 -0500
3546+
3547 libindicator (0.4.95-0ubuntu1) precise; urgency=low
3548
3549 * New upstream release.
3550
3551=== removed file 'depcomp'
3552--- depcomp 2012-04-04 19:34:11 +0000
3553+++ depcomp 1970-01-01 00:00:00 +0000
3554@@ -1,630 +0,0 @@
3555-#! /bin/sh
3556-# depcomp - compile a program generating dependencies as side-effects
3557-
3558-scriptversion=2009-04-28.21; # UTC
3559-
3560-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
3561-# Software Foundation, Inc.
3562-
3563-# This program is free software; you can redistribute it and/or modify
3564-# it under the terms of the GNU General Public License as published by
3565-# the Free Software Foundation; either version 2, or (at your option)
3566-# any later version.
3567-
3568-# This program is distributed in the hope that it will be useful,
3569-# but WITHOUT ANY WARRANTY; without even the implied warranty of
3570-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3571-# GNU General Public License for more details.
3572-
3573-# You should have received a copy of the GNU General Public License
3574-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3575-
3576-# As a special exception to the GNU General Public License, if you
3577-# distribute this file as part of a program that contains a
3578-# configuration script generated by Autoconf, you may include it under
3579-# the same distribution terms that you use for the rest of that program.
3580-
3581-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
3582-
3583-case $1 in
3584- '')
3585- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
3586- exit 1;
3587- ;;
3588- -h | --h*)
3589- cat <<\EOF
3590-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
3591-
3592-Run PROGRAMS ARGS to compile a file, generating dependencies
3593-as side-effects.
3594-
3595-Environment variables:
3596- depmode Dependency tracking mode.
3597- source Source file read by `PROGRAMS ARGS'.
3598- object Object file output by `PROGRAMS ARGS'.
3599- DEPDIR directory where to store dependencies.
3600- depfile Dependency file to output.
3601- tmpdepfile Temporary file to use when outputing dependencies.
3602- libtool Whether libtool is used (yes/no).
3603-
3604-Report bugs to <bug-automake@gnu.org>.
3605-EOF
3606- exit $?
3607- ;;
3608- -v | --v*)
3609- echo "depcomp $scriptversion"
3610- exit $?
3611- ;;
3612-esac
3613-
3614-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
3615- echo "depcomp: Variables source, object and depmode must be set" 1>&2
3616- exit 1
3617-fi
3618-
3619-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
3620-depfile=${depfile-`echo "$object" |
3621- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
3622-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
3623-
3624-rm -f "$tmpdepfile"
3625-
3626-# Some modes work just like other modes, but use different flags. We
3627-# parameterize here, but still list the modes in the big case below,
3628-# to make depend.m4 easier to write. Note that we *cannot* use a case
3629-# here, because this file can only contain one case statement.
3630-if test "$depmode" = hp; then
3631- # HP compiler uses -M and no extra arg.
3632- gccflag=-M
3633- depmode=gcc
3634-fi
3635-
3636-if test "$depmode" = dashXmstdout; then
3637- # This is just like dashmstdout with a different argument.
3638- dashmflag=-xM
3639- depmode=dashmstdout
3640-fi
3641-
3642-cygpath_u="cygpath -u -f -"
3643-if test "$depmode" = msvcmsys; then
3644- # This is just like msvisualcpp but w/o cygpath translation.
3645- # Just convert the backslash-escaped backslashes to single forward
3646- # slashes to satisfy depend.m4
3647- cygpath_u="sed s,\\\\\\\\,/,g"
3648- depmode=msvisualcpp
3649-fi
3650-
3651-case "$depmode" in
3652-gcc3)
3653-## gcc 3 implements dependency tracking that does exactly what
3654-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
3655-## it if -MD -MP comes after the -MF stuff. Hmm.
3656-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
3657-## the command line argument order; so add the flags where they
3658-## appear in depend2.am. Note that the slowdown incurred here
3659-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
3660- for arg
3661- do
3662- case $arg in
3663- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
3664- *) set fnord "$@" "$arg" ;;
3665- esac
3666- shift # fnord
3667- shift # $arg
3668- done
3669- "$@"
3670- stat=$?
3671- if test $stat -eq 0; then :
3672- else
3673- rm -f "$tmpdepfile"
3674- exit $stat
3675- fi
3676- mv "$tmpdepfile" "$depfile"
3677- ;;
3678-
3679-gcc)
3680-## There are various ways to get dependency output from gcc. Here's
3681-## why we pick this rather obscure method:
3682-## - Don't want to use -MD because we'd like the dependencies to end
3683-## up in a subdir. Having to rename by hand is ugly.
3684-## (We might end up doing this anyway to support other compilers.)
3685-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
3686-## -MM, not -M (despite what the docs say).
3687-## - Using -M directly means running the compiler twice (even worse
3688-## than renaming).
3689- if test -z "$gccflag"; then
3690- gccflag=-MD,
3691- fi
3692- "$@" -Wp,"$gccflag$tmpdepfile"
3693- stat=$?
3694- if test $stat -eq 0; then :
3695- else
3696- rm -f "$tmpdepfile"
3697- exit $stat
3698- fi
3699- rm -f "$depfile"
3700- echo "$object : \\" > "$depfile"
3701- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
3702-## The second -e expression handles DOS-style file names with drive letters.
3703- sed -e 's/^[^:]*: / /' \
3704- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
3705-## This next piece of magic avoids the `deleted header file' problem.
3706-## The problem is that when a header file which appears in a .P file
3707-## is deleted, the dependency causes make to die (because there is
3708-## typically no way to rebuild the header). We avoid this by adding
3709-## dummy dependencies for each header file. Too bad gcc doesn't do
3710-## this for us directly.
3711- tr ' ' '
3712-' < "$tmpdepfile" |
3713-## Some versions of gcc put a space before the `:'. On the theory
3714-## that the space means something, we add a space to the output as
3715-## well.
3716-## Some versions of the HPUX 10.20 sed can't process this invocation
3717-## correctly. Breaking it into two sed invocations is a workaround.
3718- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
3719- rm -f "$tmpdepfile"
3720- ;;
3721-
3722-hp)
3723- # This case exists only to let depend.m4 do its work. It works by
3724- # looking at the text of this script. This case will never be run,
3725- # since it is checked for above.
3726- exit 1
3727- ;;
3728-
3729-sgi)
3730- if test "$libtool" = yes; then
3731- "$@" "-Wp,-MDupdate,$tmpdepfile"
3732- else
3733- "$@" -MDupdate "$tmpdepfile"
3734- fi
3735- stat=$?
3736- if test $stat -eq 0; then :
3737- else
3738- rm -f "$tmpdepfile"
3739- exit $stat
3740- fi
3741- rm -f "$depfile"
3742-
3743- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
3744- echo "$object : \\" > "$depfile"
3745-
3746- # Clip off the initial element (the dependent). Don't try to be
3747- # clever and replace this with sed code, as IRIX sed won't handle
3748- # lines with more than a fixed number of characters (4096 in
3749- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
3750- # the IRIX cc adds comments like `#:fec' to the end of the
3751- # dependency line.
3752- tr ' ' '
3753-' < "$tmpdepfile" \
3754- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
3755- tr '
3756-' ' ' >> "$depfile"
3757- echo >> "$depfile"
3758-
3759- # The second pass generates a dummy entry for each header file.
3760- tr ' ' '
3761-' < "$tmpdepfile" \
3762- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
3763- >> "$depfile"
3764- else
3765- # The sourcefile does not contain any dependencies, so just
3766- # store a dummy comment line, to avoid errors with the Makefile
3767- # "include basename.Plo" scheme.
3768- echo "#dummy" > "$depfile"
3769- fi
3770- rm -f "$tmpdepfile"
3771- ;;
3772-
3773-aix)
3774- # The C for AIX Compiler uses -M and outputs the dependencies
3775- # in a .u file. In older versions, this file always lives in the
3776- # current directory. Also, the AIX compiler puts `$object:' at the
3777- # start of each line; $object doesn't have directory information.
3778- # Version 6 uses the directory in both cases.
3779- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
3780- test "x$dir" = "x$object" && dir=
3781- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
3782- if test "$libtool" = yes; then
3783- tmpdepfile1=$dir$base.u
3784- tmpdepfile2=$base.u
3785- tmpdepfile3=$dir.libs/$base.u
3786- "$@" -Wc,-M
3787- else
3788- tmpdepfile1=$dir$base.u
3789- tmpdepfile2=$dir$base.u
3790- tmpdepfile3=$dir$base.u
3791- "$@" -M
3792- fi
3793- stat=$?
3794-
3795- if test $stat -eq 0; then :
3796- else
3797- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
3798- exit $stat
3799- fi
3800-
3801- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
3802- do
3803- test -f "$tmpdepfile" && break
3804- done
3805- if test -f "$tmpdepfile"; then
3806- # Each line is of the form `foo.o: dependent.h'.
3807- # Do two passes, one to just change these to
3808- # `$object: dependent.h' and one to simply `dependent.h:'.
3809- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
3810- # That's a tab and a space in the [].
3811- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
3812- else
3813- # The sourcefile does not contain any dependencies, so just
3814- # store a dummy comment line, to avoid errors with the Makefile
3815- # "include basename.Plo" scheme.
3816- echo "#dummy" > "$depfile"
3817- fi
3818- rm -f "$tmpdepfile"
3819- ;;
3820-
3821-icc)
3822- # Intel's C compiler understands `-MD -MF file'. However on
3823- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
3824- # ICC 7.0 will fill foo.d with something like
3825- # foo.o: sub/foo.c
3826- # foo.o: sub/foo.h
3827- # which is wrong. We want:
3828- # sub/foo.o: sub/foo.c
3829- # sub/foo.o: sub/foo.h
3830- # sub/foo.c:
3831- # sub/foo.h:
3832- # ICC 7.1 will output
3833- # foo.o: sub/foo.c sub/foo.h
3834- # and will wrap long lines using \ :
3835- # foo.o: sub/foo.c ... \
3836- # sub/foo.h ... \
3837- # ...
3838-
3839- "$@" -MD -MF "$tmpdepfile"
3840- stat=$?
3841- if test $stat -eq 0; then :
3842- else
3843- rm -f "$tmpdepfile"
3844- exit $stat
3845- fi
3846- rm -f "$depfile"
3847- # Each line is of the form `foo.o: dependent.h',
3848- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
3849- # Do two passes, one to just change these to
3850- # `$object: dependent.h' and one to simply `dependent.h:'.
3851- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
3852- # Some versions of the HPUX 10.20 sed can't process this invocation
3853- # correctly. Breaking it into two sed invocations is a workaround.
3854- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
3855- sed -e 's/$/ :/' >> "$depfile"
3856- rm -f "$tmpdepfile"
3857- ;;
3858-
3859-hp2)
3860- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
3861- # compilers, which have integrated preprocessors. The correct option
3862- # to use with these is +Maked; it writes dependencies to a file named
3863- # 'foo.d', which lands next to the object file, wherever that
3864- # happens to be.
3865- # Much of this is similar to the tru64 case; see comments there.
3866- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
3867- test "x$dir" = "x$object" && dir=
3868- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
3869- if test "$libtool" = yes; then
3870- tmpdepfile1=$dir$base.d
3871- tmpdepfile2=$dir.libs/$base.d
3872- "$@" -Wc,+Maked
3873- else
3874- tmpdepfile1=$dir$base.d
3875- tmpdepfile2=$dir$base.d
3876- "$@" +Maked
3877- fi
3878- stat=$?
3879- if test $stat -eq 0; then :
3880- else
3881- rm -f "$tmpdepfile1" "$tmpdepfile2"
3882- exit $stat
3883- fi
3884-
3885- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
3886- do
3887- test -f "$tmpdepfile" && break
3888- done
3889- if test -f "$tmpdepfile"; then
3890- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
3891- # Add `dependent.h:' lines.
3892- sed -ne '2,${
3893- s/^ *//
3894- s/ \\*$//
3895- s/$/:/
3896- p
3897- }' "$tmpdepfile" >> "$depfile"
3898- else
3899- echo "#dummy" > "$depfile"
3900- fi
3901- rm -f "$tmpdepfile" "$tmpdepfile2"
3902- ;;
3903-
3904-tru64)
3905- # The Tru64 compiler uses -MD to generate dependencies as a side
3906- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
3907- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
3908- # dependencies in `foo.d' instead, so we check for that too.
3909- # Subdirectories are respected.
3910- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
3911- test "x$dir" = "x$object" && dir=
3912- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
3913-
3914- if test "$libtool" = yes; then
3915- # With Tru64 cc, shared objects can also be used to make a
3916- # static library. This mechanism is used in libtool 1.4 series to
3917- # handle both shared and static libraries in a single compilation.
3918- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
3919- #
3920- # With libtool 1.5 this exception was removed, and libtool now
3921- # generates 2 separate objects for the 2 libraries. These two
3922- # compilations output dependencies in $dir.libs/$base.o.d and
3923- # in $dir$base.o.d. We have to check for both files, because
3924- # one of the two compilations can be disabled. We should prefer
3925- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
3926- # automatically cleaned when .libs/ is deleted, while ignoring
3927- # the former would cause a distcleancheck panic.
3928- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
3929- tmpdepfile2=$dir$base.o.d # libtool 1.5
3930- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
3931- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
3932- "$@" -Wc,-MD
3933- else
3934- tmpdepfile1=$dir$base.o.d
3935- tmpdepfile2=$dir$base.d
3936- tmpdepfile3=$dir$base.d
3937- tmpdepfile4=$dir$base.d
3938- "$@" -MD
3939- fi
3940-
3941- stat=$?
3942- if test $stat -eq 0; then :
3943- else
3944- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
3945- exit $stat
3946- fi
3947-
3948- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
3949- do
3950- test -f "$tmpdepfile" && break
3951- done
3952- if test -f "$tmpdepfile"; then
3953- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
3954- # That's a tab and a space in the [].
3955- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
3956- else
3957- echo "#dummy" > "$depfile"
3958- fi
3959- rm -f "$tmpdepfile"
3960- ;;
3961-
3962-#nosideeffect)
3963- # This comment above is used by automake to tell side-effect
3964- # dependency tracking mechanisms from slower ones.
3965-
3966-dashmstdout)
3967- # Important note: in order to support this mode, a compiler *must*
3968- # always write the preprocessed file to stdout, regardless of -o.
3969- "$@" || exit $?
3970-
3971- # Remove the call to Libtool.
3972- if test "$libtool" = yes; then
3973- while test "X$1" != 'X--mode=compile'; do
3974- shift
3975- done
3976- shift
3977- fi
3978-
3979- # Remove `-o $object'.
3980- IFS=" "
3981- for arg
3982- do
3983- case $arg in
3984- -o)
3985- shift
3986- ;;
3987- $object)
3988- shift
3989- ;;
3990- *)
3991- set fnord "$@" "$arg"
3992- shift # fnord
3993- shift # $arg
3994- ;;
3995- esac
3996- done
3997-
3998- test -z "$dashmflag" && dashmflag=-M
3999- # Require at least two characters before searching for `:'
4000- # in the target name. This is to cope with DOS-style filenames:
4001- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
4002- "$@" $dashmflag |
4003- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
4004- rm -f "$depfile"
4005- cat < "$tmpdepfile" > "$depfile"
4006- tr ' ' '
4007-' < "$tmpdepfile" | \
4008-## Some versions of the HPUX 10.20 sed can't process this invocation
4009-## correctly. Breaking it into two sed invocations is a workaround.
4010- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
4011- rm -f "$tmpdepfile"
4012- ;;
4013-
4014-dashXmstdout)
4015- # This case only exists to satisfy depend.m4. It is never actually
4016- # run, as this mode is specially recognized in the preamble.
4017- exit 1
4018- ;;
4019-
4020-makedepend)
4021- "$@" || exit $?
4022- # Remove any Libtool call
4023- if test "$libtool" = yes; then
4024- while test "X$1" != 'X--mode=compile'; do
4025- shift
4026- done
4027- shift
4028- fi
4029- # X makedepend
4030- shift
4031- cleared=no eat=no
4032- for arg
4033- do
4034- case $cleared in
4035- no)
4036- set ""; shift
4037- cleared=yes ;;
4038- esac
4039- if test $eat = yes; then
4040- eat=no
4041- continue
4042- fi
4043- case "$arg" in
4044- -D*|-I*)
4045- set fnord "$@" "$arg"; shift ;;
4046- # Strip any option that makedepend may not understand. Remove
4047- # the object too, otherwise makedepend will parse it as a source file.
4048- -arch)
4049- eat=yes ;;
4050- -*|$object)
4051- ;;
4052- *)
4053- set fnord "$@" "$arg"; shift ;;
4054- esac
4055- done
4056- obj_suffix=`echo "$object" | sed 's/^.*\././'`
4057- touch "$tmpdepfile"
4058- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
4059- rm -f "$depfile"
4060- cat < "$tmpdepfile" > "$depfile"
4061- sed '1,2d' "$tmpdepfile" | tr ' ' '
4062-' | \
4063-## Some versions of the HPUX 10.20 sed can't process this invocation
4064-## correctly. Breaking it into two sed invocations is a workaround.
4065- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
4066- rm -f "$tmpdepfile" "$tmpdepfile".bak
4067- ;;
4068-
4069-cpp)
4070- # Important note: in order to support this mode, a compiler *must*
4071- # always write the preprocessed file to stdout.
4072- "$@" || exit $?
4073-
4074- # Remove the call to Libtool.
4075- if test "$libtool" = yes; then
4076- while test "X$1" != 'X--mode=compile'; do
4077- shift
4078- done
4079- shift
4080- fi
4081-
4082- # Remove `-o $object'.
4083- IFS=" "
4084- for arg
4085- do
4086- case $arg in
4087- -o)
4088- shift
4089- ;;
4090- $object)
4091- shift
4092- ;;
4093- *)
4094- set fnord "$@" "$arg"
4095- shift # fnord
4096- shift # $arg
4097- ;;
4098- esac
4099- done
4100-
4101- "$@" -E |
4102- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
4103- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
4104- sed '$ s: \\$::' > "$tmpdepfile"
4105- rm -f "$depfile"
4106- echo "$object : \\" > "$depfile"
4107- cat < "$tmpdepfile" >> "$depfile"
4108- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
4109- rm -f "$tmpdepfile"
4110- ;;
4111-
4112-msvisualcpp)
4113- # Important note: in order to support this mode, a compiler *must*
4114- # always write the preprocessed file to stdout.
4115- "$@" || exit $?
4116-
4117- # Remove the call to Libtool.
4118- if test "$libtool" = yes; then
4119- while test "X$1" != 'X--mode=compile'; do
4120- shift
4121- done
4122- shift
4123- fi
4124-
4125- IFS=" "
4126- for arg
4127- do
4128- case "$arg" in
4129- -o)
4130- shift
4131- ;;
4132- $object)
4133- shift
4134- ;;
4135- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
4136- set fnord "$@"
4137- shift
4138- shift
4139- ;;
4140- *)
4141- set fnord "$@" "$arg"
4142- shift
4143- shift
4144- ;;
4145- esac
4146- done
4147- "$@" -E 2>/dev/null |
4148- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
4149- rm -f "$depfile"
4150- echo "$object : \\" > "$depfile"
4151- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
4152- echo " " >> "$depfile"
4153- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
4154- rm -f "$tmpdepfile"
4155- ;;
4156-
4157-msvcmsys)
4158- # This case exists only to let depend.m4 do its work. It works by
4159- # looking at the text of this script. This case will never be run,
4160- # since it is checked for above.
4161- exit 1
4162- ;;
4163-
4164-none)
4165- exec "$@"
4166- ;;
4167-
4168-*)
4169- echo "Unknown depmode $depmode" 1>&2
4170- exit 1
4171- ;;
4172-esac
4173-
4174-exit 0
4175-
4176-# Local Variables:
4177-# mode: shell-script
4178-# sh-indentation: 2
4179-# eval: (add-hook 'write-file-hooks 'time-stamp)
4180-# time-stamp-start: "scriptversion="
4181-# time-stamp-format: "%:y-%02m-%02d.%02H"
4182-# time-stamp-time-zone: "UTC"
4183-# time-stamp-end: "; # UTC"
4184-# End:
4185
4186=== removed file 'install-sh'
4187--- install-sh 2012-04-04 19:34:11 +0000
4188+++ install-sh 1970-01-01 00:00:00 +0000
4189@@ -1,520 +0,0 @@
4190-#!/bin/sh
4191-# install - install a program, script, or datafile
4192-
4193-scriptversion=2009-04-28.21; # UTC
4194-
4195-# This originates from X11R5 (mit/util/scripts/install.sh), which was
4196-# later released in X11R6 (xc/config/util/install.sh) with the
4197-# following copyright and license.
4198-#
4199-# Copyright (C) 1994 X Consortium
4200-#
4201-# Permission is hereby granted, free of charge, to any person obtaining a copy
4202-# of this software and associated documentation files (the "Software"), to
4203-# deal in the Software without restriction, including without limitation the
4204-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
4205-# sell copies of the Software, and to permit persons to whom the Software is
4206-# furnished to do so, subject to the following conditions:
4207-#
4208-# The above copyright notice and this permission notice shall be included in
4209-# all copies or substantial portions of the Software.
4210-#
4211-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
4212-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
4213-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
4214-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
4215-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
4216-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4217-#
4218-# Except as contained in this notice, the name of the X Consortium shall not
4219-# be used in advertising or otherwise to promote the sale, use or other deal-
4220-# ings in this Software without prior written authorization from the X Consor-
4221-# tium.
4222-#
4223-#
4224-# FSF changes to this file are in the public domain.
4225-#
4226-# Calling this script install-sh is preferred over install.sh, to prevent
4227-# `make' implicit rules from creating a file called install from it
4228-# when there is no Makefile.
4229-#
4230-# This script is compatible with the BSD install script, but was written
4231-# from scratch.
4232-
4233-nl='
4234-'
4235-IFS=" "" $nl"
4236-
4237-# set DOITPROG to echo to test this script
4238-
4239-# Don't use :- since 4.3BSD and earlier shells don't like it.
4240-doit=${DOITPROG-}
4241-if test -z "$doit"; then
4242- doit_exec=exec
4243-else
4244- doit_exec=$doit
4245-fi
4246-
4247-# Put in absolute file names if you don't have them in your path;
4248-# or use environment vars.
4249-
4250-chgrpprog=${CHGRPPROG-chgrp}
4251-chmodprog=${CHMODPROG-chmod}
4252-chownprog=${CHOWNPROG-chown}
4253-cmpprog=${CMPPROG-cmp}
4254-cpprog=${CPPROG-cp}
4255-mkdirprog=${MKDIRPROG-mkdir}
4256-mvprog=${MVPROG-mv}
4257-rmprog=${RMPROG-rm}
4258-stripprog=${STRIPPROG-strip}
4259-
4260-posix_glob='?'
4261-initialize_posix_glob='
4262- test "$posix_glob" != "?" || {
4263- if (set -f) 2>/dev/null; then
4264- posix_glob=
4265- else
4266- posix_glob=:
4267- fi
4268- }
4269-'
4270-
4271-posix_mkdir=
4272-
4273-# Desired mode of installed file.
4274-mode=0755
4275-
4276-chgrpcmd=
4277-chmodcmd=$chmodprog
4278-chowncmd=
4279-mvcmd=$mvprog
4280-rmcmd="$rmprog -f"
4281-stripcmd=
4282-
4283-src=
4284-dst=
4285-dir_arg=
4286-dst_arg=
4287-
4288-copy_on_change=false
4289-no_target_directory=
4290-
4291-usage="\
4292-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
4293- or: $0 [OPTION]... SRCFILES... DIRECTORY
4294- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
4295- or: $0 [OPTION]... -d DIRECTORIES...
4296-
4297-In the 1st form, copy SRCFILE to DSTFILE.
4298-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
4299-In the 4th, create DIRECTORIES.
4300-
4301-Options:
4302- --help display this help and exit.
4303- --version display version info and exit.
4304-
4305- -c (ignored)
4306- -C install only if different (preserve the last data modification time)
4307- -d create directories instead of installing files.
4308- -g GROUP $chgrpprog installed files to GROUP.
4309- -m MODE $chmodprog installed files to MODE.
4310- -o USER $chownprog installed files to USER.
4311- -s $stripprog installed files.
4312- -t DIRECTORY install into DIRECTORY.
4313- -T report an error if DSTFILE is a directory.
4314-
4315-Environment variables override the default commands:
4316- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
4317- RMPROG STRIPPROG
4318-"
4319-
4320-while test $# -ne 0; do
4321- case $1 in
4322- -c) ;;
4323-
4324- -C) copy_on_change=true;;
4325-
4326- -d) dir_arg=true;;
4327-
4328- -g) chgrpcmd="$chgrpprog $2"
4329- shift;;
4330-
4331- --help) echo "$usage"; exit $?;;
4332-
4333- -m) mode=$2
4334- case $mode in
4335- *' '* | *' '* | *'
4336-'* | *'*'* | *'?'* | *'['*)
4337- echo "$0: invalid mode: $mode" >&2
4338- exit 1;;
4339- esac
4340- shift;;
4341-
4342- -o) chowncmd="$chownprog $2"
4343- shift;;
4344-
4345- -s) stripcmd=$stripprog;;
4346-
4347- -t) dst_arg=$2
4348- shift;;
4349-
4350- -T) no_target_directory=true;;
4351-
4352- --version) echo "$0 $scriptversion"; exit $?;;
4353-
4354- --) shift
4355- break;;
4356-
4357- -*) echo "$0: invalid option: $1" >&2
4358- exit 1;;
4359-
4360- *) break;;
4361- esac
4362- shift
4363-done
4364-
4365-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
4366- # When -d is used, all remaining arguments are directories to create.
4367- # When -t is used, the destination is already specified.
4368- # Otherwise, the last argument is the destination. Remove it from $@.
4369- for arg
4370- do
4371- if test -n "$dst_arg"; then
4372- # $@ is not empty: it contains at least $arg.
4373- set fnord "$@" "$dst_arg"
4374- shift # fnord
4375- fi
4376- shift # arg
4377- dst_arg=$arg
4378- done
4379-fi
4380-
4381-if test $# -eq 0; then
4382- if test -z "$dir_arg"; then
4383- echo "$0: no input file specified." >&2
4384- exit 1
4385- fi
4386- # It's OK to call `install-sh -d' without argument.
4387- # This can happen when creating conditional directories.
4388- exit 0
4389-fi
4390-
4391-if test -z "$dir_arg"; then
4392- trap '(exit $?); exit' 1 2 13 15
4393-
4394- # Set umask so as not to create temps with too-generous modes.
4395- # However, 'strip' requires both read and write access to temps.
4396- case $mode in
4397- # Optimize common cases.
4398- *644) cp_umask=133;;
4399- *755) cp_umask=22;;
4400-
4401- *[0-7])
4402- if test -z "$stripcmd"; then
4403- u_plus_rw=
4404- else
4405- u_plus_rw='% 200'
4406- fi
4407- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
4408- *)
4409- if test -z "$stripcmd"; then
4410- u_plus_rw=
4411- else
4412- u_plus_rw=,u+rw
4413- fi
4414- cp_umask=$mode$u_plus_rw;;
4415- esac
4416-fi
4417-
4418-for src
4419-do
4420- # Protect names starting with `-'.
4421- case $src in
4422- -*) src=./$src;;
4423- esac
4424-
4425- if test -n "$dir_arg"; then
4426- dst=$src
4427- dstdir=$dst
4428- test -d "$dstdir"
4429- dstdir_status=$?
4430- else
4431-
4432- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
4433- # might cause directories to be created, which would be especially bad
4434- # if $src (and thus $dsttmp) contains '*'.
4435- if test ! -f "$src" && test ! -d "$src"; then
4436- echo "$0: $src does not exist." >&2
4437- exit 1
4438- fi
4439-
4440- if test -z "$dst_arg"; then
4441- echo "$0: no destination specified." >&2
4442- exit 1
4443- fi
4444-
4445- dst=$dst_arg
4446- # Protect names starting with `-'.
4447- case $dst in
4448- -*) dst=./$dst;;
4449- esac
4450-
4451- # If destination is a directory, append the input filename; won't work
4452- # if double slashes aren't ignored.
4453- if test -d "$dst"; then
4454- if test -n "$no_target_directory"; then
4455- echo "$0: $dst_arg: Is a directory" >&2
4456- exit 1
4457- fi
4458- dstdir=$dst
4459- dst=$dstdir/`basename "$src"`
4460- dstdir_status=0
4461- else
4462- # Prefer dirname, but fall back on a substitute if dirname fails.
4463- dstdir=`
4464- (dirname "$dst") 2>/dev/null ||
4465- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4466- X"$dst" : 'X\(//\)[^/]' \| \
4467- X"$dst" : 'X\(//\)$' \| \
4468- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
4469- echo X"$dst" |
4470- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4471- s//\1/
4472- q
4473- }
4474- /^X\(\/\/\)[^/].*/{
4475- s//\1/
4476- q
4477- }
4478- /^X\(\/\/\)$/{
4479- s//\1/
4480- q
4481- }
4482- /^X\(\/\).*/{
4483- s//\1/
4484- q
4485- }
4486- s/.*/./; q'
4487- `
4488-
4489- test -d "$dstdir"
4490- dstdir_status=$?
4491- fi
4492- fi
4493-
4494- obsolete_mkdir_used=false
4495-
4496- if test $dstdir_status != 0; then
4497- case $posix_mkdir in
4498- '')
4499- # Create intermediate dirs using mode 755 as modified by the umask.
4500- # This is like FreeBSD 'install' as of 1997-10-28.
4501- umask=`umask`
4502- case $stripcmd.$umask in
4503- # Optimize common cases.
4504- *[2367][2367]) mkdir_umask=$umask;;
4505- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
4506-
4507- *[0-7])
4508- mkdir_umask=`expr $umask + 22 \
4509- - $umask % 100 % 40 + $umask % 20 \
4510- - $umask % 10 % 4 + $umask % 2
4511- `;;
4512- *) mkdir_umask=$umask,go-w;;
4513- esac
4514-
4515- # With -d, create the new directory with the user-specified mode.
4516- # Otherwise, rely on $mkdir_umask.
4517- if test -n "$dir_arg"; then
4518- mkdir_mode=-m$mode
4519- else
4520- mkdir_mode=
4521- fi
4522-
4523- posix_mkdir=false
4524- case $umask in
4525- *[123567][0-7][0-7])
4526- # POSIX mkdir -p sets u+wx bits regardless of umask, which
4527- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
4528- ;;
4529- *)
4530- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
4531- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
4532-
4533- if (umask $mkdir_umask &&
4534- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
4535- then
4536- if test -z "$dir_arg" || {
4537- # Check for POSIX incompatibilities with -m.
4538- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
4539- # other-writeable bit of parent directory when it shouldn't.
4540- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
4541- ls_ld_tmpdir=`ls -ld "$tmpdir"`
4542- case $ls_ld_tmpdir in
4543- d????-?r-*) different_mode=700;;
4544- d????-?--*) different_mode=755;;
4545- *) false;;
4546- esac &&
4547- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
4548- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
4549- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
4550- }
4551- }
4552- then posix_mkdir=:
4553- fi
4554- rmdir "$tmpdir/d" "$tmpdir"
4555- else
4556- # Remove any dirs left behind by ancient mkdir implementations.
4557- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
4558- fi
4559- trap '' 0;;
4560- esac;;
4561- esac
4562-
4563- if
4564- $posix_mkdir && (
4565- umask $mkdir_umask &&
4566- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
4567- )
4568- then :
4569- else
4570-
4571- # The umask is ridiculous, or mkdir does not conform to POSIX,
4572- # or it failed possibly due to a race condition. Create the
4573- # directory the slow way, step by step, checking for races as we go.
4574-
4575- case $dstdir in
4576- /*) prefix='/';;
4577- -*) prefix='./';;
4578- *) prefix='';;
4579- esac
4580-
4581- eval "$initialize_posix_glob"
4582-
4583- oIFS=$IFS
4584- IFS=/
4585- $posix_glob set -f
4586- set fnord $dstdir
4587- shift
4588- $posix_glob set +f
4589- IFS=$oIFS
4590-
4591- prefixes=
4592-
4593- for d
4594- do
4595- test -z "$d" && continue
4596-
4597- prefix=$prefix$d
4598- if test -d "$prefix"; then
4599- prefixes=
4600- else
4601- if $posix_mkdir; then
4602- (umask=$mkdir_umask &&
4603- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
4604- # Don't fail if two instances are running concurrently.
4605- test -d "$prefix" || exit 1
4606- else
4607- case $prefix in
4608- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
4609- *) qprefix=$prefix;;
4610- esac
4611- prefixes="$prefixes '$qprefix'"
4612- fi
4613- fi
4614- prefix=$prefix/
4615- done
4616-
4617- if test -n "$prefixes"; then
4618- # Don't fail if two instances are running concurrently.
4619- (umask $mkdir_umask &&
4620- eval "\$doit_exec \$mkdirprog $prefixes") ||
4621- test -d "$dstdir" || exit 1
4622- obsolete_mkdir_used=true
4623- fi
4624- fi
4625- fi
4626-
4627- if test -n "$dir_arg"; then
4628- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
4629- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
4630- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
4631- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
4632- else
4633-
4634- # Make a couple of temp file names in the proper directory.
4635- dsttmp=$dstdir/_inst.$$_
4636- rmtmp=$dstdir/_rm.$$_
4637-
4638- # Trap to clean up those temp files at exit.
4639- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
4640-
4641- # Copy the file name to the temp name.
4642- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
4643-
4644- # and set any options; do chmod last to preserve setuid bits.
4645- #
4646- # If any of these fail, we abort the whole thing. If we want to
4647- # ignore errors from any of these, just make sure not to ignore
4648- # errors from the above "$doit $cpprog $src $dsttmp" command.
4649- #
4650- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
4651- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
4652- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
4653- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
4654-
4655- # If -C, don't bother to copy if it wouldn't change the file.
4656- if $copy_on_change &&
4657- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
4658- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
4659-
4660- eval "$initialize_posix_glob" &&
4661- $posix_glob set -f &&
4662- set X $old && old=:$2:$4:$5:$6 &&
4663- set X $new && new=:$2:$4:$5:$6 &&
4664- $posix_glob set +f &&
4665-
4666- test "$old" = "$new" &&
4667- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
4668- then
4669- rm -f "$dsttmp"
4670- else
4671- # Rename the file to the real destination.
4672- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
4673-
4674- # The rename failed, perhaps because mv can't rename something else
4675- # to itself, or perhaps because mv is so ancient that it does not
4676- # support -f.
4677- {
4678- # Now remove or move aside any old file at destination location.
4679- # We try this two ways since rm can't unlink itself on some
4680- # systems and the destination file might be busy for other
4681- # reasons. In this case, the final cleanup might fail but the new
4682- # file should still install successfully.
4683- {
4684- test ! -f "$dst" ||
4685- $doit $rmcmd -f "$dst" 2>/dev/null ||
4686- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
4687- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
4688- } ||
4689- { echo "$0: cannot unlink or rename $dst" >&2
4690- (exit 1); exit 1
4691- }
4692- } &&
4693-
4694- # Now rename the file to the real destination.
4695- $doit $mvcmd "$dsttmp" "$dst"
4696- }
4697- fi || exit 1
4698-
4699- trap '' 0
4700- fi
4701-done
4702-
4703-# Local variables:
4704-# eval: (add-hook 'write-file-hooks 'time-stamp)
4705-# time-stamp-start: "scriptversion="
4706-# time-stamp-format: "%:y-%02m-%02d.%02H"
4707-# time-stamp-time-zone: "UTC"
4708-# time-stamp-end: "; # UTC"
4709-# End:
4710
4711=== modified file 'libindicator/indicator-image-helper.c'
4712--- libindicator/indicator-image-helper.c 2012-03-26 16:24:33 +0000
4713+++ libindicator/indicator-image-helper.c 2012-04-11 15:58:20 +0000
4714@@ -143,7 +143,7 @@
4715 {
4716 g_return_if_fail(name != NULL);
4717 g_return_if_fail(name[0] != '\0');
4718- g_return_if_fail(image != NULL);
4719+ g_return_if_fail(GTK_IS_IMAGE(image));
4720 gboolean seen_previously = FALSE;
4721
4722 /* Build us a GIcon */
4723
4724=== removed file 'ltmain.sh'
4725--- ltmain.sh 2012-04-04 19:34:11 +0000
4726+++ ltmain.sh 1970-01-01 00:00:00 +0000
4727@@ -1,8413 +0,0 @@
4728-# Generated from ltmain.m4sh.
4729-
4730-# ltmain.sh (GNU libtool) 2.2.6b
4731-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
4732-
4733-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
4734-# This is free software; see the source for copying conditions. There is NO
4735-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
4736-
4737-# GNU Libtool is free software; you can redistribute it and/or modify
4738-# it under the terms of the GNU General Public License as published by
4739-# the Free Software Foundation; either version 2 of the License, or
4740-# (at your option) any later version.
4741-#
4742-# As a special exception to the GNU General Public License,
4743-# if you distribute this file as part of a program or library that
4744-# is built using GNU Libtool, you may include this file under the
4745-# same distribution terms that you use for the rest of that program.
4746-#
4747-# GNU Libtool is distributed in the hope that it will be useful, but
4748-# WITHOUT ANY WARRANTY; without even the implied warranty of
4749-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4750-# General Public License for more details.
4751-#
4752-# You should have received a copy of the GNU General Public License
4753-# along with GNU Libtool; see the file COPYING. If not, a copy
4754-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
4755-# or obtained by writing to the Free Software Foundation, Inc.,
4756-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
4757-
4758-# Usage: $progname [OPTION]... [MODE-ARG]...
4759-#
4760-# Provide generalized library-building support services.
4761-#
4762-# --config show all configuration variables
4763-# --debug enable verbose shell tracing
4764-# -n, --dry-run display commands without modifying any files
4765-# --features display basic configuration information and exit
4766-# --mode=MODE use operation mode MODE
4767-# --preserve-dup-deps don't remove duplicate dependency libraries
4768-# --quiet, --silent don't print informational messages
4769-# --tag=TAG use configuration variables from tag TAG
4770-# -v, --verbose print informational messages (default)
4771-# --version print version information
4772-# -h, --help print short or long help message
4773-#
4774-# MODE must be one of the following:
4775-#
4776-# clean remove files from the build directory
4777-# compile compile a source file into a libtool object
4778-# execute automatically set library path, then run a program
4779-# finish complete the installation of libtool libraries
4780-# install install libraries or executables
4781-# link create a library or an executable
4782-# uninstall remove libraries from an installed directory
4783-#
4784-# MODE-ARGS vary depending on the MODE.
4785-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
4786-#
4787-# When reporting a bug, please describe a test case to reproduce it and
4788-# include the following information:
4789-#
4790-# host-triplet: $host
4791-# shell: $SHELL
4792-# compiler: $LTCC
4793-# compiler flags: $LTCFLAGS
4794-# linker: $LD (gnu? $with_gnu_ld)
4795-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
4796-# automake: $automake_version
4797-# autoconf: $autoconf_version
4798-#
4799-# Report bugs to <bug-libtool@gnu.org>.
4800-
4801-PROGRAM=ltmain.sh
4802-PACKAGE=libtool
4803-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
4804-TIMESTAMP=""
4805-package_revision=1.3017
4806-
4807-# Be Bourne compatible
4808-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4809- emulate sh
4810- NULLCMD=:
4811- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
4812- # is contrary to our usage. Disable this feature.
4813- alias -g '${1+"$@"}'='"$@"'
4814- setopt NO_GLOB_SUBST
4815-else
4816- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
4817-fi
4818-BIN_SH=xpg4; export BIN_SH # for Tru64
4819-DUALCASE=1; export DUALCASE # for MKS sh
4820-
4821-# NLS nuisances: We save the old values to restore during execute mode.
4822-# Only set LANG and LC_ALL to C if already set.
4823-# These must not be set unconditionally because not all systems understand
4824-# e.g. LANG=C (notably SCO).
4825-lt_user_locale=
4826-lt_safe_locale=
4827-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
4828-do
4829- eval "if test \"\${$lt_var+set}\" = set; then
4830- save_$lt_var=\$$lt_var
4831- $lt_var=C
4832- export $lt_var
4833- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
4834- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
4835- fi"
4836-done
4837-
4838-$lt_unset CDPATH
4839-
4840-
4841-
4842-
4843-
4844-: ${CP="cp -f"}
4845-: ${ECHO="echo"}
4846-: ${EGREP="/bin/grep -E"}
4847-: ${FGREP="/bin/grep -F"}
4848-: ${GREP="/bin/grep"}
4849-: ${LN_S="ln -s"}
4850-: ${MAKE="make"}
4851-: ${MKDIR="mkdir"}
4852-: ${MV="mv -f"}
4853-: ${RM="rm -f"}
4854-: ${SED="/bin/sed"}
4855-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
4856-: ${Xsed="$SED -e 1s/^X//"}
4857-
4858-# Global variables:
4859-EXIT_SUCCESS=0
4860-EXIT_FAILURE=1
4861-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
4862-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
4863-
4864-exit_status=$EXIT_SUCCESS
4865-
4866-# Make sure IFS has a sensible default
4867-lt_nl='
4868-'
4869-IFS=" $lt_nl"
4870-
4871-dirname="s,/[^/]*$,,"
4872-basename="s,^.*/,,"
4873-
4874-# func_dirname_and_basename file append nondir_replacement
4875-# perform func_basename and func_dirname in a single function
4876-# call:
4877-# dirname: Compute the dirname of FILE. If nonempty,
4878-# add APPEND to the result, otherwise set result
4879-# to NONDIR_REPLACEMENT.
4880-# value returned in "$func_dirname_result"
4881-# basename: Compute filename of FILE.
4882-# value retuned in "$func_basename_result"
4883-# Implementation must be kept synchronized with func_dirname
4884-# and func_basename. For efficiency, we do not delegate to
4885-# those functions but instead duplicate the functionality here.
4886-func_dirname_and_basename ()
4887-{
4888- # Extract subdirectory from the argument.
4889- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
4890- if test "X$func_dirname_result" = "X${1}"; then
4891- func_dirname_result="${3}"
4892- else
4893- func_dirname_result="$func_dirname_result${2}"
4894- fi
4895- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
4896-}
4897-
4898-# Generated shell functions inserted here.
4899-
4900-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
4901-# is ksh but when the shell is invoked as "sh" and the current value of
4902-# the _XPG environment variable is not equal to 1 (one), the special
4903-# positional parameter $0, within a function call, is the name of the
4904-# function.
4905-progpath="$0"
4906-
4907-# The name of this program:
4908-# In the unlikely event $progname began with a '-', it would play havoc with
4909-# func_echo (imagine progname=-n), so we prepend ./ in that case:
4910-func_dirname_and_basename "$progpath"
4911-progname=$func_basename_result
4912-case $progname in
4913- -*) progname=./$progname ;;
4914-esac
4915-
4916-# Make sure we have an absolute path for reexecution:
4917-case $progpath in
4918- [\\/]*|[A-Za-z]:\\*) ;;
4919- *[\\/]*)
4920- progdir=$func_dirname_result
4921- progdir=`cd "$progdir" && pwd`
4922- progpath="$progdir/$progname"
4923- ;;
4924- *)
4925- save_IFS="$IFS"
4926- IFS=:
4927- for progdir in $PATH; do
4928- IFS="$save_IFS"
4929- test -x "$progdir/$progname" && break
4930- done
4931- IFS="$save_IFS"
4932- test -n "$progdir" || progdir=`pwd`
4933- progpath="$progdir/$progname"
4934- ;;
4935-esac
4936-
4937-# Sed substitution that helps us do robust quoting. It backslashifies
4938-# metacharacters that are still active within double-quoted strings.
4939-Xsed="${SED}"' -e 1s/^X//'
4940-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
4941-
4942-# Same as above, but do not quote variable references.
4943-double_quote_subst='s/\(["`\\]\)/\\\1/g'
4944-
4945-# Re-`\' parameter expansions in output of double_quote_subst that were
4946-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
4947-# in input to double_quote_subst, that '$' was protected from expansion.
4948-# Since each input `\' is now two `\'s, look for any number of runs of
4949-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
4950-bs='\\'
4951-bs2='\\\\'
4952-bs4='\\\\\\\\'
4953-dollar='\$'
4954-sed_double_backslash="\
4955- s/$bs4/&\\
4956-/g
4957- s/^$bs2$dollar/$bs&/
4958- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
4959- s/\n//g"
4960-
4961-# Standard options:
4962-opt_dry_run=false
4963-opt_help=false
4964-opt_quiet=false
4965-opt_verbose=false
4966-opt_warning=:
4967-
4968-# func_echo arg...
4969-# Echo program name prefixed message, along with the current mode
4970-# name if it has been set yet.
4971-func_echo ()
4972-{
4973- $ECHO "$progname${mode+: }$mode: $*"
4974-}
4975-
4976-# func_verbose arg...
4977-# Echo program name prefixed message in verbose mode only.
4978-func_verbose ()
4979-{
4980- $opt_verbose && func_echo ${1+"$@"}
4981-
4982- # A bug in bash halts the script if the last line of a function
4983- # fails when set -e is in force, so we need another command to
4984- # work around that:
4985- :
4986-}
4987-
4988-# func_error arg...
4989-# Echo program name prefixed message to standard error.
4990-func_error ()
4991-{
4992- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
4993-}
4994-
4995-# func_warning arg...
4996-# Echo program name prefixed warning message to standard error.
4997-func_warning ()
4998-{
4999- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
5000-
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches