diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-19 14:32:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-19 15:42:14 +0000 |
| commit | 138e5a051805ca8a3b7e9626742cc475e3577cc4 (patch) | |
| tree | b9e382a8c5e7faebca3f9342b2433567078530d4 /configure.ac | |
| parent | 95e6a0885e65cc57b11719cc0658be9d8b78fba9 (diff) | |
make it possible to build with system icu 4.2 (RHEL-6)
Change-Id: I69bf7bc33a619c4aa9483e2dc3d5540e4dfa7458
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ef68d5288f04..6fad25ab3c9c 100644 --- a/configure.ac +++ b/configure.ac @@ -8457,6 +8457,7 @@ SYSTEM_GENCMN= ICU_MAJOR=49 ICU_MINOR=1 ICU_MICRO=1 +ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES" ICU_RECLASSIFIED_HEBREW_LETTER="YES" @@ -8481,10 +8482,10 @@ if test "$with_system_icu" = "yes"; then ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2` ICU_MICRO=`echo $ICU_VERSION | cut -d"." -f3` - if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "6" \); then + if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "2" \); then AC_MSG_RESULT([OK, $ICU_VERSION]) else - AC_MSG_ERROR([not suitable, only >= 4.6 supported currently]) + AC_MSG_ERROR([not suitable, only >= 4.2 supported currently]) fi if test "$cross_compiling" = "yes" -a \( "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" \); then @@ -8519,6 +8520,11 @@ You can use --with-system-icu-for-build=force to use it anyway.]) if test -z "$SYSTEM_GENCMN"; then AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu development tool \'gencmn\']) fi + if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4" \); then + ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" + else + ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO" + fi if test "$ICU_MAJOR" -ge "49"; then ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES" @@ -8552,6 +8558,7 @@ AC_SUBST(SYSTEM_GENCMN) AC_SUBST(ICU_MAJOR) AC_SUBST(ICU_MINOR) AC_SUBST(ICU_MICRO) +AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) |