writefilter07: merged DEV300_m71

cairo/prj/build.lst

-lcairo	cairo	: zlib soltools NULL
+lcairo	cairo	: ZLIB:zlib soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL

graphite/makefile.mk

@@ -68,6 +68,12 @@ TARGET=so_graphite
 
 .INCLUDE :	settings.mk
 
+.IF "$(SYSTEM_GRAPHITE)" == "YES"
+all:
+        @echo "An already available installation of silgraphite should exist on your system."
+        @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
 # --- Files --------------------------------------------------------
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1

neon/makefile.mk

 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -62,8 +62,8 @@ PATCH_FILES=neon.patch
 .ENDIF
 
 ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c
-
 BUILD_DIR=src
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
 OUT2INC= \
@@ -71,6 +71,7 @@ OUT2INC= \
     $(BUILD_DIR)$/ne_alloc.h \
     $(BUILD_DIR)$/ne_auth.h \
     $(BUILD_DIR)$/ne_basic.h \
+    $(BUILD_DIR)$/ne_compress.h \
     $(BUILD_DIR)$/ne_defs.h \
     $(BUILD_DIR)$/ne_locks.h \
     $(BUILD_DIR)$/ne_props.h \