diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 11:13:45 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 11:16:59 +0300 |
commit | 1b8ac64491cf4231edc0995eebc778b69aada408 (patch) | |
tree | b467f8d494a681409000db5bc254e545ab0034c0 /l10ntools | |
parent | Convert OwnList SvObjectServer into a vector<> (diff) | |
download | core-1b8ac64491cf4231edc0995eebc778b69aada408.tar.gz core-1b8ac64491cf4231edc0995eebc778b69aada408.zip |
Rework how <db.h> is included
Diffstat (limited to 'l10ntools')
-rw-r--r-- | l10ntools/source/help/HelpCompiler.hxx | 4 | ||||
-rw-r--r-- | l10ntools/source/help/makefile.mk | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx index 8b063509a699..016f7eefb8bc 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 f24ec8c16b3d..3fd6879a9989 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 |