← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/tomboy/gutsy-updates

« back to all changes in this revision

Viewing changes to config.guess

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-11-22 19:22:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061122192217-odnb17d1ib22okof
Tags: 0.5.1-0ubuntu1
* New upstream release:
  + New Managed D-Bus/DBusSharp (Sebastian Dröge)
  + Additional search interface improvements
  + More secure wrapper script to launch Tomboy.exe
  + Fix panel and TrayIcon resizing
  + Fix 1x1 pixel TrayIcon
  + Removed old tintin image
* debian/control:
  + Update build dependencies
* debian/patches/01-dbus0.9.patch,
  debian/patches/50_tintin.patch,
  debian/patches/51_tomboy-dllmap.patch,
  debian/patches/52_external-dbus-sharp.patch,
  debian/patches/53_tomboy-tray-icon.patch:
  + Dropped, merged upstream
* debian/rules,
  debian/tomboy.desktop:
  + Use upstream's desktop file again after it was fixed now
* debian/rules:
  + DBus service file path workaround removed, it's fixed upstream

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
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
 
#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
5
 
#   Inc.
 
4
#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
6
5
 
7
 
timestamp='2006-05-13'
 
6
timestamp='2005-07-08'
8
7
 
9
8
# This file is free software; you can redistribute it and/or modify it
10
9
# under the terms of the GNU General Public License as published by
107
106
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
108
107
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
109
108
: ${TMPDIR=/tmp} ;
110
 
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 
109
 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
111
110
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
112
111
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
113
112
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
217
216
    *:ekkoBSD:*:*)
218
217
        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
219
218
        exit ;;
220
 
    *:SolidBSD:*:*)
221
 
        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
222
 
        exit ;;
223
219
    macppc:MirBSD:*:*)
224
220
        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
225
221
        exit ;;
778
774
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
779
775
        exit ;;
780
776
    *:FreeBSD:*:*)
781
 
        case ${UNAME_MACHINE} in
782
 
            pc98)
783
 
                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
784
 
            amd64)
785
 
                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
786
 
            *)
787
 
                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
788
 
        esac
 
777
        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
789
778
        exit ;;
790
779
    i*:CYGWIN*:*)
791
780
        echo ${UNAME_MACHINE}-pc-cygwin
800
789
    i*:PW*:*)
801
790
        echo ${UNAME_MACHINE}-pc-pw32
802
791
        exit ;;
803
 
    x86:Interix*:[345]*)
804
 
        echo i586-pc-interix${UNAME_RELEASE}
805
 
        exit ;;
806
 
    EM64T:Interix*:[345]*)
807
 
        echo x86_64-unknown-interix${UNAME_RELEASE}
 
792
    x86:Interix*:[34]*)
 
793
        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
808
794
        exit ;;
809
795
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
810
796
        echo i${UNAME_MACHINE}-pc-mks
818
804
    i*:UWIN*:*)
819
805
        echo ${UNAME_MACHINE}-pc-uwin
820
806
        exit ;;
821
 
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 
807
    amd64:CYGWIN*:*:*)
822
808
        echo x86_64-unknown-cygwin
823
809
        exit ;;
824
810
    p*:CYGWIN*:*)
839
825
        echo ${UNAME_MACHINE}-pc-minix
840
826
        exit ;;
841
827
    arm*:Linux:*:*)
842
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
828
        echo ${UNAME_MACHINE}-${VENDOR}-linux
843
829
        exit ;;
844
830
    cris:Linux:*:*)
845
 
        echo cris-axis-linux-gnu
 
831
        echo cris-axis-linux
846
832
        exit ;;
847
833
    crisv32:Linux:*:*)
848
 
        echo crisv32-axis-linux-gnu
 
834
        echo crisv32-axis-linux
849
835
        exit ;;
850
836
    frv:Linux:*:*)
851
 
        echo frv-${VENDOR}-linux-gnu
 
837
        echo frv-${VENDOR}-linux
852
838
        exit ;;
853
839
    ia64:Linux:*:*)
854
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
840
        echo ${UNAME_MACHINE}-${VENDOR}-linux
855
841
        exit ;;
856
842
    m32r*:Linux:*:*)
857
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
843
        echo ${UNAME_MACHINE}-${VENDOR}-linux
858
844
        exit ;;
859
845
    m68*:Linux:*:*)
860
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
846
        echo ${UNAME_MACHINE}-${VENDOR}-linux
861
847
        exit ;;
862
848
    mips:Linux:*:*)
863
849
        eval $set_cc_for_build
875
861
        #endif
876
862
        #endif
877
863
EOF
878
 
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
879
 
            /^CPU/{
880
 
                s: ::g
881
 
                p
882
 
            }'`"
883
 
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 
864
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 
865
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
884
866
        ;;
885
867
    mips64:Linux:*:*)
886
868
        eval $set_cc_for_build
898
880
        #endif
