From: klueska <klueska>
Date: Fri, 27 Jun 2008 02:47:02 +0000 (+0000)
Subject: Added forced check for amd64 directory when performing a tos-locate-jre
X-Git-Tag: release_tinyos_2_1_0_0~149
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=a22df57bb78caa4ce2d95d4fc04cccb892b40c2f

Added forced check for amd64 directory when performing a tos-locate-jre
---

diff --git a/tools/configure.ac b/tools/configure.ac
index acc2e7b2..62eab0a8 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -88,7 +88,7 @@ case $host in
   *)
     JNIPREFIX=lib
     JNISUFFIX=so
-    JNIVERSIONS="-32. -64."
+    JNIVERSIONS="-64."
     INSTALLJNI="install"
     AC_MSG_RESULT(no)
 esac
diff --git a/tools/tinyos/misc/tos-locate-jre b/tools/tinyos/misc/tos-locate-jre
index 9bfbe047..4f93dd79 100755
--- a/tools/tinyos/misc/tos-locate-jre
+++ b/tools/tinyos/misc/tos-locate-jre
@@ -121,8 +121,10 @@ if [ "$jni" = "yes" ]; then
 	arch=`uname -m`
 	jnilocate "$jhome/jre/lib/$arch" || \
 	    jnilocate "$jhome/jre/lib/i386" || \
+	    jnilocate "$jhome/jre/lib/amd64" || \
 	    jnilocate "$jhome/lib/$arch" || \
-	    jnilocate "$jhome/lib/i386"
+	    jnilocate "$jhome/lib/i386" || \
+	    jnilocate "$jhome/lib/amd64"
     fi
 elif [ "$javac" = "yes" ]; then
  if [ `uname` = "Darwin" ]; then