[ooo-build-commit] .: patches/dev300

[Hanno Meyer-Thurow]

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

New commits:
commit 58ff1086b6e23be82771d66ff29819e426d3ce6e
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Fri Jul 16 11:52:24 2010 +0200

    Readd hunk of system-db-check.diff.
    
    * patches/dev300/system-db-check.diff

diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index b21699a..51ce0f9 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -21,6 +21,21 @@
      AC_MSG_CHECKING([whether db is at least 4.1])
      AC_TRY_RUN([
  #include <db.h>
+@@ -3300,8 +3298,12 @@
+        else return 1;
+ }
+     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+-    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
++    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]) ])
++    LIBS="$save_LIBS"
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+     AC_MSG_RESULT([internal])
 @@ -3315,6 +3314,8 @@
  fi
  AC_SUBST(SYSTEM_DB)