[Boost-commit] svn:boost r52379 - branches/release/libs/regex/build

Subject: [Boost-commit] svn:boost r52379 - branches/release/libs/regex/build
From: ghost_at_[hidden]
Date: 2009-04-14 04:33:46

Author: vladimir_prus
Date: 2009-04-14 04:33:45 EDT (Tue, 14 Apr 2009)
New Revision: 52379
URL: http://svn.boost.org/trac/boost/changeset/52379

Log:
Merge from trunk
Text files modified: 
   branches/release/libs/regex/build/Jamfile.v2 |    31 +++++++++++++++++--------------         
   1 files changed, 17 insertions(+), 14 deletions(-)

Modified: branches/release/libs/regex/build/Jamfile.v2
==============================================================================
--- branches/release/libs/regex/build/Jamfile.v2	(original)
+++ branches/release/libs/regex/build/Jamfile.v2	2009-04-14 04:33:45 EDT (Tue, 14 Apr 2009)
@@ -10,10 +10,13 @@
 #
 # ICU configuration:
 #
-local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+if [ modules.peek : ICU_PATH ]
+{    
+    ICU_PATH =  [ modules.peek : ICU_PATH ] ;
+}
+
 rule check-icu-config ( )
 {
-   local ICU_PATH = [ modules.peek : ICU_PATH ] ;
    local HAVE_ICU = [ modules.peek : HAVE_ICU ] ;
    local ICU_LINK = [ modules.peek : ICU_LINK ] ;
 
@@ -59,8 +62,8 @@
             }
             else
             {
-               ECHO WARNING: ICU shared common library not found in path. ;
-               ECHO HINT:    If the regex library fails to link then try again ;
+               ECHO warning: ICU shared common library not found in path. ;
+               ECHO hint:    If the regex library fails to link then try again ;
                ECHO          with the environment variable ICU_LINK set to contain ;
                ECHO          the linker options required to link to ICU. ;
                ECHO          Defaulting to look for libicuuc ... ;
@@ -91,8 +94,8 @@
             }
             else
             {
-               ECHO WARNING: ICU shared i18n library not found in path. ;
-               ECHO HINT:    If the regex library fails to link then try again ;
+               ECHO warning: ICU shared i18n library not found in path. ;
+               ECHO hint:    If the regex library fails to link then try again ;
                ECHO          with the environment variable ICU_LINK set to contain ;
                ECHO          the linker options required to link to ICU. ;
                ECHO          Defaulting to look for libicui18n ... ;
@@ -127,15 +130,15 @@
                echo $(os) ;
                if $(os) != "DARWIN"
                {
-                  ECHO WARNING: ICU shared data library not found in path. ;
-                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO warning: ICU shared data library not found in path. ;
+                  ECHO hint:    If the regex library fails to link then try again ;
                   ECHO          with the environment variable ICU_LINK set to contain ;
                   ECHO          the linker options required to link to ICU. ;
                }
                else
                {
-                  ECHO WARNING: ICU shared data library not found in path. ;
-                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO warning: ICU shared data library not found in path. ;
+                  ECHO hint:    If the regex library fails to link then try again ;
                   ECHO          with the environment variable ICU_LINK set to contain ;
                   ECHO          the linker options required to link to ICU. ;
                   ECHO          Defaulting to look for libicudata ... ;
@@ -160,14 +163,14 @@
    else
    {
       message icu_config
-		: "Building Boost.Regex with the optional Unicode/ICU support disabled."
-		: "Note: Please refer to the Boost.Regex documentation for more information"
-		: "Note: this is a strictly optional feature." ;
+		: "warning: Building Boost.Regex with the optional Unicode/ICU support disabled."
+		: "note: Please refer to the Boost.Regex documentation for more information"
+		: "note: this is a strictly optional feature." ;
 
       if $(ICU_PATH)
       {
          message icu_config2 
-           : WARNING! ICU configuration failed
+           : warning! ICU configuration failed
            : "    Couldn't find utypes.h in " $(ICU_PATH:J=" ")/include/unicode ;
       }
       else