diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-26 20:39:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-26 20:40:21 +0200 |
| commit | 647080954f4985e3e16ad863efbe89e459b26f8e (patch) | |
| tree | 248ed7a9ee3330cdd3596c270e6079943c208ae0 | |
| parent | 061652ff712da51b9f4c9efbc205869316149f70 (diff) | |
fix conditional inclusion of jdbc patch in hsqldb
Change-Id: I75e4566509d1851e7405d1738ffeaf58261233ea
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | hsqldb/UnpackedTarball_hsqldb.mk | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index c6ffc88da76f..359915ab3b3d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -227,6 +227,7 @@ export HAVE_READDIR_R=@HAVE_READDIR_R@ export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@ export HOST_PLATFORM=@host@ export HSQLDB_JAR=@HSQLDB_JAR@ +export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@ export HUNART_EXTENSION_PACK=@HUNART_EXTENSION_PACK@ export HUNSPELL_CFLAGS=@HUNSPELL_CFLAGS@ export HUNSPELL_LIBS=@HUNSPELL_LIBS@ diff --git a/configure.in b/configure.in index 7d7ec8bc8533..1a23dff93565 100644 --- a/configure.in +++ b/configure.in @@ -7250,6 +7250,7 @@ dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== if test "$with_java" != "no"; then +HSQLDB_USE_JDBC_4_1= AC_MSG_CHECKING([which hsqldb to use]) if test "$with_system_hsqldb" = "yes"; then AC_MSG_RESULT([external]) @@ -7290,9 +7291,18 @@ else AC_MSG_RESULT([internal]) SYSTEM_HSQLDB=NO BUILD_TYPE="$BUILD_TYPE HSQLDB" + AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1]) + javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` + if expr "$javanumver" '>=' 000100060000 > /dev/null; then + AC_MSG_RESULT([yes]) + HSQLDB_USE_JDBC_4_1=YES + else + AC_MSG_RESULT([no]) + fi fi AC_SUBST(SYSTEM_HSQLDB) AC_SUBST(HSQLDB_JAR) +AC_SUBST([HSQLDB_USE_JDBC_4_1]) fi dnl =================================================================== diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk index 9c9b87a7ff0b..2139eae6c404 100644 --- a/hsqldb/UnpackedTarball_hsqldb.mk +++ b/hsqldb/UnpackedTarball_hsqldb.mk @@ -25,7 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ hsqldb/patches/i103528.patch \ hsqldb/patches/i104901.patch \ hsqldb/patches/fdo36824.patch \ - $(if $(filter-out 1.5,$(JAVA_SOURCE_VER)),\ + $(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\ hsqldb/patches/jdbc-4.1.patch \ ) \ )) |