svn commit: r818018 - /commons/sandbox/runtime/trunk/configure

[mt...@apache.org]

Author: mturk
Date: Wed Sep 23 09:37:10 2009
New Revision: 818018

URL: http://svn.apache.org/viewvc?rev=818018&view=rev
Log:
Favor provided host and cpu params over detected

Modified:
    commons/sandbox/runtime/trunk/configure

Modified: commons/sandbox/runtime/trunk/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/configure?rev=818018&r1=818017&r2=818018&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/configure (original)
+++ commons/sandbox/runtime/trunk/configure Wed Sep 23 09:37:10 2009
@@ -42,6 +42,16 @@
 host=""
 mach=""
 
+toupper()
+{
+    echo "$1" | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+}
+
+tolower()
+{
+    echo "$1" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
+}
+
 for o
 do
     case "$o" in
@@ -105,7 +115,7 @@
             shift
         ;;
         --with-cpu=* )
-            host=`tolower "$a"`
+            mach=`tolower "$a"`
             shift
         ;;
         * )
@@ -135,16 +145,6 @@
     esac
 done
 
-toupper()
-{
-    echo "$1" | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-}
-
-tolower()
-{
-    echo "$1" | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
-}
-
 major_sed='/#define.*ACR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 minor_sed='/#define.*ACR_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 patch_sed='/#define.*ACR_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
@@ -161,8 +161,12 @@
     devsfx="-dev"
 fi
 
-mach=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'` || mach="unknown"
-host=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'` || host="unknown"
+if [ ".$mach" = . ]; then
+    mach=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'` || mach="unknown"
+fi
+if [ ".$host" = . ]; then
+    host=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'` || host="unknown"
+fi
 
 soext="so"
 case "$host" in