This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch hsqldb2 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit de5508cd86423d926c1ce1812331a2c78c2915ee Author: Jim Jagielski <[email protected]> AuthorDate: Sat Nov 7 04:33:52 2026 -0500 configure: reject --with-system-hsqldb, a system hsqldb lacks the storage hooks --- main/configure.ac | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/main/configure.ac b/main/configure.ac index f63397d0f1..f518686b11 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -501,7 +501,7 @@ AC_ARG_WITH(system-mysql-cppconn, [ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system ],,) AC_ARG_WITH(system-hsqldb, -[ --with-system-hsqldb Use hsqldb already on system +[ --with-system-hsqldb Not supported: the bundled hsqldb carries the storage access patch ],,) AC_ARG_WITH(hsqldb-jar, [ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ], @@ -5001,42 +5001,9 @@ dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== AC_MSG_CHECKING([which hsqldb to use]) -if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ - test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then +if test -n "$with_system_hsqldb" && test "$with_system_hsqldb" != "no"; then AC_MSG_RESULT([external]) - SYSTEM_HSQLDB=YES - if test -z $HSQLDB_JAR; then - HSQLDB_JAR=/usr/share/java/hsqldb.jar - fi - AC_CHECK_FILE($HSQLDB_JAR, [], - [AC_MSG_ERROR(hsqldb.jar not found.)], []) -AC_MSG_CHECKING([whether hsqldb is newer than 2.7]) - export HSQLDB_JAR - if $PERL -e 'use Archive::Zip; - my $file = "$ENV{'HSQLDB_JAR'}"; - my $zip = Archive::Zip->new( $file ); - my $mf = $zip->contents ( "META-INF/MANIFEST.MF" ); - if ( $mf =~ m/Specification-Version: 2\.\d+\.\d+/ ) { - push @l, split(/\n/, $mf); - foreach my $line (@l) { - if ($line =~ m/Specification-Version:/) { - ($t, $version) = split (/:/,$line); - $version =~ s/^\s//; - ($a, $b, $c) = split (/\./,$version); - if ($a == 2 && ($b > 7 || ($b == 7 && $c > 0))) { - exit 0; - } else { - exit 1; - } - } - } - } else { - exit 1; - }'; then - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([no, you need hsqldb > 2.7]) - fi + AC_MSG_ERROR([a system hsqldb cannot be used: the bundled hsqldb carries main/hsqldb/patches/aoo_integration.patch]) else AC_MSG_RESULT([internal]) SYSTEM_HSQLDB=NO
