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

Commit23b3cac

Browse files
committed
Fix configure test for ICU 5_8 found in FreeBSD11
1 parentbd5bb67 commit23b3cac

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎configure

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9813,9 +9813,9 @@ done
98139813
fi
98149814

98159815
if test "$with_icu" = yes ; then
9816-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingucol_open_58" >&5
9817-
$as_echo_n "checking for library containingucol_open_58... " >&6; }
9818-
if ${ac_cv_search_ucol_open_58+:} false; then :
9816+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingucol_open" >&5
9817+
$as_echo_n "checking for library containingucol_open... " >&6; }
9818+
if ${ac_cv_search_ucol_open+:} false; then :
98199819
$as_echo_n "(cached) " >&6
98209820
else
98219821
ac_func_search_save_LIBS=$LIBS
@@ -9828,11 +9828,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
98289828
#ifdef __cplusplus
98299829
extern "C"
98309830
#endif
9831-
charucol_open_58 ();
9831+
charucol_open ();
98329832
int
98339833
main ()
98349834
{
9835-
returnucol_open_58 ();
9835+
returnucol_open ();
98369836
;
98379837
return 0;
98389838
}
@@ -9845,25 +9845,25 @@ for ac_lib in '' icui18n icuin; do
98459845
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
98469846
fi
98479847
if ac_fn_c_try_link "$LINENO"; then :
9848-
ac_cv_search_ucol_open_58=$ac_res
9848+
ac_cv_search_ucol_open=$ac_res
98499849
fi
98509850
rm -f core conftest.err conftest.$ac_objext \
98519851
conftest$ac_exeext
9852-
if ${ac_cv_search_ucol_open_58+:} false; then :
9852+
if ${ac_cv_search_ucol_open+:} false; then :
98539853
break
98549854
fi
98559855
done
9856-
if ${ac_cv_search_ucol_open_58+:} false; then :
9856+
if ${ac_cv_search_ucol_open+:} false; then :
98579857

98589858
else
9859-
ac_cv_search_ucol_open_58=no
9859+
ac_cv_search_ucol_open=no
98609860
fi
98619861
rm conftest.$ac_ext
98629862
LIBS=$ac_func_search_save_LIBS
98639863
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
9864+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open" >&5
9865+
$as_echo "$ac_cv_search_ucol_open" >&6; }
9866+
ac_res=$ac_cv_search_ucol_open
98679867
if test "$ac_res" != no; then :
98689868
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
98699869

@@ -10874,9 +10874,9 @@ fi
1087410874

1087510875
fi
1087610876

10877-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forucnv_fromUChars_58 in -licuuc" >&5
10878-
$as_echo_n "checking forucnv_fromUChars_58 in -licuuc... " >&6; }
10879-
if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
10877+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forucnv_fromUChars in -licuuc" >&5
10878+
$as_echo_n "checking forucnv_fromUChars in -licuuc... " >&6; }
10879+
if ${ac_cv_lib_icuuc_ucnv_fromUChars+:} false; then :
1088010880
$as_echo_n "(cached) " >&6
1088110881
else
1088210882
ac_check_lib_save_LIBS=$LIBS
@@ -10890,27 +10890,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1089010890
#ifdef __cplusplus
1089110891
extern "C"
1089210892
#endif
10893-
charucnv_fromUChars_58 ();
10893+
charucnv_fromUChars ();
1089410894
int
1089510895
main ()
1089610896
{
10897-
returnucnv_fromUChars_58 ();
10897+
returnucnv_fromUChars ();
1089810898
;
1089910899
return 0;
1090010900
}
1090110901
_ACEOF
1090210902
if ac_fn_c_try_link "$LINENO"; then :
10903-
ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
10903+
ac_cv_lib_icuuc_ucnv_fromUChars=yes
1090410904
else
10905-
ac_cv_lib_icuuc_ucnv_fromUChars_58=no
10905+
ac_cv_lib_icuuc_ucnv_fromUChars=no
1090610906
fi
1090710907
rm -f core conftest.err conftest.$ac_objext \
1090810908
conftest$ac_exeext conftest.$ac_ext
1090910909
LIBS=$ac_check_lib_save_LIBS
1091010910
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 :
10911+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars" >&5
10912+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars" >&6; }
10913+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars" = xyes; then :
1091410914
cat >>confdefs.h <<_ACEOF
1091510915
#define HAVE_LIBICUUC 1
1091610916
_ACEOF

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,7 +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], [], [
1154+
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
11551155
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11561156
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11571157
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1186,7 +1186,7 @@ if test "$with_icu" = yes ; then
11861186
])
11871187
])
11881188
])
1189-
AC_CHECK_LIB(icuuc,ucnv_fromUChars_58, [], [
1189+
AC_CHECK_LIB(icuuc,ucnv_fromUChars, [], [
11901190
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11911191
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
11921192
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [

0 commit comments

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