Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit9b55e10

Browse files
committed
Merge branch 'PGPRO9_6_icu' into PGPRO9_6
2 parents46b727b +194b966 commit9b55e10

File tree

10 files changed

+2704
-151
lines changed

10 files changed

+2704
-151
lines changed

‎configure

Lines changed: 2019 additions & 149 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,16 @@ PGAC_ARG_BOOL(with, systemd, no, [build with systemd support],
729729
AC_SUBST(with_systemd)
730730
AC_MSG_RESULT([$with_systemd])
731731

732+
#
733+
# ICU
734+
#
735+
AC_MSG_CHECKING([whether to build with ICU support])
736+
PGAC_ARG_BOOL(with, icu, no, [ --with-icu build with ICU support],
737+
[AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
738+
AC_MSG_RESULT([$with_icu])
739+
AC_SUBST(with_icu)
740+
741+
732742
#
733743
# Readline
734744
#
@@ -1120,6 +1130,75 @@ if test "$with_openssl" = yes ; then
11201130
AC_CHECK_FUNCS([SSL_get_current_compression])
11211131
fi
11221132

1133+
if test "$with_icu" = yes ; then
1134+
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
1135+
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
1136+
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
1137+
AC_SEARCH_LIBS(ucol_open_54, [icui18n icuin], [], [
1138+
AC_SEARCH_LIBS(ucol_open_53, [icui18n icuin], [], [
1139+
AC_SEARCH_LIBS(ucol_open_52, [icui18n icuin], [], [
1140+
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
1141+
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
1142+
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1143+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1144+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1145+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1146+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1147+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
1148+
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
1149+
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
1150+
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
1151+
])
1152+
])
1153+
])
1154+
])
1155+
])
1156+
])
1157+
])
1158+
])
1159+
])
1160+
])
1161+
])
1162+
])
1163+
])
1164+
])
1165+
])
1166+
])
1167+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
1168+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
1169+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
1170+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_54, [], [
1171+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_53, [], [
1172+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
1173+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
1174+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
1175+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
1176+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
1177+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1178+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1179+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1180+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
1181+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
1182+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
1183+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
1184+
])
1185+
])
1186+
])
1187+
])
1188+
])
1189+
])
1190+
])
1191+
])
1192+
])
1193+
])
1194+
])
1195+
])
1196+
])
1197+
])
1198+
])
1199+
])
1200+
fi
1201+
11231202
if test "$with_pam" = yes ; then
11241203
AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
11251204
fi
@@ -1273,6 +1352,10 @@ if test "$with_openssl" = yes ; then
12731352
AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])])
12741353
fi
12751354

1355+
if test "$with_icu" = yes ; then
1356+
AC_CHECK_HEADER(unicode/utypes.h, [], [AC_MSG_ERROR([header file <unicode/utypes.h> is required for ICU])])
1357+
fi
1358+
12761359
if test "$with_pam" = yes ; then
12771360
AC_CHECK_HEADERS(security/pam_appl.h, [],
12781361
[AC_CHECK_HEADERS(pam/pam_appl.h, [],

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp