[Libreoffice-commits] .: configure.in set_soenv.in

[Tor Lillqvist]

 configure.in |    3 +++
 set_soenv.in |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 850fc19f5b09827fc56fd15e29d0bea530ca26a4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 18 11:13:43 2011 +0300

    Rework how <db.h> is included

diff --git a/configure.in b/configure.in
index b4974f0..844b463 100755
--- a/configure.in
+++ b/configure.in
@@ -4414,6 +4414,8 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
         [AC_MSG_RESULT([yes])],
         [AC_MSG_ERROR([no. you need at least db 4.1])])
 
+    SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
+
     DB_LIB=
     for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do
         for dash in - ''; do
@@ -4442,6 +4444,7 @@ else
     BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
 fi
 AC_SUBST(SYSTEM_DB)
+AC_SUBST(SYSTEM_DB_CFLAGS)
 AC_SUBST(DB_LIB)
 AC_SUBST(DB_CPPLIB)
 
diff --git a/set_soenv.in b/set_soenv.in
index 504e3a0..32ff542 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1924,6 +1924,7 @@ ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
 ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
 ToFile( "SYSTEM_TRANSLATE_TOOLKIT", "@SYSTEM_TRANSLATE_TOOLKIT@",        "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
+ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
 ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );