lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H as well.

	* lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H
	as well.

Co-Authored-By: Gerald Pfeifer <gerald@pfeifer.com>

From-SVN: r90168

gcc/java/ChangeLog

+2004-11-06  Zack Weinberg  <zack@codesourcery.com>
+            Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H
+	as well.
+
 2004-11-02  Bryce McKinlay  <mckinlay@redhat.com>
 
 	PR java/17265

gcc/java/lex.h

@@ -35,7 +35,11 @@ extern FILE *finput;
 /* A Unicode character, as read from the input file  */
 typedef unsigned short unicode_t;
 
-#if defined HAVE_ICONV_H && defined HAVE_ICONV
+#ifndef HAVE_ICONV_H
+#undef HAVE_ICONV
+#endif
+
+#if defined HAVE_ICONV
 #include <iconv.h>
 #endif /* HAVE_ICONV */