ooo-build r14330 - in trunk: . patches/dev300

[aprosky svn gnome org]

Author: aprosky
Date: Fri Oct 17 10:18:39 2008
New Revision: 14330
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14330&view=rev

Log:
Support berkdb 4.7


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/system-db-check.diff

Modified: trunk/patches/dev300/system-db-check.diff
==============================================================================
--- trunk/patches/dev300/system-db-check.diff	(original)
+++ trunk/patches/dev300/system-db-check.diff	Fri Oct 17 10:18:39 2008
@@ -12,7 +12,7 @@
 -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
 -        ], []
 -    )
-+    for dbver in -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.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
@@ -32,7 +32,7 @@
 -      [AC_MSG_ERROR([db not installed or functional])], [])
 -    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 +    save_LIBS="$LIBS"
-+    for dbver in -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.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]) ])