diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:16:02 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:16:02 +0000 |
commit | 40df8bcc69f2fef03bec99faf42bfc2cacd20afa (patch) | |
tree | 86bd31392894875119cebfbfa830e61fb4b05062 /unoxml/source/service | |
parent | 2aeeb05425a6769601ab977c80fccb7d8685f952 (diff) |
INTEGRATION: CWS ooo20040704 (1.2.12); FILE MERGED
2004/07/03 13:50:53 vq 1.2.12.2: #i27032# Thanks to the partly *crossmerge* of 27032 this change has also
to be crossmerged. This touches all lines of the file because the
lineendings were corrected to unix style.
2004/06/28 14:46:09 cmc 1.2.12.1: #i30801# allow using system libs if possible
Diffstat (limited to 'unoxml/source/service')
-rw-r--r-- | unoxml/source/service/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unoxml/source/service/makefile.mk b/unoxml/source/service/makefile.mk index e87c653b3a1a..34b1bc13e62f 100644 --- a/unoxml/source/service/makefile.mk +++ b/unoxml/source/service/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2004-07-23 11:03:50 $ +# last change: $Author: rt $ $Date: 2004-09-08 16:16:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,6 +72,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk RSCUPDVER=$(RSCREVISION)(SV$(UPD)$(UPDMINOR)) +.IF "$(SYSTEM_LIBXML)" == "YES" +CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +.ENDIF # --- Files -------------------------------------------------------- |