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

Commit7d8ea6b

Browse files
committed
Allow to build with libicu4.2
1 parent843f9c6 commit7d8ea6b

File tree

2 files changed

+112
-1
lines changed

2 files changed

+112
-1
lines changed

‎configure‎

Lines changed: 108 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8946,7 +8946,7 @@ return ucol_open_57 ();
89468946
return 0;
89478947
}
89488948
_ACEOF
8949-
forac_libin'' icui18n, icuin;do
8949+
forac_libin'' icui18n icuin;do
89508950
iftest -z"$ac_lib";then
89518951
ac_res="none required"
89528952
else
@@ -9536,6 +9536,62 @@ ac_res=$ac_cv_search_ucol_open_43
95369536
iftest"$ac_res"!= no;then:
95379537
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
95389538

9539+
else
9540+
9541+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_42">&5
9542+
$as_echo_n"checking for library containing ucol_open_42...">&6; }
9543+
if${ac_cv_search_ucol_open_42+:}false;then:
9544+
$as_echo_n"(cached)">&6
9545+
else
9546+
ac_func_search_save_LIBS=$LIBS
9547+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
9548+
/* end confdefs.h. */
9549+
9550+
/* Override any GCC internal prototype to avoid an error.
9551+
Use char because int might match the return type of a GCC
9552+
builtin and then its argument prototype would still apply. */
9553+
#ifdef __cplusplus
9554+
extern "C"
9555+
#endif
9556+
char ucol_open_42 ();
9557+
int
9558+
main ()
9559+
{
9560+
return ucol_open_42 ();
9561+
;
9562+
return 0;
9563+
}
9564+
_ACEOF
9565+
forac_libin'' icui18n icuin;do
9566+
iftest -z"$ac_lib";then
9567+
ac_res="none required"
9568+
else
9569+
ac_res=-l$ac_lib
9570+
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
9571+
fi
9572+
if ac_fn_c_try_link"$LINENO";then:
9573+
ac_cv_search_ucol_open_42=$ac_res
9574+
fi
9575+
rm -f core conftest.err conftest.$ac_objext \
9576+
conftest$ac_exeext
9577+
if${ac_cv_search_ucol_open_42+:}false;then:
9578+
break
9579+
fi
9580+
done
9581+
if${ac_cv_search_ucol_open_42+:}false;then:
9582+
9583+
else
9584+
ac_cv_search_ucol_open_42=no
9585+
fi
9586+
rm conftest.$ac_ext
9587+
LIBS=$ac_func_search_save_LIBS
9588+
fi
9589+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_ucol_open_42">&5
9590+
$as_echo"$ac_cv_search_ucol_open_42">&6; }
9591+
ac_res=$ac_cv_search_ucol_open_42
9592+
iftest"$ac_res"!= no;then:
9593+
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
9594+
95399595
else
95409596

95419597
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_3_8">&5
@@ -9745,6 +9801,9 @@ fi
97459801
fi
97469802

97479803

9804+
fi
9805+
9806+
97489807
fi
97499808

97509809
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc">&5
@@ -10240,6 +10299,51 @@ _ACEOF
1024010299

1024110300
LIBS="-licuuc$LIBS"
1024210301

10302+
else
10303+
10304+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_42 in -licuuc">&5
10305+
$as_echo_n"checking for ucnv_fromUChars_42 in -licuuc...">&6; }
10306+
if${ac_cv_lib_icuuc_ucnv_fromUChars_42+:}false;then:
10307+
$as_echo_n"(cached)">&6
10308+
else
10309+
ac_check_lib_save_LIBS=$LIBS
10310+
LIBS="-licuuc$LIBS"
10311+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
10312+
/* end confdefs.h. */
10313+
10314+
/* Override any GCC internal prototype to avoid an error.
10315+
Use char because int might match the return type of a GCC
10316+
builtin and then its argument prototype would still apply. */
10317+
#ifdef __cplusplus
10318+
extern "C"
10319+
#endif
10320+
char ucnv_fromUChars_42 ();
10321+
int
10322+
main ()
10323+
{
10324+
return ucnv_fromUChars_42 ();
10325+
;
10326+
return 0;
10327+
}
10328+
_ACEOF
10329+
if ac_fn_c_try_link"$LINENO";then:
10330+
ac_cv_lib_icuuc_ucnv_fromUChars_42=yes
10331+
else
10332+
ac_cv_lib_icuuc_ucnv_fromUChars_42=no
10333+
fi
10334+
rm -f core conftest.err conftest.$ac_objext \
10335+
conftest$ac_exeext conftest.$ac_ext
10336+
LIBS=$ac_check_lib_save_LIBS
10337+
fi
10338+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_lib_icuuc_ucnv_fromUChars_42">&5
10339+
$as_echo"$ac_cv_lib_icuuc_ucnv_fromUChars_42">&6; }
10340+
iftest"x$ac_cv_lib_icuuc_ucnv_fromUChars_42" = xyes;then:
10341+
cat>>confdefs.h<<_ACEOF
10342+
#define HAVE_LIBICUUC 1
10343+
_ACEOF
10344+
10345+
LIBS="-licuuc$LIBS"
10346+
1024310347
else
1024410348

1024510349
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_3_8 in -licuuc">&5
@@ -10416,6 +10520,9 @@ fi
1041610520
fi
1041710521

1041810522

10523+
fi
10524+
10525+
1041910526
fi
1042010527

1042110528
fi

‎configure.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ if test "$with_icu" = yes ; then
10581058
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
10591059
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
10601060
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061+
AC_SEARCH_LIBS(ucol_open_42, [icui18n icuin], [], [
10611062
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
10621063
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
10631064
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
@@ -1068,6 +1069,7 @@ if test "$with_icu" = yes ; then
10681069
])
10691070
])
10701071
])
1072+
])
10711073
])
10721074
])
10731075
])
@@ -1085,12 +1087,14 @@ if test "$with_icu" = yes ; then
10851087
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
10861088
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
10871089
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1090+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_42, [], [
10881091
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
10891092
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
10901093
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
10911094
])
10921095
])
10931096
])
1097+
])
10941098
])
10951099
])
10961100
])

0 commit comments

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