diff options
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | external/hsqldb/UnpackedTarball_hsqldb.mk | 6 |
3 files changed, 2 insertions, 16 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index c412a0b99895..cc05b3448d0b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -311,7 +311,6 @@ export HELP_ONLINE=@HELP_ONLINE@ export HELP_OMINDEX_PAGE=@HELP_OMINDEX_PAGE@ export HOST_PLATFORM=@HOST_PLATFORM@ export HSQLDB_JAR=@HSQLDB_JAR@ -export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@ export HUNSPELL_CFLAGS=$(gb_SPACE)@HUNSPELL_CFLAGS@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@ diff --git a/configure.ac b/configure.ac index af0c9937d865..1cdd22b0ae66 100644 --- a/configure.ac +++ b/configure.ac @@ -5789,7 +5789,6 @@ if test "$cross_compiling" = "yes"; then ANT ANT_HOME ANT_LIB - HSQLDB_USE_JDBC_4_1 JAVA_CLASSPATH_NOT_SET JAVA_SOURCE_VER JAVA_TARGET_VER @@ -10159,7 +10158,6 @@ dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then - HSQLDB_USE_JDBC_4_1= AC_MSG_CHECKING([which hsqldb to use]) if test "$with_system_hsqldb" = "yes"; then AC_MSG_RESULT([external]) @@ -10211,14 +10209,6 @@ if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then SYSTEM_HSQLDB= BUILD_TYPE="$BUILD_TYPE HSQLDB" NEED_ANT=TRUE - 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=TRUE - else - AC_MSG_RESULT([no]) - fi fi else if test "$with_java" != "no" -a -z "$HSQLDB_JAR"; then @@ -10227,7 +10217,6 @@ else fi AC_SUBST(SYSTEM_HSQLDB) AC_SUBST(HSQLDB_JAR) -AC_SUBST([HSQLDB_USE_JDBC_4_1]) dnl =================================================================== dnl Check for PostgreSQL stuff diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk index cbba770f19a0..389572377fa6 100644 --- a/external/hsqldb/UnpackedTarball_hsqldb.mk +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk @@ -25,10 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ external/hsqldb/patches/fdo36824.patch \ external/hsqldb/patches/limit_as_table_alias.patch \ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \ - $(if $(HSQLDB_USE_JDBC_4_1),\ - external/hsqldb/patches/jdbc-4.1.patch \ - external/hsqldb/patches/multipleResultSets.patch \ - ) \ + external/hsqldb/patches/jdbc-4.1.patch \ + external/hsqldb/patches/multipleResultSets.patch \ )) # vim: set noet sw=4 ts=4: |