[Libreoffice-commits] .: libcdr/libcdr-0.0.0.patch

[Tor Lillqvist]

 libcdr/libcdr-0.0.0.patch |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 03a8c54cfc12222c0614fb5099d287777e17a88b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Dec 8 23:52:26 2011 +0200

    Fix build with internal zlib

diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch
index 8016fec..3258740 100644
--- a/libcdr/libcdr-0.0.0.patch
+++ b/libcdr/libcdr-0.0.0.patch
@@ -18,3 +18,17 @@
  
  #endif
  
+--- misc/libcdr-0.0.0/src/lib/makefile.mk
++++ misc/build/libcdr-0.0.0/src/lib/makefile.mk
+@@ -28,6 +28,10 @@
+ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
+ .ENDIF
+ 
++.IF "$(SYSTEM_ZLIB)" != "YES"
++INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
++.ENDIF
++
+ SLOFILES= \
+         $(SLO)$/CDRDocument.obj \
+ 		$(SLO)$/CDRInternalStream.obj \
+