Skip to content

Commit a171e39

Browse files
committed
Integrated Teodor Sigaev's ICU patch
1 parent 3284f19 commit a171e39

File tree

13 files changed

+2342
-343
lines changed

13 files changed

+2342
-343
lines changed

configure

Lines changed: 1695 additions & 146 deletions
Large diffs are not rendered by default.

configure.in

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,16 @@ PGAC_ARG_BOOL(with, selinux, no, [build with SELinux support])
699699
AC_SUBST(with_selinux)
700700
AC_MSG_RESULT([$with_selinux])
701701

702+
#
703+
# ICU
704+
#
705+
AC_MSG_CHECKING([whether to build with ICU support])
706+
PGAC_ARG_BOOL(with, icu, no, [ --with-icu build with ICU support],
707+
[AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
708+
AC_MSG_RESULT([$with_icu])
709+
AC_SUBST(with_icu)
710+
711+
702712
#
703713
# Readline
704714
#
@@ -1036,6 +1046,63 @@ if test "$with_openssl" = yes ; then
10361046
AC_CHECK_FUNCS([SSL_get_current_compression])
10371047
fi
10381048

1049+
if test "$with_icu" = yes ; then
1050+
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
1051+
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
1052+
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
1053+
AC_SEARCH_LIBS(ucol_open_54, [icui18n icuin], [], [
1054+
AC_SEARCH_LIBS(ucol_open_53, [icui18n icuin], [], [
1055+
AC_SEARCH_LIBS(ucol_open_52, [icui18n icuin], [], [
1056+
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
1057+
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
1058+
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1059+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1060+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061+
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
1062+
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
1063+
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
1064+
])
1065+
])
1066+
])
1067+
])
1068+
])
1069+
])
1070+
])
1071+
])
1072+
])
1073+
])
1074+
])
1075+
])
1076+
])
1077+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
1078+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
1079+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
1080+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_54, [], [
1081+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_53, [], [
1082+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
1083+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
1084+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
1085+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
1086+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
1087+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1088+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
1089+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
1090+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
1091+
])
1092+
])
1093+
])
1094+
])
1095+
])
1096+
])
1097+
])
1098+
])
1099+
])
1100+
])
1101+
])
1102+
])
1103+
])
1104+
fi
1105+
10391106
if test "$with_pam" = yes ; then
10401107
AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
10411108
fi
@@ -1162,6 +1229,10 @@ if test "$with_openssl" = yes ; then
11621229
AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
11631230
fi
11641231

1232+
if test "$with_icu" = yes ; then
1233+
AC_CHECK_HEADER(unicode/utypes.h, [], [AC_MSG_ERROR([header file <unicode/utypes.h> is required for ICU])])
1234+
fi
1235+
11651236
if test "$with_pam" = yes ; then
11661237
AC_CHECK_HEADERS(security/pam_appl.h, [],
11671238
[AC_CHECK_HEADERS(pam/pam_appl.h, [],

contrib/hunspell_en_us/results/hunspell_en_us.out

Lines changed: 0 additions & 61 deletions
This file was deleted.

contrib/hunspell_fr/results/hunspell_fr.out

Lines changed: 0 additions & 79 deletions
This file was deleted.

contrib/hunspell_nl_nl/results/hunspell_nl_nl.out

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/hunspell_ru_ru/results/hunspell_ru_ru.out

Lines changed: 0 additions & 55 deletions
This file was deleted.

contrib/hunspell_tr_tr/results/hunspell_tr_tr.out

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)