mirror of
https://github.com/boostorg/regex.git
synced 2025-07-21 16:22:43 +02:00
Merge from trunk
[SVN r52379]
This commit is contained in:
@ -10,10 +10,13 @@ project boost/regex
|
|||||||
#
|
#
|
||||||
# ICU configuration:
|
# ICU configuration:
|
||||||
#
|
#
|
||||||
local ICU_PATH = [ modules.peek : ICU_PATH ] ;
|
if [ modules.peek : ICU_PATH ]
|
||||||
|
{
|
||||||
|
ICU_PATH = [ modules.peek : ICU_PATH ] ;
|
||||||
|
}
|
||||||
|
|
||||||
rule check-icu-config ( )
|
rule check-icu-config ( )
|
||||||
{
|
{
|
||||||
local ICU_PATH = [ modules.peek : ICU_PATH ] ;
|
|
||||||
local HAVE_ICU = [ modules.peek : HAVE_ICU ] ;
|
local HAVE_ICU = [ modules.peek : HAVE_ICU ] ;
|
||||||
local ICU_LINK = [ modules.peek : ICU_LINK ] ;
|
local ICU_LINK = [ modules.peek : ICU_LINK ] ;
|
||||||
|
|
||||||
@ -59,8 +62,8 @@ rule check-icu-config ( )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ECHO WARNING: ICU shared common library not found in path. ;
|
ECHO warning: ICU shared common library not found in path. ;
|
||||||
ECHO HINT: If the regex library fails to link then try again ;
|
ECHO hint: If the regex library fails to link then try again ;
|
||||||
ECHO with the environment variable ICU_LINK set to contain ;
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
ECHO the linker options required to link to ICU. ;
|
ECHO the linker options required to link to ICU. ;
|
||||||
ECHO Defaulting to look for libicuuc ... ;
|
ECHO Defaulting to look for libicuuc ... ;
|
||||||
@ -91,8 +94,8 @@ rule check-icu-config ( )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ECHO WARNING: ICU shared i18n library not found in path. ;
|
ECHO warning: ICU shared i18n library not found in path. ;
|
||||||
ECHO HINT: If the regex library fails to link then try again ;
|
ECHO hint: If the regex library fails to link then try again ;
|
||||||
ECHO with the environment variable ICU_LINK set to contain ;
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
ECHO the linker options required to link to ICU. ;
|
ECHO the linker options required to link to ICU. ;
|
||||||
ECHO Defaulting to look for libicui18n ... ;
|
ECHO Defaulting to look for libicui18n ... ;
|
||||||
@ -127,15 +130,15 @@ rule check-icu-config ( )
|
|||||||
echo $(os) ;
|
echo $(os) ;
|
||||||
if $(os) != "DARWIN"
|
if $(os) != "DARWIN"
|
||||||
{
|
{
|
||||||
ECHO WARNING: ICU shared data library not found in path. ;
|
ECHO warning: ICU shared data library not found in path. ;
|
||||||
ECHO HINT: If the regex library fails to link then try again ;
|
ECHO hint: If the regex library fails to link then try again ;
|
||||||
ECHO with the environment variable ICU_LINK set to contain ;
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
ECHO the linker options required to link to ICU. ;
|
ECHO the linker options required to link to ICU. ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ECHO WARNING: ICU shared data library not found in path. ;
|
ECHO warning: ICU shared data library not found in path. ;
|
||||||
ECHO HINT: If the regex library fails to link then try again ;
|
ECHO hint: If the regex library fails to link then try again ;
|
||||||
ECHO with the environment variable ICU_LINK set to contain ;
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
ECHO the linker options required to link to ICU. ;
|
ECHO the linker options required to link to ICU. ;
|
||||||
ECHO Defaulting to look for libicudata ... ;
|
ECHO Defaulting to look for libicudata ... ;
|
||||||
@ -160,14 +163,14 @@ rule check-icu-config ( )
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
message icu_config
|
message icu_config
|
||||||
: "Building Boost.Regex with the optional Unicode/ICU support disabled."
|
: "warning: Building Boost.Regex with the optional Unicode/ICU support disabled."
|
||||||
: "Note: Please refer to the Boost.Regex documentation for more information"
|
: "note: Please refer to the Boost.Regex documentation for more information"
|
||||||
: "Note: this is a strictly optional feature." ;
|
: "note: this is a strictly optional feature." ;
|
||||||
|
|
||||||
if $(ICU_PATH)
|
if $(ICU_PATH)
|
||||||
{
|
{
|
||||||
message icu_config2
|
message icu_config2
|
||||||
: WARNING! ICU configuration failed
|
: warning! ICU configuration failed
|
||||||
: " Couldn't find utypes.h in " $(ICU_PATH:J=" ")/include/unicode ;
|
: " Couldn't find utypes.h in " $(ICU_PATH:J=" ")/include/unicode ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user