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

diff --git a/tools/configure.ac b/tools/configure.ac
index acc2e7b2183b2ca4c9e11fe9e657877acdf41c38..62eab0a8189c1774e8071bd5777636ba56cdd1ad 100644 (file)
--- 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 9bfbe047e9abba39b4a5f5233c5bba2c4faa6f0b..4f93dd7945e3a886b459460fd9ab8d07f06bb694 100755 (executable)
--- 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