Changeset 7187 in orxonox.OLD

Timestamp:

Feb 22, 2006, 2:49:47 AM (18 years ago)

Author:

bensch

Message:

ltdl

Location:

branches/shared_lib

Files:

• Makefile.am (modified) (1 diff)
• config.guess (modified) (52 diffs)
• config.sub (modified) (47 diffs)
• configure.ac (modified) (2 diffs)
• src/lib/BuildLibs.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (1 diff)
• src/lib/libltdl (moved) (moved from branches/shared_lib/libltdl)
• src/lib/libltdl/Makefile.in (deleted)
• src/orxonox.cc (modified) (2 diffs)
• src/util/Makefile.am (modified) (1 diff)
• src/util/loading/dynamic_loader.h (modified) (1 diff)
• src/util/loading/resource_manager.cc (modified) (1 diff)

branches/shared_lib/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = foreign no-installman no-installinfo
 
-SUBDIRS = src
+SUBDIRS = \
+        src \
+        libltdl
 
 EXTRA_DIST = CODING-STANDARDS \

branches/shared_lib/config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-02-10'
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-06-12'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -25 +25 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
@@ -54 +53 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
@@ -89 +88 @@
 fi
 
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-        for c in cc gcc c89 c99 ; do
-          if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-             CC_FOR_BUILD="$c"; break ;
-          fi ;
-        done ;
+ ,,)    echo "int dummy(){}" > $dummy.c
+        for c in cc gcc c89 ; do
+          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+          if test $? = 0 ; then
+             CC_FOR_BUILD="$c"; break
+          fi
+        done
+        rm -f $dummy.c $dummy.o $dummy.rel
         if test x"$CC_FOR_BUILD" = x ; then
-          CC_FOR_BUILD=no_compiler_found ;
+          CC_FOR_BUILD=no_compiler_found
         fi
         ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
+# (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
         PATH=$PATH:/.attbin ; export PATH
@@ -141 +128 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-        # NetBSD (nbsd) targets should (where applicable) match one or
+        # Netbsd (nbsd) targets should (where applicable) match one or
         # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
         # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
@@ -148 +135 @@
         # compatibility and a consistent mechanism for selecting the
         # object file format.
-        #
-        # Note: NetBSD doesn't particularly care about the vendor
-        # portion of the name.  We always set it to "unknown".
-        sysctl="sysctl -n hw.machine_arch"
-        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-        case "${UNAME_MACHINE_ARCH}" in
-            armeb) machine=armeb-unknown ;;
-            arm*) machine=arm-unknown ;;
-            sh3el) machine=shl-unknown ;;
-            sh3eb) machine=sh-unknown ;;
-            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        # Determine the machine/vendor (is the vendor relevant).
+        case "${UNAME_MACHINE}" in
+            amiga) machine=m68k-unknown ;;
+            arm32) machine=arm-unknown ;;
+            atari*) machine=m68k-atari ;;
+            sun3*) machine=m68k-sun ;;
+            mac68k) machine=m68k-apple ;;
+            macppc) machine=powerpc-apple ;;
+            hp3[0-9][05]) machine=m68k-hp ;;
+            ibmrt|romp-ibm) machine=romp-ibm ;;
+            *) machine=${UNAME_MACHINE}-unknown ;;
         esac
         # The Operating System including object format, if it has switched
         # to ELF recently, or will in the future.
-        case "${UNAME_MACHINE_ARCH}" in
-            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-                eval $set_cc_for_build
+        case "${UNAME_MACHINE}" in
+            i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                         | grep __ELF__ >/dev/null
@@ -181 +166 @@
         esac
         # The OS release
-        # Debian GNU/NetBSD machines have a different userland, and
-        # thus, need a distinct triplet. However, they do not need
-        # kernel version information, so it can be replaced with a
-        # suitable tag, in the style of linux-gnu.
-        case "${UNAME_VERSION}" in
-            Debian*)
-                release='-gnu'
-                ;;
-            *)
-                release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-                ;;
-        esac
+        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
         # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
         # contains redundant information, the shorter form:
@@ -198 +172 @@
         echo "${machine}-${os}${release}"
         exit 0 ;;
-    amd64:OpenBSD:*:*)
-        echo x86_64-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    amiga:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    cats:OpenBSD:*:*)
-        echo arm-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    luna88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    macppc:OpenBSD:*:*)
-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sgi:OpenBSD:*:*)
-        echo mips64-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sun3:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    *:OpenBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    *:ekkoBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-        exit 0 ;;
-    macppc:MirBSD:*:*)
-        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-        exit 0 ;;
-    *:MirBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-        exit 0 ;;
     alpha:OSF1:*:*)
