iconv-h: Fix test-iconv-h-c++ failure on Solaris 11 2010-11.
authorBruno Haible <bruno@clisp.org>
Sat, 27 Nov 2010 03:08:53 +0000 (04:08 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 27 Nov 2010 03:08:53 +0000 (04:08 +0100)
commitf480581dc6834f060592a11c256b08068b518d42
tree391d00d5faa29beacbf9e6a8924eab87080bb3f9
parentb09cb6b027d3f97b34e3bb0308e337d161cc2ed3
iconv-h: Fix test-iconv-h-c++ failure on Solaris 11 2010-11.

* lib/iconv.in.h (iconv_open, iconv, iconv_close): Define only if the
'iconv' module is present.
(ICONV_CONST): New macro.
* m4/iconv_h.m4 (gl_ICONV_H_DEFAULTS): Initialize GNULIB_ICONV and
ICONV_CONST.
* m4/iconv.m4 (AM_ICONV): If the gnulib module 'iconv-h' is present,
set ICONV_CONST.
* m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN_UTF): Don't set ICONV_CONST
here.
* modules/iconv (configure.ac): Invoke gl_ICONV_MODULE_INDICATOR.
* modules/iconv-h (Makefile.am): Substitute GNULIB_ICONV.
* tests/test-iconv-h.c (ICONV_CONST): Don't define here.
* tests/test-iconv-h-c++.cc (ICONV_CONST): Don't define here.
(iconv_open, iconv, iconv_close): Test only if the 'iconv' module is
present.
ChangeLog
lib/iconv.in.h
m4/iconv.m4
m4/iconv_h.m4
m4/iconv_open.m4
modules/iconv
modules/iconv-h
tests/test-iconv-h-c++.cc
tests/test-iconv-h.c