diff options
author | Eike Rathke <erack@redhat.com> | 2013-01-02 19:03:51 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-01-02 19:23:03 +0100 |
commit | 79a3c9b186534c5e3adde2266d3e7fd6527b11b9 (patch) | |
tree | f2c688de53158b47994f970e897a51795f6913f0 /configure.ac | |
parent | 3b1102ad193d55b98c7c72e706173353c35bb1b6 (diff) |
partly revert 92a9b7780c6e13a4da3b12794342edbc4c09ef51 for ICU < 49
Re-enable build with ICU 4.6 and 4.8
ICU versions prior to 49 don't know Conditional_Japanese_Starter and
Hebrew_Letter
Also, the change in i18npool/CustomTarget_breakiterator.mk
- -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \
with i18npool/source/breakiterator/data/line.txt
-$CL = [:LineBreak = Close_Punctuation:] ;
+$CL = [:LineBreak = Close_Parenthesis:];
did not produce equivalent results. Instead use
$CP = [:LineBreak = Close_Parenthesis:];
$CL = [[:LineBreak = Close_Punctuation:] $CP];
Change-Id: I14fc14319ea34f23393264560452a79bb49fc3a7
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index af1b7862ae6c..f3e69acf5ab2 100644 --- a/configure.ac +++ b/configure.ac @@ -8381,6 +8381,8 @@ ICU_MAJOR=49 ICU_MINOR=1 ICU_MICRO=1 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" +ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES" +ICU_RECLASSIFIED_HEBREW_LETTER="YES" AC_MSG_CHECKING([which icu to use]) if test "$with_system_icu" = "yes"; then AC_MSG_RESULT([external]) @@ -8442,8 +8444,12 @@ You can use --with-system-icu-for-build=force to use it anyway.]) fi if test "$ICU_MAJOR" -ge "49"; then ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" + ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES" + ICU_RECLASSIFIED_HEBREW_LETTER="YES" else ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO" + ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="NO" + ICU_RECLASSIFIED_HEBREW_LETTER="NO" fi fi @@ -8463,6 +8469,8 @@ AC_SUBST(ICU_MAJOR) AC_SUBST(ICU_MINOR) AC_SUBST(ICU_MICRO) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) +AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) +AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) AC_SUBST([MINGW_ICUDATA_DLL]) AC_SUBST([MINGW_ICUI18N_DLL]) AC_SUBST([MINGW_ICUUC_DLL]) |