-        case $UNAME_RELEASE in
-        *4.0)
+        if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-                ;;
-        *5.*)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-                ;;
-        esac
-        # According to Compaq, /usr/sbin/psrinfo has been available on
-        # OSF/1 and Tru64 systems produced since 1995.  I hope that
-        # covers most systems running today.  This code pipes the CPU
-        # types through head -n 1, so we only detect the type of CPU 0.
-        ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-        case "$ALPHA_CPU_TYPE" in
-            "EV4 (21064)")
-                UNAME_MACHINE="alpha" ;;
-            "EV4.5 (21064)")
-                UNAME_MACHINE="alpha" ;;
-            "LCA4 (21066/21068)")
-                UNAME_MACHINE="alpha" ;;
-            "EV5 (21164)")
-                UNAME_MACHINE="alphaev5" ;;
-            "EV5.6 (21164A)")
-                UNAME_MACHINE="alphaev56" ;;
-            "EV5.6 (21164PC)")
-                UNAME_MACHINE="alphapca56" ;;
-            "EV5.7 (21164PC)")
-                UNAME_MACHINE="alphapca57" ;;
-            "EV6 (21264)")
-                UNAME_MACHINE="alphaev6" ;;
-            "EV6.7 (21264A)")
-                UNAME_MACHINE="alphaev67" ;;
-            "EV6.8CB (21264C)")
-                UNAME_MACHINE="alphaev68" ;;
-            "EV6.8AL (21264B)")
-                UNAME_MACHINE="alphaev68" ;;
-            "EV6.8CX (21264D)")
-                UNAME_MACHINE="alphaev68" ;;
-            "EV6.9A (21264/EV69A)")
-                UNAME_MACHINE="alphaev69" ;;
-            "EV7 (21364)")
-                UNAME_MACHINE="alphaev7" ;;
-            "EV7.9 (21364A)")
-                UNAME_MACHINE="alphaev79" ;;
-        esac
-        # A Pn.n version is a patched version.
+        fi
         # A Vn.n version is a released version.
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        cat <<EOF >$dummy.s
+        .data
+\$Lformat:
+        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+        .text
+        .globl main
+        .align 4
+        .ent main
+main:
+        .frame \$30,16,\$26,0
+        ldgp \$29,0(\$27)
+        .prologue 1
+        .long 0x47e03d80 # implver \$0
+        lda \$2,-1
+        .long 0x47e20c21 # amask \$2,\$1
+        lda \$16,\$Lformat
+        mov \$0,\$17
+        not \$1,\$18
+        jsr \$26,printf
+        ldgp \$29,0(\$26)
+        mov 0,\$16
+        jsr \$26,exit
+        .end main
+EOF
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                case `./$dummy` in
+                        0-0)
+                                UNAME_MACHINE="alpha"
+                                ;;
+                        1-0)
+                                UNAME_MACHINE="alphaev5"
+                                ;;
+                        1-1)
+                                UNAME_MACHINE="alphaev56"
+                                ;;
+                        1-101)
+                                UNAME_MACHINE="alphapca56"
+                                ;;
+                        2-303)
+                                UNAME_MACHINE="alphaev6"
+                                ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
+                esac
+        fi
+        rm -f $dummy.s $dummy
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -311 +243 @@
         echo m68k-unknown-sysv4
         exit 0;;
+    amiga:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-amigaos
         exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-        echo ${UNAME_MACHINE}-unknown-morphos
+    arc64:OpenBSD:*:*)
+        echo mips64el-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    arc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    hkmips:OpenBSD:*:*)
+        echo mips-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    pmax:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sgi:OpenBSD:*:*)
+        echo mips-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
     *:OS/390:*:*)
         echo i370-ibm-openedition
-        exit 0 ;;
-    *:z/VM:*:*)
-        echo s390-ibm-zvmoe
-        exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
         exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
@@ -343 +287 @@
         echo pyramid-pyramid-svr4
         exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-        echo sparc-icl-nx6
-        exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-        case `/usr/bin/uname -p` in
-            sparc) echo sparc-icl-nx7 && exit 0 ;;
-        esac ;;
     sun4H:SunOS:5.*:*)
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -378 +315 @@
         exit 0 ;;
     sun*:*:4.2BSD:*)
-        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+        UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
         case "`/bin/arch`" in
@@ -391 +328 @@
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
+        exit 0 ;;
+    atari*:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
@@ -418 +358 @@
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    m68k:machten:*:*)
-        echo m68k-apple-machten${UNAME_RELEASE}
+    sun3*:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mac68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
     powerpc:machten:*:*)
@@ -437 +386 @@
         exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
@@ -459 +407 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c \
-          && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-          && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy \
+          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo mips-mips-riscos${UNAME_RELEASE}
         exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
         echo powerpc-motorola-powermax
-        exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-        echo powerpc-harris-powermax
-        exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-        echo powerpc-harris-powermax
         exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -533 +476 @@
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                eval $set_cc_for_build
                 sed 's/^                //' << EOF >$dummy.c
                 #include <sys/systemcfg.h>
@@ -545 +487 @@
                         }
 EOF
-                $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+                rm -f $dummy.c $dummy
                 echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -554 +497 @@
         exit 0 ;;
     *:AIX:*:[45])
