From 3df34ca657d7a1ffb5f52684569667ab8d810a91 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 19 Jul 2006 08:38:31 +0000 Subject: INTEGRATION: CWS configure18 (1.100.16); FILE MERGED 2006/07/14 16:17:48 rene 1.100.16.1: remove mentioning of libart, long obsolete, fix GPC vars; don't fail on agg 2.4 being present, cws thbpp4 fixes agg 2.4 build --- solenv/inc/libs.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index df044190de99..fce61d64568a 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -4,9 +4,9 @@ # # $RCSfile: libs.mk,v $ # -# $Revision: 1.100 $ +# $Revision: 1.101 $ # -# last change: $Author: ihi $ $Date: 2006-06-29 11:20:08 $ +# last change: $Author: kz $ $Date: 2006-07-19 09:38:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +32,7 @@ # MA 02111-1307 USA # #************************************************************************* -LIBSMKREV!:="$$Revision: 1.100 $$" +LIBSMKREV!:="$$Revision: 1.101 $$" .IF "$(COM)"=="WTC" LIBPRE=libr @@ -288,7 +288,9 @@ ICULELIB=icule.lib ICUUCLIB=icuuc.lib I18NUTILLIB=$(LIBPRE) ii18nutil.lib I18NISOLANGLIB=$(LIBPRE) ii18nisolang.lib +.IF "$(GPC)"!="NO" GPC3RDLIB=gpc.lib +.ENDIF SALHELPERLIB=$(LIBPRE) isalhelper.lib XMLSCRIPTLIB=ixcr.lib COMPHELPERLIB=icomphelp.lib -- cgit v1.2.3