From 85b09f29bc7c0366ab1e8f1a83d51028916e8278 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 12 Dec 2007 14:04:26 +0000
Subject: INTEGRATION: CWS boostup01 (1.6.20); FILE MERGED 2007/11/08 14:00:46
 thb 1.6.20.1: #i77672# Tentatively enabling boost 1.34.1 for gcc4.x

---
 boost/spirit/makefile.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'boost')

diff --git a/boost/spirit/makefile.mk b/boost/spirit/makefile.mk
index c2100d604a8b..4648ff0a3ab0 100644
--- a/boost/spirit/makefile.mk
+++ b/boost/spirit/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: obo $ $Date: 2007-01-25 12:32:42 $
+#   last change: $Author: kz $ $Date: 2007-12-12 15:04:26 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -60,6 +60,11 @@ all:
 
 # --- Files --------------------------------------------------------
 
+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)">="000400000000" 
+all:
+        @echo "spirit is already included in boost 1.34"
+.ELSE
+
 TARFILE_NAME=spirit-1.6.1
 PATCH_FILE_NAME=$(TARFILE_NAME).patch
 
@@ -88,3 +93,4 @@ $(MISC)$/$(TARGET)_remove_build.flag : $(PRJ)$/$(PATCH_FILE_NAME)
     $(TOUCH) $(MISC)$/$(TARGET)_remove_build.flag
 
 .ENDIF
+.ENDIF
-- 
cgit