-        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                 IBM_ARCH=rs6000
@@ -594 +537 @@
             9000/[34]?? )         HP_ARCH=m68k ;;
             9000/[678][0-9][0-9])
-                if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
@@ -604 +549 @@
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
-                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                fi
-                if [ "${HP_ARCH}" = "" ]; then
-                    eval $set_cc_for_build
-                    sed 's/^              //' << EOF >$dummy.c
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
+              sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -643 +587 @@
               }
 EOF
-                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-                    test -z "$HP_ARCH" && HP_ARCH=hppa
-                fi ;;
+        (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+        rm -f $dummy.c $dummy
+        fi ;;
         esac
-        if [ ${HP_ARCH} = "hppa2.0w" ]
-        then
-            # avoid double evaluation of $set_cc_for_build
-            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-            then
-                HP_ARCH="hppa2.0w"
-            else
-                HP_ARCH="hppa64"
-            fi
-        fi
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
         exit 0 ;;
@@ -665 +599 @@
         exit 0 ;;
     3050*:HI-UX:*:*)
-        eval $set_cc_for_build
         sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
@@ -691 +624 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         echo unknown-hitachi-hiuxwe2
         exit 0 ;;
@@ -700 +634 @@
         echo hppa1.0-hp-bsd
         exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:*)
         echo hppa1.0-hp-mpeix
         exit 0 ;;
@@ -719 +653 @@
         echo hppa1.1-hp-lites
         exit 0 ;;
+    hppa*:OpenBSD:*:*)
+        echo hppa-unknown-openbsd
+        exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
@@ -737 +674 @@
         echo c4-convex-bsd
         exit 0 ;;
+    CRAY*X-MP:*:*:*)
+        echo xmp-cray-unicos
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo ymp-cray-unicos${UNAME_RELEASE}
         exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
         | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-              -e 's/\.[^.]*$/.X/'
+              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
         exit 0 ;;
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
+    CRAY*T3D:*:*:*)
+        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
     CRAY*T3E:*:*:*)
         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -755 +697 @@
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
-    *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
+    CRAY-2:*:*:*)
+        echo cray2-cray-unicos
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -764 +706 @@
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+    hp300:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -781 +721 @@
         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
+    *:OpenBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+        exit 0 ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
@@ -790 +733 @@
         echo ${UNAME_MACHINE}-pc-pw32
         exit 0 ;;
-    x86:Interix*:[34]*)
-        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-        exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-        echo i${UNAME_MACHINE}-pc-mks
+    i*:P4W*:*)
+        echo ${UNAME_MACHINE}-pc-p4w
+        exit 0 ;;
+    i*:MSYS*:*)
+        echo ${UNAME_MACHINE}-pc-msys
         exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
@@ -800 +743 @@
         # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
         # UNAME_MACHINE based on the output of uname instead of i386?
-        echo i586-pc-interix
+        echo i386-pc-interix
         exit 0 ;;
     i*:UWIN*:*)
         echo ${UNAME_MACHINE}-pc-uwin
         exit 0 ;;
-    amd64:CYGWIN*:*:*)
-        echo x86_64-unknown-cygwin
-        exit 0 ;;
     p*:CYGWIN*:*)
         echo powerpcle-unknown-cygwin
@@ -815 +755 @@
         exit 0 ;;
     *:GNU:*:*)
