Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tools / configure.ac

diff --git a/tools/configure.ac b/tools/configure.ac
index debc3de254939f5e19b5e649c12c7095cef8ac67..992d2a659825f28a76f0c2000b58d0fe5640be34 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -12,7 +12,7 @@ dnl -*- m4 -*-
 # force autoconf 2.5 on Debian systems
 AC_PREREQ(2.50)
 
-AC_INIT(tinyos-tools, 1.2.1)
+AC_INIT(tinyos-tools, 1.2.4)
 AC_CONFIG_AUX_DIR(config-aux)
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
@@ -73,17 +73,28 @@ case $host in
     AC_MSG_RESULT(yes)
     JNIPREFIX=
     JNISUFFIX=dll
+    JNIVERSIONS=.
     INSTALLJNI="install --group=SYSTEM"
     CYGWIN=yes
     ;;
+  *-apple-darwin*)
+    JNIPREFIX=lib
+    JNISUFFIX=jnilib
+    JNIVERSIONS=.
+    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 +104,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
+    /bin/echo -n "${JNIPREFIX}$1$v$JNISUFFIX "
+  done
+}
+
+GETENVLIB=`jnimap getenv`
+TOSCOMMLIB=`jnimap toscomm`
 
 AC_SUBST(GETENVLIB)
 AC_SUBST(TOSCOMMLIB)
@@ -122,9 +139,11 @@ AC_OUTPUT(
        tinyos/misc/tos-ident-flags
        tinyos/misc/tos-install-jni
        tinyos/misc/tos-set-symbols
+       tinyos/misc/tos-write-buildinfo
        tinyos/misc/tos-write-image
        tinyos/misc/tos-storage-at45db
        tinyos/misc/tos-storage-stm25p
+       tinyos/misc/tos-storage-pxa27xp30
        tinyos/misc/Makefile
        tinyos/ncc/Makefile
        tinyos/ncc/mig
@@ -132,4 +151,6 @@ AC_OUTPUT(
        tinyos/ncc/ncg
        tinyos/ncc/nesdoc
        tinyos/ncc/nesdoc-py/Makefile
+       tinyos/tosthreads/Makefile
+       tinyos/safe/Makefile
 )