[Tinyos-2-commits] CVS: tinyos-2.x/tools configure.ac,1.2,1.3

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tools
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19157

Modified Files:
	configure.ac 
Log Message:
build both 32 and 64-bit versions of the JNI code so as to support both
32 and 64-bit JDKs
install the appropriate JNI version depending on whether the JDK is 32 or 64-bit

all this is for Linux only for now


Index: configure.ac
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac	12 Jul 2006 17:00:02 -0000	1.2
--- configure.ac	6 Jun 2007 22:40:17 -0000	1.3
***************
*** 74,77 ****
--- 74,78 ----
      JNIPREFIX=
      JNISUFFIX=dll
+     JNIVERSIONS=.
      INSTALLJNI="install --group=SYSTEM"
      CYGWIN=yes
***************
*** 80,83 ****
--- 81,85 ----
      JNIPREFIX=lib
      JNISUFFIX=so
+     JNIVERSIONS="-32. -64."
      INSTALLJNI="install"
      AC_MSG_RESULT(no)
***************
*** 94,99 ****
  AC_MSG_RESULT($JDK)
  
! GETENVLIB=${JNIPREFIX}getenv.$JNISUFFIX
! TOSCOMMLIB=${JNIPREFIX}toscomm.$JNISUFFIX
  
  AC_SUBST(GETENVLIB)
--- 96,107 ----
  AC_MSG_RESULT($JDK)
  
! function jnimap {
!   for v in $JNIVERSIONS; do
!     echo -n "${JNIPREFIX}$1$v$JNISUFFIX "
!   done
! }
! 
! GETENVLIB=`jnimap getenv`
! TOSCOMMLIB=`jnimap toscomm`
  
  AC_SUBST(GETENVLIB)