-        # the GNU system
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit 0 ;;
-    *:GNU/*:*:*)
-        # other systems with GNU libc and userland
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
         exit 0 ;;
     i*86:Minix:*:*)
@@ -828 +763 @@
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
-    cris:Linux:*:*)
-        echo cris-axis-linux-gnu
-        exit 0 ;;
-    crisv32:Linux:*:*)
-        echo crisv32-axis-linux-gnu
-        exit 0 ;;
-    frv:Linux:*:*)
-        echo frv-unknown-linux-gnu
-        exit 0 ;;
     ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
-    m32r*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux
         exit 0 ;;
     m68*:Linux:*:*)
@@ -847 +770 @@
         exit 0 ;;
     mips:Linux:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #undef CPU
-        #undef mips
-        #undef mipsel
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mipsel
-        #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips
-        #else
-        CPU=
-        #endif
-        #endif
+        cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-        ;;
-    mips64:Linux:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #undef CPU
-        #undef mips64
-        #undef mips64el
-        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=mips64el
-        #else
-        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=mips64
-        #else
-        CPU=
-        #endif
-        #endif
-EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
-        exit 0 ;;
-    ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
+        # Determine Lib Version
+        cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unknown\n");
+#endif
+  return 0;
+}
+EOF
+        LIBC=""
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                ./$dummy | grep 1\.99 > /dev/null
+                if test "$?" = 0 ; then LIBC="libc1" ; fi
+        fi
+        rm -f $dummy.c $dummy
+        echo powerpc-unknown-linux-gnu${LIBC}
         exit 0 ;;
     alpha:Linux:*:*)
-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-          EV5)   UNAME_MACHINE=alphaev5 ;;
-          EV56)  UNAME_MACHINE=alphaev56 ;;
-          PCA56) UNAME_MACHINE=alphapca56 ;;
-          PCA57) UNAME_MACHINE=alphapca56 ;;
-          EV6)   UNAME_MACHINE=alphaev6 ;;
-          EV67)  UNAME_MACHINE=alphaev67 ;;
-          EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+        cat <<EOF >$dummy.s
+          .data
+          \$Lformat:
+                .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+           .text
+                .globl main
+                .align 4
+                .ent main
+            main:
+                .frame \$30,16,\$26,0
+                ldgp \$29,0(\$27)
+                .prologue 1
+                .long 0x47e03d80 # implver \$0
+                lda \$2,-1
+                .long 0x47e20c21 # amask \$2,\$1
+                lda \$16,\$Lformat
+                mov \$0,\$17
+                not \$1,\$18
+                jsr \$26,printf
+                ldgp \$29,0(\$26)
+                mov 0,\$16
+                jsr \$26,exit
+                .end main
+EOF
+        LIBC=""
+        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+        if test "$?" = 0 ; then
+                case `./$dummy` in
+                0-0)    UNAME_MACHINE="alpha" ;;
+                1-0)    UNAME_MACHINE="alphaev5" ;;
+                1-1)    UNAME_MACHINE="alphaev56" ;;
+                1-101)  UNAME_MACHINE="alphapca56" ;;
+                2-303)  UNAME_MACHINE="alphaev6" ;;
+                2-307)  UNAME_MACHINE="alphaev67" ;;
+                esac
+                objdump --private-headers $dummy | \
+                  grep ld.so.1 > /dev/null
+                if test "$?" = 0 ; then
+                        LIBC="libc1"
+                fi
+        fi
+        rm -f $dummy.s $dummy
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
         exit 0 ;;
@@ -918 +877 @@
         echo ${UNAME_MACHINE}-ibm-linux
         exit 0 ;;
-    sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
     sh*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -934 +890 @@
         # first see if it will tell us. cd to the root directory to prevent
         # problems with other programs or directories called `ld' in the path.
-        # Set LC_ALL=C to ensure ld outputs messages in English.
-        ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+        ld_supported_targets=`cd /; ld --help 2>&1 \
                          | sed -ne '/supported targets:/!d
                                     s/[         ][      ]*/ /g
@@ -947 +902 @@
           a.out-i386-linux)
                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0 ;;
+                exit 0 ;;               
           coff-i386)
                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
@@ -958 +913 @@
         esac
         # Determine whether the default compiler is a.out or elf
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #include <features.h>
-        #ifdef __ELF__
-        # ifdef __GLIBC__
-        #  if __GLIBC__ >= 2
-        LIBC=gnu
-        #  else
-        LIBC=gnulibc1
-        #  endif
-        # else
-        LIBC=gnulibc1
-        # endif
-        #else
-        #ifdef __INTEL_COMPILER
-        LIBC=gnu
-        #else
-        LIBC=gnuaout
-        #endif
-        #endif
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
+        cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+        rm -f $dummy.c $dummy
         test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
         ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
     i*86:DYNIX/ptx:4*:*)
-        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-        # earlier versions are messed up and put the nodename in both
-        # sysname and nodename.
         echo i386-sequent-sysv4
         exit 0 ;;
@@ -1000 +954 @@
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
         exit 0 ;;
-    i*86:OS/2:*:*)
-        # If we were able to find `uname', then EMX Unix compatibility
-        # is probably installed.
-        echo ${UNAME_MACHINE}-pc-os2-emx
-        exit 0 ;;
-    i*86:XTS-300:*:STOP)
-        echo ${UNAME_MACHINE}-unknown-stop
-        exit 0 ;;
-    i*86:atheos:*:*)
-        echo ${UNAME_MACHINE}-unknown-atheos
-        exit 0 ;;
-        i*86:syllable:*:*)
-        echo ${UNAME_MACHINE}-pc-syllable
-        exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-        echo i386-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
-    i*86:*DOS:*:*)
-        echo ${UNAME_MACHINE}-pc-msdosdjgpp
-        exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
@@ -1029 +963 @@
         exit 0 ;;
     i*86:*:5:[78]*)
-        case `/bin/uname -X | grep "^Machine"` in
+        case `/bin/uname -X | grep ^Machine` in
             *486*)           UNAME_MACHINE=i486 ;;
-            *Pentium)        UNAME_MACHINE=i586 ;;
+            *Pentium*)       UNAME_MACHINE=i586 ;;
             *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
         esac
@@ -1041 +975 @@
                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
         elif /bin/uname -X 2>/dev/null >/dev/null ; then
