From fb7d1d833f668ab8e854514c56b7ed819719f325 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 19 Dec 2010 11:11:22 +0100
Subject: [PATCH] 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)
---
 ChangeLog     | 7 +++++++
 modules/iconv | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d60c26dc3..dbdf0e1da 100644
--- 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 ca8b04854..105b16641 100644
--- 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:
 
-- 
2.11.0