From 69723060e5045cd185092b9144b94fda9140a7d9 Mon Sep 17 00:00:00 2001
From: John Maddock
Date: Sat, 28 May 2005 11:50:09 +0000
Subject: [PATCH] Updated build information to make it clear that ICU support
is optional.
[SVN r29253]
---
build/Jamfile | 15 +++++++--------
build/Jamfile.v2 | 15 +++++++--------
doc/Attic/install.html | 10 ++++++----
doc/install.html | 10 ++++++----
4 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/build/Jamfile b/build/Jamfile
index 75a6f6e0..668116dc 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -79,14 +79,13 @@ rule check-icu-config ( )
}
else
{
- ECHO ****************************************************** ;
- ECHO ;
- ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
- ECHO HINT: define the environment variable ICU_PATH to point to the ;
- ECHO root directy of your ICU installation if you have one. ;
- ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ;
- ECHO ;
- ECHO ****************************************************** ;
+ ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
+ ECHO Please refer to the Boost.Regex documentation for more information ;
+ ECHO (and if you don't know what ICU is then you probably don't need it). ;
+ if $(ICU_PATH)
+ {
+ ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ;
+ }
}
gICU_CONFIG_CHECKED = true ;
}
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index fa7833a9..64fa2394 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -60,14 +60,13 @@ rule check-icu-config ( )
}
else
{
- ECHO ****************************************************** ;
- ECHO ;
- ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
- ECHO HINT: define the environment variable ICU_PATH to point to the ;
- ECHO root directy of your ICU installation if you have one. ;
- ECHO Couldn't find utypes.h in \"$(ICU_PATH:J=" ")/include/unicode\" ;
- ECHO ;
- ECHO ****************************************************** ;
+ ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
+ ECHO Please refer to the Boost.Regex documentation for more information ;
+ ECHO (and if you don't know what ICU is then you probably don't need it). ;
+ if $(ICU_PATH)
+ {
+ ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ;
+ }
}
gICU_CONFIG_CHECKED = true ;
}
diff --git a/doc/Attic/install.html b/doc/Attic/install.html
index ffc1e996..3b26256f 100644
--- a/doc/Attic/install.html
+++ b/doc/Attic/install.html
@@ -46,9 +46,12 @@
guide for more information.
Building With Unicode and ICU Support
A default build of this library does not enable Unciode
- support via ICU. To do that you need to set the environment
- variable ICU_PATH to point to the route directory of your ICU installation, for
- example if ICU was installed to /usr/local you might use:
+ support via ICU. There is no need to enable this support if you
+ don't need it, but if you use ICU for your Unicode support already, and want to
+ work with Unicode-aware regular expressions then read on.
+ To enable ICU support you need to set the environment variable ICU_PATH to
+ point to the route directory of your ICU installation, for example if ICU was
+ installed to /usr/local you might use:
bjam -sICU_PATH=/usr/local -sTOOLS=my-compiler
Note that ICU is a C++ library just like Boost is, as such your copy of ICU
must have been built with the same C++ compiler (and compiler version) that you
@@ -243,4 +246,3 @@
or copy at http://www.boost.org/LICENSE_1_0.txt)