X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tools%2Fconfigure.ac;h=197c8990fe7e1dfda5d67a4c76f61e288ece15cb;hb=28e84f45fe784048c4832cab959394e4e8cc2c9e;hp=debc3de254939f5e19b5e649c12c7095cef8ac67;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git

diff --git a/tools/configure.ac b/tools/configure.ac
index debc3de2..197c8990 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -73,17 +73,27 @@ case $host in
     AC_MSG_RESULT(yes)
     JNIPREFIX=
     JNISUFFIX=dll
+    JNIVERSIONS=.
     INSTALLJNI="install --group=SYSTEM"
     CYGWIN=yes
     ;;
+  *-apple-darwin*)
+    JNIPREFIX=lib
+    JNISUFFIX=jnilib
+    INSTALLJNI="install"
+    AC_MSG_RESULT(no)
+    DARWIN=yes
+    ;;
   *)
     JNIPREFIX=lib
     JNISUFFIX=so
+    JNIVERSIONS="-32. -64."
     INSTALLJNI="install"
     AC_MSG_RESULT(no)
 esac
 
 AM_CONDITIONAL([CYGWIN], [test "$CYGWIN"])
+AM_CONDITIONAL([DARWIN], [test "$DARWIN"])
 
 AC_MSG_CHECKING(for JDK location)
 JAVAC_DIR=`/bin/sh tinyos/misc/tos-locate-jre --javac`
@@ -93,8 +103,14 @@ fi
 JDK=`dirname "$JAVAC_DIR"`
 AC_MSG_RESULT($JDK)
 
-GETENVLIB=${JNIPREFIX}getenv.$JNISUFFIX
-TOSCOMMLIB=${JNIPREFIX}toscomm.$JNISUFFIX
+function jnimap {
+  for v in $JNIVERSIONS; do
+    echo -n "${JNIPREFIX}$1$v$JNISUFFIX "
+  done
+}
+
+GETENVLIB=`jnimap getenv`
+TOSCOMMLIB=`jnimap toscomm`
 
 AC_SUBST(GETENVLIB)
 AC_SUBST(TOSCOMMLIB)