diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:40:28 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:40:28 +0000 |
| commit | 82e0abb6ba14b786265afd7c60f137b518a8acac (patch) | |
| tree | 0e21e04332b94e85f51e59feb2649df4b868cf05 /config_office/configure.in | |
| parent | 4716e65e66a4c7c3260f6507df805ba881f15f4f (diff) | |
INTEGRATION: CWS dba24c (1.221.8); FILE MERGED
2007/10/30 16:36:37 fs 1.221.8.2: RESYNC: (1.221-1.223); FILE MERGED
2007/10/29 11:04:15 fs 1.221.8.1: #i83079# HSQL 1.8.0.9 is needed by now
Diffstat (limited to 'config_office/configure.in')
| -rw-r--r-- | config_office/configure.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 480c1a912742..a0a34155318f 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2007-11-06 14:53:15 $ +dnl * Date: $Date: 2007-11-21 16:40:28 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.228 $ ) +AC_REVISION( $Revision: 1.229 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -3291,7 +3291,7 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ fi AC_CHECK_FILE($HSQLDB_JAR, [], [AC_MSG_ERROR(hsqldb.jar not found.)], []) - AC_MSG_CHECKING([whether hsqldb is >= 1.8.0.8]) + AC_MSG_CHECKING([whether hsqldb is >= 1.8.0.9]) export HSQLDB_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'HSQLDB_JAR'}"; @@ -3304,7 +3304,7 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ ($t, $version) = split (/:/,$line); $version =~ s/^\s//; ($a, $b, $c, $d) = split (/\./,$version); - if (($c == "0" && $d > "7") || $c > 0) { + if (($c == "0" && $d > "8") || $c > 0) { exit 0; } else { exit 1; @@ -3316,7 +3316,7 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ }'; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([no, hsqldb >= 1.8.0.8 is needed]) + AC_MSG_ERROR([no, hsqldb >= 1.8.0.9 is needed]) fi else AC_MSG_RESULT([internal]) |