Skip to content

Commit 5d450e7

Browse files
vbwagnervbwagner
committed
Support for build with libicu version 4.2
1 parent 7d8ea6b commit 5d450e7

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
@@ -9538,9 +9538,9 @@ if test "$ac_res" != no; then :
95389538

95399539
else
95409540

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 :
9541+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_2" >&5
9542+
$as_echo_n "checking for library containing ucol_open_4_2... " >&6; }
9543+
if ${ac_cv_search_ucol_open_4_2+:} false; then :
95449544
$as_echo_n "(cached) " >&6
95459545
else
95469546
ac_func_search_save_LIBS=$LIBS
@@ -9553,11 +9553,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
95539553
#ifdef __cplusplus
95549554
extern "C"
95559555
#endif
9556-
char ucol_open_42 ();
9556+
char ucol_open_4_2 ();
95579557
int
95589558
main ()
95599559
{
9560-
return ucol_open_42 ();
9560+
return ucol_open_4_2 ();
95619561
;
95629562
return 0;
95639563
}
@@ -9570,25 +9570,25 @@ for ac_lib in '' icui18n icuin; do
95709570
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
95719571
fi
95729572
if ac_fn_c_try_link "$LINENO"; then :
9573-
ac_cv_search_ucol_open_42=$ac_res
9573+
ac_cv_search_ucol_open_4_2=$ac_res
95749574
fi
95759575
rm -f core conftest.err conftest.$ac_objext \
95769576
conftest$ac_exeext
9577-
if ${ac_cv_search_ucol_open_42+:} false; then :
9577+
if ${ac_cv_search_ucol_open_4_2+:} false; then :
95789578
break
95799579
fi
95809580
done
9581-
if ${ac_cv_search_ucol_open_42+:} false; then :
9581+
if ${ac_cv_search_ucol_open_4_2+:} false; then :
95829582

95839583
else
9584-
ac_cv_search_ucol_open_42=no
9584+
ac_cv_search_ucol_open_4_2=no
95859585
fi
95869586
rm conftest.$ac_ext
95879587
LIBS=$ac_func_search_save_LIBS
95889588
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
9589+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_4_2" >&5
9590+
$as_echo "$ac_cv_search_ucol_open_4_2" >&6; }
9591+
ac_res=$ac_cv_search_ucol_open_4_2
95929592
if test "$ac_res" != no; then :
95939593
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
95949594

@@ -10301,9 +10301,9 @@ _ACEOF
1030110301

1030210302
else
1030310303

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 :
10304+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_2 in -licuuc" >&5
10305+
$as_echo_n "checking for ucnv_fromUChars_4_2 in -licuuc... " >&6; }
10306+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_4_2+:} false; then :
1030710307
$as_echo_n "(cached) " >&6
1030810308
else
1030910309
ac_check_lib_save_LIBS=$LIBS
@@ -10317,27 +10317,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1031710317
#ifdef __cplusplus
1031810318
extern "C"
1031910319
#endif
10320-
char ucnv_fromUChars_42 ();
10320+
char ucnv_fromUChars_4_2 ();
1032110321
int
1032210322
main ()
1032310323
{
10324-
return ucnv_fromUChars_42 ();
10324+
return ucnv_fromUChars_4_2 ();
1032510325
;
1032610326
return 0;
1032710327
}
1032810328
_ACEOF
1032910329
if ac_fn_c_try_link "$LINENO"; then :
10330-
ac_cv_lib_icuuc_ucnv_fromUChars_42=yes
10330+
ac_cv_lib_icuuc_ucnv_fromUChars_4_2=yes
1033110331
else
10332-
ac_cv_lib_icuuc_ucnv_fromUChars_42=no
10332+
ac_cv_lib_icuuc_ucnv_fromUChars_4_2=no
1033310333
fi
1033410334
rm -f core conftest.err conftest.$ac_objext \
1033510335
conftest$ac_exeext conftest.$ac_ext
1033610336
LIBS=$ac_check_lib_save_LIBS
1033710337
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-
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_42" = xyes; then :
10338+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_4_2" >&5
10339+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_4_2" >&6; }
10340+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_4_2" = xyes; then :
1034110341
cat >>confdefs.h <<_ACEOF
1034210342
#define HAVE_LIBICUUC 1
1034310343
_ACEOF

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +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], [], [
1061+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
10621062
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
10631063
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
10641064
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
@@ -1087,7 +1087,7 @@ if test "$with_icu" = yes ; then
10871087
AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
10881088
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
10891089
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
1090-
AC_CHECK_LIB(icuuc, ucnv_fromUChars_42, [], [
1090+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
10911091
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
10921092
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
10931093
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])

0 commit comments

Comments
 (0)