-                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+                UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+                (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+                (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
                         && UNAME_MACHINE=i586
-                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+                (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
                         && UNAME_MACHINE=i686
-                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
                         && UNAME_MACHINE=i686
                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
@@ -1053 +987 @@
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
+        exit 0 ;;
+    i*86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
         exit 0 ;;
     pc:*:*:*)
@@ -1077 +1014 @@
         echo m68010-convergent-sysv
         exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-        echo m68k-convergent-sysv
-        exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-        echo m68k-diab-dnix
-        exit 0 ;;
-    M68*:*:R3V[5678]*:*)
+    M68*:*:R3V[567]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    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)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
@@ -1102 +1033 @@
         echo m68k-atari-sysv4
         exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+        echo i386-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
@@ -1128 +1062 @@
         fi
         exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
@@ -1140 +1074 @@
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
-        exit 0 ;;
-    *:VOS:*:*)
-        # From Paul.Green@stratus.com.
-        echo hppa1.1-stratus-vos
         exit 0 ;;
     mc68*:A/UX:*:*)
@@ -1173 +1103 @@
         echo sx5-nec-superux${UNAME_RELEASE}
         exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-        echo sx6-nec-superux${UNAME_RELEASE}
-        exit 0 ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
@@ -1183 +1110 @@
         exit 0 ;;
     *:Darwin:*:*)
-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        case $UNAME_PROCESSOR in
-            *86) UNAME_PROCESSOR=i686 ;;
-            unknown) UNAME_PROCESSOR=powerpc ;;
-        esac
-        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+        echo `uname -p`-apple-darwin${UNAME_RELEASE}
         exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-        UNAME_PROCESSOR=`uname -p`
-        if test "$UNAME_PROCESSOR" = "x86"; then
-                UNAME_PROCESSOR=i386
+        if test "${UNAME_MACHINE}" = "x86pc"; then
                 UNAME_MACHINE=pc
         fi
-        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        echo `uname -p`-${UNAME_MACHINE}-nto-qnx
         exit 0 ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit 0 ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk${UNAME_RELEASE}
-        exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
         exit 0 ;;
@@ -1227 +1144 @@
         echo ${UNAME_MACHINE}-unknown-plan9
         exit 0 ;;
+    i*86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit 0 ;;
     *:TOPS-10:*:*)
         echo pdp10-unknown-tops10
@@ -1245 +1167 @@
         echo pdp10-unknown-its
         exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-        exit 0 ;;
-    *:DragonFly:*:*)
-        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit 0 ;;
-    *:*VMS:*:*)
-        UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "${UNAME_MACHINE}" in
-            A*) echo alpha-dec-vms && exit 0 ;;
-            I*) echo ia64-dec-vms && exit 0 ;;
-            V*) echo vax-dec-vms && exit 0 ;;
-        esac ;;
-    *:XENIX:*:SysV)
-        echo i386-pc-xenix
-        exit 0 ;;
 esac
 
@@ -1266 +1172 @@
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1381 +1286 @@
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.

branches/shared_lib/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-02-10'
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-06-08'
 
 # This file is (in principle) common to ALL GNU software.
@@ -30 +30 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -71 +70 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
@@ -119 +118 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -146 +144 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis)
                 os=
                 basic_machine=$1
@@ -226 +224 @@
         # Recognize the basic CPU types without company name.
         # Some are omitted here because they have special meanings below.
-        1750a | 580 \
-        | a29k \
-        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-        | c4x | clipper \
-        | d10v | d30v | dlx | dsp16xx \
-        | fr30 | frv \
-        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-        | i370 | i860 | i960 | ia64 \
-        | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-        | mips | mipsbe | mipseb | mipsel | mipsle \
-        | mips16 \
-        | mips64 | mips64el \
-        | mips64vr | mips64vrel \
-        | mips64orion | mips64orionel \
-        | mips64vr4100 | mips64vr4100el \
-        | mips64vr4300 | mips64vr4300el \
-        | mips64vr5000 | mips64vr5000el \
-        | mipsisa32 | mipsisa32el \
-        | mipsisa32r2 | mipsisa32r2el \
-        | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
-        | mipsisa64sb1 | mipsisa64sb1el \
-        | mipsisa64sr71k | mipsisa64sr71kel \
-        | mipstx39 | mipstx39el \
-        | mn10200 | mn10300 \
-        | msp430 \
-        | ns16k | ns32k \
-        | openrisc | or32 \
-        | pdp10 | pdp11 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-        | pyramid \
-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-        | sh64 | sh64le \
-        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
-        | v850 | v850e \
-        | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-        | z8k)
+        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+                | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+                | pyramid | mn10200 | mn10300 | tron | a29k \
+                | 580 | i960 | h8300 \
+                | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+                | hppa64 \
+                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+                | alphaev6[78] \
+                | we32k | ns16k | clipper | i370 | sh | sh[34] \
+                | powerpc | powerpcle \
+                | 1750a | dsp16xx | pdp10 | pdp11 \
+                | mips16 | mips64 | mipsel | mips64el \
+                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+                | v850 | c4x \
+                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+                | pj | pjl | h8500 | z8k)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -292 +266 @@
                 ;;
         # Recognize the basic CPU types with company name.
