1 --- hildon-plugins-settings-0.0.10-1/config.guess
2 +++ hildon-plugins-settings-0.0.10-1/config.guess
5 # Attempt to guess a canonical system name.
6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
9 +# Free Software Foundation, Inc.
11 -timestamp='2005-04-22'
12 +timestamp='2008-01-23'
14 # This file is free software; you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License as published by
18 # You should have received a copy of the GNU General Public License
19 # along with this program; if not, write to the Free Software
20 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
24 # As a special exception to the GNU General Public License, if you
25 # distribute this file as part of a program that contains a
26 # configuration script generated by Autoconf, you may include it under
27 # the same distribution terms that you use for the rest of that program.
30 # Originally written by Per Bothner <per@bothner.com>.
31 # Please send patches to <config-patches@gnu.org>. Submit a context
32 # diff and a properly formatted ChangeLog entry.
34 GNU config.guess ($timestamp)
36 Originally written by Per Bothner.
37 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
38 -Free Software Foundation, Inc.
39 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
40 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
42 This is free software; see the source for copying conditions. There is NO
43 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
45 while test $# -gt 0 ; do
47 --time-stamp | --time* | -t )
48 - echo "$timestamp" ; exit 0 ;;
49 + echo "$timestamp" ; exit ;;
51 - echo "$version" ; exit 0 ;;
52 + echo "$version" ; exit ;;
54 - echo "$usage"; exit 0 ;;
55 + echo "$usage"; exit ;;
56 -- ) # Stop option processing
58 - ) # Use stdin as input.
60 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
61 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
63 - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
64 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
65 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
66 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
67 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
70 ,,*) CC_FOR_BUILD=$CC ;;
71 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
73 +esac ; set_cc_for_build= ;'
75 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
76 # (ghazi@noc.rutgers.edu 1994-08-24)
78 arm*) machine=arm-unknown ;;
79 sh3el) machine=shl-unknown ;;
80 sh3eb) machine=sh-unknown ;;
81 + sh5el) machine=sh5le-unknown ;;
82 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
84 # The Operating System including object format, if it has switched
86 # contains redundant information, the shorter form:
87 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
88 echo "${machine}-${os}${release}"
91 - echo x86_64-unknown-openbsd${UNAME_RELEASE}
94 - echo m68k-unknown-openbsd${UNAME_RELEASE}
97 - echo arm-unknown-openbsd${UNAME_RELEASE}
100 - echo m68k-unknown-openbsd${UNAME_RELEASE}
102 - luna88k:OpenBSD:*:*)
103 - echo m88k-unknown-openbsd${UNAME_RELEASE}
105 - mac68k:OpenBSD:*:*)
106 - echo m68k-unknown-openbsd${UNAME_RELEASE}
108 - macppc:OpenBSD:*:*)
109 - echo powerpc-unknown-openbsd${UNAME_RELEASE}
111 - mvme68k:OpenBSD:*:*)
112 - echo m68k-unknown-openbsd${UNAME_RELEASE}
114 - mvme88k:OpenBSD:*:*)
115 - echo m88k-unknown-openbsd${UNAME_RELEASE}
117 - mvmeppc:OpenBSD:*:*)
118 - echo powerpc-unknown-openbsd${UNAME_RELEASE}
121 - echo mips64-unknown-openbsd${UNAME_RELEASE}
124 - echo m68k-unknown-openbsd${UNAME_RELEASE}
128 - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
130 + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
131 + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
134 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
138 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
141 - echo powerppc-unknown-mirbsd${UNAME_RELEASE}
143 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
146 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
150 case $UNAME_RELEASE in
152 @@ -297,40 +269,43 @@
153 # A Xn.n version is an unreleased experimental baselevel.
154 # 1.2 uses "1.2" for uname -r.
155 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
158 Alpha\ *:Windows_NT*:*)
159 # How do we know it's Interix rather than the generic POSIX subsystem?
160 # Should we change UNAME_MACHINE based on the output of uname instead
161 # of the specific Alpha model?
162 echo alpha-pc-interix
165 21064:Windows_NT:50:3)
166 echo alpha-dec-winnt3.5
169 Amiga*:UNIX_System_V:4.0:*)
170 echo m68k-unknown-sysv4
173 *:[Aa]miga[Oo][Ss]:*:*)
174 echo ${UNAME_MACHINE}-unknown-amigaos
177 *:[Mm]orph[Oo][Ss]:*:*)
178 echo ${UNAME_MACHINE}-unknown-morphos
182 echo i370-ibm-openedition
190 echo powerpc-ibm-os400
193 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
194 echo arm-acorn-riscix${UNAME_RELEASE}
197 + arm:riscos:*:*|arm:RISCOS:*:*)
198 + echo arm-unknown-riscos
200 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
201 echo hppa1.1-hitachi-hiuxmpp
204 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
205 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
206 if test "`(/bin/universe) 2>/dev/null`" = att ; then
207 @@ -338,32 +313,32 @@
209 echo pyramid-pyramid-bsd
214 echo pyramid-pyramid-svr4
217 DRS?6000:unix:4.0:6*)
221 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
222 case `/usr/bin/uname -p` in
223 - sparc) echo sparc-icl-nx7 && exit 0 ;;
224 + sparc) echo sparc-icl-nx7; exit ;;
227 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
230 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
231 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
235 + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
236 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
240 # According to config.sub, this is the proper way to canonicalize
241 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
242 # it's likely to be more like Solaris than SunOS4.
243 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
247 case "`/usr/bin/arch -k`" in
249 @@ -372,10 +347,10 @@
251 # Japanese Language versions have a version number like `4.1.3-JL'.
252 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
256 echo m68k-sun-sunos${UNAME_RELEASE}
260 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
261 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
262 @@ -387,10 +362,10 @@
263 echo sparc-sun-sunos${UNAME_RELEASE}
269 echo sparc-auspex-sunos${UNAME_RELEASE}
272 # The situation for MiNT is a little confusing. The machine name
273 # can be virtually everything (everything which is not
274 # "atarist" or "atariste" at least should have a processor
275 @@ -401,40 +376,40 @@
277 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
278 echo m68k-atari-mint${UNAME_RELEASE}
281 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
282 echo m68k-atari-mint${UNAME_RELEASE}
285 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
286 echo m68k-atari-mint${UNAME_RELEASE}
289 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
290 echo m68k-milan-mint${UNAME_RELEASE}
293 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
294 echo m68k-hades-mint${UNAME_RELEASE}
297 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
298 echo m68k-unknown-mint${UNAME_RELEASE}
302 echo m68k-apple-machten${UNAME_RELEASE}
306 echo powerpc-apple-machten${UNAME_RELEASE}
310 echo mips-dec-mach_bsd4.3
314 echo mips-dec-ultrix${UNAME_RELEASE}
318 echo vax-dec-ultrix${UNAME_RELEASE}
321 2020:CLIX:*:* | 2430:CLIX:*:*)
322 echo clipper-intergraph-clix${UNAME_RELEASE}
325 mips:*:*:UMIPS | mips:*:*:RISCos)
326 eval $set_cc_for_build
327 sed 's/^ //' << EOF >$dummy.c
328 @@ -458,32 +433,33 @@
332 - $CC_FOR_BUILD -o $dummy $dummy.c \
333 - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
335 + $CC_FOR_BUILD -o $dummy $dummy.c &&
336 + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
337 + SYSTEM_NAME=`$dummy $dummyarg` &&
338 + { echo "$SYSTEM_NAME"; exit; }
339 echo mips-mips-riscos${UNAME_RELEASE}
342 Motorola:PowerMAX_OS:*:*)
343 echo powerpc-motorola-powermax
346 Motorola:*:4.3:PL8-*)
347 echo powerpc-harris-powermax
350 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
351 echo powerpc-harris-powermax
354 Night_Hawk:Power_UNIX:*:*)
355 echo powerpc-harris-powerunix
359 echo m88k-harris-cxux7
363 echo m88k-motorola-sysv4
367 echo m88k-motorola-sysv3
371 # DG/UX returns AViiON for all architectures
372 UNAME_PROCESSOR=`/usr/bin/uname -p`
373 @@ -499,29 +475,29 @@
375 echo i586-dg-dgux${UNAME_RELEASE}
379 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
380 echo m88k-dolphin-sysv3
384 # Delta 88k system running SVR3
385 echo m88k-motorola-sysv3
388 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
389 echo m88k-tektronix-sysv3
392 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
393 echo m68k-tektronix-bsd
397 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
400 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
401 - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
402 - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
403 + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
404 + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
410 if [ -x /usr/bin/oslevel ] ; then
411 IBM_REV=`/usr/bin/oslevel`
413 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
415 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
419 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
420 eval $set_cc_for_build
421 @@ -544,15 +520,19 @@
425 - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
426 - echo rs6000-ibm-aix3.2.5
427 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
429 + echo "$SYSTEM_NAME"
431 + echo rs6000-ibm-aix3.2.5
433 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
434 echo rs6000-ibm-aix3.2.4
436 echo rs6000-ibm-aix3.2
442 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
443 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
445 @@ -565,28 +545,28 @@
446 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
448 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
455 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
459 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
460 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
461 - exit 0 ;; # report: romp-ibm BSD 4.3
462 + exit ;; # report: romp-ibm BSD 4.3
464 echo rs6000-bull-bosx
471 9000/[34]??:4.3bsd:1.*:*)
475 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
479 9000/[34678]??:HP-UX:*:*)
480 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
481 case "${UNAME_MACHINE}" in
484 if [ ${HP_ARCH} = "hppa2.0w" ]
486 - # avoid double evaluation of $set_cc_for_build
487 - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
488 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
489 + eval $set_cc_for_build
491 + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
492 + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
493 + # generating 64-bit code. GNU and HP use different nomenclature:
495 + # $ CC_FOR_BUILD=cc ./config.guess
496 + # => hppa2.0w-hp-hpux11.23
497 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
498 + # => hppa64-hp-hpux11.23
500 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
501 + grep __LP64__ >/dev/null
505 @@ -658,11 +648,11 @@
508 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
512 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
513 echo ia64-hp-hpux${HPUX_REV}
517 eval $set_cc_for_build
518 sed 's/^ //' << EOF >$dummy.c
519 @@ -690,161 +680,192 @@
523 - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
524 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
525 + { echo "$SYSTEM_NAME"; exit; }
526 echo unknown-hitachi-hiuxwe2
529 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
537 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
538 echo hppa1.0-hp-mpeix
541 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
550 if [ -x /usr/sbin/sysversion ] ; then
551 echo ${UNAME_MACHINE}-unknown-osf1mk
553 echo ${UNAME_MACHINE}-unknown-osf1
558 echo hppa1.1-hp-lites
561 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
565 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
566 if getsysinfo -f scalar_acc
567 then echo c32-convex-bsd
568 else echo c2-convex-bsd
572 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
576 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
580 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
585 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
589 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
590 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
591 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
596 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
600 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
604 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
608 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
611 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
612 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
613 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
614 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
615 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
618 5000:UNIX_System_V:4.*:*)
619 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
620 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
621 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
624 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
625 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
629 echo sparc-unknown-bsdi${UNAME_RELEASE}
633 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
637 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
639 + case ${UNAME_MACHINE} in
641 + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
643 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
645 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
649 echo ${UNAME_MACHINE}-pc-cygwin
654 echo ${UNAME_MACHINE}-pc-mingw32
658 + # uname -m includes "-pc" on this system.
659 + echo ${UNAME_MACHINE}-mingw32
662 echo ${UNAME_MACHINE}-pc-pw32
664 - x86:Interix*:[34]*)
665 - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
668 + *:Interix*:[3456]*)
669 + case ${UNAME_MACHINE} in
671 + echo i586-pc-interix${UNAME_RELEASE}
673 + EM64T | authenticamd)
674 + echo x86_64-unknown-interix${UNAME_RELEASE}
677 + echo ia64-unknown-interix${UNAME_RELEASE}
680 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
681 echo i${UNAME_MACHINE}-pc-mks
684 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
685 # How do we know it's Interix rather than the generic POSIX subsystem?
686 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
687 # UNAME_MACHINE based on the output of uname instead of i386?
692 echo ${UNAME_MACHINE}-pc-uwin
696 + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
697 echo x86_64-unknown-cygwin
701 echo powerpcle-unknown-cygwin
705 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
710 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
714 # other systems with GNU libc and userland
715 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
719 echo ${UNAME_MACHINE}-pc-minix
723 + eval $set_cc_for_build
724 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
725 + | grep -q __ARM_EABI__
727 + echo ${UNAME_MACHINE}-unknown-linux-gnu
729 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
733 echo ${UNAME_MACHINE}-unknown-linux-gnu
737 echo cris-axis-linux-gnu
741 echo crisv32-axis-linux-gnu
745 echo frv-unknown-linux-gnu
749 echo ${UNAME_MACHINE}-unknown-linux-gnu
753 echo ${UNAME_MACHINE}-unknown-linux-gnu
757 echo ${UNAME_MACHINE}-unknown-linux-gnu
761 eval $set_cc_for_build
762 sed 's/^ //' << EOF >$dummy.c
767 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
768 - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
769 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
774 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
777 eval $set_cc_for_build
778 @@ -880,15 +905,22 @@
782 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
783 - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
784 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
789 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
792 + echo or32-unknown-linux-gnu
795 echo powerpc-unknown-linux-gnu
799 echo powerpc64-unknown-linux-gnu
803 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
804 EV5) UNAME_MACHINE=alphaev5 ;;
806 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
807 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
808 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
811 parisc:Linux:*:* | hppa:Linux:*:*)
813 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
814 @@ -910,25 +942,31 @@
815 PA8*) echo hppa2.0-unknown-linux-gnu ;;
816 *) echo hppa-unknown-linux-gnu ;;
820 parisc64:Linux:*:* | hppa64:Linux:*:*)
821 echo hppa64-unknown-linux-gnu
824 s390:Linux:*:* | s390x:Linux:*:*)
825 echo ${UNAME_MACHINE}-ibm-linux
829 echo ${UNAME_MACHINE}-unknown-linux-gnu
833 echo ${UNAME_MACHINE}-unknown-linux-gnu
836 sparc:Linux:*:* | sparc64:Linux:*:*)
837 echo ${UNAME_MACHINE}-unknown-linux-gnu
841 + echo ${UNAME_MACHINE}-dec-linux-gnu
844 echo x86_64-unknown-linux-gnu
848 + echo ${UNAME_MACHINE}-unknown-linux-gnu
851 # The BFD linker knows what the default object file format is, so
852 # first see if it will tell us. cd to the root directory to prevent
853 @@ -946,15 +984,15 @@
856 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
860 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
864 # Either a pre-BFD a.out linker (linux-gnuoldld) or
865 # one that does not give us useful --help.
866 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
870 # Determine whether the default compiler is a.out or elf
871 eval $set_cc_for_build
876 - #ifdef __INTEL_COMPILER
877 + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
881 @@ -981,16 +1019,23 @@
885 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
886 - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
887 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
888 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
893 + test x"${LIBC}" != x && {
894 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
897 + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
900 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
901 # earlier versions are messed up and put the nodename in both
902 # sysname and nodename.
903 echo i386-sequent-sysv4
906 i*86:UNIX_SV:4.2MP:2.*)
907 # Unixware is an offshoot of SVR4, but it has its own version
908 # number series starting with 2...
909 @@ -998,27 +1043,27 @@
910 # I just have to hope. -- rms.
911 # Use sysv4.2uw... so that sysv4* matches it.
912 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
916 # If we were able to find `uname', then EMX Unix compatibility
917 # is probably installed.
918 echo ${UNAME_MACHINE}-pc-os2-emx
922 echo ${UNAME_MACHINE}-unknown-stop
926 echo ${UNAME_MACHINE}-unknown-atheos
931 echo ${UNAME_MACHINE}-pc-syllable
934 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
935 echo i386-unknown-lynxos${UNAME_RELEASE}
939 echo ${UNAME_MACHINE}-pc-msdosdjgpp
942 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
943 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
944 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
945 @@ -1026,15 +1071,16 @@
947 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
953 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
954 case `/bin/uname -X | grep "^Machine"` in
955 *486*) UNAME_MACHINE=i486 ;;
956 *Pentium) UNAME_MACHINE=i586 ;;
957 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
959 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
963 if test -f /usr/options/cb.name; then
964 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
965 @@ -1052,73 +1098,73 @@
967 echo ${UNAME_MACHINE}-pc-sysv32
972 # Left here for compatibility:
973 # uname -m prints for DJGPP always 'pc', but it prints nothing about
974 # the processor, so we play safe by assuming i386.
975 echo i386-pc-msdosdjgpp
986 i860:*:4.*:*) # i860-SVR4
987 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
988 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
989 else # Add other i860-SVR4 vendors below as they are discovered.
990 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
996 echo m68010-convergent-sysv
999 mc68k:UNIX:SYSTEM5:3.51m)
1000 echo m68k-convergent-sysv
1007 M68*:*:R3V[5678]*:*)
1008 - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1009 + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1010 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)
1012 test -r /etc/.relid \
1013 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1014 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1015 - && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1016 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1017 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1018 - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1019 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1020 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1021 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1022 - && echo i486-ncr-sysv4 && exit 0 ;;
1023 + && { echo i486-ncr-sysv4; exit; } ;;
1024 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1025 echo m68k-unknown-lynxos${UNAME_RELEASE}
1028 mc68030:UNIX_System_V:4.*:*)
1029 echo m68k-atari-sysv4
1032 TSUNAMI:LynxOS:2.*:*)
1033 echo sparc-unknown-lynxos${UNAME_RELEASE}
1036 rs6000:LynxOS:2.*:*)
1037 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1040 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1041 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1044 SM[BE]S:UNIX_SV:*:*)
1045 echo mips-dde-sysv${UNAME_RELEASE}
1048 RM*:ReliantUNIX-*:*:*)
1057 if uname -p 2>/dev/null >/dev/null ; then
1058 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1059 @@ -1126,73 +1172,81 @@
1065 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1066 # says <Richard.M.Bartel@ccMail.Census.GOV>
1067 echo i586-unisys-sysv4
1070 *:UNIX_System_V:4*:FTX*)
1071 # From Gerald Hewes <hewes@openmarket.com>.
1072 # How about differentiating between stratus architectures? -djm
1073 echo hppa1.1-stratus-sysv4
1077 # From seanf@swdc.stratus.com.
1078 echo i860-stratus-sysv4
1082 # From Paul.Green@stratus.com.
1083 echo ${UNAME_MACHINE}-stratus-vos
1087 # From Paul.Green@stratus.com.
1088 echo hppa1.1-stratus-vos
1092 echo m68k-apple-aux${UNAME_RELEASE}
1096 echo mips-sony-newsos6
1099 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1100 if [ -d /usr/nec ]; then
1101 echo mips-nec-sysv${UNAME_RELEASE}
1103 echo mips-unknown-sysv${UNAME_RELEASE}
1107 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1108 echo powerpc-be-beos
1111 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
1112 echo powerpc-apple-beos
1115 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1120 echo sx4-nec-superux${UNAME_RELEASE}
1124 echo sx5-nec-superux${UNAME_RELEASE}
1128 echo sx6-nec-superux${UNAME_RELEASE}
1131 + SX-7:SUPER-UX:*:*)
1132 + echo sx7-nec-superux${UNAME_RELEASE}
1134 + SX-8:SUPER-UX:*:*)
1135 + echo sx8-nec-superux${UNAME_RELEASE}
1137 + SX-8R:SUPER-UX:*:*)
1138 + echo sx8r-nec-superux${UNAME_RELEASE}
1140 Power*:Rhapsody:*:*)
1141 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1145 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1149 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1150 case $UNAME_PROCESSOR in
1151 - *86) UNAME_PROCESSOR=i686 ;;
1152 unknown) UNAME_PROCESSOR=powerpc ;;
1154 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1157 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1158 UNAME_PROCESSOR=`uname -p`
1159 if test "$UNAME_PROCESSOR" = "x86"; then
1160 @@ -1200,25 +1254,25 @@
1163 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1170 NSE-?:NONSTOP_KERNEL:*:*)
1171 echo nse-tandem-nsk${UNAME_RELEASE}
1174 NSR-?:NONSTOP_KERNEL:*:*)
1175 echo nsr-tandem-nsk${UNAME_RELEASE}
1179 echo mips-compaq-nonstopux
1183 echo bs2000-siemens-sysv
1186 DS/*:UNIX_System_V:*:*)
1187 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1191 # "uname -m" is not consistent, so use $cputype instead. 386
1192 # is converted to i386 for consistency with other x86
1193 @@ -1229,41 +1283,47 @@
1194 UNAME_MACHINE="$cputype"
1196 echo ${UNAME_MACHINE}-unknown-plan9
1200 echo pdp10-unknown-tops10
1204 echo pdp10-unknown-tenex
1207 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1208 echo pdp10-dec-tops20
1211 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1212 echo pdp10-xkl-tops20
1216 echo pdp10-unknown-tops20
1220 echo pdp10-unknown-its
1224 echo mips-sei-seiux${UNAME_RELEASE}
1228 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1232 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1233 case "${UNAME_MACHINE}" in
1234 - A*) echo alpha-dec-vms && exit 0 ;;
1235 - I*) echo ia64-dec-vms && exit 0 ;;
1236 - V*) echo vax-dec-vms && exit 0 ;;
1237 + A*) echo alpha-dec-vms ; exit ;;
1238 + I*) echo ia64-dec-vms ; exit ;;
1239 + V*) echo vax-dec-vms ; exit ;;
1246 + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1249 + echo ${UNAME_MACHINE}-pc-rdos
1253 #echo '(No uname command or uname output not recognized.)' 1>&2
1254 @@ -1295,7 +1355,7 @@
1257 #if defined (__arm) && defined (__acorn) && defined (__unix)
1258 - printf ("arm-acorn-riscix"); exit (0);
1259 + printf ("arm-acorn-riscix\n"); exit (0);
1262 #if defined (hp300) && !defined (hpux)
1263 @@ -1384,11 +1444,12 @@
1267 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
1268 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1269 + { echo "$SYSTEM_NAME"; exit; }
1271 # Apollos put the system type in the environment.
1273 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1274 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1276 # Convex versions that predate uname can use getsysinfo(1)
1278 @@ -1397,22 +1458,22 @@
1279 case `getsysinfo -f cpu_type` in
1285 if getsysinfo -f scalar_acc
1286 then echo c32-convex-bsd
1287 else echo c2-convex-bsd
1306 @@ -1423,9 +1484,9 @@
1307 the operating system you are using. It is advised that you
1308 download the most up to date version of the config scripts from
1310 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1311 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1313 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1314 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1316 If the version you run ($0) is already up to date, please
1317 send the following data and any information you think might be
1318 --- hildon-plugins-settings-0.0.10-1/configure.ac
1319 +++ hildon-plugins-settings-0.0.10-1/configure.ac
1322 CFLAGS="$CFLAGS -g -finstrument-functions"
1324 - CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror"
1325 + CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations"
1328 ALL_LINGUAS="de_DE en_GB en_US es_ES es_MX fi_FI fr_CA fr_FR it_IT pt_BR ru_RU"
1329 --- hildon-plugins-settings-0.0.10-1/config.sub
1330 +++ hildon-plugins-settings-0.0.10-1/config.sub
1333 # Configuration validation subroutine script.
1334 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1335 -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
1336 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
1337 +# Free Software Foundation, Inc.
1339 -timestamp='2005-04-22'
1340 +timestamp='2008-01-16'
1342 # This file is (in principle) common to ALL GNU software.
1343 # The presence of a machine in this file suggests that SOME GNU software
1346 # You should have received a copy of the GNU General Public License
1347 # along with this program; if not, write to the Free Software
1348 -# Foundation, Inc., 59 Temple Place - Suite 330,
1349 -# Boston, MA 02111-1307, USA.
1351 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
1354 # As a special exception to the GNU General Public License, if you
1355 # distribute this file as part of a program that contains a
1356 # configuration script generated by Autoconf, you may include it under
1357 # the same distribution terms that you use for the rest of that program.
1360 # Please send patches to <config-patches@gnu.org>. Submit a context
1361 # diff and a properly formatted ChangeLog entry.
1365 GNU config.sub ($timestamp)
1367 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1368 -Free Software Foundation, Inc.
1369 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
1370 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1372 This is free software; see the source for copying conditions. There is NO
1373 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1375 while test $# -gt 0 ; do
1377 --time-stamp | --time* | -t )
1378 - echo "$timestamp" ; exit 0 ;;
1379 + echo "$timestamp" ; exit ;;
1381 - echo "$version" ; exit 0 ;;
1382 + echo "$version" ; exit ;;
1383 --help | --h* | -h )
1384 - echo "$usage"; exit 0 ;;
1385 + echo "$usage"; exit ;;
1386 -- ) # Stop option processing
1388 - ) # Use stdin as input.
1391 # First pass through any local machine types.
1399 # Here we must recognize all the valid KERNEL-OS combinations.
1400 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1402 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
1403 - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
1404 + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
1405 + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
1406 + storm-chaos* | os2-emx* | rtmk-nova*)
1408 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1410 @@ -170,6 +173,10 @@
1416 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1420 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1421 @@ -186,6 +193,10 @@
1422 # Don't forget version if it is 3.2v4 or newer.
1423 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1426 + # Don't forget version if it is 3.2v4 or newer.
1427 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1431 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1432 @@ -230,15 +241,16 @@
1433 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1434 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1436 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1437 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1440 | d10v | d30v | dlx | dsp16xx \
1442 + | fido | fr30 | frv \
1443 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1444 | i370 | i860 | i960 | ia64 \
1446 - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
1447 + | m32c | m32r | m32rle | m68000 | m68k | m88k \
1448 + | maxq | mb | microblaze | mcore | mep \
1449 | mips | mipsbe | mipseb | mipsel | mipsle \
1451 | mips64 | mips64el \
1453 | mips64vr4100 | mips64vr4100el \
1454 | mips64vr4300 | mips64vr4300el \
1455 | mips64vr5000 | mips64vr5000el \
1456 + | mips64vr5900 | mips64vr5900el \
1457 | mipsisa32 | mipsisa32el \
1458 | mipsisa32r2 | mipsisa32r2el \
1459 | mipsisa64 | mipsisa64el \
1460 @@ -255,21 +268,24 @@
1461 | mipsisa64sr71k | mipsisa64sr71kel \
1462 | mipstx39 | mipstx39el \
1463 | mn10200 | mn10300 \
1468 - | openrisc | or32 \
1470 | pdp10 | pdp11 | pj | pjl \
1471 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1473 - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1475 + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1477 - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
1478 - | sparcv8 | sparcv9 | sparcv9b \
1480 + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
1481 + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
1482 + | spu | strongarm \
1483 | tahoe | thumb | tic4x | tic80 | tron \
1486 - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
1487 + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
1489 basic_machine=$basic_machine-unknown
1493 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1496 + basic_machine=mt-unknown
1499 # We use `pc' rather than `unknown'
1500 # because (1) that's what they normally are, and
1501 @@ -299,18 +318,18 @@
1502 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1503 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1504 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1506 + | avr-* | avr32-* \
1507 | bfin-* | bs2000-* \
1508 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1509 | clipper-* | craynv-* | cydra-* \
1510 | d10v-* | d30v-* | dlx-* \
1512 - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
1513 + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1514 | h8300-* | h8500-* \
1515 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1516 | i*86-* | i860-* | i960-* | ia64-* \
1517 | ip2k-* | iq2000-* \
1518 - | m32r-* | m32rle-* \
1519 + | m32c-* | m32r-* | m32rle-* \
1520 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1521 | m88110-* | m88k-* | maxq-* | mcore-* \
1522 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1524 | mips64vr4100-* | mips64vr4100el-* \
1525 | mips64vr4300-* | mips64vr4300el-* \
1526 | mips64vr5000-* | mips64vr5000el-* \
1527 + | mips64vr5900-* | mips64vr5900el-* \
1528 | mipsisa32-* | mipsisa32el-* \
1529 | mipsisa32r2-* | mipsisa32r2el-* \
1530 | mipsisa64-* | mipsisa64el-* \
1531 @@ -329,28 +349,34 @@
1532 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1533 | mipstx39-* | mipstx39el-* \
1537 + | nios-* | nios2-* \
1538 | none-* | np1-* | ns16k-* | ns32k-* \
1540 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1541 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1543 | romp-* | rs6000-* \
1544 - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
1545 + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1546 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1547 - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
1548 + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1550 - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
1551 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
1552 | tahoe-* | thumb-* \
1553 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1555 | v850-* | v850e-* | vax-* \
1557 - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
1558 - | xstormy16-* | xtensa-* \
1559 + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
1560 + | xstormy16-* | xtensa*-* \
1564 + # Recognize the basic CPU types without company name, with glob match.
1566 + basic_machine=$basic_machine-unknown
1568 # Recognize the various machine names and aliases which stand
1569 # for a CPU type and a company and sometimes even an OS.
1571 @@ -421,6 +447,14 @@
1572 basic_machine=ns32k-sequent
1576 + basic_machine=bfin-unknown
1580 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
1584 basic_machine=c90-cray
1587 basic_machine=craynv-cray
1591 - basic_machine=cr16c-unknown
1593 + basic_machine=cr16-unknown
1597 @@ -646,6 +680,14 @@
1598 basic_machine=m68k-isi
1602 + basic_machine=m68k-unknown
1606 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
1610 basic_machine=m88k-omron
1612 @@ -661,6 +703,10 @@
1613 basic_machine=i386-pc
1617 + basic_machine=arm-unknown
1621 basic_machine=m68000-convergent
1624 basic_machine=i386-pc
1628 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1631 basic_machine=i370-ibm
1634 basic_machine=hppa1.1-oki
1638 + openrisc | openrisc-*)
1639 basic_machine=or32-unknown
1643 basic_machine=powerpc-ibm
1644 @@ -785,6 +833,14 @@
1645 basic_machine=i860-intel
1649 + basic_machine=hppa-unknown
1653 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
1657 basic_machine=sparc-tti
1659 @@ -794,6 +850,12 @@
1661 basic_machine=ns32k-pc532
1664 + basic_machine=i386-pc
1667 + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
1669 pentium | p5 | k5 | k6 | nexgen | viac3)
1670 basic_machine=i586-pc
1672 @@ -850,6 +912,10 @@
1673 basic_machine=i586-unknown
1677 + basic_machine=i386-pc
1681 basic_machine=m68k-rom68k
1683 @@ -876,6 +942,10 @@
1685 basic_machine=mipsisa64sb1el-unknown
1688 + basic_machine=mipsisa32-sde
1692 basic_machine=mips-sei
1695 basic_machine=sh-hitachi
1699 + basic_machine=sh5le-unknown
1702 basic_machine=sh64-unknown
1704 @@ -976,6 +1049,10 @@
1705 basic_machine=tic6x-unknown
1709 + basic_machine=tile-unknown
1713 basic_machine=mipstx39-unknown
1715 @@ -1089,13 +1166,10 @@
1717 basic_machine=we32k-att
1719 - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1720 + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1721 basic_machine=sh-unknown
1724 - basic_machine=sh64-unknown
1726 - sparc | sparcv8 | sparcv9 | sparcv9b)
1727 + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1728 basic_machine=sparc-sun
1731 @@ -1168,20 +1242,23 @@
1733 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1734 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1735 - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1736 + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1737 + | -openbsd* | -solidbsd* \
1738 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1739 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1740 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1741 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1742 | -chorusos* | -chorusrdb* \
1743 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1744 - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1745 + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1746 + | -uxpv* | -beos* | -mpeix* | -udk* \
1747 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1748 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1749 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1750 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1751 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1752 - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
1753 + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1754 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1755 # Remember, each alternative MUST END IN *, to match a version number.
1758 @@ -1199,7 +1276,7 @@
1759 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1761 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1762 - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1763 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1764 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1767 @@ -1333,6 +1410,12 @@
1768 # system, and we'll never get to this point.
1770 case $basic_machine in
1780 @@ -1342,9 +1425,9 @@
1790 # This must come before the *-dec entry.
1793 @@ -1370,6 +1453,9 @@
1803 @@ -1388,6 +1474,9 @@
1813 @@ -1559,7 +1648,7 @@
1816 echo $basic_machine$os
1821 # eval: (add-hook 'write-file-hooks 'time-stamp)
1822 --- hildon-plugins-settings-0.0.10-1/debian/control
1823 +++ hildon-plugins-settings-0.0.10-1/debian/control
1827 Maintainer: Moises Martinez <moises.martinez@nokia.com>
1828 -Build-Depends: debhelper (>= 4.0.0), libosso-dev (>= 0.9.19), osso-af-settings, hildon-control-panel-dev, hildon-desktop-dev (>= 0.0.16), libhildondesktop-dev (>= 0.0.16), libhildon1-dev, libdbus-glib-1-dev, libhildonhelp-dev
1829 +Build-Depends: debhelper (>= 4.0.0), libosso-dev (>= 0.9.19), osso-af-settings, hildon-control-panel-dev, hildon-desktop-dev (>= 0.0.16), libhildondesktop-dev (>= 0.0.16), libhildon1-dev, libdbus-glib-1-dev, libhildonhelp-dev, pkg-config, autoconf, automake, libtool
1830 Standards-Version: 3.6.1
1832 Package: hildon-plugins-settings-cpa
1834 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0, hildon-control-panel
1835 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-public | osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0, hildon-control-panel
1836 Conflicts: hildon-control-panel-navigatorapplet
1837 Description: Hildon Control Panel's Task navigator & Statusbar applet plugin
1838 Hildon Control Panel applet to configure the Hildon Desktop's panels.
1840 Package: hildon-plugins-settings-bin
1842 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0
1843 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, osso-applet-tasknavigator-l10n-public | osso-applet-tasknavigator-l10n-mr | osso-applet-tasknavigator-l10n-mr0
1844 Description: Hildon Desktop's Plugins Settings
1845 Hildon Control Panel applet to configure the Hildon Desktop's plugins.
1846 --- hildon-plugins-settings-0.0.10-1/debian/changelog
1847 +++ hildon-plugins-settings-0.0.10-1/debian/changelog
1849 +hildon-plugins-settings (0.0.10-1-mer3) jaunty; urgency=low
1851 + * Fix problem with crashing.
1853 + -- root <root@cfph-toy> Sun, 12 Apr 2009 11:32:04 +0000
1855 +hildon-plugins-settings (0.0.10-1-mer2) sardine; urgency=low
1857 + * Adding in libtool etc deps.
1859 + -- Faheem Pervez <trippin1@gmail.com> Mon, 26 Jan 2009 18:38:16 +0000
1861 +hildon-plugins-settings (0.0.10-1-mer1) sardine; urgency=low
1863 + * Fixing compiling errors for Mer (remove Werror).
1864 + * Add in OR dependency to depend on osso-applet-tasknavigator-l10n-public.
1866 + -- Faheem Pervez <trippin1@gmail.com> Mon, 26 Jan 2009 17:42:23 +0000
1868 hildon-plugins-settings (0.0.10-1) sardine; urgency=low
1870 * src/hildon-plugin-config-parser.c:
1871 --- hildon-plugins-settings-0.0.10-1/src/hildon-plugin-settings.c
1872 +++ hildon-plugins-settings-0.0.10-1/src/hildon-plugin-settings.c
1877 - if (g_str_equal (name,HP_APPLICATION_SWITCHER) ||
1878 +/* if (g_str_equal (name,HP_APPLICATION_SWITCHER) ||
1879 g_str_equal (name,HP_SWITCHER_MENU))
1885 --- hildon-plugins-settings-0.0.10-1/src/hildon-plugin-settings-dialog.c
1886 +++ hildon-plugins-settings-0.0.10-1/src/hildon-plugin-settings-dialog.c
1889 GTK_POLICY_AUTOMATIC);
1892 hildon_plugin_config_parser_load (((HPSDTab *)l->data)->parser, &error);