diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:23:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:23:13 +0000 |
| commit | fc888c776f45bba0033a03b8a6d63211639133a6 (patch) | |
| tree | 6d0574dd221c51ab758f043a500efa034e019dd2 /store | |
| parent | 39f825f06dbaf8ddc354a2e309e27ca049d19cc2 (diff) | |
INTEGRATION: CWS configure22 (1.20.8); FILE MERGED
2007/11/14 21:10:50 rene 1.20.8.2: RESYNC: (1.20-1.22); FILE MERGED
2007/10/15 22:46:22 rene 1.20.8.1: #i79874# STLport5 support for configure
Diffstat (limited to 'store')
| -rw-r--r-- | store/util/makefile.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk index e4e23ff2fe46..dfdafddcbdbe 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: hr $ $Date: 2007-11-02 13:04:39 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:23:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,8 @@ SHL1VERSIONMAP= $(TARGET).map SHL1STDLIBS= $(SALLIB) -.IF "$(USE_STLP_DEBUG)" != "" +# system STLport5 needs it +.IF "$(USE_STLP_DEBUG)" != "" || "$(STLPORT_VER)" >= "500" SHL1STDLIBS+=$(LIBSTLPORT) .ENDIF |