-        580-* \
-        | a29k-* \
-        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
-        | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | craynv-* | cydra-* \
-        | d10v-* | d30v-* | dlx-* \
-        | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-        | h8300-* | h8500-* \
-        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-        | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | m32r-* | m32rle-* \
-        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* \
-        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-        | mips16-* \
-        | mips64-* | mips64el-* \
-        | mips64vr-* | mips64vrel-* \
-        | mips64orion-* | mips64orionel-* \
-        | mips64vr4100-* | mips64vr4100el-* \
-        | mips64vr4300-* | mips64vr4300el-* \
-        | mips64vr5000-* | mips64vr5000el-* \
-        | mipsisa32-* | mipsisa32el-* \
-        | mipsisa32r2-* | mipsisa32r2el-* \
-        | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
-        | mipsisa64sb1-* | mipsisa64sb1el-* \
-        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-        | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | msp430-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
-        | orion-* \
-        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-        | pyramid-* \
-        | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-        | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tron-* \
-        | v850-* | v850e-* | vax-* \
-        | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa-* \
-        | ymp-* \
-        | z8k-*)
+        # FIXME: clean up the formatting here.
+        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+              | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+              | xmp-* | ymp-* \
+              | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+              | hppa2.0n-* | hppa64-* \
+              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+              | alphaev6[78]-* \
+              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+              | clipper-* | orion-* \
+              | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
+              | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+              | mips16-* | mips64-* | mipsel-* \
+              | mips64el-* | mips64orion-* | mips64orionel-* \
+              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+              | mipstx39-* | mipstx39el-* | mcore-* \
+              | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+              | [cjt]90-* \
+              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
                 ;;
         # Recognize the various machine names and aliases which stand
@@ -365 +308 @@
                 os=-udi
                 ;;
-        abacus)
-                basic_machine=abacus-unknown
-                ;;
         adobe68k)
                 basic_machine=m68010-adobe
@@ -382 +322 @@
                 os=-bsd
                 ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
-        amd64-*)
-                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -419 +353 @@
                 os=-dynix
                 ;;
-        c90)
-                basic_machine=c90-cray
-                os=-unicos
-                ;;
         convex-c1)
                 basic_machine=c1-convex
@@ -443 +373 @@
                 os=-bsd
                 ;;
-        cray | j90)
-                basic_machine=j90-cray
+        cray | ymp)
+                basic_machine=ymp-cray
                 os=-unicos
                 ;;
-        craynv)
-                basic_machine=craynv-cray
-                os=-unicosmp
-                ;;
-        cr16c)
-                basic_machine=cr16c-unknown
-                os=-elf
+        cray2)
+                basic_machine=cray2-cray
+                os=-unicos
+                ;;
+        [cjt]90)
+                basic_machine=${basic_machine}-cray
+                os=-unicos
                 ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
                 ;;
-        crx)
-                basic_machine=crx-unknown
-                os=-elf
+        cygwin*)
+                basic_machine=i586-pc
+                os=-cygwin
                 ;;
         da30 | da30-*)
@@ -473 +400 @@
         decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                 basic_machine=mips-dec
-                ;;
-        decsystem10* | dec10*)
-                basic_machine=pdp10-dec
-                os=-tops10
-                ;;
-        decsystem20* | dec20*)
-                basic_machine=pdp10-dec
-                os=-tops20
                 ;;
         delta | 3300 | motorola-3300 | motorola-delta \
@@ -489 +408 @@
                 basic_machine=m88k-motorola
                 os=-sysv3
-                ;;
-        djgpp)
-                basic_machine=i586-pc
-                os=-msdosdjgpp
                 ;;
         dpx20 | dpx20-*)
@@ -655 +570 @@
                 os=-sysv
                 ;;
-        mingw32)
-                basic_machine=i386-pc
-                os=-mingw32
+        mingw*)
+                basic_machine=i586-pc
+                os=-mingw
                 ;;
         miniframe)
@@ -666 +581 @@
                 os=-mint
                 ;;
+        mipsel*-linux*)
+                basic_machine=mipsel-unknown
+                os=-linux-gnu
+                ;;
+        mips*-linux*)
+                basic_machine=mips-unknown
+                os=-linux-gnu
+                ;;
         mips3*-*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -671 +594 @@
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
                 ;;
         monitor)
@@ -676 +603 @@
                 os=-coff
                 ;;
-        morphos)
-                basic_machine=powerpc-unknown
-                os=-morphos
-                ;;
         msdos)
                 basic_machine=i386-pc
                 os=-msdos
+                ;;
+        msys)
+                basic_machine=i386-pc
+                os=-msys
                 ;;
         mvs)
@@ -759 +686 @@
                 os=-proelf
                 ;;
-        or32 | or32-*)
-                basic_machine=or32-unknown
-                os=-coff
-                ;;
-        os400)
-                basic_machine=powerpc-ibm
-                os=-os400
-                ;;
         OSE68000 | ose68000)
                 basic_machine=m68000-ericsson
@@ -775 +694 @@
                 os=-os68k
                 ;;
+        p4w)
+                basic_machine=i586-pc
+                os=-p4w
+                ;;
         pa-hitachi)
                 basic_machine=hppa1.1-hitachi
@@ -789 +712 @@
                 basic_machine=m68k-tti
                 ;;
-        pc532 | pc532-*)
+        pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5 | k5 | k6 | nexgen | viac3)
+        pentium | p5 | k5 | k6 | nexgen)
                 basic_machine=i586-pc
                 ;;
-        pentiumpro | p6 | 6x86 | athlon | athlon_*)
+        pentiumpro | p6 | 6x86 | athlon)
                 basic_machine=i686-pc
                 ;;
-        pentiumii | pentium2 | pentiumiii | pentium3)
+        pentiumii | pentium2)
                 basic_machine=i686-pc
                 ;;
-        pentium4)
-                basic_machine=i786-pc
-                ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
@@ -810 +730 @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+        pentiumii-* | pentium2-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentium4-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -822 +739 @@
                 ;;
         ppc)    basic_machine=powerpc-unknown
-                ;;
+                ;;
         ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-                ;;
+                ;;
         ppcle-* | powerpclittle-*)
                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64)  basic_machine=powerpc64-unknown
-                ;;
-        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-                basic_machine=powerpc64le-unknown
-                ;;
-        ppc64le-* | powerpc64little-*)
-                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ps2)
@@ -858 +765 @@
                 basic_machine=romp-ibm
                 ;;
-        s390 | s390-*)
-                basic_machine=s390-ibm
-                ;;
-        s390x | s390x-*)
-                basic_machine=s390x-ibm
-                ;;
         sa29200)
                 basic_machine=a29k-amd
                 os=-udi
                 ;;
-        sb1)
-                basic_machine=mipsisa64sb1-unknown
-                ;;
-        sb1el)
-                basic_machine=mipsisa64sb1el-unknown
-                ;;
-        sei)
-                basic_machine=mips-sei
-                os=-seiux
-                ;;
         sequent)
                 basic_machine=i386-sequent
@@ -885 +776 @@
                 os=-hms
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparclite-wrs | simso-wrs)
+        sparclite-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
@@ -955 +843 @@
                 ;;
         t3e)
-                basic_machine=alphaev5-cray
-                os=-unicos
-                ;;
-        t90)
-                basic_machine=t90-cray
+                basic_machine=t3e-cray
                 os=-unicos
                 ;;
@@ -966 +850 @@
                 os=-coff
                 ;;
-        tic55x | c55x*)
-                basic_machine=tic55x-unknown
-                os=-coff
-                ;;
-        tic6x | c6x*)
-                basic_machine=tic6x-unknown
-                os=-coff
-                ;;
         tx39)
                 basic_machine=mipstx39-unknown
@@ -980 +856 @@
                 basic_machine=mipstx39el-unknown
                 ;;
-        toad1)
-                basic_machine=pdp10-xkl
-                os=-tops20
-                ;;
         tower | tower-32)
                 basic_machine=m68k-ncr
-                ;;
-        tpf)
-                basic_machine=s390x-ibm
-                os=-tpf
                 ;;
         udi29k)
@@ -1012 +880 @@
                 ;;
         vpp*|vx|vx-*)
-                basic_machine=f301-fujitsu
-                ;;
+               basic_machine=f301-fujitsu
+               ;;
         vxworks960)
                 basic_machine=i960-wrs
@@ -1034 +902 @@
                 os=-proelf
                 ;;
-        xbox)
-                basic_machine=i686-pc
-                os=-mingw32
-                ;;
-        xps | xps100)
+        windows32)
+                basic_machine=i386-pc
+                os=-windows32-msvcrt
+                ;;
+        xmp)
+                basic_machine=xmp-cray
+                os=-unicos
+                ;;
+        xps | xps100)
                 basic_machine=xps100-honeywell
-                ;;
-        ymp)
-                basic_machine=ymp-cray
-                os=-unicos
                 ;;
         z8k-*-coff)
@@ -1065 +933 @@
                 basic_machine=hppa1.1-oki
                 ;;
+        mips)
+                if [ x$os = x-linux-gnu ]; then
+                        basic_machine=mips-unknown
+                else
+                        basic_machine=mips-mips
+                fi
+                ;;
         romp)
                 basic_machine=romp-ibm
-                ;;
-        mmix)
-                basic_machine=mmix-knuth
                 ;;
         rs6000)
@@ -1087 +959 @@
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh3 | sh4)
                 basic_machine=sh-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
-        cydra)
+        cydra)
                 basic_machine=cydra-cydrome
                 ;;
@@ -1110 +979 @@
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
+                ;;
+        c4x*)
+                basic_machine=c4x-none
+                os=-coff
                 ;;
         *-unknown)
@@ -1166 +1039 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* \
-              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -cygwin* | -msys* | -p4w* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1191 +1060 @@
                 esac
                 ;;
