[Libreoffice-commits] .: l10ntools/source

[Tor Lillqvist]

 l10ntools/source/help/HelpCompiler.hxx |    4 ++--
 l10ntools/source/help/makefile.mk      |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

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

    Rework how <db.h> is included

diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 2223c76..05d7b8d 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -38,8 +38,8 @@
 #include <sstream>
 #include <algorithm>
 #include <ctype.h>
-#ifdef SYSTEM_DB
-#include <db.h>
+#ifdef SYSTEM_DB_HEADER
+#include SYSTEM_DB_HEADER
 #else
 #include <berkeleydb/db.h>
 #endif
diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index f24ec8c..3fd6879 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -44,9 +44,7 @@ LIBXSLTINCDIR=external$/libxslt
 CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
 .ENDIF
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB
-.ENDIF
+CFLAGS+= $(SYSTEM_DB_CFLAGS)
 
 .IF "$(SYSTEM_EXPAT)" == "YES"
 CFLAGS+=-DSYSTEM_EXPAT