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>.

diff --git a/ChangeLog b/ChangeLog
index 6656b45f266eedcb4fcc22f937d2758829235541..d453f44555adcaf3991b72436b44cd3637ae6052 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 ca8b048544802a8517f5dce003516d01739d6d21..105b16641373ee97698b6dad18e0ad7d829e3c13 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: