← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-settings-daemon/saucy-proposed

« back to all changes in this revision

Viewing changes to config.guess

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Rico Tzschichholz
  • Date: 2013-09-09 10:21:09 UTC
  • mfrom: (1.1.64)
  • Revision ID: package-import@ubuntu.com-20130909102109-t2zyyll79urcfz56
Tags: 3.8.5-0ubuntu1
https://launchpad.net/bugs/1219148
https://launchpad.net/bugs/1219486
https://launchpad.net/bugs/1217166
https://launchpad.net/bugs/1221367
https://launchpad.net/bugs/1201679
[ Tim Lunn ]
* Refreshed patches
* debian/patches: 
  - fix_media_keys_on_unity.patch:
    Use legacy media keys keygrabber when running Unity
  - git_revert_remove_automount_helper.patch: bring back the automount
    helper, revert upstream commit and port to dbus session tracking.
  - fix_screenshots_on_unity.patch: bring back support for screenshots
    via gnome-screenshot when using unity.
  - ubuntu-lid-close-suspend.patch:
     Reimplement support for setting lid close suspend actions
  - ubuntu-fix-desktop-file.patch: Autostart in Unity too
  - fix_input_switching_on_unity.patch: Bring back support for input
    switching under Unity
  - 63_gnome_disable_background_plugin.patch: Disable loading
    of background plugin for GNOME session (LP: #1219148)

* Dropped obsolete patches:
  - power-check-null-devices.patch, Dropped: Applied in new version
  - 51_lock_screen_on_suspend.patch, Superseded by handling this key
    in gnome-screensaver. With that, g-screensaver mirrors what's
    done in g-shell, and avoids patching settings-daemon.
* gnome-settings-daemon.gsettings-override:
  - Update switch input source keys for 3.8

[ Jeremy Bicha ]
* New upstream release (LP: #1219486)
  - Two-finger scrolling enabled by default (LP: #1217166)
  - But use edge scrolling if two-finger scrolling isn't
    available (LP: #1221367)
  - Fix Super+Space switch-input-source shortcut in Unity (LP: #1201679)
* debian/control.in:
  - Bump minimum glib, gsettings-desktop-schemas, gnome-desktop3, gtk,
    libpulse, and libwacom
  - Build-depend on librsvg2-dev
  - This update needs changes to gnome-control-center so break older
    versions
* Refreshed patches
* revert_background_dropping.patch:
  - Don't drop the background plugin yet, GNOME Fallback & Unity
    still need it (when Nautilus isn't handling the desktop)
* Dropped obsolete patches:
  - bugzilla_segfault_dpms.patch: Applied in new version
  - 47_delay_pa_connect_to_idle.patch: Applied in new version
  - power-no-fallback-notifications.patch: Applied in new version
  - 60_unity_hide_status_icon.patch
  - 61_unity_use_application_indicator.patch
  - 63_unity_start_mounter.patch
  - logind_support.patch
  - and patches backported from 3.8
* Disabled patch that need to be rewritten or dropped:
  - 48_register_client_before_idle_callbacks.patch
* debian/patches/touchscreen_rotation.patch:
  - Updated with latest version from bugzilla
* debian/patches/git_revert_hardcoded_input_methods.patch:
  - Add patch from git (and also applied in Fedora 19) to not hardcode
    input methods based on the current locale

[ Rico Tzschichholz ]
* debian/patches:
  - 16_use_synchronous_notifications.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.guess
1
1
#! /bin/sh
2
2
# Attempt to guess a canonical system name.
3
 
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
 
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
 
#   2011, 2012 Free Software Foundation, Inc.
 
3
#   Copyright 1992-2013 Free Software Foundation, Inc.
6
4
 
7
 
timestamp='2012-06-10'
 
5
timestamp='2013-06-10'
8
6
 
9
7
# This file is free software; you can redistribute it and/or modify it
10
8
# under the terms of the GNU General Public License as published by
11
 
# the Free Software Foundation; either version 2 of the License, or
 
9
# the Free Software Foundation; either version 3 of the License, or
12
10
# (at your option) any later version.
13
11
#
14
12
# This program is distributed in the hope that it will be useful, but
22
20
# As a special exception to the GNU General Public License, if you
23
21
# distribute this file as part of a program that contains a
24
22
# configuration script generated by Autoconf, you may include it under
25
 
# the same distribution terms that you use for the rest of that program.
26
 
 
27
 
 
28
 
# Originally written by Per Bothner.  Please send patches (context
29
 
# diff format) to <config-patches@gnu.org> and include a ChangeLog
30
 
# entry.
 
23
# the same distribution terms that you use for the rest of that
 
24
# program.  This Exception is an additional permission under section 7
 
25
# of the GNU General Public License, version 3 ("GPLv3").
31
26
#
32
 
# This script attempts to guess a canonical system name similar to
33
 
# config.sub.  If it succeeds, it prints the system name on stdout, and
34
 
# exits with 0.  Otherwise, it exits with 1.
 
27
# Originally written by Per Bothner.
35
28
#
36
29
# You can get the latest version of this script from:
37
30
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
31
#
 
32
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 
33
 
38
34
 
39
35
me=`echo "$0" | sed -e 's,.*/,,'`
40
36
 
54
50
GNU config.guess ($timestamp)
55
51
 
56
52
Originally written by Per Bothner.
57
 
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
58
 
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59
 
Free Software Foundation, Inc.
 
53
Copyright 1992-2013 Free Software Foundation, Inc.
60
54
 
61
55
This is free software; see the source for copying conditions.  There is NO
62
56
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
138
132
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
139
133
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
140
134
 
 
135
case "${UNAME_SYSTEM}" in
 
136
Linux|GNU|GNU/*)
 
137
        # If the system lacks a compiler, then just pick glibc.
 
138
        # We could probably try harder.
 
139
        LIBC=gnu
 
140
 
 
141
        eval $set_cc_for_build
 
142
        cat <<-EOF > $dummy.c
 
143
        #include <features.h>
 
144
        #if defined(__UCLIBC__)
 
145
        LIBC=uclibc
 
146
        #elif defined(__dietlibc__)
 
147
        LIBC=dietlibc
 
148
        #else
 
149
        LIBC=gnu
 
150
        #endif
 
151
        EOF
 
152
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 
153
        ;;
 
154
esac
 
155
 
141
156
# Note: order is significant - the case branches are not exclusive.
142
157
 
143
158
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
200
215
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
201
216
        echo "${machine}-${os}${release}"
202
217
        exit ;;
 
218
    *:Bitrig:*:*)
 
219
        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
 
220
        echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 
221
        exit ;;
203
222
    *:OpenBSD:*:*)
204
223
        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
205
224
        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
302
321
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
303
322
        echo arm-acorn-riscix${UNAME_RELEASE}
304
323
        exit ;;
305
 
    arm:riscos:*:*|arm:RISCOS:*:*)
 
324
    arm*:riscos:*:*|arm*:RISCOS:*:*)
306
325
        echo arm-unknown-riscos
307
326
        exit ;;
308
327
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
801
820
    i*:CYGWIN*:*)
802
821
        echo ${UNAME_MACHINE}-pc-cygwin
803
822
        exit ;;
 
823
    *:MINGW64*:*)
 
824
        echo ${UNAME_MACHINE}-pc-mingw64
 
825
        exit ;;
804
826
    *:MINGW*:*)
805
827
        echo ${UNAME_MACHINE}-pc-mingw32
806
828
        exit ;;
852
874
        exit ;;
853
875
    *:GNU:*:*)
854
876
        # the GNU system
855
 
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 
877
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
856
878
        exit ;;
857
879
    *:GNU/*:*:*)
858
880
        # other systems with GNU libc and userland
859
 
        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 
881
        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
860
882
        exit ;;
861
883
    i*86:Minix:*:*)
862
884
        echo ${UNAME_MACHINE}-pc-minix
863
885
        exit ;;
864
886
    aarch64:Linux:*:*)
865
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
887
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
866
888
        exit ;;
867
889
    aarch64_be:Linux:*:*)
868
890
        UNAME_MACHINE=aarch64_be
869
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
891
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
870
892
        exit ;;
871
893
    alpha:Linux:*:*)
872
894
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
879
901
          EV68*) UNAME_MACHINE=alphaev68 ;;
880
902
        esac
881
903
        objdump --private-headers /bin/sh | grep -q ld.so.1
882
 
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
883
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 
904
        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 
905
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 
906
        exit ;;
 
907
    arc:Linux:*:* | arceb:Linux:*:*)
 
908
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
884
909
        exit ;;
885
910
    arm*:Linux:*:*)
886
911
        eval $set_cc_for_build
887
912
        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
888
913
            | grep -q __ARM_EABI__
889
914
        then
890
 
            echo ${UNAME_MACHINE}-unknown-linux-gnu
 
915
            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
891
916
        else
892
917
            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
893
918
                | grep -q __ARM_PCS_VFP
894
919
            then
895
 
                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 
920
                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
896
921
            else
897
 
                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 
922
                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
898
923
            fi
899
924
        fi
900
925
        exit ;;
901
926
    avr32*:Linux:*:*)
902
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
927
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
903
928
        exit ;;
904
929
    cris:Linux:*:*)
905
 
        echo ${UNAME_MACHINE}-axis-linux-gnu
 
930
        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
906
931
        exit ;;
907
932
    crisv32:Linux:*:*)
908
 
        echo ${UNAME_MACHINE}-axis-linux-gnu
 
933
        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
909
934
        exit ;;
910
935
    frv:Linux:*:*)
911
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
936
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
912
937
        exit ;;
913
938
    hexagon:Linux:*:*)
914
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
939
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
915
940
        exit ;;
916
941
    i*86:Linux:*:*)
917
 
        LIBC=gnu
918
 
        eval $set_cc_for_build
919
 
        sed 's/^        //' << EOF >$dummy.c
920
 
        #ifdef __dietlibc__
921
 
        LIBC=dietlibc
922
 
        #endif
923
 
EOF
924
 
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
925
 
        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 
942
        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
926
943
        exit ;;
927
944
    ia64:Linux:*:*)
928
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
945
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
929
946
        exit ;;
930
947
    m32r*:Linux:*:*)
931
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
948
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
932
949
        exit ;;
933
950
    m68*:Linux:*:*)
934
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
951
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
935
952
        exit ;;
936
953
    mips:Linux:*:* | mips64:Linux:*:*)
937
954
        eval $set_cc_for_build
950
967
        #endif
951
968
EOF
952
969
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
953
 
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 
970
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
954
971
        ;;
 
972
    or1k:Linux:*:*)
 
973
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 
974
        exit ;;
955
975
    or32:Linux:*:*)
956
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
976
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
957
977
        exit ;;
958
978
    padre:Linux:*:*)
959
 
        echo sparc-unknown-linux-gnu
 
979
        echo sparc-unknown-linux-${LIBC}
960
980
        exit ;;
961
981
    parisc64:Linux:*:* | hppa64:Linux:*:*)
962
 
        echo hppa64-unknown-linux-gnu
 
982
        echo hppa64-unknown-linux-${LIBC}
963
983
        exit ;;
964
984
    parisc:Linux:*:* | hppa:Linux:*:*)
965
985
        # Look for CPU level
966
986
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
967
 
          PA7*) echo hppa1.1-unknown-linux-gnu ;;
968
 
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
969
 
          *)    echo hppa-unknown-linux-gnu ;;
 
987
          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
 
988
          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
 
989
          *)    echo hppa-unknown-linux-${LIBC} ;;
970
990
        esac
971
991
        exit ;;
972
992
    ppc64:Linux:*:*)
973
 
        echo powerpc64-unknown-linux-gnu
 
993
        echo powerpc64-unknown-linux-${LIBC}
974
994
        exit ;;
975
995
    ppc:Linux:*:*)
976
 
        echo powerpc-unknown-linux-gnu
 
996
        echo powerpc-unknown-linux-${LIBC}
 
997
        exit ;;
 
998
    ppc64le:Linux:*:*)
 
999
        echo powerpc64le-unknown-linux-${LIBC}
 
1000
        exit ;;
 
1001
    ppcle:Linux:*:*)
 
1002
        echo powerpcle-unknown-linux-${LIBC}
977
1003
        exit ;;
978
1004
    s390:Linux:*:* | s390x:Linux:*:*)
979
 
        echo ${UNAME_MACHINE}-ibm-linux
 
1005
        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
980
1006
        exit ;;
981
1007
    sh64*:Linux:*:*)
982
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1008
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
983
1009
        exit ;;
984
1010
    sh*:Linux:*:*)
985
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1011
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
986
1012
        exit ;;
987
1013
    sparc:Linux:*:* | sparc64:Linux:*:*)
988
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1014
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
989
1015
        exit ;;
990
1016
    tile*:Linux:*:*)
991
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1017
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
992
1018
        exit ;;
993
1019
    vax:Linux:*:*)
994
 
        echo ${UNAME_MACHINE}-dec-linux-gnu
 
1020
        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
995
1021
        exit ;;
996
1022
    x86_64:Linux:*:*)
997
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1023
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
998
1024
        exit ;;
999
1025
    xtensa*:Linux:*:*)
1000
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
 
1026
        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1001
1027
        exit ;;
1002
1028
    i*86:DYNIX/ptx:4*:*)
1003
1029
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1201
1227
    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
1202
1228
        echo i586-pc-haiku
1203
1229
        exit ;;
 
1230
    x86_64:Haiku:*:*)
 
1231
        echo x86_64-unknown-haiku
 
1232
        exit ;;
1204
1233
    SX-4:SUPER-UX:*:*)
1205
1234
        echo sx4-nec-superux${UNAME_RELEASE}
1206
1235
        exit ;;
1227
1256
        exit ;;
1228
1257
    *:Darwin:*:*)
1229
1258
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1230
 
        case $UNAME_PROCESSOR in
1231
 
            i386)
1232
 
                eval $set_cc_for_build
1233
 
                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1234
 
                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1235
 
                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1236
 
                      grep IS_64BIT_ARCH >/dev/null
1237
 
                  then
1238
 
                      UNAME_PROCESSOR="x86_64"
1239
 
                  fi
1240
 
                fi ;;
1241
 
            unknown) UNAME_PROCESSOR=powerpc ;;
1242
 
        esac
 
1259
        eval $set_cc_for_build
 
1260
        if test "$UNAME_PROCESSOR" = unknown ; then
 
1261
            UNAME_PROCESSOR=powerpc
 
1262
        fi
 
1263
        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 
1264
            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 
1265
                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 
1266
                grep IS_64BIT_ARCH >/dev/null
 
1267
            then
 
1268
                case $UNAME_PROCESSOR in
 
1269
                    i386) UNAME_PROCESSOR=x86_64 ;;
 
1270
                    powerpc) UNAME_PROCESSOR=powerpc64 ;;
 
1271
                esac
 
1272
            fi
 
1273
        fi
1243
1274
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1244
1275
        exit ;;
1245
1276
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1330
1361
        exit ;;
1331
1362
esac
1332
1363
 
1333
 
#echo '(No uname command or uname output not recognized.)' 1>&2
1334
 
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1335
 
 
1336
1364
eval $set_cc_for_build
1337
1365
cat >$dummy.c <<EOF
1338
1366
#ifdef _SEQUENT_