Skip to content

Commit e376383

Browse files
vbwagnervbwagner
committed
Support for two more versions of libicu
1 parent ee71132 commit e376383

File tree

2 files changed

+222
-0
lines changed

2 files changed

+222
-0
lines changed

‎configure

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10426,6 +10426,118 @@ ac_res=$ac_cv_search_ucol_open_4_2
1042610426
if test "$ac_res" != no; then :
1042710427
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
1042810428

10429+
else
10430+
10431+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_1" >&5
10432+
$as_echo_n "checking for library containing ucol_open_4_1... " >&6; }
10433+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
10434+
$as_echo_n "(cached) " >&6
10435+
else
10436+
ac_func_search_save_LIBS=$LIBS
10437+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10438+
/* end confdefs.h. */
10439+
10440+
/* Override any GCC internal prototype to avoid an error.
10441+
Use char because int might match the return type of a GCC
10442+
builtin and then its argument prototype would still apply. */
10443+
#ifdef __cplusplus
10444+
extern "C"
10445+
#endif
10446+
char ucol_open_4_1 ();
10447+
int
10448+
main ()
10449+
{
10450+
return ucol_open_4_1 ();
10451+
;
10452+
return 0;
10453+
}
10454+
_ACEOF
10455+
for ac_lib in '' icui18n icuin; do
10456+
if test -z "$ac_lib"; then
10457+
ac_res="none required"
10458+
else
10459+
ac_res=-l$ac_lib
10460+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10461+
fi
10462+
if ac_fn_c_try_link "$LINENO"; then :
10463+
ac_cv_search_ucol_open_4_1=$ac_res
10464+
fi
10465+
rm -f core conftest.err conftest.$ac_objext \
10466+
conftest$ac_exeext
10467+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
10468+
break
10469+
fi
10470+
done
10471+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
10472+
10473+
else
10474+
ac_cv_search_ucol_open_4_1=no
10475+
fi
10476+
rm conftest.$ac_ext
10477+
LIBS=$ac_func_search_save_LIBS
10478+
fi
10479+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_4_1" >&5
10480+
$as_echo "$ac_cv_search_ucol_open_4_1" >&6; }
10481+
ac_res=$ac_cv_search_ucol_open_4_1
10482+
if test "$ac_res" != no; then :
10483+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
10484+
10485+
else
10486+
10487+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_0" >&5
10488+
$as_echo_n "checking for library containing ucol_open_4_0... " >&6; }
10489+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
10490+
$as_echo_n "(cached) " >&6
10491+
else
10492+
ac_func_search_save_LIBS=$LIBS
10493+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10494+
/* end confdefs.h. */
10495+
10496+
/* Override any GCC internal prototype to avoid an error.
10497+
Use char because int might match the return type of a GCC
10498+
builtin and then its argument prototype would still apply. */
10499+
#ifdef __cplusplus
10500+
extern "C"
10501+
#endif
10502+
char ucol_open_4_0 ();
10503+
int
10504+
main ()
10505+
{
10506+
return ucol_open_4_0 ();
10507+
;
10508+
return 0;
10509+
}
10510+
_ACEOF
10511+
for ac_lib in '' icui18n icuin; do
10512+
if test -z "$ac_lib"; then
10513+
ac_res="none required"
10514+
else
10515+
ac_res=-l$ac_lib
10516+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
10517+
fi
10518+
if ac_fn_c_try_link "$LINENO"; then :
10519+
ac_cv_search_ucol_open_4_0=$ac_res
10520+
fi
10521+
rm -f core conftest.err conftest.$ac_objext \
10522+
conftest$ac_exeext
10523+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
10524+
break
10525+
fi
10526+
done
10527+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
10528+
10529+
else
10530+
ac_cv_search_ucol_open_4_0=no
10531+
fi
10532+
rm conftest.$ac_ext
10533+
LIBS=$ac_func_search_save_LIBS
10534+
fi
10535+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_4_0" >&5
10536+
$as_echo "$ac_cv_search_ucol_open_4_0" >&6; }
10537+
ac_res=$ac_cv_search_ucol_open_4_0
10538+
if test "$ac_res" != no; then :
10539+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
10540+
1042910541
else
1043010542

1043110543
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_3_8" >&5
@@ -10638,6 +10750,12 @@ fi
1063810750
fi
1063910751

1064010752

10753+
fi
10754+
10755+
10756+
fi
10757+
10758+
1064110759
fi
1064210760

1064310761
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
@@ -11178,6 +11296,96 @@ _ACEOF
1117811296

