diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-04-06 08:20:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-04-06 10:46:47 +0200 |
| commit | cedf0b23542a06cd31440dd1deb450d03191a1b9 (patch) | |
| tree | 64ec4d29f37fcd630678c1bf79387c2f1d04c0c4 /configure.ac | |
| parent | fd0aa82a61612b90352b0780e62bb4d4dd0d94f8 (diff) | |
Remove obsolete HSQLDB_USE_JDBC_4_1
...that must always be true ever since 1b8c61d5ca8e2a7ae7a0bcd189b7a87defecea03
"Bump JDK buildtime requirement to 1.6"
Change-Id: I9432ac9d0a0e2c4999a80b6f144099d0e4dc15bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132616
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 0 insertions, 11 deletions
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 |