aclocal.m4 (AM_ICONV): Add explicit check for iconv.h.

	* 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

gcc/ChangeLog

+2003-12-03  Zack Weinberg  <zack@codesourcery.com>
+
+	* aclocal.m4 (AM_ICONV): Add explicit check for iconv.h.
+	* config.in, configure.in: Regenerate.
+	* cpphash.h: Check both HAVE_ICONV and HAVE_ICONV_H before
+	including iconv.h.
+
 2003-12-03  Alan Modra  <amodra@bigpond.net.au>
 
 	PR target/11229
@@ -41,9 +48,9 @@
 
 2003-12-02  Richard Henderson  <rth@redhat.com>
 
-        * rtl.h (PUT_CODE, PUT_MODE): Remove ENUM_BITFIELD cast.
-        * tree.h (TREE_SET_CODE): Likewise.
-        * recog.h (struct insn_operand_data): Move const after ENUM_BITFIELD.
+	* rtl.h (PUT_CODE, PUT_MODE): Remove ENUM_BITFIELD cast.
+	* tree.h (TREE_SET_CODE): Likewise.
+	* recog.h (struct insn_operand_data): Move const after ENUM_BITFIELD.
 
 2003-12-02  Ben Elliston  <bje@wasabisystems.com>
 
@@ -56,7 +63,7 @@
 	* Makefile.in (GCC_CFLAGS): Add -Wold-style-definition.
 
 2003-12-01  James Lemke <jim@wasabisystems.com>
- 
+
 	* config/arm/arm.c (arm_rtx_costs): Improve for xscale multiply.
 
 2003-12-01  Roger Sayle  <roger@eyesopen.com>

gcc/aclocal.m4

@@ -607,6 +607,8 @@ AC_DEFUN([AM_ICONV],
     done
    ])
 
+  AC_CHECK_HEADERS([iconv.h])
+
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no

gcc/config.in

@@ -115,6 +115,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 

gcc/cpphash.h

@@ -25,7 +25,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "hashtable.h"
 
-#ifdef HAVE_ICONV
+#if defined HAVE_ICONV_H && defined HAVE_ICONV
 #include <iconv.h>
 #else
 #define HAVE_ICONV 0

gcc/java/ChangeLog

+2003-12-03  Zack Weinberg  <zack@codesourcery.com>
+
+	* lex.h: Check both HAVE_ICONV and HAVE_ICONV_H before
+	including iconv.h.
+
 2003-12-03  Ralph Loader  <rcl@ihug.co.nz>
 
 	PR java/12374:
@@ -7,7 +12,7 @@
 	RESOLVE_EXPRESSION_NAME_P as it isn't used anywhere else.
 	* java-tree.h: Remove RESOLVE_EXPRESSION_NAME_P as it isn't
 	used.
-	
+
 2003-12-01  Jeff Sturm  <jsturm@one-point.com>
 
 	Fix PR java/13237
@@ -93,7 +98,7 @@
 2003-11-17  Andrew Haley  <aph@redhat.com>
 
 	* java-tree.h (LOCAL_VAR_OUT_OF_SCOPE_P): New.
-	(struct lang_decl_var:freed): New variable. 
+	(struct lang_decl_var:freed): New variable.
 	* decl.c (poplevel): Mark local vars that have gone out of scope.
 	(push_jvm_slot): Don't use the RTL of a var that has gone out of
 	scope.
@@ -305,7 +310,7 @@
 	(atable_syms_decl): New.
 	(enum java_tree_index): Add JTI_ATABLE_METHODS, JTI_ATABLE_DECL,
 	JTI_ATABLE_SYMS_DECL.  Rename JTI_METHOD_SYMBOL* to JTI_SYMBOL*.
-	(symbol_*type): Rename method_symbol* to symbol*type.	
+	(symbol_*type): Rename method_symbol* to symbol*type.
 	(emit_offset_symbol_table): Delete.
 	(emit_symbol_table): New.
 	(get_symbol_table_index): New.
@@ -322,7 +327,7 @@
 	(emit_symbol_table): Rename from emit_offset_symbol_table.
 	Parameterize to allow re-use by different types of symbol table.
 	(build_symbol_entry): Renamed from build_method_symbols_entry.
-	
+
 2003-09-30  Roger Sayle  <roger@eyesopen.com>
 
 	* jcf-write.c (generate_bytecode_insns): Implement evaluate-once
@@ -385,17 +390,17 @@
 
 2003-09-21  Richard Henderson  <rth@redhat.com>
 
-	* class.c, decl.c, jcf-parse.c, jcf-write.c, parse.y, 
+	* class.c, decl.c, jcf-parse.c, jcf-write.c, parse.y,
 	resource.c: Revert.
 
 2003-09-21  Richard Henderson  <rth@redhat.com>
 
-	* class.c, decl.c, jcf-parse.c, jcf-write.c, parse.y, 
+	* class.c, decl.c, jcf-parse.c, jcf-write.c, parse.y,
 	resource.c: Update for DECL_SOURCE_LOCATION rename and change to const.
 
 2003-09-20  Richard Henderson  <rth@redhat.com>
 
-        * check-init.c, class.c, decl.c, expr.c: Use %J in diagnostics.
+	* check-init.c, class.c, decl.c, expr.c: Use %J in diagnostics.
 
 2003-09-18  Roger Sayle  <roger@eyesopen.com>
 
@@ -421,18 +426,18 @@
 
 2003-09-16  Bryce McKinlay  <bryce@mckinlay.net.nz>
 
-	* class.c (add_miranda_methods): Ensure super-interfaces are laid 
+	* class.c (add_miranda_methods): Ensure super-interfaces are laid
 	out. Fix for PR java/12254.
 
 2003-09-11  Richard Henderson  <rth@redhat.com>
 
-        * parse.y (source_end_java_method): Update for new
-        cgraph_finalize_function argument.
+	* parse.y (source_end_java_method): Update for new
+	cgraph_finalize_function argument.
 
 2003-09-09  Richard Henderson  <rth@redhat.com>
 
-        * parse.y (source_end_java_method): Update call to
-        cgraph_finalize_function.
+	* parse.y (source_end_java_method): Update call to
+	cgraph_finalize_function.
 
 2003-09-03  Jeff Sturm  <jsturm@one-point.com>
 
@@ -480,8 +485,8 @@
 
 2003-08-20  Andrew Haley  <aph@redhat.com>
 
-        * except.c (prepare_eh_table_type): Use new encoding for exception
-        handlers when using -fno-assume-compiled.
+	* except.c (prepare_eh_table_type): Use new encoding for exception
+	handlers when using -fno-assume-compiled.
 
 2003-08-13  Tom Tromey  <tromey@redhat.com>
 

gcc/java/lex.h

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