[patch] Openoffice only searches for sys-libs/db between 4.0 and 4.7.

db-4.8.diff (text/plain), 1.51 KB, created by Adam Hunt on 2009-09-20 12:32:19 UTC

--- patches/dev300/system-db-check.diff.orig	2009-09-20 08:01:14.366087470 -0400
+++ patches/dev300/system-db-check.diff	2009-09-20 08:06:01.282079265 -0400
@@ -12,14 +12,16 @@
 -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
 -        ], []
 -    )
-+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+-    AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
 +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
 +    done
 +    if test "$DB_INCLUDES" = ""; then
 +       AC_MSG_ERROR(no. install the db4-dev package)
 +    fi
-     AC_MSG_CHECKING([whether db is at least 4.1])
-     for v in 1 2 3 4 5; do
++     AC_MSG_CHECKING([whether db is at least 4.1])
++    for v in `seq 1 8`; do
         AC_TRY_RUN([
 @@ -3302,12 +3300,13 @@
      else
@@ -32,7 +34,7 @@
 -      [AC_MSG_ERROR([db not installed or functional])], [])
 -    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 +    save_LIBS="$LIBS"
-+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
++    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -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]) ])