iconv: Make it possible again to use this module without 'iconv-h'.

* modules/iconv (configure.ac): Don't invoke gl_ICONV_MODULE_INDICATOR
if it is not defined.
Reported by Ian Beckwith <ianb@erislabs.net>.
(cherry picked from commit 585734b4e6aeede3bb80ea994fd0efea9a026f86)

diff --git a/ChangeLog b/ChangeLog
index d60c26d..dbdf0e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-19  Bruno Haible  <bruno@clisp.org>
+
+       iconv: Make it possible again to use this module without 'iconv-h'.
+       * modules/iconv (configure.ac): Don't invoke gl_ICONV_MODULE_INDICATOR
+       if it is not defined.
+       Reported by Ian Beckwith <ianb@erislabs.net>.
+
 2010-12-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        acl: port to Solaris 8 when copying from tmpfs to ufs

diff --git a/modules/iconv b/modules/iconv
index ca8b048..105b166 100644 (file)
--- a/modules/iconv
+++ b/modules/iconv
@@ -9,7 +9,8 @@ havelib
 
 configure.ac:
 AM_ICONV
-gl_ICONV_MODULE_INDICATOR([iconv])
+m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+  [gl_ICONV_MODULE_INDICATOR([iconv])])
 
 Makefile.am: