Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12694/buildtools/conf
Modified Files:
Tag: MonetDB_1-20
MonetDB.m4
Log Message:
parameterized check for Java in AM_MONETDB_COMPILER() in
buildtools/conf/MonetDB.m4
to compile the Java code in clients (JDBC client, mjclient), we need Java >=
1.4 && < 1.6
to compile the Java code in pathfinder (XRPC wrapper), we need Java >= 1.5
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -u -d -r1.37.2.6 -r1.37.2.7
--- MonetDB.m4 14 Oct 2007 09:09:40 -0000 1.37.2.6
+++ MonetDB.m4 22 Oct 2007 20:58:20 -0000 1.37.2.7
@@ -437,6 +437,18 @@
AC_DEFUN([AM_MONETDB_COMPILER],
[
+if test "x$1" != "x"; then
+ JAVA_REQ_VER_MIN="$1"
+else
+ JAVA_REQ_VER_MIN="1.4"
+fi
+
+if test "x$2" != "x"; then
+ JAVA_REQ_VER_MAX="$2"
+else
+ unset JAVA_REQ_VER_MAX
+fi
+
AC_PROG_CPP()
dnl check for compiler (also set GCC (yes/no)).
AC_PROG_CC()
@@ -954,23 +966,33 @@
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, but < 1.6])
+ if test "x$JAVA_REQ_VER_MAX" = "x" ; then
+ AC_MSG_CHECKING([for Java >= $JAVA_REQ_VER_MIN])
+ else
+ AC_MSG_CHECKING([for Java >= $JAVA_REQ_VER_MIN, but < $JAVA_REQ_VER_MAX])
+ fi
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
- if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "1.6"); then
- have_java_1_4=yes
+ have_java_req=no
+ if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "$JAVA_REQ_VER_MIN"); then
+ if test "x$JAVA_REQ_VER_MAX" = "x" ; then
+ have_java_req=yes
+ elif test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "$JAVA_REQ_VER_MAX"); then
+ have_java_req=yes
fi
fi
- AC_MSG_RESULT($have_java_1_4 -> $JAVA_VERSION found)
+ AC_MSG_RESULT($have_java_req -> $JAVA_VERSION found)
fi
AC_PATH_PROG(JAVAC,javac,,$JPATH)
AC_PATH_PROG(JAR,jar,,$JPATH)
AC_PATH_PROG(JAVADOC,javadoc,,$JPATH)
- if test x$have_java_1_4 != xyes; then
+ if test x$have_java_req != xyes; then
if test "x$have_java" = xyes; then
- AC_MSG_ERROR([Java version too old (1.4 required) or too new (1.6 an
higher not yet supported)])
+ if test "x$JAVA_REQ_VER_MAX" = "x" ; then
+ AC_MSG_ERROR([Java version too old ($JAVA_REQUIRED_VERSION
required)])
+ else
+ AC_MSG_ERROR([Java version too old ($JAVA_REQUIRED_VERSION
required) or too new ($JAVA_REQ_VER_MAX an higher not yet supported)])
+ fi
fi
have_java=no
elif test "x$JAVAC" = "x"; then
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
