From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17995 invoked by alias); 1 Dec 2003 19:11:45 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 17988 invoked from network); 1 Dec 2003 19:11:43 -0000 Received: from unknown (HELO mail.codesourcery.com) (65.73.237.138) by sources.redhat.com with SMTP; 1 Dec 2003 19:11:43 -0000 Received: (qmail 18417 invoked from network); 1 Dec 2003 19:06:40 -0000 Received: from taltos.codesourcery.com (zack@66.92.218.83) by mail.codesourcery.com with DES-CBC3-SHA encrypted SMTP; 1 Dec 2003 19:06:40 -0000 Received: by taltos.codesourcery.com (sSMTP sendmail emulation); Mon, 1 Dec 2003 11:11:42 -0800 From: "Zack Weinberg" To: Gerald Pfeifer cc: Gcc Patch List Subject: Re: cpplib and iconv.h (bootstrap failure) References: Date: Mon, 01 Dec 2003 19:11:00 -0000 In-Reply-To: (Gerald Pfeifer's message of "Mon, 1 Dec 2003 19:44:16 +0100 (CET)") Message-ID: <87r7zoqro2.fsf@egil.codesourcery.com> User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2003-12/txt/msg00080.txt.bz2 Gerald Pfeifer writes: > Hi Zack, > > do you think you'll have time to look into this regression caused by your > patch before the next snapshot (on Wednesday)? Please try the appended patch. You will need to run autoconf and autoheader. I think this would also be addressed by updating to the latest iconv.m4, but it requires autoconf 2.5x. I'm not sure if the autoconf transition ever got to the point where we could cut over the gcc directory. zw * aclocal.m4 (AM_ICONV): Add explicit check for iconv.h. * cpphash.h, java/lex.h: Check both HAVE_ICONV and HAVE_ICONV_H before including iconv.h. =================================================================== Index: aclocal.m4 --- aclocal.m4 26 Nov 2003 19:17:49 -0000 1.82 +++ aclocal.m4 1 Dec 2003 19:09:12 -0000 @@ -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 =================================================================== Index: cpphash.h --- cpphash.h 2 Oct 2003 07:23:26 -0000 1.202 +++ cpphash.h 1 Dec 2003 19:09:12 -0000 @@ -25,7 +25,7 @@ Foundation, 59 Temple Place - Suite 330, #include "hashtable.h" -#ifdef HAVE_ICONV +#if defined HAVE_ICONV_H && defined HAVE_ICONV #include #else #define HAVE_ICONV 0 =================================================================== Index: java/lex.h --- java/lex.h 4 May 2003 14:05:15 -0000 1.35 +++ java/lex.h 1 Dec 2003 19:09:12 -0000 @@ -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 #endif /* HAVE_ICONV */