locales34: #i112240# for system icu >=4.4 add Close_Parenthesis to $CL Close_Punctuation; patch from <cmc>
This commit is contained in:
parent
f57ab0e27d
commit
a11f234834
3 changed files with 15670 additions and 14217 deletions
29856
configure
vendored
29856
configure
vendored
File diff suppressed because one or more lines are too long
28
configure.in
28
configure.in
|
@ -4690,6 +4690,7 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
|
|||
AC_LANG_PUSH([C++])
|
||||
AC_MSG_CHECKING([for unicode/rbbi.h])
|
||||
AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
|
||||
AC_LANG_POP([C++])
|
||||
AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
|
||||
if test -z "$SYSTEM_GENBRK"; then
|
||||
AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
|
||||
|
@ -4702,18 +4703,20 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
|
|||
if test -z "$SYSTEM_GENCMN"; then
|
||||
AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
|
||||
fi
|
||||
AC_MSG_CHECKING([ICU version])
|
||||
AC_TRY_RUN([
|
||||
#include <unicode/uversion.h>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
if(U_ICU_VERSION_MAJOR_NUM < 4)
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])])
|
||||
AC_LANG_POP([C++])
|
||||
AC_PATH_PROG( ICUCONFIG, icu-config)
|
||||
AC_MSG_CHECKING([ICU version])
|
||||
ICU_VERSION=`$ICUCONFIG --version`
|
||||
ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
|
||||
ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
|
||||
ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
|
||||
|
||||
if test "$ICU_MAJOR" -ge "4"; then
|
||||
AC_MSG_RESULT([OK])
|
||||
else
|
||||
AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
|
||||
fi
|
||||
|
||||
else
|
||||
AC_MSG_RESULT([internal])
|
||||
SYSTEM_ICU=NO
|
||||
|
@ -4723,6 +4726,9 @@ AC_SUBST(SYSTEM_ICU)
|
|||
AC_SUBST(SYSTEM_GENBRK)
|
||||
AC_SUBST(SYSTEM_GENCCODE)
|
||||
AC_SUBST(SYSTEM_GENCMN)
|
||||
AC_SUBST(ICU_MAJOR)
|
||||
AC_SUBST(ICU_MINOR)
|
||||
AC_SUBST(ICU_MICRO)
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Graphite
|
||||
|
|
|
@ -1857,6 +1857,9 @@ if ($SYSTEM_PYTHON eq "NO") {
|
|||
ToFile( "HOME", "@HOME@", "e" );
|
||||
}
|
||||
ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );
|
||||
ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
|
||||
ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
|
||||
ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
|
||||
ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
|
||||
ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
|
||||
ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );
|
||||
|
|
Loading…
Reference in a new issue