From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-22039-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 14721 invoked by alias); 28 Jan 2003 05:04:51 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 14714 invoked from network); 28 Jan 2003 05:04:49 -0000
Received: from unknown (HELO takamaka.act-europe.fr) (80.14.53.12)
  by 172.16.49.205 with SMTP; 28 Jan 2003 05:04:49 -0000
Received: by takamaka.act-europe.fr (Postfix, from userid 507)
	id 20EC8D34AE; Tue, 28 Jan 2003 09:04:44 +0400 (RET)
Date: Tue, 28 Jan 2003 05:04:00 -0000
From: Joel Brobecker <brobecker@gnat.com>
To: bash-maintainers@gnu.org
Cc: gdb-patches@sources.redhat.com
Subject: Re: Missing check for mbsrtowc causes compilation failure on HP/UX 11.11
Message-ID: <20030128050444.GI6437@gnat.com>
References: <20030128050317.GH6437@gnat.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="CdrF4e02JqNVZeln"
Content-Disposition: inline
In-Reply-To: <20030128050317.GH6437@gnat.com>
User-Agent: Mutt/1.4i
X-SW-Source: 2003-01/txt/msg00754.txt.bz2


--CdrF4e02JqNVZeln
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-length: 280

> The patch is attached.

Sigh... With the patch, this time. Sorry.

> Changelog:
> 
> aclocal.m4
>         - add check for mbsrtowc.
> 
> config.h.in
>         - regenerate.
> 
> rlmbutil.h
>         - make sure mbsrtowc is available before enabling multibyte support.

-- 
Joel

--CdrF4e02JqNVZeln
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="readline.diff"
Content-length: 1657

diff -cp ../../gdb-public.orig/readline/aclocal.m4 ./aclocal.m4
*** ../../gdb-public.orig/readline/aclocal.m4	Fri Dec 13 08:55:58 2002
--- ./aclocal.m4	Mon Jan 27 12:42:10 2003
*************** AC_CHECK_HEADERS(wctype.h)
*** 1652,1657 ****
--- 1652,1658 ----
  AC_CHECK_HEADERS(wchar.h)
  AC_CHECK_HEADERS(langinfo.h)
  
+ AC_CHECK_FUNC(mbsrtowc, AC_DEFINE(HAVE_MBSRTOWC))
  AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS))
  AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
  
diff -cp ../../gdb-public.orig/readline/config.h.in ./config.h.in
*** ../../gdb-public.orig/readline/config.h.in	Fri Dec 13 08:55:59 2002
--- ./config.h.in	Mon Jan 27 12:43:22 2003
***************
*** 31,36 ****
--- 31,39 ----
  /* Define if you have the lstat function. */
  #undef HAVE_LSTAT
  
+ /* Define if you have the mbsrtowc function. */
+ #undef HAVE_MBSRTOWC
+ 
  /* Define if you have the mbsrtowcs function. */
  #undef HAVE_MBSRTOWCS
  
diff -cp ../../gdb-public.orig/readline/rlmbutil.h ./rlmbutil.h
*** ../../gdb-public.orig/readline/rlmbutil.h	Sun Dec  8 17:31:37 2002
--- ./rlmbutil.h	Mon Jan 27 23:22:15 2003
***************
*** 35,41 ****
  #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
  #  include <wchar.h>
  #  include <wctype.h>
! #  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
  #    define HANDLE_MULTIBYTE      1
  #  endif
  #endif
--- 35,42 ----
  #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
  #  include <wchar.h>
  #  include <wctype.h>
! #  if defined (HAVE_MBSRTOWC) && defined (HAVE_MBSRTOWCS)
!      /* system is supposed to support XPG5 */
  #    define HANDLE_MULTIBYTE      1
  #  endif
  #endif

--CdrF4e02JqNVZeln--