1117911297
LIBS="-licuuc $LIBS"
1118011298

11299+
else
11300+
11301+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_1 in -licuuc" >&5
11302+
$as_echo_n "checking for ucnv_fromUChars_4_1 in -licuuc... " >&6; }
11303+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_4_1+:} false; then :
11304+
$as_echo_n "(cached) " >&6
11305+
else
11306+
ac_check_lib_save_LIBS=$LIBS
11307+
LIBS="-licuuc $LIBS"
11308+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11309+
/* end confdefs.h. */
11310+
11311+
/* Override any GCC internal prototype to avoid an error.
11312+
Use char because int might match the return type of a GCC
11313+
builtin and then its argument prototype would still apply. */
11314+
#ifdef __cplusplus
11315+
extern "C"
11316+
#endif
11317+
char ucnv_fromUChars_4_1 ();
11318+
int
11319+
main ()
11320+
{
11321+
return ucnv_fromUChars_4_1 ();
11322+
;
11323+
return 0;
11324+
}
11325+
_ACEOF
11326+
if ac_fn_c_try_link "$LINENO"; then :
11327+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=yes
11328+
else
11329+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=no
11330+
fi
11331+
rm -f core conftest.err conftest.$ac_objext \
11332+
conftest$ac_exeext conftest.$ac_ext
11333+
LIBS=$ac_check_lib_save_LIBS
11334+
fi
11335+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_4_1" >&5
11336+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_4_1" >&6; }
11337+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_4_1" = xyes; then :
11338+
cat >>confdefs.h <<_ACEOF
11339+
#define HAVE_LIBICUUC 1
11340+
_ACEOF
11341+
11342+
LIBS="-licuuc $LIBS"
11343+
11344+
else
11345+
11346+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_0 in -licuuc" >&5
11347+
$as_echo_n "checking for ucnv_fromUChars_4_0 in -licuuc... " >&6; }
11348+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_4_0+:} false; then :
11349+
$as_echo_n "(cached) " >&6
11350+
else
11351+
ac_check_lib_save_LIBS=$LIBS
11352+
LIBS="-licuuc $LIBS"
11353+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11354+
/* end confdefs.h. */
11355+
11356+
/* Override any GCC internal prototype to avoid an error.
11357+
Use char because int might match the return type of a GCC
11358+
builtin and then its argument prototype would still apply. */
11359+
#ifdef __cplusplus
11360+
extern "C"
11361+
#endif
11362+
char ucnv_fromUChars_4_0 ();
11363+
int
11364+
main ()
11365+
{
11366+
return ucnv_fromUChars_4_0 ();
11367+
;
11368+
return 0;
11369+
}
11370+
_ACEOF
11371+
if ac_fn_c_try_link "$LINENO"; then :
11372+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=yes
11373+
else
11374+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=no
11375+
fi
11376+
rm -f core conftest.err conftest.$ac_objext \
11377+
conftest$ac_exeext conftest.$ac_ext
11378+
LIBS=$ac_check_lib_save_LIBS
11379+
fi
11380+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_4_0" >&5
11381+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_4_0" >&6; }
11382+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_4_0" = xyes; then :
11383+
cat >>confdefs.h <<_ACEOF
11384+
#define HAVE_LIBICUUC 1
11385+
_ACEOF
11386+
11387+
LIBS="-licuuc $LIBS"
11388+
1118111389
else
1118211390

1118311391
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_3_8 in -licuuc" >&5
@@ -11357,6 +11565,12 @@ fi
1135711565
fi
1135811566

1135911567

11568+
fi
11569+
11570+
11571+
fi
11572+
11573+
1136011574
fi
1136111575

1136211576
fi

‎configure.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,8 @@ if test "$with_icu" = yes ; then
11431143
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
11441144
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
11451145
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1146+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1147+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
11461148
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
11471149
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
11481150
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
@@ -1160,6 +1162,8 @@ if test "$with_icu" = yes ; then
11601162
])
11611163
])
11621164
])
1165+
])
1166+
])
11631167
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11641168
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
11651169
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1172,6 +1176,8 @@ if test "$with_icu" = yes ; then
11721176
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
11731177
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
11741178
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1179+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1180+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
11751181
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
11761182
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
11771183
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
@@ -1189,6 +1195,8 @@ if test "$with_icu" = yes ; then
11891195
])
11901196
])
11911197
])
1198+
])
1199+
])
11921200
fi
11931201

11941202
if test "$with_pam" = yes ; then

0 commit comments

Comments
 (0)