Add configure support for ICU 5.8

Author: vbwagner

configure

@@ -9813,6 +9813,62 @@ 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_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ucol_open_58 ();
+int
+main ()
+{
+return ucol_open_58 ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' icui18n icuin; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    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
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_ucol_open_58+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_ucol_open_58+:} false; then :
+
+else
+  ac_cv_search_ucol_open_58=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
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
 $as_echo_n "checking for library containing ucol_open_57... " >&6; }
 if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10815,6 +10871,54 @@ fi
 
 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_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-licuuc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ucnv_fromUChars_58 ();
+int
+main ()
+{
+return ucnv_fromUChars_58 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
+else
+  ac_cv_lib_icuuc_ucnv_fromUChars_58=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 :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBICUUC 1
+_ACEOF
+
+  LIBS="-licuuc $LIBS"
+
+else
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
 $as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
 if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11628,6 +11732,9 @@ fi
 fi
 
 
+fi
+
+
 fi
 
 fi

configure.in

@@ -1151,6 +1151,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_57, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1184,6 +1185,8 @@ if test "$with_icu" = yes ; then
  ])
  ])
  ])
+])
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1217,6 +1220,7 @@ if test "$with_icu" = yes ; then
  ])
  ])
  ])
+])
 fi
 
 if test "$with_pam" = yes ; then