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

Commit4c7cb9a

Browse files
committed
Add ICU 5.8 to list of supported ICU versuons
1 parent57416b4 commit4c7cb9a

File tree

2 files changed

+111
-0
lines changed

2 files changed

+111
-0
lines changed

‎configure

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9869,6 +9869,62 @@ if test "$ac_res" != no; then :
98699869

98709870
else
98719871

9872+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
9873+
$as_echo_n "checking for library containing ucol_open_58... " >&6; }
9874+
if ${ac_cv_search_ucol_open_58+:} false; then :
9875+
$as_echo_n "(cached) " >&6
9876+
else
9877+
ac_func_search_save_LIBS=$LIBS
9878+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9879+
/* end confdefs.h. */
9880+
9881+
/* Override any GCC internal prototype to avoid an error.
9882+
Use char because int might match the return type of a GCC
9883+
builtin and then its argument prototype would still apply. */
9884+
#ifdef __cplusplus
9885+
extern "C"
9886+
#endif
9887+
char ucol_open_58 ();
9888+
int
9889+
main ()
9890+
{
9891+
return ucol_open_58 ();
9892+
;
9893+
return 0;
9894+
}
9895+
_ACEOF
9896+
for ac_lib in '' icui18n icuin; do
9897+
if test -z "$ac_lib"; then
9898+
ac_res="none required"
9899+
else
9900+
ac_res=-l$ac_lib
9901+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9902+
fi
9903+
if ac_fn_c_try_link "$LINENO"; then :
9904+
ac_cv_search_ucol_open_58=$ac_res
9905+
fi
9906+
rm -f core conftest.err conftest.$ac_objext \
9907+
conftest$ac_exeext
9908+
if ${ac_cv_search_ucol_open_58+:} false; then :
9909+
break
9910+
fi
9911+
done
9912+
if ${ac_cv_search_ucol_open_58+:} false; then :
9913+
9914+
else
9915+
ac_cv_search_ucol_open_58=no
9916+
fi
9917+
rm conftest.$ac_ext
9918+
LIBS=$ac_func_search_save_LIBS
9919+
fi
9920+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
9921+
$as_echo "$ac_cv_search_ucol_open_58" >&6; }
9922+
ac_res=$ac_cv_search_ucol_open_58
9923+
if test "$ac_res" != no; then :
9924+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9925+
9926+
else
9927+
98729928
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
98739929
$as_echo_n "checking for library containing ucol_open_57... " >&6; }
98749930
if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10931,6 +10987,9 @@ fi
1093110987
fi
1093210988

1093310989

10990+
fi
10991+
10992+
1093410993
fi
1093510994

1093610995
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
@@ -10978,6 +11037,51 @@ _ACEOF
1097811037

1097911038
else
1098011039

11040+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
11041+
$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
11042+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
11043+
$as_echo_n "(cached) " >&6
11044+
else
11045+
ac_check_lib_save_LIBS=$LIBS
11046+
LIBS="-licuuc $LIBS"
11047+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11048+
/* end confdefs.h. */
11049+
11050+
/* Override any GCC internal prototype to avoid an error.
11051+
Use char because int might match the return type of a GCC
11052+
builtin and then its argument prototype would still apply. */
11053+
#ifdef __cplusplus
11054+
extern "C"
11055+
#endif
11056+
char ucnv_fromUChars_58 ();
11057+
int
11058+
main ()
11059+
{
11060+
return ucnv_fromUChars_58 ();
11061+
;
11062+
return 0;
11063+
}
11064+
_ACEOF
11065+
if ac_fn_c_try_link "$LINENO"; then :
11066+
ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
11067+
else
11068+
ac_cv_lib_icuuc_ucnv_fromUChars_58=no
11069+
fi
11070+
rm -f core conftest.err conftest.$ac_objext \
11071+
conftest$ac_exeext conftest.$ac_ext
11072+
LIBS=$ac_check_lib_save_LIBS
11073+
fi
11074+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
11075+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
11076+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
11077+
cat >>confdefs.h <<_ACEOF
11078+
#define HAVE_LIBICUUC 1
11079+
_ACEOF
11080+
11081+
LIBS="-licuuc $LIBS"
11082+
11083+
else
11084+
1098111085
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
1098211086
$as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
1098311087
if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11842,6 +11946,9 @@ fi
1184211946
fi
1184311947

1184411948

11949+
fi
11950+
11951+
1184511952
fi
1184611953

1184711954
fi

‎configure.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,6 +1152,7 @@ fi
11521152

11531153
if test "$with_icu" = yes ; then
11541154
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
1155+
AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
11551156
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11561157
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11571158
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1188,7 +1189,9 @@ AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui1
11881189
])
11891190
])
11901191
])
1192+
])
11911193
AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
1194+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
11921195
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11931196
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
11941197
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1225,6 +1228,7 @@ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is r
12251228
])
12261229
])
12271230
])
1231+
])
12281232
fi
12291233

12301234
if test "$with_pam" = yes ; then

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp