Changeset 433 for pjproject/trunk/configure

Timestamp:

May 10, 2006 7:24:40 PM (19 years ago)

Author:

bennylp

Message:

Merge-in RTEMS port patch by Phil Torre <ptorre@…>, alpha release.

File:

• pjproject/trunk/configure (modified) (6 diffs)

pjproject/trunk/configure

@@ -2 +2 @@
 
 #
-# Detect machine
+# Detect machine, unless the choice has been made already.
 #
-MACHINE=`uname -p`
-if echo $MACHINE | grep unknown > /dev/null; then
-    MACHINE=`uname -m`
-fi;
+if [ "$MACHINE" = "" ]; then
+        MACHINE=`uname -m`
+fi      
 
-if echo $MACHINE | grep sparc > /dev/null; then
+if echo $MACHINE | grep sun4u > /dev/null; then
     MACHINE_NAME=sparc
 elif echo $MACHINE | grep i.86 > /dev/null; then
@@ -18 +17 @@
     MACHINE_NAME=powerpc
 else
-    echo "Unable to detect processor type ('uname -p' == '$MACHINE')"
+    echo "Unable to detect processor type ('uname -m' == '$MACHINE')"
     exit 1
 fi
 
 #
-# Detect OS and host
+# Detect OS and host, unless the choice has been made already
 #
-SYSTEM=`uname -s`
+if [ "$SYSTEM" = "" ]; then
+    SYSTEM=`uname -s`
+fi      
+ 
 
 if echo $SYSTEM | grep -i sunos > /dev/null; then
@@ -54 +56 @@
     OS_NAME=darwinos
     HOST_NAME=unix
+elif echo $SYSTEM | grep -i rtems > /dev/null; then
+    OS_NAME=rtems
+    HOST_NAME=unix
 else
     echo "Unable to detect system type ('uname -s' == '$SYSTEM')"
@@ -60 +65 @@
 
 #
-# Detect gcc
+# Detect gcc, unless it has been chosen already
 #
-if gcc --version 2>&1 > /dev/null; then
-    CC_NAME=gcc
-else
-    echo "Unable to find gcc"
-    exit 1
-fi
+if [ "$CC_NAME" = "" ]; then
+        if gcc --version 2>&1 > /dev/null; then
+                CC_NAME=gcc
+        else
+                echo "Unable to find gcc"
+                exit 1
+        fi
+fi      
+ 
 
 #
-# TARGET
+# Specify TARGET_NAME, if not already choosen.
 #
-TARGET_NAME=$MACHINE_NAME-$OS_NAME-$CC_NAME
+if [ "$TARGET_NAME" = "" ]; then
+   TARGET_NAME=$MACHINE_NAME-$OS_NAME-$CC_NAME
+fi
 
 
@@ -86 +96 @@
 echo " CC_NAME      = $CC_NAME"
 echo " TARGET_NAME  = $TARGET_NAME"
+echo " CROSS_COMPILE= $CROSS_COMPILE"
 echo " LINUX_POLL   = $LINUX_POLL"
 
@@ -94 +105 @@
 echo "export CC_NAME := $CC_NAME" >> build.mak
 echo "export TARGET_NAME := $TARGET_NAME" >> build.mak
+echo "export CROSS_COMPILE := $CROSS_COMPILE" >> build.mak
 echo "export LINUX_POLL := $LINUX_POLL" >> build.mak