Attachment 42286 Details for Bug 33230 – combined solution for libreoffice-3-3 branch

[patch] combined solution for libreoffice-3-3 branch

0001-combined-check-for-system-BerkleyDB-fdo-33230.patch (text/plain), 1.76 KB, created by Petr Mladek on 2011-01-21 11:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Mladek

Created: 2011-01-21 11:48:34 UTC

Size: 1.76 KB

patch

obsolete

>From 38951e26266ca3d20ca8dec1abb8cc16a6932c29 Mon Sep 17 00:00:00 2001
>From: Petr Mladek <pmladek@suse.cz>
>Date: Fri, 21 Jan 2011 19:04:00 +0100
>Subject: [PATCH] combined check for system BerkleyDB (fdo#33230)
>
>There are BerkleyDB installations that provides neither dbopen
>nor __db185_open. Let's use more complex fallback to all
>known symbols.
>
>---
> configure.in |   12 ++++++++++--
> 1 files changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/configure.in b/configure.in
>index db20f9d..80469cb 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -4312,8 +4312,16 @@ int main(int argc, char **argv) {
>     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
>     DB_LIB=
>     for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
>-        AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>-            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
>+        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>+            AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>+                AC_CHECK_LIB(db$dbver, db_create_4008, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>+                    AC_CHECK_LIB(db$dbver, db_create_4007, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>+                        AC_CHECK_LIB(db$dbver, db_create_4004, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
>+                            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
>+                            )
>+                        )
>+                    )
>+                )
>             )
>         )
>     done
>-- 
>1.7.3.4
>

Actions: View

Attachments on bug 33230: 42145 | 42272 | 42286