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

Commitf59efd0

Browse files
committed
Add configure support for ICU 5.8
1 parentbbec89c commitf59efd0

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
@@ -9813,6 +9813,62 @@ done
98139813
fi
98149814

98159815
if test "$with_icu" = yes ; then
9816+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
9817+
$as_echo_n "checking for library containing ucol_open_58... " >&6; }
9818+
if ${ac_cv_search_ucol_open_58+:} false; then :
9819+
$as_echo_n "(cached) " >&6
9820+
else
9821+
ac_func_search_save_LIBS=$LIBS
9822+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9823+
/* end confdefs.h. */
9824+
9825+
/* Override any GCC internal prototype to avoid an error.
9826+
Use char because int might match the return type of a GCC
9827+
builtin and then its argument prototype would still apply. */
9828+
#ifdef __cplusplus
9829+
extern "C"
9830+
#endif
9831+
char ucol_open_58 ();
9832+
int
9833+
main ()
9834+
{
9835+
return ucol_open_58 ();
9836+
;
9837+
return 0;
9838+
}
9839+
_ACEOF
9840+
for ac_lib in '' icui18n icuin; do
9841+
if test -z "$ac_lib"; then
9842+
ac_res="none required"
9843+
else
9844+
ac_res=-l$ac_lib
9845+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9846+
fi
9847+
if ac_fn_c_try_link "$LINENO"; then :
9848+
ac_cv_search_ucol_open_58=$ac_res
9849+
fi
9850+
rm -f core conftest.err conftest.$ac_objext \
9851+
conftest$ac_exeext
9852+
if ${ac_cv_search_ucol_open_58+:} false; then :
9853+
break
9854+
fi
9855+
done
9856+
if ${ac_cv_search_ucol_open_58+:} false; then :
9857+
9858+
else
9859+
ac_cv_search_ucol_open_58=no
9860+
fi
9861+
rm conftest.$ac_ext
9862+
LIBS=$ac_func_search_save_LIBS
9863+
fi
9864+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
9865+
$as_echo "$ac_cv_search_ucol_open_58" >&6; }
9866+
ac_res=$ac_cv_search_ucol_open_58
9867+
if test "$ac_res" != no; then :
9868+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9869+
9870+
else
9871+
98169872
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
98179873
$as_echo_n "checking for library containing ucol_open_57... " >&6; }
98189874
if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10815,6 +10871,54 @@ fi
1081510871

1081610872
fi
1081710873

10874+
10875+
fi
10876+
10877+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
10878+
$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
10879+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
10880+
$as_echo_n "(cached) " >&6
10881+
else
10882+
ac_check_lib_save_LIBS=$LIBS
10883+
LIBS="-licuuc $LIBS"
10884+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10885+
/* end confdefs.h. */
10886+
10887+
/* Override any GCC internal prototype to avoid an error.
10888+
Use char because int might match the return type of a GCC
10889+
builtin and then its argument prototype would still apply. */
10890+
#ifdef __cplusplus
10891+
extern "C"
10892+
#endif
10893+
char ucnv_fromUChars_58 ();
10894+
int
10895+
main ()
10896+
{
10897+
return ucnv_fromUChars_58 ();
10898+
;
10899+
return 0;
10900+
}
10901+
_ACEOF
10902+
if ac_fn_c_try_link "$LINENO"; then :
10903+
ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
10904+
else
10905+
ac_cv_lib_icuuc_ucnv_fromUChars_58=no
10906+
fi
10907+
rm -f core conftest.err conftest.$ac_objext \
10908+
conftest$ac_exeext conftest.$ac_ext
10909+
LIBS=$ac_check_lib_save_LIBS
10910+
fi
10911+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
10912+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
10913+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
10914+
cat >>confdefs.h <<_ACEOF
10915+
#define HAVE_LIBICUUC 1
10916+
_ACEOF
10917+
10918+
LIBS="-licuuc $LIBS"
10919+
10920+
else
10921+
1081810922
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
1081910923
$as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
1082010924
if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11628,6 +11732,9 @@ fi
1162811732
fi
1162911733

1163011734

11735+
fi
11736+
11737+
1163111738
fi
1163211739

1163311740
fi

‎configure.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,7 @@ if test "$with_openssl" = yes ; then
11511151
fi
11521152

11531153
if test "$with_icu" = yes ; then
1154+
AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
11541155
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11551156
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11561157
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1184,6 +1185,8 @@ if test "$with_icu" = yes ; then
11841185
])
11851186
])
11861187
])
1188+
])
1189+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
11871190
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11881191
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
11891192
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1217,6 +1220,7 @@ if test "$with_icu" = yes ; then
12171220
])
12181221
])
12191222
])
1223+
])
12201224
fi
12211225

12221226
if test "$with_pam" = yes ; then

0 commit comments

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