Kaydet (Commit) 7b5921d1 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS dba23e (1.216.4); FILE MERGED

2007/08/13 11:02:21 rene 1.216.4.2: #i10000# fix configure logic
2007/08/10 05:39:24 oj 1.216.4.1: #i80338# check for hsqldb version 1.8.0.8
üst 5c4f05bc
...@@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: ...@@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl * dnl *
dnl * Name: configure.in dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2007-08-20 13:46:15 $ dnl * Date: $Date: 2007-08-27 16:05:43 $
dnl * dnl *
dnl * Desc: This file serves as input for the GNU autoconf package dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script. dnl * in order to create a configure script.
...@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org ...@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl * dnl *
dnl * dnl *
dnl ******************************************************************/ dnl ******************************************************************/
AC_REVISION( $Revision: 1.217 $ ) AC_REVISION( $Revision: 1.218 $ )
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT() AC_INIT()
echo "$@" >config.parms echo "$@" >config.parms
...@@ -3187,20 +3187,32 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ ...@@ -3187,20 +3187,32 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
fi fi
AC_CHECK_FILE($HSQLDB_JAR, [], AC_CHECK_FILE($HSQLDB_JAR, [],
[AC_MSG_ERROR(hsqldb.jar not found.)], []) [AC_MSG_ERROR(hsqldb.jar not found.)], [])
AC_MSG_CHECKING([whether hsqldb is >= 1.8.0]) AC_MSG_CHECKING([whether hsqldb is >= 1.8.0.8])
export HSQLDB_JAR export HSQLDB_JAR
if $PERL -e 'use Archive::Zip; if $PERL -e 'use Archive::Zip;
my $file = "$ENV{'HSQLDB_JAR'}"; my $file = "$ENV{'HSQLDB_JAR'}";
my $zip = Archive::Zip->new( $file ); my $zip = Archive::Zip->new( $file );
my $mf = $zip->contents ( "META-INF/MANIFEST.MF" ); my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
if ( $mf =~ m/Specification-Version: 1.8.*/ ) { if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
exit 0; push @l, split(/\n/, $mf);
} else { foreach my $line (@l) {
exit 1; if ($line =~ m/Specification-Version:/) {
($t, $version) = split (/:/,$line);
$version =~ s/^\s//;
($a, $b, $c, $d) = split (/\./,$version);
if (($c == "0" && $d > "7") || $c > 0) {
exit 0;
} else {
exit 1;
}
}
}
} else {
exit 1;
}'; then }'; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed]) AC_MSG_ERROR([no, hsqldb >= 1.8.0.8 is needed])
fi fi
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment