Mercurial > hg > octave-shane > gnulib-hg

changeset 13938:8bb7740af8bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author Bruno Haible <bruno@clisp.org>
date Sun, 19 Dec 2010 11:11:22 +0100
parents e7b74d54a791
children bb671fbb31ca
files ChangeLog modules/iconv
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/modules/iconv
+++ b/modules/iconv
@@ -9,7 +9,8 @@
 
 configure.ac:
 AM_ICONV
-gl_ICONV_MODULE_INDICATOR([iconv])
+m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+  [gl_ICONV_MODULE_INDICATOR([iconv])])
 
 Makefile.am: