From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13693 invoked by alias); 25 May 2003 11:29:54 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 13436 invoked from network); 25 May 2003 11:29:53 -0000 Received: from unknown (HELO walton.kettenis.dyndns.org) (62.163.169.212) by sources.redhat.com with SMTP; 25 May 2003 11:29:53 -0000 Received: from elgar.kettenis.dyndns.org (elgar.kettenis.dyndns.org [192.168.0.2]) by walton.kettenis.dyndns.org (8.12.6p2/8.12.5) with ESMTP id h4PBTgNt001484; Sun, 25 May 2003 13:29:42 +0200 (CEST) (envelope-from kettenis@elgar.kettenis.dyndns.org) Received: from elgar.kettenis.dyndns.org (localhost [127.0.0.1]) by elgar.kettenis.dyndns.org (8.12.6p2/8.12.6) with ESMTP id h4PBTfvj010275; Sun, 25 May 2003 13:29:41 +0200 (CEST) (envelope-from kettenis@elgar.kettenis.dyndns.org) Received: (from kettenis@localhost) by elgar.kettenis.dyndns.org (8.12.6p2/8.12.6/Submit) id h4PBTfrV010272; Sun, 25 May 2003 13:29:41 +0200 (CEST) Date: Sun, 25 May 2003 11:29:00 -0000 Message-Id: <200305251129.h4PBTfrV010272@elgar.kettenis.dyndns.org> From: Mark Kettenis To: gdb-patches@sources.redhat.com, ezannoni@redhat.com CC: chet@po.cwru.edu Subject: Fix readline for platforms without X-SW-Source: 2003-05/txt/msg00477.txt.bz2 [ Chet, I don't now if you ever received the change that was origionally made to the copy of readline in the GDB tree. Just in case you intend to incorporate such a change in the next release of readline, this patch solves a problem with it. ] There is a problem with one of our local GDB fixes for readline: 2003-03-03 Kris Warkentin * aclocal.m4: Cause wcwidth check to substitute HAVE_WCWIDTH for building. * Makefile.in: Add wcwidth object to lib if required. * shlib/Makefile.in: Likewise. * configure: Regenerate. The problem is that this patch is that support/wcwidth.c unconditionally includes . Compilation of support/wcwidth.c will therefore fail on platforms that don't have , such as OpenBSD 3.0. The attached patch fixes this. I chose to fix this in aclocal.m4 instead of using HAVE_WCHAR_H in support/wcwidth.c since it keeps that file unchanged from the upstream sources. OK to check this in Elena? Mark Index: ChangeLog.gdb from Mark Kettenis * aclocal.m4: Don't add wcwidth.o if we don't have wchar.h. * configure: Regenerate. Index: aclocal.m4 =================================================================== RCS file: /cvs/src/src/readline/aclocal.m4,v retrieving revision 1.6 diff -u -p -r1.6 aclocal.m4 --- aclocal.m4 3 Mar 2003 18:52:27 -0000 1.6 +++ aclocal.m4 25 May 2003 11:26:57 -0000 @@ -1654,13 +1654,13 @@ AC_CHECK_HEADERS(langinfo.h) AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC)) AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) -AC_CHECK_FUNC(wcwidth, have_wcwidth=yes) -if test "$have_wcwidth" = yes; then - AC_DEFINE(HAVE_WCWIDTH) - AC_SUBST(WCWIDTH_OBJ,) +AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) +if test "$ac_cv_func_wcwidth" = no && test "$ac_cv_header_wchar_h" = yes; then + WCWIDTH_OBJ=wcwidth.o else - AC_SUBST(WCWIDTH_OBJ,wcwidth.o) + WCWIDTH_OBJ= fi +AC_SUBST(WCWIDTH_OBJ) AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, [AC_TRY_RUN([