svn commit: r818037 - /commons/sandbox/runtime/trunk/src/main/native/configure

[mt...@apache.org]

Author: mturk
Date: Wed Sep 23 10:19:00 2009
New Revision: 818037

URL: http://svn.apache.org/viewvc?rev=818037&view=rev
Log:
Darwin reports i386 for uname -m, while in fact it can be x86_64

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=818037&r1=818036&r2=818037&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Wed Sep 23 10:19:00 2009
@@ -230,6 +230,8 @@
   --with-cxx=CC            Use C++ compiler instead default one
                               [g++]
 Optional features:
+  --enable-32-bit          Forces 32-bit code compilation
+                              [platform dependent]
   --enable-64-bit          Forces 64-bit code compilation
                               [platform dependent]
   --enable-maintainer-mode Compile code with debug options.
@@ -334,6 +336,8 @@
 test ".$has_32_bit" = .yes && bits=32
 
 case "$host" in
+    darwin  )
+    ;;
     hp-ux   )
         platform=HPUX
         host=hpux
@@ -365,6 +369,13 @@
     ;;
     i[3-7]86 )
         mach=i386
+        if [ $host = darwin ]; then
+            if [ ".$has_32_bit" = .no ]; then
+                test ".`java -version | grep '64-Bit'`" != . && has_64_bit=yes
+            fi
+            test ".$has_64_bit" = .yes && mach=x86_64
+            test ".$has_32_bit" = .yes && mach=i386
+        fi
     ;;
     i86pc    )
         mach=i386