Update of /cvsroot/boost/boost/libs/regex/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7404/libs/regex/build
Modified Files:
Jamfile.v2
Log Message:
Fixed if...else logic and added cygwin to the list of compilers that need to be
statically linked.
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/regex/build/Jamfile.v2,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Jamfile.v2 4 Feb 2007 10:19:37 -0000 1.11
+++ Jamfile.v2 17 Feb 2007 12:22:49 -0000 1.12
@@ -106,23 +106,24 @@
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 $(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 @@
<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 @@
+
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