-        -nto-qnx*)
-                ;;
         -nto*)
-                os=`echo $os | sed -e 's|nto|nto-qnx|'`
+                os=-nto-qnx
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -1203 +1070 @@
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        -linux-dietlibc)
-                os=-linux-dietlibc
-                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
@@ -1218 +1082 @@
                 os=-openedition
                 ;;
-        -os400*)
-                os=-os400
-                ;;
         -wince*)
                 os=-wince
@@ -1239 +1100 @@
                 os=-aos
                 ;;
-        -atheos*)
-                os=-atheos
-                ;;
-        -syllable*)
-                os=-syllable
-                ;;
         -386bsd)
                 os=-bsd
@@ -1251 +1106 @@
                 os=-sysv
                 ;;
-        -nova*)
-                os=-rtmk-nova
-                ;;
         -ns2 )
-                os=-nextstep2
+                os=-nextstep2
                 ;;
         -nsk*)
@@ -1267 +1119 @@
                 os=-sysv4
                 ;;
-        -tpf*)
-                os=-tpf
-                ;;
         -triton*)
                 os=-sysv3
@@ -1297 +1146 @@
                 os=-xenix
                 ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                os=-mint
-                ;;
-        -aros*)
-                os=-aros
-                ;;
-        -kaos*)
-                os=-kaos
-                ;;
-        -zvmoe)
-                os=-zvmoe
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
                 ;;
         -none)
@@ -1340 +1180 @@
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-        # This must come before the *-dec entry.
         pdp10-*)
                 os=-tops20
                 ;;
-        pdp11-*)
+        pdp11-*)
                 os=-none
                 ;;
@@ -1374 +1210 @@
                 os=-elf
                 ;;
-        or32-*)
-                os=-coff
-                ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
                 os=-sysv3
@@ -1389 +1222 @@
                 os=-aix
                 ;;
-        *-knuth)
-                os=-mmixware
-                ;;
         *-wec)
                 os=-proelf
@@ -1443 +1273 @@
                 os=-nextstep3
                 ;;
-        *-gould)
+        *-gould)
                 os=-sysv
                 ;;
-        *-highlevel)
+        *-highlevel)
                 os=-bsd
                 ;;
@@ -1452 +1282 @@
                 os=-bsd
                 ;;
-        *-sgi)
+        *-sgi)
                 os=-irix
                 ;;
-        *-siemens)
+        *-siemens)
                 os=-sysv4
                 ;;
@@ -1524 +1354 @@
                                 vendor=ibm
                                 ;;
-                        -os400*)
-                                vendor=ibm
-                                ;;
                         -ptx*)
                                 vendor=sequent
                                 ;;
-                        -tpf*)
-                                vendor=ibm
-                                ;;
-                        -vxsim* | -vxworks* | -windiss*)
+                        -vxsim* | -vxworks*)
                                 vendor=wrs
                                 ;;
@@ -1547 +1371 @@
                         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                 vendor=atari
-                                ;;
-                        -vos*)
-                                vendor=stratus
                                 ;;
                 esac

branches/shared_lib/configure.ac

@@ -42 +42 @@
 #########################
 AC_PROG_CXX
-AC_LIBLTDL_INSTALLABLE
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
@@ -645 +644 @@
                  src/lib/parser/tinyxml/Makefile
                  src/lib/parser/ini_parser/Makefile
+                 src/lib/libltdl/Makefile
                  src/util/Makefile
                  src/world_entities/Makefile

branches/shared_lib/src/lib/BuildLibs.am

@@ -15 +15 @@
                 $(LIB_PREFIX)/parser/tinyxml/libtinyxml.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
+                $(LIB_PREFIX)/libltdl/libltdl.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a

branches/shared_lib/src/lib/Makefile.am

@@ -48 +48 @@
         shell \
         gui \
+        libltdl \
         .

branches/shared_lib/src/orxonox.cc

@@ -54 +54 @@
 
 #include "load_param_description.h"
+#include "dynamic_loader.h"
 
 #include "network_manager.h"
@@ -290 +291 @@
 }
 
-#include "dynamic_loader.h"
-#include <dlfcn.h>
-
 /**
  * initializes and loads resource files

branches/shared_lib/src/util/Makefile.am

@@ -3 +3 @@
 
 noinst_LIBRARIES = libORXutils.a
+
+INCLUDES = $(LTDLINCL)
 
 

branches/shared_lib/src/util/loading/dynamic_loader.h

@@ -8 +8 @@
 
 #include "factory.h"
-#include <ltdl.h>
+#include "lib/libltdl/ltdl.h"
 
 #include <string>

branches/shared_lib/src/util/loading/resource_manager.cc

@@ -1049 +1049 @@
   {
     char cwd[1024];
-    char* errno = getcwd(cwd, 1024);
-    if (errno == 0)
+    char* errorCode = getcwd(cwd, 1024);
+    if (errorCode == 0)
       return NULL;