From a1de8967fa816e11cf765c1b9c7cbf42b2c77a6e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 17 Feb 2007 12:22:49 +0000
Subject: [PATCH] Fixed if...else logic and added cygwin to the list of
 compilers that need to be statically linked.

[SVN r36984]
---
 build/Jamfile.v2 | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 6f5f8f8f..b1acde23 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -106,23 +106,24 @@ rule check-icu-config ( )
                gICU_IN_LIB = icui18n ;
             }
          }
-         else
-         {
-            ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
-            ECHO Please refer to the Boost.Regex documentation for more information ;
-            ECHO (don't panic: this is a strictly optional feature). ;
-            if $(ICU_PATH)
-            {
-               ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")/include/unicode ;
-            }
-         }
-         gICU_CONFIG_CHECKED = true ;
+      }
+      gICU_CONFIG_CHECKED = true ;
+   }
+   
+   if $(gHAS_ICU)
+   {
+      return true ;
+   }
+   else
+   {
+      ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
+      ECHO Please refer to the Boost.Regex documentation for more information ;
+      ECHO (don't panic: this is a strictly optional feature). ;
+      if $(ICU_PATH)
+      {
+         ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")/include/unicode ;
       }
    }
-    if $(gHAS_ICU)
-    {
-        return true ;
-    }
 }
 
 if [ check-icu-config ]
@@ -133,7 +134,6 @@ if [ check-icu-config ]
    {
       if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
       {
-         ECHO "BAH!" ;
          BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;
          ICU_SEARCH_OPTS = <search>/$(ICU_PATH)/lib ;
       }
@@ -178,6 +178,7 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
 	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
 	     <toolset>gcc-mw:<link>static
 	     <toolset>gcc-mingw:<link>static
+	     <toolset>gcc-cygwin:<link>static
 	     $(BOOST_REGEX_ICU_OPTS)
     ;
 
@@ -185,3 +186,5 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
 
 
 
+
+