899
881
        #endif
900
882
EOF
901
 
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
902
 
            /^CPU/{
903
 
                s: ::g
904
 
                p
905
 
            }'`"
906
 
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 
883
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 
884
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
907
885
        ;;
908
 
    or32:Linux:*:*)
909
 
        echo or32-${VENDOR}-linux-gnu
910
 
        exit ;;
911
886
    ppc:Linux:*:*)
912
 
        echo powerpc-${VENDOR}-linux-gnu
 
887
        echo powerpc-${VENDOR}-linux
913
888
        exit ;;
914
889
    ppc64:Linux:*:*)
915
 
        echo powerpc64-${VENDOR}-linux-gnu
 
890
        echo powerpc64-${VENDOR}-linux
916
891
        exit ;;
917
892
    alpha:Linux:*:*)
918
893
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
926
901
        esac
927
902
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
928
903
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
929
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
 
904
        echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
930
905
        exit ;;
931
906
    parisc:Linux:*:* | hppa:Linux:*:*)
932
907
        # Look for CPU level
933
908
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
934
 
          PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
935
 
          PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
936
 
          *)    echo hppa-${VENDOR}-linux-gnu ;;
 
909
          PA7*) echo hppa1.1-${VENDOR}-linux ;;
 
910
          PA8*) echo hppa2.0-${VENDOR}-linux ;;
 
911
          *)    echo hppa-${VENDOR}-linux ;;
937
912
        esac
938
913
        exit ;;
939
914
    parisc64:Linux:*:* | hppa64:Linux:*:*)
940
 
        echo hppa64-${VENDOR}-linux-gnu
 
915
        echo hppa64-${VENDOR}-linux
941
916
        exit ;;
942
917
    s390:Linux:*:* | s390x:Linux:*:*)
943
918
        echo ${UNAME_MACHINE}-ibm-linux
944
919
        exit ;;
945
920
    sh64*:Linux:*:*)
946
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
921
        echo ${UNAME_MACHINE}-${VENDOR}-linux
947
922
        exit ;;
948
923
    sh*:Linux:*:*)
949
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 
924
        echo ${UNAME_MACHINE}-${VENDOR}-linux
950
925
        exit ;;
951
926
    sparc:Linux:*:* | sparc64:Linux:*:*)
952
 
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
953
 
        exit ;;
954
 
    vax:Linux:*:*)
955
 
        echo ${UNAME_MACHINE}-dec-linux-gnu
 
927
        echo ${UNAME_MACHINE}-${VENDOR}-linux
956
928
        exit ;;
957
929
    x86_64:Linux:*:*)
958
 
        echo x86_64-${VENDOR}-linux-gnu
 
930
        echo x86_64-${VENDOR}-linux
959
931
        exit ;;
960
932
    i*86:Linux:*:*)
961
933
        # The BFD linker knows what the default object file format is, so
970
942
                                    p'`
971
943
        case "$ld_supported_targets" in
972
944
          elf32-i386)
973
 
                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
 
945
                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
974
946
                ;;
975
947
          a.out-i386-linux)
976
 
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
 
948
                echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
977
949
                exit ;;
978
950
          coff-i386)
979
 
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
 
951
                echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
980
952
                exit ;;
981
953
          "")
982
 
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
 
954
                # Either a pre-BFD a.out linker (linuxoldld) or
983
955
                # one that does not give us useful --help.
984
 
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
 
956
                echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
985
957
                exit ;;
986
958
        esac
987
959
        # Determine whether the default compiler is a.out or elf
999
971
        LIBC=gnulibc1
1000
972
        # endif
1001
973
        #else
1002
 
        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 
974
        #ifdef __INTEL_COMPILER
1003
975
        LIBC=gnu
1004
976
        #else
1005
977
        LIBC=gnuaout
1009
981
        LIBC=dietlibc
1010
982
        #endif
1011
983
EOF
1012
 
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1013
 
            /^LIBC/{
1014
 
                s: ::g
1015
 
                p
1016
 
            }'`"
 
984
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
1017
985
        test x"${LIBC}" != x && {
1018
 
                echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
 
986
                echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
1019
987
                exit
1020
988
        }
1021
989
        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1224
1192
    *:Darwin:*:*)
1225
1193
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1226
1194
        case $UNAME_PROCESSOR in
 
1195
            *86) UNAME_PROCESSOR=i686 ;;
1227
1196
            unknown) UNAME_PROCESSOR=powerpc ;;
1228
1197
        esac
1229
1198
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1302
1271
    i*86:skyos:*:*)
1303
1272
        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1304
1273
        exit ;;
1305
 
    i*86:rdos:*:*)
1306
 
        echo ${UNAME_MACHINE}-pc-rdos
1307
 
        exit ;;
1308
1274
esac
1309
1275
 
1310
1276
#echo '(No uname command or uname output not recognized.)' 1>&2