msvc-stlport-tools patch

From: John Maddock (john_at_[hidden])
Date: 2003-12-18 07:56:14

To recap: the variable STLPORT_VERSION has no effect, contrary to the
documentation which tells you to set this variable to fix the version (and
path) of stlport.

Finally I've come up with the following fix, so that:

If <stlport-version> is set in the BUILD variable then this take precedence.
Otherwise STLPORT_VERSION is used to determine the version number.

Let me know if it's OK to commit,

John.

Here's the patch:

Index: msvc-stlport-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v1/msvc-stlport-tools.jam,v
retrieving revision 1.9
diff -u -r1.9 msvc-stlport-tools.jam
--- msvc-stlport-tools.jam 16 Aug 2003 15:30:01 -0000 1.9
+++ msvc-stlport-tools.jam 18 Dec 2003 12:51:10 -0000
@@ -49,13 +49,14 @@
# STLport iostreams or native iostreams
feature stlport-iostream : off on ;

-STLPORT_VERSION = 4.5.3 ;
-STLPORT_VERSIONS = 4.5 4.0 ;
+STLPORT_VERSION ?= 4.5.3 ;
+STLPORT_VERSIONS ?= 4.6 4.5 4.0 ;
# major versions of STLport
feature stlport-version : $(STLPORT_VERSION) $(STLPORT_VERSIONS) ;

feature stlport-cstd-namespace : std global ;

+

############################################################################
#

# Returns a path which is assumed to be the root of the STLport
installation.
@@ -66,7 +67,9 @@
#
rule get-stlport-root
{
- local version = [ get-values <stlport-version> : $(gBUILD_PROPERTIES) ]
;
+ local version ;
+ version ?= [ get-values <stlport-version> : $(gBUILD_PROPERTIES) ] ;
+ version ?= $(STLPORT_VERSION) ;

local path ;
path ?= $(STLPORT_$(version)_PATH) ;
@@ -108,7 +111,7 @@
flags msvc-stlport STDLIBPATH <stlport-iostream>on : [ join [
get-stlport-root
] $(SLASH)lib ] ;

-flags msvc-stlport STLPORT_VERSION <stlport-version> ;
+flags msvc-stlport STLPORT_VERSION_FLAG <stlport-version> : ;

# special flags for STLport 4.0
{