[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

Hanno Meyer-Thurow hmth at kemper.freedesktop.org
Thu Nov 11 13:26:42 PST 2010


 patches/dev300/system-db-check.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2657ce943d0474644a99507801cfe1286dd6b9da
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Thu Nov 11 22:17:20 2010 +0100

    (GentooOnly) Add check for berkeley db 5.1.
    
    * patches/dev300/system-db-check.diff:

diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index 51ce0f9..d4f58e7 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -12,7 +12,7 @@
 -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
 -        ], []
 -    )
-+    for dbver in -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
++    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_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
 +    done
 +    if test "$DB_INCLUDES" = ""; then
@@ -28,7 +28,7 @@
 -    AC_HAVE_LIBRARY(db, [],
 -      [AC_MSG_ERROR([db not installed or functional])], [])
 +    save_LIBS="$LIBS"
-+    for dbver in -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
++    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, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
 +    done
 +    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])


More information about the Libreoffice-commits mailing list