Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r52168 - trunk/libs/iostreams/build
From: ghost_at_[hidden]
Date: 2009-04-04 08:44:56


Author: vladimir_prus
Date: 2009-04-04 08:44:55 EDT (Sat, 04 Apr 2009)
New Revision: 52168
URL: http://svn.boost.org/trac/boost/changeset/52168

Log:
Check if value of NO_COMPRESSION/NO_ZLIB is 0 or 1.

Originally, only presence of these variables was checked.
Unfortunately, iostreams documentation said, incorrectly,
that NO_ZLIB and NO_BZIP2 default to 1 on Windows, which
caused some users to pass NO_ZLIB=0 explicitly, together
with other variables,thereby still disabling zlib.

This match makes Jamfile forgiving of this error.

Fixes #1967.

Text files modified:
   trunk/libs/iostreams/build/Jamfile.v2 | 18 +++++++++++++++++-
   1 files changed, 17 insertions(+), 1 deletions(-)

Modified: trunk/libs/iostreams/build/Jamfile.v2
==============================================================================
--- trunk/libs/iostreams/build/Jamfile.v2 (original)
+++ trunk/libs/iostreams/build/Jamfile.v2 2009-04-04 08:44:55 EDT (Sat, 04 Apr 2009)
@@ -55,7 +55,23 @@
         modules.poke : NO_$(LIB) : 1 ;
     }
     
- if $(NO_COMPRESSION) || $(NO_$(LIB))
+ if $(NO_COMPRESSION)
+ {
+ if ! $(NO_COMPRESSION) in 0 1
+ {
+ ECHO "warning: NO_COMPRESSION should be either '0' or '1'" ;
+ }
+ }
+
+ if $(NO_$(LIB))
+ {
+ if ! $(NO_$(LIB)) in 0 1
+ {
+ ECHO "warning: NO_$(LIB) should be either '0' or '1'" ;
+ }
+ }
+
+ if $(NO_COMPRESSION) = 1 || $(NO_$(LIB)) = 1
     {
         if $(debug)
         {


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk