diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:18:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:18:50 +0000 |
| commit | 12897dc51e036666cba10affda2f30682c8f18e1 (patch) | |
| tree | d0ebd655040d4e9a1c0cd758f8317b8f9376bd74 /solenv/inc/unxbsds.mk | |
| parent | e2da2821e86950f0a40b9bad20edb4d21eabdbdc (diff) | |
INTEGRATION: CWS configure22 (1.16.236); FILE MERGED
2007/10/15 22:46:22 rene 1.16.236.1: #i79874# STLport5 support for configure
Diffstat (limited to 'solenv/inc/unxbsds.mk')
| -rw-r--r-- | solenv/inc/unxbsds.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk index c7b989cb3a85..31e0c24f4598 100644 --- a/solenv/inc/unxbsds.mk +++ b/solenv/inc/unxbsds.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxbsds.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:07:44 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:18:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DOSL_USE_SYS_V_SEMAPHORE +CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" @@ -154,8 +154,13 @@ STDSHLCUIMT=-lpthread -lm # STLport always needs pthread. This may yield some redundant -lpthread # but that doesn't matter. +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlport -lpthread +LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -lpthread +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread +.ENDIF # name of library manager |