[vlc-commits] m4: fix false negative working iconv test

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 14 18:59:02 2017 +0200| [8b3ebbbb2a1ebe5afd42e8542ecdbab14374033d] | committer: Rémi Denis-Courmont

m4: fix false negative working iconv test

Part of the test is leaking memory, which can trip the leak sanitizer.

(This should be fixed in gettext. In the mean time, it will need to be
 applied manually at every gettext update.)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b3ebbbb2a1ebe5afd42e8542ecdbab14374033d
---

 m4/iconv.m4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 4e37363156..53a6b3b0c2 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
       }
   }
 #endif
+#if 0 /* This test leaks and we do not care about HP-UX. */
   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
      provided.  */
   if (/* Try standardized names.  */
@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
     result |= 16;
+#endif
   return result;
 ]])],
           [am_cv_func_iconv_works=yes], ,