Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10813/conf
Modified Files:
MonetDB.m4
Log Message:
propagated changes of Monday Jun 04 2007 - Wednesday Jun 06 2007
from the MonetDB_1-18 branch to the development trunk
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MonetDB.m4 3 Jun 2007 20:56:22 -0000 1.19
+++ MonetDB.m4 6 Jun 2007 11:44:27 -0000 1.20
@@ -791,12 +791,13 @@
if test "x$have_java" != xno; then
AC_PATH_PROG(JAVA,java,,$JPATH)
if test "x$JAVA" != "x"; then
- AC_MSG_CHECKING(for Java >= 1.4)
+ AC_MSG_CHECKING([for Java >= 1.4, but < 1.6])
JAVA_VERSION=[`"$JAVA" -version 2>&1 | grep '[0-9]\.[0-9]' | head -n1 |
sed -e 's|^[^0-9]*||' -e 's|[^0-9]*$||'`]
+ have_java_1_4=no
if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "1.4"); then
- have_java_1_4=yes
- else
- have_java_1_4=no
+ if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "1.6"); then
+ have_java_1_4=yes
+ fi
fi
AC_MSG_RESULT($have_java_1_4 -> $JAVA_VERSION found)
fi
@@ -806,7 +807,7 @@
AC_PATH_PROG(JAVADOC,javadoc,,$JPATH)
if test x$have_java_1_4 != xyes; then
if test "x$have_java" = xyes; then
- AC_MSG_ERROR([Java version too old (1.4 required)])
+ AC_MSG_ERROR([Java version too old (1.4 required) or too new (1.6 an
higher not yet supported)])
fi
have_java=no
elif test "x$JAVAC" = "x"; then
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
