#
#
# patch "m4/iconv_translit.m4"
#  from [c619e46f3b1c7baa6ca9ebc2da43b8e21a3ab25c]
#    to [06c1b493c96b704e4ee77c278535f133c5eebb2d]
#
============================================================
--- m4/iconv_translit.m4	c619e46f3b1c7baa6ca9ebc2da43b8e21a3ab25c
+++ m4/iconv_translit.m4	06c1b493c96b704e4ee77c278535f133c5eebb2d
@@ -1,18 +1,25 @@ AC_DEFUN([AC_FUNC_ICONV_TRANSLIT],
 AC_DEFUN([AC_FUNC_ICONV_TRANSLIT],
 [AC_CACHE_CHECK([if iconv supports //IGNORE//TRANSLIT],
-	ac_cv_iconv_translit, [
-	AC_TRY_RUN([
+    ac_cv_iconv_translit, [
+    am_save_CPPFLAGS="$CPPFLAGS"
+    AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+    am_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIBICONV"
+    AC_TRY_RUN([
 #include <iconv.h>
 
 int main()
 {
-  return iconv_open("ASCII//IGNORE//TRANSLIT", "UTF8") == (iconv_t)(-1);
+  iconv_t i = iconv_open("ASCII//IGNORE//TRANSLIT", "UTF-8");
+  return i == (iconv_t)(-1);
 }
 ],
-		ac_cv_iconv_translit=yes,
-		ac_cv_iconv_translit=no,
-		ac_cv_iconv_translit=no)
-	])
+        ac_cv_iconv_translit=yes,
+        ac_cv_iconv_translit=no,
+        ac_cv_iconv_translit=no)
+    LIBS="$am_save_LIBS"
+    CPPFLAGS="$am_save_CPPFLAGS"
+    ])
 if test "$ac_cv_iconv_translit" = "yes"; then
   AC_DEFINE(ICONV_TRANSLIT, 1, [Define if iconv supports //IGNORE//TRANSLIT.])
 fi])