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:16 +0300 |
| commit | 4819e1bd1ad26a3b4715c35c8534ec24b917b94b (patch) | |
| tree | 2a782faf8397e3ddd69dd6ff2b15765d2d53f585 /xmlhelp | |
| parent | 4b7c263fb31b68a59e52f44cc2907a125b7d9d2b (diff) | |
Rework how <db.h> is included
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/db.hxx | 4 | ||||
| -rwxr-xr-x | xmlhelp/source/cxxhelp/provider/makefile.mk | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index b34aa4a34600..adc8c9fd0d8f 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -28,8 +28,8 @@ #ifndef BERKELEYDBPROXY_DB_HXX_ #define BERKELEYDBPROXY_DB_HXX_ -#ifdef SYSTEM_DB -#include <db.h> +#ifdef SYSTEM_DB_HEADER +#include SYSTEM_DB_H_HEADER #else #include <berkeleydb/db.h> #endif diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk index 398e4feb9726..cc8eaf9355f0 100755 --- a/xmlhelp/source/cxxhelp/provider/makefile.mk +++ b/xmlhelp/source/cxxhelp/provider/makefile.mk @@ -52,9 +52,7 @@ CFLAGSWERRCXX:= CFLAGS += -DHAVE_EXPAT_H -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -.ENDIF +CFLAGS+= $(SYSTEM_DB_CFLAGS) .IF "$(SYSTEM_LIBXML)" == "YES" CFLAGS+= $(LIBXML_CFLAGS) |