← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xfce4-utils/jaunty

« back to all changes in this revision

Viewing changes to config.guess

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-02-07 11:23:12 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20090207112312-2mn6cn61863f49wi
Tags: 4.5.99.1-0ubuntu1
https://launchpad.net/bugs/264594
https://launchpad.net/bugs/232364
* Merge with Debian pkg-xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libdbus-glib-1-dev (>= 0.33)
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
* debian/patches/02_xfce4-about_return_version.patch: dropped, merged
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.guess
4
4
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
5
#   Free Software Foundation, Inc.
6
6
 
7
 
timestamp='2008-01-08'
 
7
timestamp='2008-11-15'
8
8
 
9
9
# This file is free software; you can redistribute it and/or modify it
10
10
# under the terms of the GNU General Public License as published by
331
331
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
332
332
        exit ;;
333
333
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
334
 
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 
334
        eval $set_cc_for_build
 
335
        SUN_ARCH="i386"
 
336
        # If there is a compiler, see if it is configured for 64-bit objects.
 
337
        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 
338
        # This test works for both compilers.
 
339
        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 
340
            if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
 
341
                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 
342
                grep IS_64BIT_ARCH >/dev/null
 
343
            then
 
344
                SUN_ARCH="x86_64"
 
345
            fi
 
346
        fi
 
347
        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335
348
        exit ;;
336
349
    sun4*:SunOS:6*:*)
337
350
        # According to config.sub, this is the proper way to canonicalize
796
809
            x86)
797
810
                echo i586-pc-interix${UNAME_RELEASE}
798
811
                exit ;;
799
 
            EM64T | authenticamd)
 
812
            EM64T | authenticamd | genuineintel)
800
813
                echo x86_64-unknown-interix${UNAME_RELEASE}
801
814
                exit ;;
802
815
            IA64)
935
948
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
936
949
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
937
950
        exit ;;
 
951
    padre:Linux:*:*)
 
952
        echo sparc-unknown-linux-gnu
 
953
        exit ;;
938
954
    parisc:Linux:*:* | hppa:Linux:*:*)
939
955
        # Look for CPU level
940
956
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
985
1001
          a.out-i386-linux)
986
1002
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
987
1003
                exit ;;
988
 
          coff-i386)
989
 
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
990
 
                exit ;;
991
1004
          "")
992
1005
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
993
1006
                # one that does not give us useful --help.
1216
1229
    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
1217
1230
        echo i586-pc-beos
1218
1231
        exit ;;
 
1232
    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
 
1233
        echo i586-pc-haiku
 
1234
        exit ;;
1219
1235
    SX-4:SUPER-UX:*:*)
1220
1236
        echo sx4-nec-superux${UNAME_RELEASE}
1221
1237
        exit ;;
1484
1500
the operating system you are using. It is advised that you
1485
1501
download the most up to date version of the config scripts from
1486
1502
 
1487
 
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 
1503
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1488
1504
and
1489
 
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
1505
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1490
1506
 
1491
1507
If the version you run ($0) is already up to date, please
1492
1508
send the following data and any information you think might be