Fix bug introduced on 2007-03-31.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 5f9adcc9c25bc1779965453deb58ca4ac30d8846..73ca5c69e760e5e6a2b35526feffa5449ff043bd 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * iconv.m4: Update from gnulib.
+       2007-05-27  Bruno Haible  <bruno@clisp.org>
+               * iconv.m4 (AM_ICONV_LINK): Fix 2007-03-31 patch.
+
 2007-05-20  Bruno Haible  <bruno@clisp.org>
 
        * iconv.m4: Update from gnulib.

diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index 32239e31dfe09f07f577ca5f2afc6d0150b63bc6..8e36b52d4da8a668dd89fc7231d17116724fb849 100644 (file)
--- a/gettext-runtime/m4/iconv.m4
+++ b/gettext-runtime/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial AM5 (gettext-0.16.2)
+# iconv.m4 serial AM6 (gettext-0.16.2)
 dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -117,6 +117,7 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
   return 0;
 }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
         [case "$host_os" in