Changeset: 8435c3174536 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8435c3174536
Modified Files:
configure.ag
Branch: Apr2011
Log Message:
configure: simplify JDBC Java requirements
"MonetDB JDBC currently requires Java >= 1.5, but < 1.6 to build"
is a complex way to say "MonetDB JDBC currently requires Java 1.5 to
build", so just say the latter, and also check that.
diffs (23 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1797,16 +1797,14 @@
fi
;;
*)
- req_java_ver_min=1.5 # >= $req_java_ver_min required
- req_java_ver_max=1.6 # < $req_java_ver_max required
- if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "$req_java_ver_min") -a
MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "$req_java_ver_max"); then
+ if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) =
MONETDB_VERSION_TO_NUMBER(echo "1.5") ; then
have_java_jdbc=yes
else
if test "x$enable_jdbc" = xyes; then
- AC_MSG_ERROR([MonetDB JDBC requires ant and Java >=
$req_java_ver_min, but < $req_java_ver_max.])
+ AC_MSG_ERROR([MonetDB JDBC requires ant and Java 1.5])
else
enable_jdbc=no
- disable_jdbc="(MonetDB JDBC currently requires Java >=
$req_java_ver_min, but < $req_java_ver_max to build)"
+ disable_jdbc="(MonetDB JDBC currently requires Java 1.5
to build)"
fi
fi
;;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
