diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:22:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:22:00 +0000 |
| commit | 9af91bf2563850c0d2f982a972490017a2390caa (patch) | |
| tree | 756402ac5bc489ceb40dbf403e3a461d16a13edc /solenv/inc/unxsogs.mk | |
| parent | 9eeda4509c35b067916adee2fbcfe5c8750b3bd8 (diff) | |
INTEGRATION: CWS configure22 (1.14.236); FILE MERGED
2007/10/15 22:46:22 rene 1.14.236.1: #i79874# STLport5 support for configure
Diffstat (limited to 'solenv/inc/unxsogs.mk')
| -rw-r--r-- | solenv/inc/unxsogs.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index 593042861cd4..978dd2bae86f 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxsogs.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:11:46 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:22:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ SOLAR_JAVA=TRUE JAVAFLAGSDEBUG=-g # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1 +CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 .IF "$(SOLAR_JAVA)"!="" @@ -119,8 +119,13 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm STDLIBGUIMT+=-lX11 +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlport +LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) +.ENDIF LIBMGR=ar LIBFLAGS=-r |