Fix configure test for ICU 5_8 found in FreeBSD11

vbwagner · vbwagner · commit bf65f8b6eb01 · 2017-01-26T18:20:26.000+03:00
diff --git a/configure b/configure
@@ -9898,9 +9898,9 @@ done
 fi
 
 if test "$with_icu" = yes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
-$as_echo_n "checking for library containing ucol_open_58... " >&6; }
-if ${ac_cv_search_ucol_open_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open" >&5
+$as_echo_n "checking for library containing ucol_open... " >&6; }
+if ${ac_cv_search_ucol_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -9913,11 +9913,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucol_open_58 ();
+char ucol_open ();
 int
 main ()
 {
-return ucol_open_58 ();
+return ucol_open ();
   ;
   return 0;
 }
@@ -9930,25 +9930,25 @@ for ac_lib in '' icui18n icuin; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ucol_open_58=$ac_res
+  ac_cv_search_ucol_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ucol_open_58+:} false; then :
+  if ${ac_cv_search_ucol_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ucol_open_58+:} false; then :
+if ${ac_cv_search_ucol_open+:} false; then :
 
 else
-  ac_cv_search_ucol_open_58=no
+  ac_cv_search_ucol_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
-$as_echo "$ac_cv_search_ucol_open_58" >&6; }
-ac_res=$ac_cv_search_ucol_open_58
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open" >&5
+$as_echo "$ac_cv_search_ucol_open" >&6; }
+ac_res=$ac_cv_search_ucol_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
@@ -10959,9 +10959,9 @@ fi
 
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
-$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
-if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
+$as_echo_n "checking for ucnv_fromUChars in -licuuc... " >&6; }
+if ${ac_cv_lib_icuuc_ucnv_fromUChars+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10975,27 +10975,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucnv_fromUChars_58 ();
+char ucnv_fromUChars ();
 int
 main ()
 {
-return ucnv_fromUChars_58 ();
+return ucnv_fromUChars ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
+  ac_cv_lib_icuuc_ucnv_fromUChars=yes
 else
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=no
+  ac_cv_lib_icuuc_ucnv_fromUChars=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
-$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
-if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars" >&5
+$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars" >&6; }
+if test "x$ac_cv_lib_icuuc_ucnv_fromUChars" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
 _ACEOF
diff --git a/configure.in b/configure.in
@@ -1162,7 +1162,7 @@ if test "$with_openssl" = yes ; then
 fi
 
 if test "$with_icu" = yes ; then
- AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
+ AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1197,7 +1197,7 @@ if test "$with_icu" = yes ; then
  ])
  ])
 ])
- AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
