[Libreoffice] [PATCH] ./configure after ". *-Env.Set.sh"

In this situation:
 the only "db.h" on the system is /usr/include/db.h (that is, no db$ver/db.h)
 AND
 ./configure previously called with --with-system-db (or --with-system-libs)
 AND
 The -Env.set.sh file has been sourced in the current shell.
then:
 ./configure --with-system-db
fails saying that db is older than 4.1.

That is because DB_INCLUDES envvar is set by the -Env.set.sh file, and
this disables looking for /usr/include/db.h.

The attached patch uses the db_header shell variable instead to detect
whether a db$vver/db.h has been found and to enable or disable looking
for /usr/include/db.h.

-- 
Lionelx

From 702babf4e4d3f5c36c7dc535ce2a8790b2d10d87 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sun, 16 Jan 2011 01:13:32 +0100
Subject: [PATCH] Make configure still work after Env.Set.sh

---
 configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index c4982cb..bb8302f 100755
--- a/configure.in
+++ b/configure.in
@@ -4351,7 +4351,7 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
         AC_MSG_RESULT([no])
     done
 
-    if test "$DB_INCLUDES" = ""; then
+    if test "$db_header" = ""; then
        AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include; db_header="db.h" ],
            [ AC_MSG_ERROR(no. install the db4-dev package) ])
     fi
-- 
1.7.2.3