Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5479 in orxonox.OLD for trunk


Ignore:
Timestamp:
Nov 3, 2005, 8:50:51 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: updated to new autoconf, moved resourcemanager to util/loading

Location:
trunk
Files:
34 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33

  • trunk/aclocal.m4

    r5475 r5479  
    1 # generated automatically by aclocal 1.9.5 -*- Autoconf -*-
     1# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    … …  
    2929# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    3030AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    31          [AM_AUTOMAKE_VERSION([1.9.5])])
     31         [AM_AUTOMAKE_VERSION([1.9.6])])
    3232
    3333# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

  • trunk/config.guess

    r5413 r5479  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    5 
    6 timestamp='2004-03-12'
     4#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
     5
     6timestamp='2005-05-27'
    77
    88# This file is free software; you can redistribute it and/or modify it
    … …  
    1818# You should have received a copy of the GNU General Public License
    1919# along with this program; if not, write to the Free Software
    20 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     20# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
     21# 02110-1301, USA.
    2122#
    2223# As a special exception to the GNU General Public License, if you
    … …  
    2425# configuration script generated by Autoconf, you may include it under
    2526# the same distribution terms that you use for the rest of that program.
     27
    2628
    2729# Originally written by Per Bothner <per@bothner.com>.
    … …  
    5456
    5557Originally written by Per Bothner.
    56 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     58Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    5759Free Software Foundation, Inc.
    5860
    … …  
    6769  case $1 in
    6870    --time-stamp | --time* | -t )
    69        echo "$timestamp" ; exit 0 ;;
     71       echo "$timestamp" ; exit ;;
    7072    --version | -v )
    71        echo "$version" ; exit 0 ;;
     73       echo "$version" ; exit ;;
    7274    --help | --h* | -h )
    73        echo "$usage"; exit 0 ;;
     75       echo "$usage"; exit ;;
    7476    -- )     # Stop option processing
    7577       shift; break ;;
    … …  
    137139UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    138140
    139 # Detect uclibc systems.
    140 
    141 LIBC="gnu"
    142 if [ -f /usr/include/bits/uClibc_config.h ]
    143 then
     141if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
     142        eval $set_cc_for_build
     143        cat << EOF > $dummy.c
     144        #include <features.h>
     145        #ifdef __UCLIBC__
     146        # ifdef __UCLIBC_CONFIG_VERSION__
     147        LIBC=uclibc __UCLIBC_CONFIG_VERSION__
     148        # else
    144149        LIBC=uclibc
    145         if [[ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]]
    146         then
    147                 UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h`
    148                 LIBC=$LIBC$UCLIBC_SUBVER
    149         fi
     150        # endif
     151        #else
     152        LIBC=gnu
     153        #endif
     154EOF
     155        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
    150156fi
    151157
    … …  
    210216        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    211217        echo "${machine}-${os}${release}"
    212         exit 0 ;;
     218        exit ;;
    213219    amd64:OpenBSD:*:*)
    214220        echo x86_64-unknown-openbsd${UNAME_RELEASE}
    215         exit 0 ;;
     221        exit ;;
    216222    amiga:OpenBSD:*:*)
    217223        echo m68k-unknown-openbsd${UNAME_RELEASE}
    218         exit 0 ;;
    219     arc:OpenBSD:*:*)
    220         echo mipsel-unknown-openbsd${UNAME_RELEASE}
    221         exit 0 ;;
     224        exit ;;
    222225    cats:OpenBSD:*:*)
    223226        echo arm-unknown-openbsd${UNAME_RELEASE}
    224         exit 0 ;;
     227        exit ;;
    225228    hp300:OpenBSD:*:*)
    226229        echo m68k-unknown-openbsd${UNAME_RELEASE}
    227         exit 0 ;;
     230        exit ;;
     231    luna88k:OpenBSD:*:*)
     232        echo m88k-unknown-openbsd${UNAME_RELEASE}
     233        exit ;;
    228234    mac68k:OpenBSD:*:*)
    229235        echo m68k-unknown-openbsd${UNAME_RELEASE}
    230         exit 0 ;;
     236        exit ;;
    231237    macppc:OpenBSD:*:*)
    232238        echo powerpc-unknown-openbsd${UNAME_RELEASE}
    233         exit 0 ;;
     239        exit ;;
    234240    mvme68k:OpenBSD:*:*)
    235241        echo m68k-unknown-openbsd${UNAME_RELEASE}
    236         exit 0 ;;
     242        exit ;;
    237243    mvme88k:OpenBSD:*:*)
    238244        echo m88k-unknown-openbsd${UNAME_RELEASE}
    239         exit 0 ;;
     245        exit ;;
    240246    mvmeppc:OpenBSD:*:*)
    241247        echo powerpc-unknown-openbsd${UNAME_RELEASE}
    242         exit 0 ;;
    243     pegasos:OpenBSD:*:*)
    244         echo powerpc-unknown-openbsd${UNAME_RELEASE}
    245         exit 0 ;;
    246     pmax:OpenBSD:*:*)
    247         echo mipsel-unknown-openbsd${UNAME_RELEASE}
    248         exit 0 ;;
     248        exit ;;
    249249    sgi:OpenBSD:*:*)
    250         echo mipseb-unknown-openbsd${UNAME_RELEASE}
    251         exit 0 ;;
     250        echo mips64-unknown-openbsd${UNAME_RELEASE}
     251        exit ;;
    252252    sun3:OpenBSD:*:*)
    253253        echo m68k-unknown-openbsd${UNAME_RELEASE}
    254         exit 0 ;;
    255     wgrisc:OpenBSD:*:*)
    256         echo mipsel-unknown-openbsd${UNAME_RELEASE}
    257         exit 0 ;;
     254        exit ;;
    258255    *:OpenBSD:*:*)
    259256        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    260         exit 0 ;;
     257        exit ;;
    261258    *:ekkoBSD:*:*)
    262259        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    263         exit 0 ;;
     260        exit ;;
    264261    macppc:MirBSD:*:*)
    265262        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
    266         exit 0 ;;
     263        exit ;;
    267264    *:MirBSD:*:*)
    268265        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
    269         exit 0 ;;
     266        exit ;;
    270267    alpha:OSF1:*:*)
    271268        case $UNAME_RELEASE in
    … …  
    320317        # 1.2 uses "1.2" for uname -r.
    321318        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    322         exit 0 ;;
    323     Alpha*:OpenVMS:*:*)
    324         echo alpha-hp-vms
    325         exit 0 ;;
     319        exit ;;
    326320    Alpha\ *:Windows_NT*:*)
    327321        # How do we know it's Interix rather than the generic POSIX subsystem?
    … …  
    329323        # of the specific Alpha model?
    330324        echo alpha-pc-interix
    331         exit 0 ;;
     325        exit ;;
    332326    21064:Windows_NT:50:3)
    333327        echo alpha-dec-winnt3.5
    334         exit 0 ;;
     328        exit ;;
    335329    Amiga*:UNIX_System_V:4.0:*)
    336330        echo m68k-unknown-sysv4
    337         exit 0;;
     331        exit ;;
    338332    *:[Aa]miga[Oo][Ss]:*:*)
    339333        echo ${UNAME_MACHINE}-unknown-amigaos
    340         exit 0 ;;
     334        exit ;;
    341335    *:[Mm]orph[Oo][Ss]:*:*)
    342336        echo ${UNAME_MACHINE}-unknown-morphos
    343         exit 0 ;;
     337        exit ;;
    344338    *:OS/390:*:*)
    345339        echo i370-ibm-openedition
    346         exit 0 ;;
     340        exit ;;
     341    *:z/VM:*:*)
     342        echo s390-ibm-zvmoe
     343        exit ;;
    347344    *:OS400:*:*)
    348345        echo powerpc-ibm-os400
    349         exit 0 ;;
     346        exit ;;
    350347    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    351348        echo arm-acorn-riscix${UNAME_RELEASE}
    352         exit 0;;
     349        exit ;;
     350    arm:riscos:*:*|arm:RISCOS:*:*)
     351        echo arm-unknown-riscos
     352        exit ;;
    353353    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
    354354        echo hppa1.1-hitachi-hiuxmpp
    355         exit 0;;
     355        exit ;;
    356356    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
    357357        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
    … …  
    361361                echo pyramid-pyramid-bsd
    362362        fi
    363         exit 0 ;;
     363        exit ;;
    364364    NILE*:*:*:dcosx)
    365365        echo pyramid-pyramid-svr4
    366         exit 0 ;;
     366        exit ;;
    367367    DRS?6000:unix:4.0:6*)
    368368        echo sparc-icl-nx6
    369         exit 0 ;;
    370     DRS?6000:UNIX_SV:4.2*:7*)
     369        exit ;;
     370    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
    371371        case `/usr/bin/uname -p` in
    372             sparc) echo sparc-icl-nx7 && exit 0 ;;
     372            sparc) echo sparc-icl-nx7; exit ;;
    373373        esac ;;
    374374    sun4H:SunOS:5.*:*)
    375375        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    376         exit 0 ;;
     376        exit ;;
    377377    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
    378378        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    379         exit 0 ;;
     379        exit ;;
    380380    i86pc:SunOS:5.*:*)
    381381        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    382         exit 0 ;;
     382        exit ;;
    383383    sun4*:SunOS:6*:*)
    384384        # According to config.sub, this is the proper way to canonicalize
    … …  
    386386        # it's likely to be more like Solaris than SunOS4.
    387387        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    388         exit 0 ;;
     388        exit ;;
    389389    sun4*:SunOS:*:*)
    390390        case "`/usr/bin/arch -k`" in
    … …  
    395395        # Japanese Language versions have a version number like `4.1.3-JL'.
    396396        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
    397         exit 0 ;;
     397        exit ;;
    398398    sun3*:SunOS:*:*)
    399399        echo m68k-sun-sunos${UNAME_RELEASE}
    400         exit 0 ;;
     400        exit ;;
    401401    sun*:*:4.2BSD:*)
    402402        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
    … …  
    410410                ;;
    411411        esac
    412         exit 0 ;;
     412        exit ;;
    413413    aushp:SunOS:*:*)
    414414        echo sparc-auspex-sunos${UNAME_RELEASE}
    415         exit 0 ;;
     415        exit ;;
    416416    # The situation for MiNT is a little confusing.  The machine name
    417417    # can be virtually everything (everything which is not
    … …  
    424424    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
    425425        echo m68k-atari-mint${UNAME_RELEASE}
    426         exit 0 ;;
     426        exit ;;
    427427    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
    428428        echo m68k-atari-mint${UNAME_RELEASE}
    429         exit 0 ;;
     429        exit ;;
    430430    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
    431431        echo m68k-atari-mint${UNAME_RELEASE}
    432         exit 0 ;;
     432        exit ;;
    433433    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
    434434        echo m68k-milan-mint${UNAME_RELEASE}
    435         exit 0 ;;
     435        exit ;;
    436436    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
    437437        echo m68k-hades-mint${UNAME_RELEASE}
    438         exit 0 ;;
     438        exit ;;
    439439    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
    440440        echo m68k-unknown-mint${UNAME_RELEASE}
    441         exit 0 ;;
     441        exit ;;
    442442    m68k:machten:*:*)
    443443        echo m68k-apple-machten${UNAME_RELEASE}
    444         exit 0 ;;
     444        exit ;;
    445445    powerpc:machten:*:*)
    446446        echo powerpc-apple-machten${UNAME_RELEASE}
    447         exit 0 ;;
     447        exit ;;
    448448    RISC*:Mach:*:*)
    449449        echo mips-dec-mach_bsd4.3
    450         exit 0 ;;
     450        exit ;;
    451451    RISC*:ULTRIX:*:*)
    452452        echo mips-dec-ultrix${UNAME_RELEASE}
    453         exit 0 ;;
     453        exit ;;
    454454    VAX*:ULTRIX*:*:*)
    455455        echo vax-dec-ultrix${UNAME_RELEASE}
    456         exit 0 ;;
     456        exit ;;
    457457    2020:CLIX:*:* | 2430:CLIX:*:*)
    458458        echo clipper-intergraph-clix${UNAME_RELEASE}
    459         exit 0 ;;
     459        exit ;;
    460460    mips:*:*:UMIPS | mips:*:*:RISCos)
    461461        eval $set_cc_for_build
    … …  
    481481        }
    482482EOF
    483         $CC_FOR_BUILD -o $dummy $dummy.c \
    484           && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
    485           && exit 0
     483        $CC_FOR_BUILD -o $dummy $dummy.c &&
     484          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
     485          SYSTEM_NAME=`$dummy $dummyarg` &&
     486            { echo "$SYSTEM_NAME"; exit; }
    486487        echo mips-mips-riscos${UNAME_RELEASE}
    487         exit 0 ;;
     488        exit ;;
    488489    Motorola:PowerMAX_OS:*:*)
    489490        echo powerpc-motorola-powermax
    490         exit 0 ;;
     491        exit ;;
    491492    Motorola:*:4.3:PL8-*)
    492493        echo powerpc-harris-powermax
    493         exit 0 ;;
     494        exit ;;
    494495    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
    495496        echo powerpc-harris-powermax
    496         exit 0 ;;
     497        exit ;;
    497498    Night_Hawk:Power_UNIX:*:*)
    498499        echo powerpc-harris-powerunix
    499         exit 0 ;;
     500        exit ;;
    500501    m88k:CX/UX:7*:*)
    501502        echo m88k-harris-cxux7
    502         exit 0 ;;
     503        exit ;;
    503504    m88k:*:4*:R4*)
    504505        echo m88k-motorola-sysv4
    505         exit 0 ;;
     506        exit ;;
    506507    m88k:*:3*:R3*)
    507508        echo m88k-motorola-sysv3
    508         exit 0 ;;
     509        exit ;;
    509510    AViiON:dgux:*:*)
    510511        # DG/UX returns AViiON for all architectures
    … …  
    522523            echo i586-dg-dgux${UNAME_RELEASE}
    523524        fi
    524         exit 0 ;;
     525        exit ;;
    525526    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
    526527        echo m88k-dolphin-sysv3
    527         exit 0 ;;
     528        exit ;;
    528529    M88*:*:R3*:*)
    529530        # Delta 88k system running SVR3
    530531        echo m88k-motorola-sysv3
    531         exit 0 ;;
     532        exit ;;
    532533    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
    533534        echo m88k-tektronix-sysv3
    534         exit 0 ;;
     535        exit ;;
    535536    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
    536537        echo m68k-tektronix-bsd
    537         exit 0 ;;
     538        exit ;;
    538539    *:IRIX*:*:*)
    539540        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
    540         exit 0 ;;
     541        exit ;;
    541542    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
    542         echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
    543         exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     543        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
     544        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
    544545    i*86:AIX:*:*)
    545546        echo i386-ibm-aix
    546         exit 0 ;;
     547        exit ;;
    547548    ia64:AIX:*:*)
    548549        if [ -x /usr/bin/oslevel ] ; then
    … …  
    552553        fi
    553554        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
    554         exit 0 ;;
     555        exit ;;
    555556    *:AIX:2:3)
    556557        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
    … …  
    567568                        }
    568569EOF
    569                 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
    570                 echo rs6000-ibm-aix3.2.5
     570                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
     571                then
     572                        echo "$SYSTEM_NAME"
     573                else
     574                        echo rs6000-ibm-aix3.2.5
     575                fi
    571576        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
    572577                echo rs6000-ibm-aix3.2.4
    … …  
    574579                echo rs6000-ibm-aix3.2
    575580        fi
    576         exit 0 ;;
     581        exit ;;
    577582    *:AIX:*:[45])
    578583        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
    … …  
    588593        fi
    589594        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
    590         exit 0 ;;
     595        exit ;;
    591596    *:AIX:*:*)
    592597        echo rs6000-ibm-aix
    593         exit 0 ;;
     598        exit ;;
    594599    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
    595600        echo romp-ibm-bsd4.4
    596         exit 0 ;;
     601        exit ;;
    597602    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
    598603        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
    599         exit 0 ;;                           # report: romp-ibm BSD 4.3
     604        exit ;;                             # report: romp-ibm BSD 4.3
    600605    *:BOSX:*:*)
    601606        echo rs6000-bull-bosx
    602         exit 0 ;;
     607        exit ;;
    603608    DPX/2?00:B.O.S.:*:*)
    604609        echo m68k-bull-sysv3
    605         exit 0 ;;
     610        exit ;;
    606611    9000/[34]??:4.3bsd:1.*:*)
    607612        echo m68k-hp-bsd
    608         exit 0 ;;
     613        exit ;;
    609614    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
    610615        echo m68k-hp-bsd4.4
    611         exit 0 ;;
     616        exit ;;
    612617    9000/[34678]??:HP-UX:*:*)
    613618        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
    … …  
    673678            # avoid double evaluation of $set_cc_for_build
    674679            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
    675             if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
     680
     681            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
     682            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
     683            # generating 64-bit code.  GNU and HP use different nomenclature:
     684            #
     685            # $ CC_FOR_BUILD=cc ./config.guess
     686            # => hppa2.0w-hp-hpux11.23
     687            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
     688            # => hppa64-hp-hpux11.23
     689
     690            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
     691                grep __LP64__ >/dev/null
    676692            then
    677693                HP_ARCH="hppa2.0w"
    … …  
    681697        fi
    682698        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
    683         exit 0 ;;
     699        exit ;;
    684700    ia64:HP-UX:*:*)
    685701        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
    686702        echo ia64-hp-hpux${HPUX_REV}
    687         exit 0 ;;
     703        exit ;;
    688704    3050*:HI-UX:*:*)
    689705        eval $set_cc_for_build
    … …  
    713729        }
    714730EOF
    715         $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
     731        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
     732                { echo "$SYSTEM_NAME"; exit; }
    716733        echo unknown-hitachi-hiuxwe2
    717         exit 0 ;;
     734        exit ;;
    718735    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
    719736        echo hppa1.1-hp-bsd
    720         exit 0 ;;
     737        exit ;;
    721738    9000/8??:4.3bsd:*:*)
    722739        echo hppa1.0-hp-bsd
    723         exit 0 ;;
     740        exit ;;
    724741    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
    725742        echo hppa1.0-hp-mpeix
    726         exit 0 ;;
     743        exit ;;
    727744    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
    728745        echo hppa1.1-hp-osf
    729         exit 0 ;;
     746        exit ;;
    730747    hp8??:OSF1:*:*)
    731748        echo hppa1.0-hp-osf
    732         exit 0 ;;
     749        exit ;;
    733750    i*86:OSF1:*:*)
    734751        if [ -x /usr/sbin/sysversion ] ; then
    … …  
    737754            echo ${UNAME_MACHINE}-unknown-osf1
    738755        fi
    739         exit 0 ;;
     756        exit ;;
    740757    parisc*:Lites*:*:*)
    741758        echo hppa1.1-hp-lites
    742         exit 0 ;;
     759        exit ;;
    743760    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
    744761        echo c1-convex-bsd
    745         exit 0 ;;
     762        exit ;;
    746763    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
    747764        if getsysinfo -f scalar_acc
    … …  
    749766        else echo c2-convex-bsd
    750767        fi
    751         exit 0 ;;
     768        exit ;;
    752769    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
    753770        echo c34-convex-bsd
    754         exit 0 ;;
     771        exit ;;
    755772    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
    756773        echo c38-convex-bsd
    757         exit 0 ;;
     774        exit ;;
    758775    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
    759776        echo c4-convex-bsd
    760         exit 0 ;;
     777        exit ;;
    761778    CRAY*Y-MP:*:*:*)
    762779        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    763         exit 0 ;;
     780        exit ;;
    764781    CRAY*[A-Z]90:*:*:*)
    765782        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
    … …  
    767784              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
    768785              -e 's/\.[^.]*$/.X/'
    769         exit 0 ;;
     786        exit ;;
    770787    CRAY*TS:*:*:*)
    771788        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    772         exit 0 ;;
     789        exit ;;
    773790    CRAY*T3E:*:*:*)
    774791        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    775         exit 0 ;;
     792        exit ;;
    776793    CRAY*SV1:*:*:*)
    777794        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    778         exit 0 ;;
     795        exit ;;
    779796    *:UNICOS/mp:*:*)
    780         echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    781         exit 0 ;;
     797        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
     798        exit ;;
    782799    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    783800        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    … …  
    785802        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
    786803        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    787         exit 0 ;;
     804        exit ;;
    788805    5000:UNIX_System_V:4.*:*)
    789806        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    790807        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
    791808        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    792         exit 0 ;;
     809        exit ;;
    793810    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
    794811        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
    795         exit 0 ;;
     812        exit ;;
    796813    sparc*:BSD/OS:*:*)
    797814        echo sparc-unknown-bsdi${UNAME_RELEASE}
    798         exit 0 ;;
     815        exit ;;
    799816    *:BSD/OS:*:*)
    800817        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
    801         exit 0 ;;
     818        exit ;;
    802819    *:FreeBSD:*:*)
    803         # Determine whether the default compiler uses glibc.
    804         eval $set_cc_for_build
    805         sed 's/^        //' << EOF >$dummy.c
    806         #include <features.h>
    807         #if __GLIBC__ >= 2
    808         LIBC=gnu
    809         #else
    810         LIBC=
    811         #endif
    812 EOF
    813         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    814         # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
    815         # FreeBSD's kernel, but not the complete OS.
    816         case ${LIBC} in gnu) kernel_only='k' ;; esac
    817         echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
    818         exit 0 ;;
     820        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     821        exit ;;
    819822    i*:CYGWIN*:*)
    820823        echo ${UNAME_MACHINE}-pc-cygwin
    821         exit 0 ;;
     824        exit ;;
    822825    i*:MINGW*:*)
    823826        echo ${UNAME_MACHINE}-pc-mingw32
    824         exit 0 ;;
     827        exit ;;
     828    i*:windows32*:*)
     829        # uname -m includes "-pc" on this system.
     830        echo ${UNAME_MACHINE}-mingw32
     831        exit ;;
    825832    i*:PW*:*)
    826833        echo ${UNAME_MACHINE}-pc-pw32
    827         exit 0 ;;
     834        exit ;;
    828835    x86:Interix*:[34]*)
    829836        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
    830         exit 0 ;;
     837        exit ;;
    831838    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    832839        echo i${UNAME_MACHINE}-pc-mks
    833         exit 0 ;;
     840        exit ;;
    834841    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
    835842        # How do we know it's Interix rather than the generic POSIX subsystem?
    … …  
    837844        # UNAME_MACHINE based on the output of uname instead of i386?
    838845        echo i586-pc-interix
    839         exit 0 ;;
     846        exit ;;
    840847    i*:UWIN*:*)
    841848        echo ${UNAME_MACHINE}-pc-uwin
    842         exit 0 ;;
     849        exit ;;
     850    amd64:CYGWIN*:*:*)
     851        echo x86_64-unknown-cygwin
     852        exit ;;
    843853    p*:CYGWIN*:*)
    844854        echo powerpcle-unknown-cygwin
    845         exit 0 ;;
     855        exit ;;
    846856    prep*:SunOS:5.*:*)
    847857        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    848         exit 0 ;;
     858        exit ;;
    849859    *:GNU:*:*)
    850860        # the GNU system
    851861        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
    852         exit 0 ;;
     862        exit ;;
    853863    *:GNU/*:*:*)
    854864        # other systems with GNU libc and userland
    855865        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
    856         exit 0 ;;
     866        exit ;;
    857867    i*86:Minix:*:*)
    858868        echo ${UNAME_MACHINE}-pc-minix
    859         exit 0 ;;
     869        exit ;;
    860870    arm*:Linux:*:*)
    861871        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    862         exit 0 ;;
     872        exit ;;
    863873    cris:Linux:*:*)
    864874        echo cris-axis-linux-${LIBC}
    865         exit 0 ;;
     875        exit ;;
     876    crisv32:Linux:*:*)
     877        echo crisv32-axis-linux-${LIBC}
     878        exit ;;
     879    frv:Linux:*:*)
     880        echo frv-unknown-linux-${LIBC}
     881        exit ;;
    866882    ia64:Linux:*:*)
    867883        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    868         exit 0 ;;
     884        exit ;;
    869885    m32r*:Linux:*:*)
    870886        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    871         exit 0 ;;
     887        exit ;;
    872888    m68*:Linux:*:*)
    873889        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    874         exit 0 ;;
     890        exit ;;
    875891    mips:Linux:*:*)
    876892        eval $set_cc_for_build
    … …  
    890906EOF
    891907        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    892         test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
     908        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    893909        ;;
    894910    mips64:Linux:*:*)
    … …  
    909925EOF
    910926        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    911         test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
     927        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    912928        ;;
    913929    ppc:Linux:*:*)
    914930        echo powerpc-unknown-linux-${LIBC}
    915         exit 0 ;;
     931        exit ;;
    916932    ppc64:Linux:*:*)
    917933        echo powerpc64-unknown-linux-${LIBC}
    918         exit 0 ;;
     934        exit ;;
    919935    alpha:Linux:*:*)
    920936        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
    … …  
    930946        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
    931947        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    932         exit 0 ;;
     948        exit ;;
    933949    parisc:Linux:*:* | hppa:Linux:*:*)
    934950        # Look for CPU level
    … …  
    938954          *)    echo hppa-unknown-linux-${LIBC} ;;
    939955        esac
    940         exit 0 ;;
     956        exit ;;
    941957    parisc64:Linux:*:* | hppa64:Linux:*:*)
    942958        echo hppa64-unknown-linux-${LIBC}
    943         exit 0 ;;
     959        exit ;;
    944960    s390:Linux:*:* | s390x:Linux:*:*)
    945961        echo ${UNAME_MACHINE}-ibm-linux
    946         exit 0 ;;
     962        exit ;;
    947963    sh64*:Linux:*:*)
    948964        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    949         exit 0 ;;
     965        exit ;;
    950966    sh*:Linux:*:*)
    951967        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    952         exit 0 ;;
     968        exit ;;
    953969    sparc:Linux:*:* | sparc64:Linux:*:*)
    954970        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    955         exit 0 ;;
     971        exit ;;
    956972    x86_64:Linux:*:*)
    957973        echo x86_64-unknown-linux-${LIBC}
    958         exit 0 ;;
     974        exit ;;
    959975    i*86:Linux:*:*)
    960976        # The BFD linker knows what the default object file format is, so
    … …  
    974990          a.out-i386-linux)
    975991                echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
    976                 exit 0 ;;
     992                exit ;;
    977993          coff-i386)
    978994                echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
    979                 exit 0 ;;
     995                exit ;;
    980996          "")
    981997                # Either a pre-BFD a.out linker (linux-gnuoldld) or
    982998                # one that does not give us useful --help.
    983999                echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
    984                 exit 0 ;;
     1000                exit ;;
    9851001        esac
    986         if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit 0; fi
     1002        if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
    9871003        # Determine whether the default compiler is a.out or elf
    9881004        eval $set_cc_for_build
    … …  
    10111027EOF
    10121028        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    1013         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
    1014         test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
     1029        test x"${LIBC}" != x && {
     1030                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
     1031                exit
     1032        }
     1033        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
    10151034        ;;
    10161035    i*86:DYNIX/ptx:4*:*)
    … …  
    10191038        # sysname and nodename.
    10201039        echo i386-sequent-sysv4
    1021         exit 0 ;;
     1040        exit ;;
    10221041    i*86:UNIX_SV:4.2MP:2.*)
    10231042        # Unixware is an offshoot of SVR4, but it has its own version
    … …  
    10271046        # Use sysv4.2uw... so that sysv4* matches it.
    10281047        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
    1029         exit 0 ;;
     1048        exit ;;
    10301049    i*86:OS/2:*:*)
    10311050        # If we were able to find `uname', then EMX Unix compatibility
    10321051        # is probably installed.
    10331052        echo ${UNAME_MACHINE}-pc-os2-emx
    1034         exit 0 ;;
     1053        exit ;;
    10351054    i*86:XTS-300:*:STOP)
    10361055        echo ${UNAME_MACHINE}-unknown-stop
    1037         exit 0 ;;
     1056        exit ;;
    10381057    i*86:atheos:*:*)
    10391058        echo ${UNAME_MACHINE}-unknown-atheos
    1040         exit 0 ;;
    1041         i*86:syllable:*:*)
     1059        exit ;;
     1060    i*86:syllable:*:*)
    10421061        echo ${UNAME_MACHINE}-pc-syllable
    1043         exit 0 ;;
     1062        exit ;;
    10441063    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    10451064        echo i386-unknown-lynxos${UNAME_RELEASE}
    1046         exit 0 ;;
     1065        exit ;;
    10471066    i*86:*DOS:*:*)
    10481067        echo ${UNAME_MACHINE}-pc-msdosdjgpp
    1049         exit 0 ;;
     1068        exit ;;
    10501069    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
    10511070        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
    … …  
    10551074                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
    10561075        fi
    1057         exit 0 ;;
    1058     i*86:*:5:[78]*)
     1076        exit ;;
     1077    i*86:*:5:[678]*)
     1078        # UnixWare 7.x, OpenUNIX and OpenServer 6.
    10591079        case `/bin/uname -X | grep "^Machine"` in
    10601080            *486*)           UNAME_MACHINE=i486 ;;
    … …  
    10631083        esac
    10641084        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
    1065         exit 0 ;;
     1085        exit ;;
    10661086    i*86:*:3.2:*)
    10671087        if test -f /usr/options/cb.name; then
    … …  
    10811101                echo ${UNAME_MACHINE}-pc-sysv32
    10821102        fi
    1083         exit 0 ;;
     1103        exit ;;
    10841104    pc:*:*:*)
    10851105        # Left here for compatibility:
    … …  
    10871107        # the processor, so we play safe by assuming i386.
    10881108        echo i386-pc-msdosdjgpp
    1089         exit 0 ;;
     1109        exit ;;
    10901110    Intel:Mach:3*:*)
    10911111        echo i386-pc-mach3
    1092         exit 0 ;;
     1112        exit ;;
    10931113    paragon:*:*:*)
    10941114        echo i860-intel-osf1
    1095         exit 0 ;;
     1115        exit ;;
    10961116    i860:*:4.*:*) # i860-SVR4
    10971117        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
    … …  
    11001120          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
    11011121        fi
    1102         exit 0 ;;
     1122        exit ;;
    11031123    mini*:CTIX:SYS*5:*)
    11041124        # "miniframe"
    11051125        echo m68010-convergent-sysv
    1106         exit 0 ;;
     1126        exit ;;
    11071127    mc68k:UNIX:SYSTEM5:3.51m)
    11081128        echo m68k-convergent-sysv
    1109         exit 0 ;;
     1129        exit ;;
    11101130    M680?0:D-NIX:5.3:*)
    11111131        echo m68k-diab-dnix
    1112         exit 0 ;;
    1113     M68*:*:R3V[567]*:*)
    1114         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
    1115     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)
     1132        exit ;;
     1133    M68*:*:R3V[5678]*:*)
     1134        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     1135    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)
    11161136        OS_REL=''
    11171137        test -r /etc/.relid \
    11181138        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
    11191139        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
    1120           && echo i486-ncr-sysv4.3${OS_REL} && exit 0
     1140          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
    11211141        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
    1122           && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     1142          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    11231143    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
    11241144        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
    1125           && echo i486-ncr-sysv4 && exit 0 ;;
     1145          && { echo i486-ncr-sysv4; exit; } ;;
    11261146    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
    11271147        echo m68k-unknown-lynxos${UNAME_RELEASE}
    1128         exit 0 ;;
     1148        exit ;;
    11291149    mc68030:UNIX_System_V:4.*:*)
    11301150        echo m68k-atari-sysv4
    1131         exit 0 ;;
     1151        exit ;;
    11321152    TSUNAMI:LynxOS:2.*:*)
    11331153        echo sparc-unknown-lynxos${UNAME_RELEASE}
    1134         exit 0 ;;
     1154        exit ;;
    11351155    rs6000:LynxOS:2.*:*)
    11361156        echo rs6000-unknown-lynxos${UNAME_RELEASE}
    1137         exit 0 ;;
     1157        exit ;;
    11381158    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
    11391159        echo powerpc-unknown-lynxos${UNAME_RELEASE}
    1140         exit 0 ;;
     1160        exit ;;
    11411161    SM[BE]S:UNIX_SV:*:*)
    11421162        echo mips-dde-sysv${UNAME_RELEASE}
    1143         exit 0 ;;
     1163        exit ;;
    11441164    RM*:ReliantUNIX-*:*:*)
    11451165        echo mips-sni-sysv4
    1146         exit 0 ;;
     1166        exit ;;
    11471167    RM*:SINIX-*:*:*)
    11481168        echo mips-sni-sysv4
    1149         exit 0 ;;
     1169        exit ;;
    11501170    *:SINIX-*:*:*)
    11511171        if uname -p 2>/dev/null >/dev/null ; then
    … …  
    11551175                echo ns32k-sni-sysv
    11561176        fi
    1157         exit 0 ;;
     1177        exit ;;
    11581178    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
    11591179                      # says <Richard.M.Bartel@ccMail.Census.GOV>
    11601180        echo i586-unisys-sysv4
    1161         exit 0 ;;
     1181        exit ;;
    11621182    *:UNIX_System_V:4*:FTX*)
    11631183        # From Gerald Hewes <hewes@openmarket.com>.
    11641184        # How about differentiating between stratus architectures? -djm
    11651185        echo hppa1.1-stratus-sysv4
    1166         exit 0 ;;
     1186        exit ;;
    11671187    *:*:*:FTX*)
    11681188        # From seanf@swdc.stratus.com.
    11691189        echo i860-stratus-sysv4
    1170         exit 0 ;;
     1190        exit ;;
     1191    i*86:VOS:*:*)
     1192        # From Paul.Green@stratus.com.
     1193        echo ${UNAME_MACHINE}-stratus-vos
     1194        exit ;;
    11711195    *:VOS:*:*)
    11721196        # From Paul.Green@stratus.com.
    11731197        echo hppa1.1-stratus-vos
    1174         exit 0 ;;
     1198        exit ;;
    11751199    mc68*:A/UX:*:*)
    11761200        echo m68k-apple-aux${UNAME_RELEASE}
    1177         exit 0 ;;
     1201        exit ;;
    11781202    news*:NEWS-OS:6*:*)
    11791203        echo mips-sony-newsos6
    1180         exit 0 ;;
     1204        exit ;;
    11811205    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
    11821206        if [ -d /usr/nec ]; then
    … …  
    11851209                echo mips-unknown-sysv${UNAME_RELEASE}
    11861210        fi
    1187         exit 0 ;;
     1211        exit ;;
    11881212    BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
    11891213        echo powerpc-be-beos
    1190         exit 0 ;;
     1214        exit ;;
    11911215    BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
    11921216        echo powerpc-apple-beos
    1193         exit 0 ;;
     1217        exit ;;
    11941218    BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
    11951219        echo i586-pc-beos
    1196         exit 0 ;;
     1220        exit ;;
    11971221    SX-4:SUPER-UX:*:*)
    11981222        echo sx4-nec-superux${UNAME_RELEASE}
    1199         exit 0 ;;
     1223        exit ;;
    12001224    SX-5:SUPER-UX:*:*)
    12011225        echo sx5-nec-superux${UNAME_RELEASE}
    1202         exit 0 ;;
     1226        exit ;;
    12031227    SX-6:SUPER-UX:*:*)
    12041228        echo sx6-nec-superux${UNAME_RELEASE}
    1205         exit 0 ;;
     1229        exit ;;
    12061230    Power*:Rhapsody:*:*)
    12071231        echo powerpc-apple-rhapsody${UNAME_RELEASE}
    1208         exit 0 ;;
     1232        exit ;;
    12091233    *:Rhapsody:*:*)
    12101234        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
    1211         exit 0 ;;
     1235        exit ;;
    12121236    *:Darwin:*:*)
    1213         case `uname -p` in
     1237        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
     1238        case $UNAME_PROCESSOR in
    12141239            *86) UNAME_PROCESSOR=i686 ;;
    1215             powerpc) UNAME_PROCESSOR=powerpc ;;
     1240            unknown) UNAME_PROCESSOR=powerpc ;;
    12161241        esac
    12171242        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    1218         exit 0 ;;
     1243        exit ;;
    12191244    *:procnto*:*:* | *:QNX:[0123456789]*:*)
    12201245        UNAME_PROCESSOR=`uname -p`
    … …  
    12241249        fi
    12251250        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
    1226         exit 0 ;;
     1251        exit ;;
    12271252    *:QNX:*:4*)
    12281253        echo i386-pc-qnx
    1229         exit 0 ;;
     1254        exit ;;
     1255    NSE-?:NONSTOP_KERNEL:*:*)
     1256        echo nse-tandem-nsk${UNAME_RELEASE}
     1257        exit ;;
    12301258    NSR-?:NONSTOP_KERNEL:*:*)
    12311259        echo nsr-tandem-nsk${UNAME_RELEASE}
    1232         exit 0 ;;
     1260        exit ;;
    12331261    *:NonStop-UX:*:*)
    12341262        echo mips-compaq-nonstopux
    1235         exit 0 ;;
     1263        exit ;;
    12361264    BS2000:POSIX*:*:*)
    12371265        echo bs2000-siemens-sysv
    1238         exit 0 ;;
     1266        exit ;;
    12391267    DS/*:UNIX_System_V:*:*)
    12401268        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
    1241         exit 0 ;;
     1269        exit ;;
    12421270    *:Plan9:*:*)
    12431271        # "uname -m" is not consistent, so use $cputype instead. 386
    … …  
    12501278        fi
    12511279        echo ${UNAME_MACHINE}-unknown-plan9
    1252         exit 0 ;;
     1280        exit ;;
    12531281    *:TOPS-10:*:*)
    12541282        echo pdp10-unknown-tops10
    1255         exit 0 ;;
     1283        exit ;;
    12561284    *:TENEX:*:*)
    12571285        echo pdp10-unknown-tenex
    1258         exit 0 ;;
     1286        exit ;;
    12591287    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
    12601288        echo pdp10-dec-tops20
    1261         exit 0 ;;
     1289        exit ;;
    12621290    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
    12631291        echo pdp10-xkl-tops20
    1264         exit 0 ;;
     1292        exit ;;
    12651293    *:TOPS-20:*:*)
    12661294        echo pdp10-unknown-tops20
    1267         exit 0 ;;
     1295        exit ;;
    12681296    *:ITS:*:*)
    12691297        echo pdp10-unknown-its
    1270         exit 0 ;;
     1298        exit ;;
    12711299    SEI:*:*:SEIUX)
    12721300        echo mips-sei-seiux${UNAME_RELEASE}
    1273         exit 0 ;;
     1301        exit ;;
    12741302    *:DragonFly:*:*)
    12751303        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    1276         exit 0 ;;
     1304        exit ;;
     1305    *:*VMS:*:*)
     1306        UNAME_MACHINE=`(uname -p) 2>/dev/null`
     1307        case "${UNAME_MACHINE}" in
     1308            A*) echo alpha-dec-vms ; exit ;;
     1309            I*) echo ia64-dec-vms ; exit ;;
     1310            V*) echo vax-dec-vms ; exit ;;
     1311        esac ;;
     1312    *:XENIX:*:SysV)
     1313        echo i386-pc-xenix
     1314        exit ;;
     1315    i*86:skyos:*:*)
     1316        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
     1317        exit ;;
    12771318esac
    12781319
    … …  
    13061347
    13071348#if defined (__arm) && defined (__acorn) && defined (__unix)
    1308   printf ("arm-acorn-riscix"); exit (0);
     1349  printf ("arm-acorn-riscix\n"); exit (0);
    13091350#endif
    13101351
    … …  
    13951436EOF
    13961437
    1397 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
     1438$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
     1439        { echo "$SYSTEM_NAME"; exit; }
    13981440
    13991441# Apollos put the system type in the environment.
    14001442
    1401 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
     1443test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
    14021444
    14031445# Convex versions that predate uname can use getsysinfo(1)
    … …  
    14081450    c1*)
    14091451        echo c1-convex-bsd
    1410         exit 0 ;;
     1452        exit ;;
    14111453    c2*)
    14121454        if getsysinfo -f scalar_acc
    … …  
    14141456        else echo c2-convex-bsd
    14151457        fi
    1416         exit 0 ;;
     1458        exit ;;
    14171459    c34*)
    14181460        echo c34-convex-bsd
    1419         exit 0 ;;
     1461        exit ;;
    14201462    c38*)
    14211463        echo c38-convex-bsd
    1422         exit 0 ;;
     1464        exit ;;
    14231465    c4*)
    14241466        echo c4-convex-bsd
    1425         exit 0 ;;
     1467        exit ;;
    14261468    esac
    14271469fi
    … …  
    14341476download the most up to date version of the config scripts from
    14351477
    1436     ftp://ftp.gnu.org/pub/gnu/config/
     1478  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
     1479and
     1480  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
    14371481
    14381482If the version you run ($0) is already up to date, please

  • trunk/config.sub

    r5413 r5479  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    5 
    6 timestamp='2004-03-12'
     4#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
     5
     6timestamp='2005-06-02'
    77
    88# This file is (in principle) common to ALL GNU software.
    … …  
    2222# You should have received a copy of the GNU General Public License
    2323# along with this program; if not, write to the Free Software
    24 # Foundation, Inc., 59 Temple Place - Suite 330,
    25 # Boston, MA 02111-1307, USA.
    26 
     24# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
     25# 02110-1301, USA.
     26#
    2727# As a special exception to the GNU General Public License, if you
    2828# distribute this file as part of a program that contains a
    2929# configuration script generated by Autoconf, you may include it under
    3030# the same distribution terms that you use for the rest of that program.
     31
    3132
    3233# Please send patches to <config-patches@gnu.org>.  Submit a context
    … …  
    7172GNU config.sub ($timestamp)
    7273
    73 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     74Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    7475Free Software Foundation, Inc.
    7576
    … …  
    8485  case $1 in
    8586    --time-stamp | --time* | -t )
    86        echo "$timestamp" ; exit 0 ;;
     87       echo "$timestamp" ; exit ;;
    8788    --version | -v )
    88        echo "$version" ; exit 0 ;;
     89       echo "$version" ; exit ;;
    8990    --help | --h* | -h )
    90        echo "$usage"; exit 0 ;;
     91       echo "$usage"; exit ;;
    9192    -- )     # Stop option processing
    9293       shift; break ;;
    … …  
    100101       # First pass through any local machine types.
    101102       echo $1
    102        exit 0;;
     103       exit ;;
    103104
    104105    * )
    … …  
    146147        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    147148        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
    148         -apple | -axis)
     149        -apple | -axis | -knuth | -cray)
    149150                os=
    150151                basic_machine=$1
    … …  
    232233        | am33_2.0 \
    233234        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
     235        | bfin \
    234236        | c4x | clipper \
    235         | d10v | d30v | dlx | dsp16xx \
     237        | d10v | d30v | dlx | dsp16xx | dvp \
    236238        | fr30 | frv \
    237239        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    238240        | i370 | i860 | i960 | ia64 \
    239241        | ip2k | iq2000 \
    240         | m32r | m32rle | m68000 | m68k | m88k | mcore \
     242        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
    241243        | mips | mipsbe | mipseb | mipsel | mipsle \
    242244        | mips16 \
    … …  
    247249        | mips64vr4300 | mips64vr4300el \
    248250        | mips64vr5000 | mips64vr5000el \
     251        | mips64r5900 | mips64r5900el \
    249252        | mipsisa32 | mipsisa32el \
    250253        | mipsisa32r2 | mipsisa32r2el \
    … …  
    255258        | mipstx39 | mipstx39el \
    256259        | mn10200 | mn10300 \
     260        | ms1 \
    257261        | msp430 \
    258262        | ns16k | ns32k \
    … …  
    263267        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
    264268        | sh64 | sh64le \
    265         | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
     269        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
     270        | sparcv8 | sparcv9 | sparcv9b \
    266271        | strongarm \
    267272        | tahoe | thumb | tic4x | tic80 | tron \
    268273        | v850 | v850e \
    269274        | we32k \
    270         | x86 | xscale | xstormy16 | xtensa \
     275        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
    271276        | z8k)
     277                basic_machine=$basic_machine-unknown
     278                ;;
     279        m32c)
    272280                basic_machine=$basic_machine-unknown
    273281                ;;
    … …  
    299307        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
    300308        | avr-* \
    301         | bs2000-* \
     309        | bfin-* | bs2000-* \
    302310        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
    303         | clipper-* | cydra-* \
     311        | clipper-* | craynv-* | cydra-* \
    304312        | d10v-* | d30v-* | dlx-* \
    305313        | elxsi-* \
    … …  
    311319        | m32r-* | m32rle-* \
    312320        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    313         | m88110-* | m88k-* | mcore-* \
     321        | m88110-* | m88k-* | maxq-* | mcore-* \
    314322        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
    315323        | mips16-* \
    … …  
    320328        | mips64vr4300-* | mips64vr4300el-* \
    321329        | mips64vr5000-* | mips64vr5000el-* \
     330        | mips64r5900-* | mips64r5900el-* \
    322331        | mipsisa32-* | mipsisa32el-* \
    323332        | mipsisa32r2-* | mipsisa32r2el-* \
    … …  
    327336        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
    328337        | mipstx39-* | mipstx39el-* \
     338        | mmix-* \
     339        | ms1-* \
    329340        | msp430-* \
    330         | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
     341        | none-* | np1-* | ns16k-* | ns32k-* \
    331342        | orion-* \
    332343        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    … …  
    336347        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
    337348        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    338         | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
     349        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
     350        | sparclite-* \
    339351        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
    340352        | tahoe-* | thumb-* \
    … …  
    343355        | v850-* | v850e-* | vax-* \
    344356        | we32k-* \
    345         | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
    346         | xtensa-* \
     357        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
     358        | xstormy16-* | xtensa-* \
    347359        | ymp-* \
    348360        | z8k-*)
     361                ;;
     362        m32c-*)
    349363                ;;
    350364        # Recognize the various machine names and aliases which stand
    … …  
    446460                os=-unicos
    447461                ;;
     462        craynv)
     463                basic_machine=craynv-cray
     464                os=-unicosmp
     465                ;;
    448466        cr16c)
    449467                basic_machine=cr16c-unknown
    … …  
    453471                basic_machine=m68k-crds
    454472                ;;
     473        crisv32 | crisv32-* | etraxfs*)
     474                basic_machine=crisv32-axis
     475                ;;
    455476        cris | cris-* | etrax*)
    456477                basic_machine=cris-axis
    … …  
    481502                basic_machine=m88k-motorola
    482503                os=-sysv3
     504                ;;
     505        djgpp)
     506                basic_machine=i586-pc
     507                os=-msdosdjgpp
    483508                ;;
    484509        dpx20 | dpx20-*)
    … …  
    654679                os=-mint
    655680                ;;
     681        mipsEE* | ee | ps2)
     682                basic_machine=mips64r5900el-scei
     683                case $os in
     684                    -linux*)
     685                        ;;
     686                    *)
     687                        os=-elf
     688                        ;;
     689                esac
     690                ;;
     691        iop)
     692                basic_machine=mipsel-scei
     693                os=-irx
     694                ;;
     695        dvp)
     696                basic_machine=dvp-scei
     697                os=-elf
     698                ;;
    656699        mips3*-*)
    657700                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
    … …  
    659702        mips3*)
    660703                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
    661                 ;;
    662         mmix*)
    663                 basic_machine=mmix-knuth
    664                 os=-mmixware
    665704                ;;
    666705        monitor)
    … …  
    744783                basic_machine=np1-gould
    745784                ;;
    746         nv1)
    747                 basic_machine=nv1-cray
    748                 os=-unicosmp
    749                 ;;
    750785        nsr-tandem)
    751786                basic_machine=nsr-tandem
    … …  
    10291064                basic_machine=hppa1.1-winbond
    10301065                os=-proelf
     1066                ;;
     1067        xbox)
     1068                basic_machine=i686-pc
     1069                os=-mingw32
    10311070                ;;
    10321071        xps | xps100)
    … …  
    10591098        romp)
    10601099                basic_machine=romp-ibm
     1100                ;;
     1101        mmix)
     1102                basic_machine=mmix-knuth
    10611103                ;;
    10621104        rs6000)
    … …  
    11681210              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    11691211              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    1170               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
     1212              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos* \
     1213              | -irx* )
    11711214        # Remember, each alternative MUST END IN *, to match a version number.
    11721215                ;;
    … …  
    12951338                os=-kaos
    12961339                ;;
     1340        -zvmoe)
     1341                os=-zvmoe
     1342                ;;
    12971343        -none)
    12981344                ;;
    … …  
    13741420        *-ibm)
    13751421                os=-aix
     1422                ;;
     1423        *-knuth)
     1424                os=-mmixware
    13761425                ;;
    13771426        *-wec)
    … …  
    15401589
    15411590echo $basic_machine$os
    1542 exit 0
     1591exit
    15431592
    15441593# Local variables:

  • trunk/configure

    r5475 r5479  
    867867  --enable-debug          compiles in debug mode. Lots of debug info about the
    868868                          game.
    869   --disable-modular-debug compiles in modular-debug mode, that logs
    870                           differently on the many modules of orxonox.
     869  --disable-modular-debug                            compiles in modular-debug
     870that logs differently on the many modules of orxonox.mode
    871871  --disable-gtk           Prevents GTK from being loaded
    872872  --disable-curl          Prevents libcURL from being loaded
    … …  
    879879  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    880880  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    881   --with-shared-lib-path  Tells the executable, where to look for the shared
    882                           libraries.
     881  --with-shared-lib-path               Tells the executable
    883882  --with-sub-projects     also builds the subProjects while make from srcdir
    884883  --with-tardis           sets all the necesary environment flags for
    … …  
    41734172#---------------------------#
    41744173def_tardis=no
     4174GTKPATH=""
    41754175echo "$as_me:$LINENO: checking convenience flag for working at the taris in the ETH zurich" >&5
    41764176echo $ECHO_N "checking convenience flag for working at the taris in the ETH zurich... $ECHO_C" >&6
    … …  
    41894189  ## GTK
    41904190  GTKPREFIX=/usr/pack/gtk-2.8.3-mo
     4191  GTKPATH=${GTKPREFIX}/${ARCH}/bin
    41914192  CPPFLAGS="${CPPFLAGS} -I${GTKPREFIX}/include"
    41924193  LDFLAGS="${LDFLAGS} -L${GTKPREFIX}/${ARCH}/lib -Wl,-rpath -Wl,${GTKPREFIX}/${ARCH}/lib"
    … …  
    43024303#-------------------------#
    43034304if test x$def_gtk = xyes; then
    4304  # Extract the first word of "pkg-config", so it can be a program name with args.
     4305 if test x${GTKPATH} != x; then
     4306   # Extract the first word of "pkg-config", so it can be a program name with args.
    43054307set dummy pkg-config; ac_word=$2
     4308echo "$as_me:$LINENO: checking for $ac_word" >&5
     4309echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     4310if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     4311  echo $ECHO_N "(cached) $ECHO_C" >&6
     4312else
     4313  case $PKG_CONFIG in
     4314  [\\/]* | ?:[\\/]*)
     4315  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
     4316  ;;
     4317  *)
     4318  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4319for as_dir in $GTKPATH
     4320do
     4321  IFS=$as_save_IFS
     4322  test -z "$as_dir" && as_dir=.
     4323  for ac_exec_ext in '' $ac_executable_extensions; do
     4324  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4325    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     4326    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     4327    break 2
     4328  fi
     4329done
     4330done
     4331
     4332  ;;
     4333esac
     4334fi
     4335PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     4336
     4337if test -n "$PKG_CONFIG"; then
     4338  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
     4339echo "${ECHO_T}$PKG_CONFIG" >&6
     4340else
     4341  echo "$as_me:$LINENO: result: no" >&5
     4342echo "${ECHO_T}no" >&6
     4343fi
     4344
     4345 else
     4346   # Extract the first word of "pkg-config ", so it can be a program name with args.
     4347set dummy pkg-config ; ac_word=$2
    43064348echo "$as_me:$LINENO: checking for $ac_word" >&5
    43074349echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    … …  
    43414383fi
    43424384
     4385 fi
    43434386fi
    43444387

  • trunk/configure.ac

    r5478 r5479  
    2424## AUTOCONF INIT PHASE ##
    2525#########################
    26 AC_PREREQ(2.56)
    27 AC_INIT(orxonox, 0.3.1_alpha, [orxonox-dev at mail.datacore.ch])
     26AC_PREREQ(2.59)
     27AC_INIT([orxonox],[0.3.1_alpha],[orxonox-dev at mail.datacore.ch])
    2828
    2929## Detect the canonical host and target build environment.
    … …  
    7070AC_MSG_CHECKING([shared lib path])
    7171AC_ARG_WITH([shared-lib-path],
    72         AC_HELP_STRING( [--with-shared-lib-path], [Tells the executable, where to look for the shared libraries.]),
     72        AS_HELP_STRING(--with-shared-lib-path,Tells the executable, where to look for the shared libraries.),
    7373         SHARED_LIB_PATH=$withval)
    7474if test x$SHARED_LIB_PATH != xno; then
    … …  
    8585AC_MSG_CHECKING([if DEBUG-mode should be enabled])
    8686AC_ARG_ENABLE([debug],
    87         AC_HELP_STRING( [--enable-debug], [compiles in debug mode. Lots of debug info about the game.]),
     87        AS_HELP_STRING(--enable-debug,compiles in debug mode. Lots of debug info about the game.),
    8888         DEBUG=$enableval)
    8989
    … …  
    108108AC_MSG_CHECKING([if Modular-DEBUG-mode should be ebabled])
    109109AC_ARG_ENABLE([modular-debug],
    110         AC_HELP_STRING( [--disable-modular-debug], [compiles in modular-debug mode, that logs differently on the many modules of orxonox.]),
     110        AS_HELP_STRING(--disable-modular-debug,compiles in modular-debug mode, that logs differently on the many modules of orxonox.),
    111111         MODULAR_DEBUG=$enableval)
    112112
    … …  
    123123AC_MSG_CHECKING([if gtk should be enabled])
    124124AC_ARG_ENABLE([gtk],
    125         AC_HELP_STRING( [--disable-gtk],
    126         [Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes])
     125        AS_HELP_STRING(--disable-gtk,Prevents GTK from being loaded), [def_gtk=no], [def_gtk=yes])
    127126if test x$def_gtk = xyes; then
    128127  echo "yes"
    … …  
    137136AC_MSG_CHECKING([if libcURL should be enabled])
    138137AC_ARG_ENABLE([curl],
    139         AC_HELP_STRING( [--disable-curl],
    140         [Prevents libcURL from being loaded]), [def_curl=no], [def_curl=yes])
     138        AS_HELP_STRING(--disable-curl,Prevents libcURL from being loaded), [def_curl=no], [def_curl=yes])
    141139if test x$def_curl = xyes; then
    142140  echo "yes"
    … …  
    152150AC_MSG_CHECKING([if the SubProjects should be built])
    153151AC_ARG_WITH([sub-projects],
    154         AC_HELP_STRING( [--with-sub-projects],
    155         [also builds the subProjects while make from srcdir]), [def_sub_projects=yes])
     152        AS_HELP_STRING(--with-sub-projects,also builds the subProjects while make from srcdir), [def_sub_projects=yes])
    156153if test x$def_sub_projects = xyes; then
    157154  echo "yes"
    … …  
    168165AC_MSG_CHECKING([if Profiling should be enabled])
    169166AC_ARG_ENABLE([profile],
    170         AC_HELP_STRING( [--enable-profile],
    171         [builds orxonox with profiling support]), [def_profiling=yes])
     167        AS_HELP_STRING(--enable-profile,builds orxonox with profiling support), [def_profiling=yes])
    172168if test x$def_profiling = xyes; then
    173169  echo "yes"
    … …  
    184180AC_MSG_CHECKING([if efence should be enabled])
    185181AC_ARG_ENABLE([efence],
    186         AC_HELP_STRING( [--enable-efence],
    187         [builds orxonox with efence support]), [def_efence=yes])
     182        AS_HELP_STRING(--enable-efence,builds orxonox with efence support), [def_efence=yes])
    188183if test x$def_efence = xyes; then
    189184  echo "yes"
    … …  
    199194AC_MSG_CHECKING([if the Documentation should be build by default])
    200195AC_ARG_ENABLE([documentation],
    201         AC_HELP_STRING( [--enable-documentation],
    202         [also builds the sDocumentation while make from srcdir]), [def_documentation=yes])
     196        AS_HELP_STRING(--enable-documentation,also builds the sDocumentation while make from srcdir), [def_documentation=yes])
    203197if test x$def_documentation = xyes; then
    204198  echo "yes"
    … …  
    218212AC_MSG_CHECKING([convenience flag for working at the taris in the ETH zurich])
    219213AC_ARG_WITH([tardis],
    220         AC_HELP_STRING( [--with-tardis],
    221         [sets all the necesary environment flags for linux-TARDIS boxes at the ETH Zurich]), [def_tardis=yes])
     214        AS_HELP_STRING(--with-tardis,sets all the necesary environment flags for linux-TARDIS boxes at the ETH Zurich), [def_tardis=yes])
    222215if test x$def_tardis = xyes; then
    223216  ARCH=i686-debian-linux3.1

  • trunk/depcomp

    r1956 r5479  
    11#! /bin/sh
    2 
    32# depcomp - compile a program generating dependencies as side-effects
    4 # Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
     3
     4scriptversion=2005-07-09.11
     5
     6# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
    57
    68# This program is free software; you can redistribute it and/or modify
    … …  
    1618# You should have received a copy of the GNU General Public License
    1719# along with this program; if not, write to the Free Software
    18 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    19 # 02111-1307, USA.
     20# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     21# 02110-1301, USA.
    2022
    2123# As a special exception to the GNU General Public License, if you
    … …  
    2628# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
    2729
     30case $1 in
     31  '')
     32     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     33     exit 1;
     34     ;;
     35  -h | --h*)
     36    cat <<\EOF
     37Usage: depcomp [--help] [--version] PROGRAM [ARGS]
     38
     39Run PROGRAMS ARGS to compile a file, generating dependencies
     40as side-effects.
     41
     42Environment variables:
     43  depmode     Dependency tracking mode.
     44  source      Source file read by `PROGRAMS ARGS'.
     45  object      Object file output by `PROGRAMS ARGS'.
     46  DEPDIR      directory where to store dependencies.
     47  depfile     Dependency file to output.
     48  tmpdepfile  Temporary file to use when outputing dependencies.
     49  libtool     Whether libtool is used (yes/no).
     50
     51Report bugs to <bug-automake@gnu.org>.
     52EOF
     53    exit $?
     54    ;;
     55  -v | --v*)
     56    echo "depcomp $scriptversion"
     57    exit $?
     58    ;;
     59esac
     60
    2861if test -z "$depmode" || test -z "$source" || test -z "$object"; then
    2962  echo "depcomp: Variables source, object and depmode must be set" 1>&2
    3063  exit 1
    3164fi
    32 # `libtool' can also be set to `yes' or `no'.
    33 
    34 if test -z "$depfile"; then
    35    base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
    36    dir=`echo "$object" | sed 's,/.*$,/,'`
    37    if test "$dir" = "$object"; then
    38       dir=
    39    fi
    40    # FIXME: should be _deps on DOS.
    41    depfile="$dir.deps/$base"
    42 fi
    43 
     65
     66# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
     67depfile=${depfile-`echo "$object" |
     68  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
    4469tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
    4570
    … …  
    263288
    264289   if test "$libtool" = yes; then
    265       tmpdepfile1="$dir.libs/$base.lo.d"
    266       tmpdepfile2="$dir.libs/$base.d"
     290      # With Tru64 cc, shared objects can also be used to make a
     291      # static library.  This mecanism is used in libtool 1.4 series to
     292      # handle both shared and static libraries in a single compilation.
     293      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
     294      #
     295      # With libtool 1.5 this exception was removed, and libtool now
     296      # generates 2 separate objects for the 2 libraries.  These two
     297      # compilations output dependencies in in $dir.libs/$base.o.d and
     298      # in $dir$base.o.d.  We have to check for both files, because
     299      # one of the two compilations can be disabled.  We should prefer
     300      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
     301      # automatically cleaned when .libs/ is deleted, while ignoring
     302      # the former would cause a distcleancheck panic.
     303      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
     304      tmpdepfile2=$dir$base.o.d          # libtool 1.5
     305      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
     306      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
    267307      "$@" -Wc,-MD
    268308   else
    269       tmpdepfile1="$dir$base.o.d"
    270       tmpdepfile2="$dir$base.d"
     309      tmpdepfile1=$dir$base.o.d
     310      tmpdepfile2=$dir$base.d
     311      tmpdepfile3=$dir$base.d
     312      tmpdepfile4=$dir$base.d
    271313      "$@" -MD
    272314   fi
    … …  
    275317   if test $stat -eq 0; then :
    276318   else
    277       rm -f "$tmpdepfile1" "$tmpdepfile2"
     319      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
    278320      exit $stat
    279321   fi
    280322
    281    if test -f "$tmpdepfile1"; then
    282       tmpdepfile="$tmpdepfile1"
    283    else
    284       tmpdepfile="$tmpdepfile2"
    285    fi
     323   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
     324   do
     325     test -f "$tmpdepfile" && break
     326   done
    286327   if test -f "$tmpdepfile"; then
    287328      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
    … …  
    427468
    428469  "$@" -E |
    429     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     470    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
     471       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    430472    sed '$ s: \\$::' > "$tmpdepfile"
    431473  rm -f "$depfile"
    … …  
    478520
    479521exit 0
     522
     523# Local Variables:
     524# mode: shell-script
     525# sh-indentation: 2
     526# eval: (add-hook 'write-file-hooks 'time-stamp)
     527# time-stamp-start: "scriptversion="
     528# time-stamp-format: "%:y-%02m-%02d.%02H"
     529# time-stamp-end: "$"
     530# End:

  • trunk/install-sh

    r1956 r5479  
    11#!/bin/sh
    2 #
    32# install - install a program, script, or datafile
    4 #
     3
     4scriptversion=2005-05-14.22
     5
    56# This originates from X11R5 (mit/util/scripts/install.sh), which was
    67# later released in X11R6 (xc/config/util/install.sh) with the
    … …  
    4243# shared with many OS's install programs.
    4344
    44 
    4545# set DOITPROG to echo to test this script
    4646
    4747# Don't use :- since 4.3BSD and earlier shells don't like it.
    4848doit="${DOITPROG-}"
    49 
    5049
    5150# put in absolute paths if you don't have them in your path; or use env. vars.
    … …  
    6059mkdirprog="${MKDIRPROG-mkdir}"
    6160
    62 transformbasename=""
    63 transform_arg=""
    64 instcmd="$mvprog"
    6561chmodcmd="$chmodprog 0755"
    66 chowncmd=""
    67 chgrpcmd=""
    68 stripcmd=""
     62chowncmd=
     63chgrpcmd=
     64stripcmd=
    6965rmcmd="$rmprog -f"
    7066mvcmd="$mvprog"
    71 src=""
    72 dst=""
    73 dir_arg=""
    74 
    75 while [ x"$1" != x ]; do
    76     case $1 in
    77         -c) instcmd=$cpprog
    78             shift
    79             continue;;
    80 
    81         -d) dir_arg=true
    82             shift
    83             continue;;
    84 
    85         -m) chmodcmd="$chmodprog $2"
    86             shift
    87             shift
    88             continue;;
    89 
    90         -o) chowncmd="$chownprog $2"
    91             shift
    92             shift
    93             continue;;
    94 
    95         -g) chgrpcmd="$chgrpprog $2"
    96             shift
    97             shift
    98             continue;;
    99 
    100         -s) stripcmd=$stripprog
    101             shift
    102             continue;;
    103 
    104         -t=*) transformarg=`echo $1 | sed 's/-t=//'`
    105             shift
    106             continue;;
    107 
    108         -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
    109             shift
    110             continue;;
    111 
    112         *)  if [ x"$src" = x ]
    113             then
    114                 src=$1
    115             else
    116                 # this colon is to work around a 386BSD /bin/sh bug
    117                 :
    118                 dst=$1
    119             fi
    120             shift
    121             continue;;
     67src=
     68dst=
     69dir_arg=
     70dstarg=
     71no_target_directory=
     72
     73usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     74   or: $0 [OPTION]... SRCFILES... DIRECTORY
     75   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
     76   or: $0 [OPTION]... -d DIRECTORIES...
     77
     78In the 1st form, copy SRCFILE to DSTFILE.
     79In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
     80In the 4th, create DIRECTORIES.
     81
     82Options:
     83-c         (ignored)
     84-d         create directories instead of installing files.
     85-g GROUP   $chgrpprog installed files to GROUP.
     86-m MODE    $chmodprog installed files to MODE.
     87-o USER    $chownprog installed files to USER.
     88-s         $stripprog installed files.
     89-t DIRECTORY  install into DIRECTORY.
     90-T         report an error if DSTFILE is a directory.
     91--help     display this help and exit.
     92--version  display version info and exit.
     93
     94Environment variables override the default commands:
     95  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
     96"
     97
     98while test -n "$1"; do
     99  case $1 in
     100    -c) shift
     101        continue;;
     102
     103    -d) dir_arg=true
     104        shift
     105        continue;;
     106
     107    -g) chgrpcmd="$chgrpprog $2"
     108        shift
     109        shift
     110        continue;;
     111
     112    --help) echo "$usage"; exit $?;;
     113
     114    -m) chmodcmd="$chmodprog $2"
     115        shift
     116        shift
     117        continue;;
     118
     119    -o) chowncmd="$chownprog $2"
     120        shift
     121        shift
     122        continue;;
     123
     124    -s) stripcmd=$stripprog
     125        shift
     126        continue;;
     127
     128    -t) dstarg=$2
     129        shift
     130        shift
     131        continue;;
     132
     133    -T) no_target_directory=true
     134        shift
     135        continue;;
     136
     137    --version) echo "$0 $scriptversion"; exit $?;;
     138
     139    *)  # When -d is used, all remaining arguments are directories to create.
     140        # When -t is used, the destination is already specified.
     141        test -n "$dir_arg$dstarg" && break
     142        # Otherwise, the last argument is the destination.  Remove it from $@.
     143        for arg
     144        do
     145          if test -n "$dstarg"; then
     146            # $@ is not empty: it contains at least $arg.
     147            set fnord "$@" "$dstarg"
     148            shift # fnord
     149          fi
     150          shift # arg
     151          dstarg=$arg
     152        done
     153        break;;
     154  esac
     155done
     156
     157if test -z "$1"; then
     158  if test -z "$dir_arg"; then
     159    echo "$0: no input file specified." >&2
     160    exit 1
     161  fi
     162  # It's OK to call `install-sh -d' without argument.
     163  # This can happen when creating conditional directories.
     164  exit 0
     165fi
     166
     167for src
     168do
     169  # Protect names starting with `-'.
     170  case $src in
     171    -*) src=./$src ;;
     172  esac
     173
     174  if test -n "$dir_arg"; then
     175    dst=$src
     176    src=
     177
     178    if test -d "$dst"; then
     179      mkdircmd=:
     180      chmodcmd=
     181    else
     182      mkdircmd=$mkdirprog
     183    fi
     184  else
     185    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     186    # might cause directories to be created, which would be especially bad
     187    # if $src (and thus $dsttmp) contains '*'.
     188    if test ! -f "$src" && test ! -d "$src"; then
     189      echo "$0: $src does not exist." >&2
     190      exit 1
     191    fi
     192
     193    if test -z "$dstarg"; then
     194      echo "$0: no destination specified." >&2
     195      exit 1
     196    fi
     197
     198    dst=$dstarg
     199    # Protect names starting with `-'.
     200    case $dst in
     201      -*) dst=./$dst ;;
    122202    esac
     203
     204    # If destination is a directory, append the input filename; won't work
     205    # if double slashes aren't ignored.
     206    if test -d "$dst"; then
     207      if test -n "$no_target_directory"; then
     208        echo "$0: $dstarg: Is a directory" >&2
     209        exit 1
     210      fi
     211      dst=$dst/`basename "$src"`
     212    fi
     213  fi
     214
     215  # This sed command emulates the dirname command.
     216  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
     217
     218  # Make sure that the destination directory exists.
     219
     220  # Skip lots of stat calls in the usual case.
     221  if test ! -d "$dstdir"; then
     222    defaultIFS='
     223         '
     224    IFS="${IFS-$defaultIFS}"
     225
     226    oIFS=$IFS
     227    # Some sh's can't handle IFS=/ for some reason.
     228    IFS='%'
     229    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
     230    shift
     231    IFS=$oIFS
     232
     233    pathcomp=
     234
     235    while test $# -ne 0 ; do
     236      pathcomp=$pathcomp$1
     237      shift
     238      if test ! -d "$pathcomp"; then
     239        $mkdirprog "$pathcomp"
     240        # mkdir can fail with a `File exist' error in case several
     241        # install-sh are creating the directory concurrently.  This
     242        # is OK.
     243        test -d "$pathcomp" || exit
     244      fi
     245      pathcomp=$pathcomp/
     246    done
     247  fi
     248
     249  if test -n "$dir_arg"; then
     250    $doit $mkdircmd "$dst" \
     251      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
     252      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
     253      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
     254      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
     255
     256  else
     257    dstfile=`basename "$dst"`
     258
     259    # Make a couple of temp file names in the proper directory.
     260    dsttmp=$dstdir/_inst.$$_
     261    rmtmp=$dstdir/_rm.$$_
     262
     263    # Trap to clean up those temp files at exit.
     264    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
     265    trap '(exit $?); exit' 1 2 13 15
     266
     267    # Copy the file name to the temp name.
     268    $doit $cpprog "$src" "$dsttmp" &&
     269
     270    # and set any options; do chmod last to preserve setuid bits.
     271    #
     272    # If any of these fail, we abort the whole thing.  If we want to
     273    # ignore errors from any of these, just make sure not to ignore
     274    # errors from the above "$doit $cpprog $src $dsttmp" command.
     275    #
     276    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
     277      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
     278      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
     279      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
     280
     281    # Now rename the file to the real destination.
     282    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
     283      || {
     284           # The rename failed, perhaps because mv can't rename something else
     285           # to itself, or perhaps because mv is so ancient that it does not
     286           # support -f.
     287
     288           # Now remove or move aside any old file at destination location.
     289           # We try this two ways since rm can't unlink itself on some
     290           # systems and the destination file might be busy for other
     291           # reasons.  In this case, the final cleanup might fail but the new
     292           # file should still install successfully.
     293           {
     294             if test -f "$dstdir/$dstfile"; then
     295               $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
     296               || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
     297               || {
     298                 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
     299                 (exit 1); exit 1
     300               }
     301             else
     302               :
     303             fi
     304           } &&
     305
     306           # Now rename the file to the real destination.
     307           $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
     308         }
     309    }
     310  fi || { (exit 1); exit 1; }
    123311done
    124312
    125 if [ x"$src" = x ]
    126 then
    127         echo "$0: no input file specified" >&2
    128         exit 1
    129 else
    130         :
    131 fi
    132 
    133 if [ x"$dir_arg" != x ]; then
    134         dst=$src
    135         src=""
    136 
    137         if [ -d "$dst" ]; then
    138                 instcmd=:
    139                 chmodcmd=""
    140         else
    141                 instcmd=$mkdirprog
    142         fi
    143 else
    144 
    145 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
    146 # might cause directories to be created, which would be especially bad
    147 # if $src (and thus $dsttmp) contains '*'.
    148 
    149         if [ -f "$src" ] || [ -d "$src" ]
    150         then
    151                 :
    152         else
    153                 echo "$0: $src does not exist" >&2
    154                 exit 1
    155         fi
    156 
    157         if [ x"$dst" = x ]
    158         then
    159                 echo "$0: no destination specified" >&2
    160                 exit 1
    161         else
    162                 :
    163         fi
    164 
    165 # If destination is a directory, append the input filename; if your system
    166 # does not like double slashes in filenames, you may need to add some logic
    167 
    168         if [ -d "$dst" ]
    169         then
    170                 dst=$dst/`basename "$src"`
    171         else
    172                 :
    173         fi
    174 fi
    175 
    176 ## this sed command emulates the dirname command
    177 dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
    178 
    179 # Make sure that the destination directory exists.
    180 #  this part is taken from Noah Friedman's mkinstalldirs script
    181 
    182 # Skip lots of stat calls in the usual case.
    183 if [ ! -d "$dstdir" ]; then
    184 defaultIFS='
    185         '
    186 IFS="${IFS-$defaultIFS}"
    187 
    188 oIFS=$IFS
    189 # Some sh's can't handle IFS=/ for some reason.
    190 IFS='%'
    191 set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
    192 IFS=$oIFS
    193 
    194 pathcomp=''
    195 
    196 while [ $# -ne 0 ] ; do
    197         pathcomp=$pathcomp$1
    198         shift
    199 
    200         if [ ! -d "$pathcomp" ] ;
    201         then
    202                 $mkdirprog "$pathcomp"
    203         else
    204                 :
    205         fi
    206 
    207         pathcomp=$pathcomp/
    208 done
    209 fi
    210 
    211 if [ x"$dir_arg" != x ]
    212 then
    213         $doit $instcmd "$dst" &&
    214 
    215         if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
    216         if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
    217         if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
    218         if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
    219 else
    220 
    221 # If we're going to rename the final executable, determine the name now.
    222 
    223         if [ x"$transformarg" = x ]
    224         then
    225                 dstfile=`basename "$dst"`
    226         else
    227                 dstfile=`basename "$dst" $transformbasename |
    228                         sed $transformarg`$transformbasename
    229         fi
    230 
    231 # don't allow the sed command to completely eliminate the filename
    232 
    233         if [ x"$dstfile" = x ]
    234         then
    235                 dstfile=`basename "$dst"`
    236         else
    237                 :
    238         fi
    239 
    240 # Make a couple of temp file names in the proper directory.
    241 
    242         dsttmp=$dstdir/_inst.$$_
    243         rmtmp=$dstdir/_rm.$$_
    244 
    245 # Trap to clean up temp files at exit.
    246 
    247         trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
    248         trap '(exit $?); exit' 1 2 13 15
    249 
    250 # Move or copy the file name to the temp name
    251 
    252         $doit $instcmd "$src" "$dsttmp" &&
    253 
    254 # and set any options; do chmod last to preserve setuid bits
    255 
    256 # If any of these fail, we abort the whole thing.  If we want to
    257 # ignore errors from any of these, just make sure not to ignore
    258 # errors from the above "$doit $instcmd $src $dsttmp" command.
    259 
    260         if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
    261         if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
    262         if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
    263         if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
    264 
    265 # Now remove or move aside any old file at destination location.  We try this
    266 # two ways since rm can't unlink itself on some systems and the destination
    267 # file might be busy for other reasons.  In this case, the final cleanup
    268 # might fail but the new file should still install successfully.
    269 
     313# The final little trick to "correctly" pass the exit status to the exit trap.
    270314{
    271         if [ -f "$dstdir/$dstfile" ]
    272         then
    273                 $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
    274                 $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
    275                 {
    276                   echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
    277                   (exit 1); exit
    278                 }
    279         else
    280                 :
    281         fi
    282 } &&
    283 
    284 # Now rename the file to the real destination.
    285 
    286         $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
    287 
    288 fi &&
    289 
    290 # The final little trick to "correctly" pass the exit status to the exit trap.
    291 
    292 {
    293         (exit 0); exit
     315  (exit 0); exit 0
    294316}
     317
     318# Local variables:
     319# eval: (add-hook 'write-file-hooks 'time-stamp)
     320# time-stamp-start: "scriptversion="
     321# time-stamp-format: "%:y-%02m-%02d.%02H"
     322# time-stamp-end: "$"
     323# End:

  • trunk/missing

    r1956 r5479  
    11#! /bin/sh
    22# Common stub for a few missing GNU programs while installing.
    3 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
     3
     4scriptversion=2005-06-08.21
     5
     6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
     7#   Free Software Foundation, Inc.
    48# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
    59
    … …  
    1620# You should have received a copy of the GNU General Public License
    1721# along with this program; if not, write to the Free Software
    18 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    19 # 02111-1307, USA.
     22# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     23# 02110-1301, USA.
    2024
    2125# As a special exception to the GNU General Public License, if you
    … …  
    3943fi
    4044
     45msg="missing on your system"
     46
    4147case "$1" in
    4248--run)
    … …  
    4551  shift
    4652  "$@" && exit 0
     53  # Exit code 63 means version mismatch.  This often happens
     54  # when the user try to use an ancient version of a tool on
     55  # a file that requires a minimum version.  In this case we
     56  # we should proceed has if the program had been absent, or
     57  # if --run hadn't been passed.
     58  if test $? = 63; then
     59    run=:
     60    msg="probably too old"
     61  fi
    4762  ;;
    48 esac
    49 
    50 # If it does not exist, or fails to run (possibly an outdated version),
    51 # try to emulate it.
    52 case "$1" in
    5363
    5464  -h|--h|--he|--hel|--help)
    … …  
    7585  makeinfo     touch the output file
    7686  tar          try tar, gnutar, gtar, then tar without non-portable flags
    77   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     87  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
     88
     89Send bug reports to <bug-automake@gnu.org>."
     90    exit $?
    7891    ;;
    7992
    8093  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    81     echo "missing 0.4 - GNU automake"
     94    echo "missing $scriptversion (GNU Automake)"
     95    exit $?
    8296    ;;
    8397
    … …  
    88102    ;;
    89103
    90   aclocal*)
     104esac
     105
     106# Now exit if we have it, but it failed.  Also exit now if we
     107# don't have it and --version was passed (most likely to detect
     108# the program).
     109case "$1" in
     110  lex|yacc)
     111    # Not GNU programs, they don't have --version.
     112    ;;
     113
     114  tar)
     115    if test -n "$run"; then
     116       echo 1>&2 "ERROR: \`tar' requires --run"
     117       exit 1
     118    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
     119       exit 1
     120    fi
     121    ;;
     122
     123  *)
    91124    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    92125       # We have it, but it failed.
    93126       exit 1
    94     fi
    95 
    96     echo 1>&2 "\
    97 WARNING: \`$1' is missing on your system.  You should only need it if
     127    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
     128       # Could not run --version or --help.  This is probably someone
     129       # running `$TOOL --version' or `$TOOL --help' to check whether
     130       # $TOOL exists and not knowing $TOOL uses missing.
     131       exit 1
     132    fi
     133    ;;
     134esac
     135
     136# If it does not exist, or fails to run (possibly an outdated version),
     137# try to emulate it.
     138case "$1" in
     139  aclocal*)
     140    echo 1>&2 "\
     141WARNING: \`$1' is $msg.  You should only need it if
    98142         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
    99143         to install the \`Automake' and \`Perl' packages.  Grab them from
    … …  
    103147
    104148  autoconf)
    105     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    106        # We have it, but it failed.
    107        exit 1
    108     fi
    109 
    110     echo 1>&2 "\
    111 WARNING: \`$1' is missing on your system.  You should only need it if
     149    echo 1>&2 "\
     150WARNING: \`$1' is $msg.  You should only need it if
    112151         you modified \`${configure_ac}'.  You might want to install the
    113152         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
    … …  
    117156
    118157  autoheader)
    119     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    120        # We have it, but it failed.
    121        exit 1
    122     fi
    123 
    124     echo 1>&2 "\
    125 WARNING: \`$1' is missing on your system.  You should only need it if
     158    echo 1>&2 "\
     159WARNING: \`$1' is $msg.  You should only need it if
    126160         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
    127161         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
    … …  
    141175
    142176  automake*)
    143     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    144        # We have it, but it failed.
    145        exit 1
    146     fi
    147 
    148     echo 1>&2 "\
    149 WARNING: \`$1' is missing on your system.  You should only need it if
     177    echo 1>&2 "\
     178WARNING: \`$1' is $msg.  You should only need it if
    150179         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
    151180         You might want to install the \`Automake' and \`Perl' packages.
    … …  
    157186
    158187  autom4te)
    159     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    160        # We have it, but it failed.
    161        exit 1
    162     fi
    163 
    164     echo 1>&2 "\
    165 WARNING: \`$1' is needed, and you do not seem to have it handy on your
    166          system.  You might have modified some files without having the
     188    echo 1>&2 "\
     189WARNING: \`$1' is needed, but is $msg.
     190         You might have modified some files without having the
    167191         proper tools for further handling them.
    168192         You can get \`$1' as part of \`Autoconf' from any GNU
    … …  
    186210  bison|yacc)
    187211    echo 1>&2 "\
    188 WARNING: \`$1' is missing on your system.  You should only need it if
     212WARNING: \`$1' $msg.  You should only need it if
    189213         you modified a \`.y' file.  You may need the \`Bison' package
    190214         in order for those modifications to take effect.  You can get
    … …  
    216240  lex|flex)
    217241    echo 1>&2 "\
    218 WARNING: \`$1' is missing on your system.  You should only need it if
     242WARNING: \`$1' is $msg.  You should only need it if
    219243         you modified a \`.l' file.  You may need the \`Flex' package
    220244         in order for those modifications to take effect.  You can get
    … …  
    238262
    239263  help2man)
    240     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    241        # We have it, but it failed.
    242        exit 1
    243     fi
    244 
    245     echo 1>&2 "\
    246 WARNING: \`$1' is missing on your system.  You should only need it if
     264    echo 1>&2 "\
     265WARNING: \`$1' is $msg.  You should only need it if
    247266         you modified a dependency of a manual page.  You may need the
    248267         \`Help2man' package in order for those modifications to take
    … …  
    263282
    264283  makeinfo)
    265     if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
    266        # We have makeinfo, but it failed.
    267        exit 1
    268     fi
    269 
    270     echo 1>&2 "\
    271 WARNING: \`$1' is missing on your system.  You should only need it if
     284    echo 1>&2 "\
     285WARNING: \`$1' is $msg.  You should only need it if
    272286         you modified a \`.texi' or \`.texinfo' file, or any other file
    273287         indirectly affecting the aspect of the manual.  The spurious
    … …  
    275289         DU, IRIX).  You might want to install the \`Texinfo' package or
    276290         the \`GNU make' package.  Grab either from any GNU archive site."
     291    # The file to touch is that specified with -o ...
    277292    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    278293    if test -z "$file"; then
    279       file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
    280       file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
    281     fi
     294      # ... or it is the one specified with @setfilename ...
     295      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
     296      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
     297      # ... or it is derived from the source name (dir/f.texi becomes f.info)
     298      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     299    fi
     300    # If the file does not exist, the user really needs makeinfo;
     301    # let's fail without touching anything.
     302    test -f $file || exit 1
    282303    touch $file
    283304    ;;
    … …  
    285306  tar)
    286307    shift
    287     if test -n "$run"; then
    288       echo 1>&2 "ERROR: \`tar' requires --run"
    289       exit 1
    290     fi
    291308
    292309    # We have already tried tar in the generic part.
    … …  
    324341  *)
    325342    echo 1>&2 "\
    326 WARNING: \`$1' is needed, and you do not seem to have it handy on your
    327          system.  You might have modified some files without having the
     343WARNING: \`$1' is needed, and is $msg.
     344         You might have modified some files without having the
    328345         proper tools for further handling them.  Check the \`README' file,
    329346         it often tells you about the needed prerequisites for installing
    … …  
    335352
    336353exit 0
     354
     355# Local variables:
     356# eval: (add-hook 'write-file-hooks 'time-stamp)
     357# time-stamp-start: "scriptversion="
     358# time-stamp-format: "%:y-%02m-%02d.%02H"
     359# time-stamp-end: "$"
     360# End:

  • trunk/mkinstalldirs

    r1956 r5479  
    11#! /bin/sh
    22# mkinstalldirs --- make directory hierarchy
    3 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
     3
     4scriptversion=2005-06-29.22
     5
     6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
    47# Created: 1993-05-16
    5 # Public domain
     8# Public domain.
     9#
     10# This file is maintained in Automake, please report
     11# bugs to <bug-automake@gnu.org> or send patches to
     12# <automake-patches@gnu.org>.
    613
    714errstatus=0
    8 dirmode=""
     15dirmode=
    916
    1017usage="\
    11 Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
     18Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
     19
     20Create each directory DIR (with mode MODE, if specified), including all
     21leading file name components.
     22
     23Report bugs to <bug-automake@gnu.org>."
    1224
    1325# process command line arguments
    … …  
    1527  case $1 in
    1628    -h | --help | --h*)         # -h for help
    17       echo "$usage" 1>&2
    18       exit 0
     29      echo "$usage"
     30      exit $?
    1931      ;;
    2032    -m)                         # -m PERM arg
    … …  
    2335      dirmode=$1
    2436      shift
     37      ;;
     38    --version)
     39      echo "$0 $scriptversion"
     40      exit $?
    2541      ;;
    2642    --)                         # stop option processing
    … …  
    5167esac
    5268
     69# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
     70# mkdir -p a/c at the same time, both will detect that a is missing,
     71# one will create a, then the other will try to create a and die with
     72# a "File exists" error.  This is a problem when calling mkinstalldirs
     73# from a parallel make.  We use --version in the probe to restrict
     74# ourselves to GNU mkdir, which is thread-safe.
    5375case $dirmode in
    5476  '')
    55     if mkdir -p -- . 2>/dev/null; then
     77    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    5678      echo "mkdir -p -- $*"
    5779      exec mkdir -p -- "$@"
     80    else
     81      # On NextStep and OpenStep, the `mkdir' command does not
     82      # recognize any option.  It will interpret all options as
     83      # directories to create, and then abort because `.' already
     84      # exists.
     85      test -d ./-p && rmdir ./-p
     86      test -d ./--version && rmdir ./--version
    5887    fi
    5988    ;;
    6089  *)
    61     if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
     90    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
     91       test ! -d ./--version; then
    6292      echo "mkdir -m $dirmode -p -- $*"
    6393      exec mkdir -m "$dirmode" -p -- "$@"
     94    else
     95      # Clean up after NextStep and OpenStep mkdir.
     96      for d in ./-m ./-p ./--version "./$dirmode";
     97      do
     98        test -d $d && rmdir $d
     99      done
    64100    fi
    65101    ;;
    … …  
    68104for file
    69105do
    70   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
     106  case $file in
     107    /*) pathcomp=/ ;;
     108    *)  pathcomp= ;;
     109  esac
     110  oIFS=$IFS
     111  IFS=/
     112  set fnord $file
    71113  shift
     114  IFS=$oIFS
    72115
    73   pathcomp=
    74116  for d
    75117  do
    76     pathcomp="$pathcomp$d"
     118    test "x$d" = x && continue
     119
     120    pathcomp=$pathcomp$d
    77121    case $pathcomp in
    78122      -*) pathcomp=./$pathcomp ;;
    … …  
    85129
    86130      if test ! -d "$pathcomp"; then
    87         errstatus=$lasterr
     131        errstatus=$lasterr
    88132      else
    89         if test ! -z "$dirmode"; then
     133        if test ! -z "$dirmode"; then
    90134          echo "chmod $dirmode $pathcomp"
    91           lasterr=""
    92           chmod "$dirmode" "$pathcomp" || lasterr=$?
     135          lasterr=
     136          chmod "$dirmode" "$pathcomp" || lasterr=$?
    93137
    94           if test ! -z "$lasterr"; then
    95             errstatus=$lasterr
    96           fi
    97         fi
     138          if test ! -z "$lasterr"; then
     139            errstatus=$lasterr
     140          fi
     141        fi
    98142      fi
    99143    fi
    100144
    101     pathcomp="$pathcomp/"
     145    pathcomp=$pathcomp/
    102146  done
    103147done
    … …  
    108152# mode: shell-script
    109153# sh-indentation: 2
     154# eval: (add-hook 'write-file-hooks 'time-stamp)
     155# time-stamp-start: "scriptversion="
     156# time-stamp-format: "%:y-%02m-%02d.%02H"
     157# time-stamp-end: "$"
    110158# End:
    111 # mkinstalldirs ends here

  • trunk/src/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(orxonox_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXlibs_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/collision_detection/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXcd_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/event/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXevent_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/graphics/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXgraphics_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/graphics/importer/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXimporter_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXquadtree_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXglgui_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/gui/gtk_gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXgui_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/particles/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXparticles_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/physics/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXphysics_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/shell/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXshell_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/sound/Makefile.in

    r5473 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXsound_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/tinyxml/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libtinyxml_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/orxonox.cc

    r5424 r5479  
    285285              CONFIG_SECTION_DATA,
    286286              CONFIG_NAME_DATADIR);
     287    Gui* gui = new Gui(argc, argv);
     288    gui->startGui();
     289    delete gui;
    287290    exit(-1);
    288291  }

  • trunk/src/subprojects/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33

  • trunk/src/subprojects/collision_detection/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(collision_SOURCES)
    1816
    1917srcdir = @srcdir@

  • trunk/src/subprojects/importer/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(importer_SOURCES)
    1816
    1917srcdir = @srcdir@

  • trunk/src/subprojects/particles/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(particles_SOURCES)
    1816
    1917srcdir = @srcdir@

  • trunk/src/subprojects/testmain/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(testmain_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/util/Makefile.am

    r5463 r5479  
    66libORXutils_a_SOURCES = fast_factory.cc \
    77                        garbage_collector.cc \
    8                         resource_manager.cc \
    98                        state.cc \
    109                        user_control.cc \
    … …  
    1211                        animation/animation.cc \
    1312                        animation/animation_player.cc \
     13                        loading/resource_manager.cc \
    1414                        loading/factory.cc \
    1515                        loading/game_loader.cc \
    … …  
    2121noinst_HEADERS =        fast_factory.h \
    2222                        garbage_collector.h \
    23                         resource_manager.h \
    2423                        state.h \
    2524                        user_control.h \
    … …  
    2827                        animation/animation_player.h \
    2928                        animation/t_animation.h \
     29                        loading/resource_manager.h \
    3030                        loading/factory.h \
    3131                        loading/game_loader.h \

  • trunk/src/util/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXutils_a_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    5755libORXutils_a_LIBADD =
    5856am_libORXutils_a_OBJECTS = fast_factory.$(OBJEXT) \
    59         garbage_collector.$(OBJEXT) resource_manager.$(OBJEXT) \
    60         state.$(OBJEXT) user_control.$(OBJEXT) animation3d.$(OBJEXT) \
     57        garbage_collector.$(OBJEXT) state.$(OBJEXT) \
     58        user_control.$(OBJEXT) animation3d.$(OBJEXT) \
    6159        animation.$(OBJEXT) animation_player.$(OBJEXT) \
    62         factory.$(OBJEXT) game_loader.$(OBJEXT) load_param.$(OBJEXT) \
     60        resource_manager.$(OBJEXT) factory.$(OBJEXT) \
     61        game_loader.$(OBJEXT) load_param.$(OBJEXT) \
    6362        pilot_node.$(OBJEXT) track_manager.$(OBJEXT) \
    6463        track_node.$(OBJEXT)
    … …  
    192191libORXutils_a_SOURCES = fast_factory.cc \
    193192                        garbage_collector.cc \
    194                         resource_manager.cc \
    195193                        state.cc \
    196194                        user_control.cc \
    … …  
    198196                        animation/animation.cc \
    199197                        animation/animation_player.cc \
     198                        loading/resource_manager.cc \
    200199                        loading/factory.cc \
    201200                        loading/game_loader.cc \
    … …  
    207206noinst_HEADERS = fast_factory.h \
    208207                        garbage_collector.h \
    209                         resource_manager.h \
    210208                        state.h \
    211209                        user_control.h \
    … …  
    214212                        animation/animation_player.h \
    215213                        animation/t_animation.h \
     214                        loading/resource_manager.h \
    216215                        loading/factory.h \
    217216                        loading/game_loader.h \
    … …  
    338337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    339338@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'animation/animation_player.cc'; then $(CYGPATH_W) 'animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/animation/animation_player.cc'; fi`
     339
     340resource_manager.o: loading/resource_manager.cc
     341@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc; \
     342@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='loading/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     345@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc
     346
     347resource_manager.obj: loading/resource_manager.cc
     348@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`; \
     349@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     350@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='loading/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
     351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     352@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`
    340353
    341354factory.o: loading/factory.cc

  • trunk/src/world_entities/weapons/rocket.cc

    r5472 r5479  
    115115  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
    116116
     117  this->update(0);
    117118  this->emitter->setEmissionRate(45.0);
    118119  this->emitter->setEmissionVelocity(0.0);
Note: See TracChangeset for help on using the changeset viewer.