Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23769/buildtools/conf
Modified Files:
MonetDB.m4
Log Message:
conditional "HAVE_MONETDB_JAVA" is no longer sufficient to determine
whether Java/JDBC test can/should be run or not;
hence, we introduce more specific conditionals
"HAVE_MONETDB_JAVAJDBC" & "HAVE_MONETDB_JAVAXRPC" also for testing
and extend monetdb-java-config with options
"--HAVE_MONETDB_JAVAJDBC" & "--HAVE_MONETDB_JAVAXRPC"
to convey the information to other packages
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- MonetDB.m4 11 Dec 2007 13:33:50 -0000 1.58
+++ MonetDB.m4 11 Dec 2007 22:19:05 -0000 1.59
@@ -172,6 +172,8 @@
dnl check for MonetDB Java Interface
have_monetdb_java=auto
+have_monetdb_javajdbc=auto
+have_monetdb_javaxrpc=auto
MONETDB_JAVA_PREFIX="."
if test "x$1" = "x"; then
MONETDB_JAVA_REQUIRED_VERSION="1.7.0"
@@ -198,6 +200,20 @@
if test x$have_java != xno; then
have_monetdb_java=yes
AC_MSG_RESULT($have_monetdb_java: found version $MONETDB_JAVA_VERSION)
+ AC_MSG_CHECKING(whether MonetDB Java includes JDBC support)
+ if test x"`$MONETDB_JAVA_CONFIG --HAVE_MONETDB_JAVAJDBC`" != x ; then
+ have_monetdb_javajdbc=yes
+ else
+ have_monetdb_javajdbc=no
+ fi
+ AC_MSG_RESULT($have_monetdb_javajdbc)
+ AC_MSG_CHECKING(whether MonetDB Java includes XRPC wrapper)
+ if test x"`$MONETDB_JAVA_CONFIG --HAVE_MONETDB_JAVAXRPC`" != x ; then
+ have_monetdb_javaxrpc=yes
+ else
+ have_monetdb_javaxrpc=no
+ fi
+ AC_MSG_RESULT($have_monetdb_javaxrpc)
else
have_monetdb_java=no
AC_MSG_RESULT($have_monetdb_java: found version $MONETDB_JAVA_VERSION,
but no Java support)
@@ -217,6 +233,8 @@
AC_SUBST(MONETDB_JAVA_PREFIX)
AC_SUBST(MONETDB_JAVA_VERSION)
AM_CONDITIONAL(HAVE_MONETDB_JAVA,test x$have_monetdb_java = xyes)
+AM_CONDITIONAL(HAVE_MONETDB_JAVAJDBC,test x$have_monetdb_javajdbc = xyes)
+AM_CONDITIONAL(HAVE_MONETDB_JAVAXRPC,test x$have_monetdb_javaxrpc = xyes)
]) dnl AC_DEFUN AM_MONETDB_JAVA
AC_DEFUN([AM_MONETDB_COMMON],
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
