summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-18 15:19:10 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-18 15:19:10 +0000
commit1aff91ff2e0afad7b294c3d7201e36a01b3609be (patch)
treef16ad9790c4477e9a8e837f41bbdc47882f79a44 /boost
parent50680c8efb3310d8aa05bc1eb8e8f137f4013db8 (diff)
INTEGRATION: CWS systemboost (1.6.2); FILE MERGED
2005/01/13 15:31:46 cmc 1.6.2.1: #i36983# optional build with system-boost
Diffstat (limited to 'boost')
-rw-r--r--boost/makefile.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 746a06ca4fcf..182593abbd11 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: rt $ $Date: 2004-11-26 20:46:16 $
+# last change: $Author: kz $ $Date: 2005-01-18 16:19:10 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -69,6 +69,12 @@ TARGET=ooo_boost
.INCLUDE : settings.mk
+.IF "$(SYSTEM_BOOST)" == "YES"
+all:
+ @echo "An already available installation of boost should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ELSE
+
# --- Files --------------------------------------------------------
TARFILE_NAME=boost-1.30.2
@@ -86,3 +92,4 @@ BUILD_FLAGS=
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.ENDIF