From: Bruno Haible <bruno@clisp.org>
Date: Sat, 27 Nov 2010 03:11:02 +0000 (+0100)
Subject: Update from gnulib.
X-Git-Tag: v0.18.2~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=430b68eb2b3bd2304f11582b46eaab7b95edf065;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 92962b8df..ed1e30641 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-26  Bruno Haible  <bruno@clisp.org>
+
+	* iconv.m4 (AM_ICONV): If the gnulib module 'iconv-h' is present, set
+	ICONV_CONST.
+
 2010-11-20  Bruno Haible  <bruno@clisp.org>
 
 	Ensure that <features.h> is included before __GLIBC__ is tested.
diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index 425145c0a..7d1959423 100644
--- a/gettext-runtime/m4/iconv.m4
+++ b/gettext-runtime/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial 15 (gettext-0.18.2)
+# iconv.m4 serial 16 (gettext-0.18.2)
 dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -252,5 +252,12 @@ size_t iconv();
          $am_cv_proto_iconv])
     AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
       [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
   fi
 ])