[Libreoffice-commits] .: configure.in
Robert Nagy
rnagy at kemper.freedesktop.org
Mon Dec 6 09:30:37 PST 2010
configure.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2618f419b3c012897a09b7e90df6474f3ccdf024
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Dec 6 18:27:05 2010 +0100
use /usr/include/db.h as a last resort for berlekey db
the berkeley db header is installed as /usr/local/db.h
on debian/ubuntu
diff --git a/configure.in b/configure.in
index 481c9ea..0be475c 100644
--- a/configure.in
+++ b/configure.in
@@ -4551,7 +4551,8 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
done
if test "$DB_INCLUDES" = ""; then
- AC_MSG_ERROR(no. install the db4-dev package)
+ AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include; db_header="db.h" ],
+ [ AC_MSG_ERROR(no. install the db4-dev package) ])
fi
AC_MSG_CHECKING([whether db is at least 4.1])
AC_TRY_RUN([
@@ -4563,7 +4564,7 @@ int main(int argc, char **argv) {
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
save_LIBS="$LIBS"
- for dbver in -5.1 5.1 -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