diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-07-06 10:00:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-07-06 10:00:32 +0000 |
| commit | e77689882666bcfa4113e24c94beabdc51741c2a (patch) | |
| tree | 9672b0f6b70ec8aa9d7c9784c527d6697e9a60ab /sdext/source | |
| parent | 0db94dbe0a0f79e1c649b681eaa3dbaa065faa64 (diff) | |
#i102679# build fix
Diffstat (limited to 'sdext/source')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/makefile.mk | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/makefile.mk b/sdext/source/pdfimport/xpdfwrapper/makefile.mk index 796bef066cde..f45840dd8d7c 100644 --- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk +++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk @@ -41,6 +41,10 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE: settings.mk +.IF "$(SYSTEM_ZLIB)" == "YES" +CFLAGS+=-DSYSTEM_ZLIB +.ENDIF + .IF "$(ENABLE_PDFIMPORT)" == "NO" @all: @echo "PDF Import extension disabled." diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index e3fc861982f3..0c3497abcbad 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -30,7 +30,11 @@ #include "pnghelper.hxx" -#include "zlib/zlib.h" +#ifdef SYSTEM_ZLIB +#include "zlib.h" +#else +#include <zlib/zlib.h> +#endif using namespace pdfi; |