From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15744 invoked by alias); 12 Jun 2006 17:49:39 -0000 Received: (qmail 15689 invoked by uid 22791); 12 Jun 2006 17:49:38 -0000 X-Spam-Check-By: sourceware.org Received: from smtp3.wanadoo.co.uk (HELO smtp3.freeserve.com) (193.252.22.156) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 12 Jun 2006 17:49:01 +0000 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf3208.me.freeserve.com (SMTP Server) with ESMTP id 80B6A7400085; Mon, 12 Jun 2006 19:48:58 +0200 (CEST) Received: from merlin.buzzard.freeserve.co.uk (user-3413.l5.c5.dsl.pol.co.uk [84.65.77.85]) by mwinf3208.me.freeserve.com (SMTP Server) with ESMTP id 45E4A7400094; Mon, 12 Jun 2006 19:48:58 +0200 (CEST) X-ME-UUID: 20060612174858286.45E4A7400094@mwinf3208.me.freeserve.com Received: from merlin (localhost [127.0.0.1]) by merlin.buzzard.freeserve.co.uk (8.13.3/8.13.3) with ESMTP id k5CHmvi0020596; Mon, 12 Jun 2006 18:48:57 +0100 (BST) Message-Id: <200606121748.k5CHmvi0020596@merlin.buzzard.freeserve.co.uk> X-Mailer: exmh version 2.6.3 04/04/2003 with nmh-1.0.4 To: Daniel Jacobowitz Cc: Richard.Earnshaw@buzzard.freeserve.co.uk, gdb-patches@sourceware.org, Masaki Muranaka , Alexandre Oliva From: Richard Earnshaw Subject: Re: Failed to detect config.intl at sim/*/configure In-Reply-To: <1150125925.21187.56.camel@pc960.cambridge.arm.com> Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_-8883686640" Date: Mon, 12 Jun 2006 17:49:00 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-06/txt/msg00157.txt.bz2 This is a multipart MIME message. --==_Exmh_-8883686640 Content-Type: text/plain; charset=us-ascii Content-length: 1014 mark@mcs.vuw.ac.nz said: > > This can't use with sim because it was linked at not sim/ > > but sim/*/ . > > I've tried to fix it, but I can't see how to get > > the top level build directory. > > > > Would anyone fix it? > > I couldn't see how either - we want $ac_top_builddir but the only way > to set it is undocumented. But, we can just keep trying. Want to try > this patch? > I was discussing exactly this problem with Alexander Olivia just last > night. I think the patch he proposed to me and which I've run tests on is > a bit more general than your solution. I'll post it tonight. > R. Here's the patch I have. R. 2006/06/12 Richard Earnshaw Alexandre Oliva * config/gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Add optional argument for where to search for NLS config file. * sim/common/aclocal.m4: Pass ../../intl to ZW_GNU_GETTEXT_SISTER_DIR. * sim/common/common.m4: Likewise. * sim/*/configure: Regenerate. --==_Exmh_-8883686640 Content-Type: text/x-patch ; name="sim.patch"; charset=us-ascii Content-Description: sim.patch Content-Disposition: attachment; filename="sim.patch" Content-length: 2022 Index: config/gettext-sister.m4 =================================================================== RCS file: /cvs/src/src/config/gettext-sister.m4,v retrieving revision 1.2 diff -p -u -r1.2 gettext-sister.m4 --- config/gettext-sister.m4 31 May 2006 15:14:35 -0000 1.2 +++ config/gettext-sister.m4 12 Jun 2006 17:37:27 -0000 @@ -19,8 +19,9 @@ INCINTL= AC_SUBST(INCINTL) XGETTEXT= AC_SUBST(XGETTEXT) GMSGFMT= AC_SUBST(GMSGFMT) POSUB= AC_SUBST(POSUB) -if test -f ../intl/config.intl; then - . ../intl/config.intl + +if test -f ifelse([$1],,[../intl],[$1])/config.intl; then + . ifelse([$1],,[../intl],[$1])/config.intl fi AC_MSG_CHECKING([whether NLS is requested]) if test x"$USE_NLS" != xyes; then Index: sim/common/aclocal.m4 =================================================================== RCS file: /cvs/src/src/sim/common/aclocal.m4,v retrieving revision 1.13 diff -p -u -r1.13 aclocal.m4 --- sim/common/aclocal.m4 31 May 2006 15:14:40 -0000 1.13 +++ sim/common/aclocal.m4 12 Jun 2006 17:37:40 -0000 @@ -44,7 +44,7 @@ AC_PROG_RANLIB dnl We don't use gettext, but bfd does. So we do the appropriate checks dnl to see if there are intl libraries we should link against. ALL_LINGUAS= -ZW_GNU_GETTEXT_SISTER_DIR +ZW_GNU_GETTEXT_SISTER_DIR(../../intl) # Check for common headers. # FIXME: Seems to me this can cause problems for i386-windows hosts. Index: sim/common/common.m4 =================================================================== RCS file: /cvs/src/src/sim/common/common.m4,v retrieving revision 1.3 diff -p -u -r1.3 common.m4 --- sim/common/common.m4 5 Jun 2006 14:21:11 -0000 1.3 +++ sim/common/common.m4 12 Jun 2006 17:37:40 -0000 @@ -39,7 +39,7 @@ AC_PROG_RANLIB dnl We don't use gettext, but bfd does. So we do the appropriate checks dnl to see if there are intl libraries we should link against. ALL_LINGUAS= -ZW_GNU_GETTEXT_SISTER_DIR +ZW_GNU_GETTEXT_SISTER_DIR(../../intl) # Check for common headers. # FIXME: Seems to me this can cause problems for i386-windows hosts. --==_Exmh_-8883686640--