[ooo-build-commit] Branch 'ooo/OOO310' - sdext/source

[Jan Holesovsky]

 sdext/source/pdfimport/xpdfwrapper/makefile.mk   |    4 ++++
 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e2b4ce7ef3faf2f3b3c8819b6ead89a59b2dccc8
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jul 6 09:56:30 2009 +0000

    #i102679# build fix

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;