[Monetdb-developers] XRPCwrapper fails to compile with java 1.4

Fabian Groffen Fabian.Groffen at cwi.nl
Tue Oct 16 09:43:17 CEST 2007


On 16-10-2007 08:32:49 +0200, Stefan Manegold wrote:
> Hoi,
> 
> for after the release, I have the attached patch ready.

I have included some comments on your patch.

> Index: buildtools/conf/MonetDB.m4
> ===================================================================
> RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
> retrieving revision 1.37.2.6
> diff -u -r1.37.2.6 MonetDB.m4
> --- buildtools/conf/MonetDB.m4	14 Oct 2007 09:09:40 -0000	1.37.2.6
> +++ buildtools/conf/MonetDB.m4	16 Oct 2007 06:30:22 -0000
> @@ -437,6 +437,12 @@
>  AC_DEFUN([AM_MONETDB_COMPILER],
>  [
>  
> +if test "x$1" = "x"; then
> +  JAVA_REQUIRED_VERSION="1.4"
> +else
> +  JAVA_REQUIRED_VERSION="$1"
> +fi

(pseudo)
JAVA_REQ_MIN_VERSION=${JAVA_REQ_MIN_VERSION:-1.4}
unset JAVA_REQ_MAX_VERSION

> +
>  AC_PROG_CPP()
>  dnl check for compiler (also set GCC (yes/no)).
>  AC_PROG_CC()
> @@ -954,23 +960,23 @@
>  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])
> +    AC_MSG_CHECKING([for Java >= $JAVA_REQUIRED_VERSION, but < 1.6])

if test "x$JAVA_REQ_MAX_VERSION" = "x" ; then
	AC_MSG_CHECKING([for Java >= $JAVA_REQ_MIN_VERSION])
	do_logic
else
	AC_MSG_CHECKING([for Java >= $JAVA_REQ_MIN_VERSION, but <= $JAVA_REQ_MAX_VERSION])
	do_logic
fi

[snip]

> Index: pathfinder/configure.ag
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
> retrieving revision 1.116.2.2
> diff -u -r1.116.2.2 configure.ag
> --- pathfinder/configure.ag	20 Sep 2007 11:42:54 -0000	1.116.2.2
> +++ pathfinder/configure.ag	16 Oct 2007 06:30:22 -0000
> @@ -72,7 +72,8 @@
>  
>  dnl must check for compiler before checking for MonetDB4
>  AM_MONETDB_DEFAULTS()
> -AM_MONETDB_COMPILER()
> +req_java_ver=1.5
> +AM_MONETDB_COMPILER($req_java_ver)

req_min_java_ver="1.5"
AM_MONETDB_COMPILER($req_min_java_ver)


Index: clients/configure.ag
============================

req_min_java_ver="1.4"
req_max_java_ver="1.5"
AM_MONETDB_COMPILER($req_min_java_ver $req_max_java_ver)




More information about the developers-list mailing list