Permalink
Browse files

fixes for the new jdk

  • Loading branch information...
jarvi
jarvi committed Oct 22, 2006
1 parent eadc663 commit e1dd1adcca79b8245f32350dbbd26d4d308aa886
Showing with 10 additions and 10 deletions.
  1. +5 −5 configure
  2. +5 −5 configure.in
View
@@ -7832,7 +7832,7 @@ fi
# Define the identity of the package.
PACKAGE=Serial
- VERSION=2.0.7pre2
+ VERSION=2.0.7
cat >>confdefs.h <<_ACEOF
@@ -10084,7 +10084,7 @@ Linux)
CFLAGS=$CFLAGS" -D__need_timespec"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name comm.jar |head -n1`
JHOME=$JPATH"/jre/lib/ext"
@@ -10154,7 +10154,7 @@ Linux)
TARGETLIB="\$(target_triplet)/librxtxSerial.la \
\$(target_triplet)/librxtxParallel.la"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name comm.jar |head -n1`
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
@@ -10290,7 +10290,7 @@ BeOS)
WIN32)
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name comm.jar |head -n1`:$CLASSPATH"
JHOME=$JPATH"/jre/lib/ext"
;;
@@ -10335,7 +10335,7 @@ Solaris*)
CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/comm.jar:$CLASSPATH"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
;;
View
@@ -53,7 +53,7 @@ AC_PROG_CC
AC_DISABLE_STATIC
AM_PROG_LIBTOOL
# end of SCO fixes
-AM_INIT_AUTOMAKE(Serial,2.0.7pre2)
+AM_INIT_AUTOMAKE(Serial,2.0.7)
AC_CHECK_HEADERS(fcntl.h)
AC_CHECK_HEADERS(sys/fcntl.h)
AC_CHECK_HEADERS(sys/file.h)
@@ -537,7 +537,7 @@ Linux)
CFLAGS=$CFLAGS" -D__need_timespec"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name comm.jar |head -n1`
JHOME=$JPATH"/jre/lib/ext"
@@ -607,7 +607,7 @@ Linux)
TARGETLIB="\$(target_triplet)/librxtxSerial.la \
\$(target_triplet)/librxtxParallel.la"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name comm.jar |head -n1`
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
@@ -743,7 +743,7 @@ BeOS)
WIN32)
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name comm.jar |head -n1`:$CLASSPATH"
JHOME=$JPATH"/jre/lib/ext"
;;
@@ -788,7 +788,7 @@ Solaris*)
CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/comm.jar:$CLASSPATH"
case $JAVA_VERSION in
- 1.2*|1.3*|1.4*|1.5*)
+ 1.2*|1.3*|1.4*|1.5*|1.6*)
fix_parameters $JPATH/jre/lib/javax.comm.properties
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
;;

0 comments on commit e1dd1ad

Please sign in to comment.