Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 931d24a

Browse files
committed
Add ICU 5.8 to list of supported ICU versuons
1 parent 4614669 commit 931d24a

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
@@ -9954,6 +9954,62 @@ if test "$ac_res" != no; then :
99549954

99559955
else
99569956

9957+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
9958+
$as_echo_n "checking for library containing ucol_open_58... " >&6; }
9959+
if ${ac_cv_search_ucol_open_58+:} false; then :
9960+
$as_echo_n "(cached) " >&6
9961+
else
9962+
ac_func_search_save_LIBS=$LIBS
9963+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9964+
/* end confdefs.h. */
9965+
9966+
/* Override any GCC internal prototype to avoid an error.
9967+
Use char because int might match the return type of a GCC
9968+
builtin and then its argument prototype would still apply. */
9969+
#ifdef __cplusplus
9970+
extern "C"
9971+
#endif
9972+
char ucol_open_58 ();
9973+
int
9974+
main ()
9975+
{
9976+
return ucol_open_58 ();
9977+
;
9978+
return 0;
9979+
}
9980+
_ACEOF
9981+
for ac_lib in '' icui18n icuin; do
9982+
if test -z "$ac_lib"; then
9983+
ac_res="none required"
9984+
else
9985+
ac_res=-l$ac_lib
9986+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9987+
fi
9988+
if ac_fn_c_try_link "$LINENO"; then :
9989+
ac_cv_search_ucol_open_58=$ac_res
9990+
fi
9991+
rm -f core conftest.err conftest.$ac_objext \
9992+
conftest$ac_exeext
9993+
if ${ac_cv_search_ucol_open_58+:} false; then :
9994+
break
9995+
fi
9996+
done
9997+
if ${ac_cv_search_ucol_open_58+:} false; then :
9998+
9999+
else
10000+
ac_cv_search_ucol_open_58=no
10001+
fi
10002+
rm conftest.$ac_ext
10003+
LIBS=$ac_func_search_save_LIBS
10004+
fi
10005+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
10006+
$as_echo "$ac_cv_search_ucol_open_58" >&6; }
10007+
ac_res=$ac_cv_search_ucol_open_58
10008+
if test "$ac_res" != no; then :
10009+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
10010+
10011+
else
10012+
995710013
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
995810014
$as_echo_n "checking for library containing ucol_open_57... " >&6; }
995910015
if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -11016,6 +11072,9 @@ fi
1101611072
fi
1101711073

1101811074

11075+
fi
11076+
11077+
1101911078
fi
1102011079

1102111080
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
@@ -11063,6 +11122,51 @@ _ACEOF
1106311122

1106411123
else
1106511124

11125+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
11126+
$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
11127+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
11128+
$as_echo_n "(cached) " >&6
11129+
else
11130+
ac_check_lib_save_LIBS=$LIBS
11131+
LIBS="-licuuc $LIBS"
11132+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11133+
/* end confdefs.h. */
11134+
11135+
/* Override any GCC internal prototype to avoid an error.
11136+
Use char because int might match the return type of a GCC
11137+
builtin and then its argument prototype would still apply. */
11138+
#ifdef __cplusplus
11139+
extern "C"
11140+
#endif
11141+
char ucnv_fromUChars_58 ();
11142+
int
11143+
main ()
11144+
{
11145+
return ucnv_fromUChars_58 ();
11146+
;
11147+
return 0;
11148+
}
11149+
_ACEOF
11150+
if ac_fn_c_try_link "$LINENO"; then :
11151+
ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
11152+
else
11153+
ac_cv_lib_icuuc_ucnv_fromUChars_58=no
11154+
fi
11155+
rm -f core conftest.err conftest.$ac_objext \
11156+
conftest$ac_exeext conftest.$ac_ext
11157+
LIBS=$ac_check_lib_save_LIBS
11158+
fi
11159+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
11160+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
11161+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
11162+
cat >>confdefs.h <<_ACEOF
11163+
#define HAVE_LIBICUUC 1
11164+
_ACEOF
11165+
11166+
LIBS="-licuuc $LIBS"
11167+
11168+
else
11169+
1106611170
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
1106711171
$as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
1106811172
if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11927,6 +12031,9 @@ fi
1192712031
fi
1192812032

1192912033

12034+
fi
12035+
12036+
1193012037
fi
1193112038

1193212039
fi

configure.in

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

11641164
if test "$with_icu" = yes ; then
11651165
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
1166+
AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
11661167
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11671168
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11681169
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1199,7 +1200,9 @@ AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui1
11991200
])
12001201
])
12011202
])
1203+
])
12021204
AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
1205+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
12031206
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
12041207
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
12051208
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1236,6 +1239,7 @@ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is r
12361239
])
12371240
])
12381241
])
1242+
])
12391243
fi
12401244

12411245
if test "$with_pam" = yes ; then

0 commit comments

Comments
 (0)