X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tools%2Fconfigure.ac;h=992d2a659825f28a76f0c2000b58d0fe5640be34;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=60ec10cb308d7e8867fc184bb93419f8fce53748;hpb=d27da1037ae320629869d76a75599e9713a076fb;p=tinyos-2.x.git

diff --git a/tools/configure.ac b/tools/configure.ac
index 60ec10cb..992d2a65 100644
--- 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
@@ -77,6 +77,14 @@ case $host in
     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
@@ -86,6 +94,7 @@ case $host in
 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`
@@ -97,7 +106,7 @@ AC_MSG_RESULT($JDK)
 
 function jnimap {
   for v in $JNIVERSIONS; do
-    echo -n "${JNIPREFIX}$1$v$JNISUFFIX "
+    /bin/echo -n "${JNIPREFIX}$1$v$JNISUFFIX "
   done
 }
 
@@ -130,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
@@ -140,4 +151,6 @@ AC_OUTPUT(
 	tinyos/ncc/ncg
 	tinyos/ncc/nesdoc
 	tinyos/ncc/nesdoc-py/Makefile
+	tinyos/tosthreads/Makefile
+	tinyos/safe/Makefile
 )