diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-07-06 09:56:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-07-06 09:56:30 +0000 |
| commit | e2b4ce7ef3faf2f3b3c8819b6ead89a59b2dccc8 (patch) | |
| tree | 3ec95278be5a053f260e7772b6869d363d70f08e | |
| parent | 8ec5ec8535fcf5b2ba287ca8a998a3f0d57851b2 (diff) | |
#i102679# build fix
| -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 796bef0..f45840d 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 abe293b..c653ff4 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; |