* aclocal.m4 (AM_ICONV): Add explicit check for iconv.h.
	* config.in, configure.in: Regenerate.
	* cpphash.h, java/lex.h: Check both HAVE_ICONV and HAVE_ICONV_H
	before including iconv.h.

From-SVN: r74234