Failed to detect config.intl at sim/*/configure

Failed to detect config.intl at sim/*/configure

[Masaki Muranaka]

Hello,

It failed to build sim/mips/run on MacOS X with message.
 > /usr/bin/ld: Undefined symbols:
 > _libintl_dgettext
 > collect2: ld returned 1 exit status


I think it is caused by config/gettext-sister.m4.

 > if test -f ../intl/config.intl; then
 >  . ../intl/config.intl
 > fi

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?

--
Masaki Muranaka
Monami software

Re: Failed to detect config.intl at sim/*/configure

[Daniel Jacobowitz]

On Mon, Jun 12, 2006 at 02:07:36PM +0900, Masaki Muranaka wrote:
> 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?

Index: config/gettext-sister.m4
===================================================================
RCS file: /cvs/src/src/config/gettext-sister.m4,v
retrieving revision 1.2
diff -u -p -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 12:58:14 -0000
@@ -21,6 +21,8 @@ GMSGFMT=	AC_SUBST(GMSGFMT)
 POSUB=		AC_SUBST(POSUB)
 if test -f ../intl/config.intl; then
   . ../intl/config.intl
+elif test -f ../../intl/config.intl; then
+  . ../../intl/config.intl
 fi
 AC_MSG_CHECKING([whether NLS is requested])
 if test x"$USE_NLS" != xyes; then
Index: sim/mips/configure
===================================================================
RCS file: /cvs/src/src/sim/mips/configure,v
retrieving revision 1.24
diff -u -p -r1.24 configure
--- sim/mips/configure	5 Jun 2006 14:21:13 -0000	1.24
+++ sim/mips/configure	12 Jun 2006 12:58:16 -0000
@@ -2705,6 +2705,8 @@ GMSGFMT=
 POSUB=
 if test -f ../intl/config.intl; then
   . ../intl/config.intl
+elif test -f ../../intl/config.intl; then
+  . ../../intl/config.intl
 fi
 echo "$as_me:$LINENO: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6


-- 
Daniel Jacobowitz
CodeSourcery

Re: Failed to detect config.intl at sim/*/configure

[Masaki Muranaka]

On 2006/06/12, at 21:58, Daniel Jacobowitz wrote:
> 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?

Thanks for your patch.
I've tried similar fix and it works well.

But... I feel this fix is slightly brute-forced.
In case failed to create intl/config.intl, it's possible to
detect config.intl which is out of the build tree.
I hesitate I request to check this patch in.

The plan B is to create sim/intl/config.intl.
sim/intl/config.intl contains:
: #!/bin/sh
: . ../../intl/config.intl
This is more safety but it's a roundabout way.


BTW, I tried also ac_top_builddir like this.
: if test -f $ac_top_builddir/intl/config.intl; then ...
and it was failed because ac_top_builddir was empty.

--
Masaki Muranaka
Monami software

Re: Failed to detect config.intl at sim/*/configure

[Daniel Jacobowitz]

On Mon, Jun 12, 2006 at 11:05:37PM +0900, Masaki Muranaka wrote:
> But... I feel this fix is slightly brute-forced.
> In case failed to create intl/config.intl, it's possible to
> detect config.intl which is out of the build tree.
> I hesitate I request to check this patch in.

This is true.  However, autoconf does this in lots of places already,
and in these directories there should always be one or the other; we
now rely on configuring intl.

-- 
Daniel Jacobowitz
CodeSourcery

Re: Failed to detect config.intl at sim/*/configure

[Richard Earnshaw]

On Mon, 2006-06-12 at 13:58, Daniel Jacobowitz wrote:
> On Mon, Jun 12, 2006 at 02:07:36PM +0900, Masaki Muranaka wrote:
> > 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.

Re: Failed to detect config.intl at sim/*/configure

[Richard Earnshaw]

[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]


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  <rearnsha@arm.com>
            Alexandre Oliva <aoliva@redhat.com>

	* 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.


[-- Attachment #2: sim.patch --]
[-- Type: text/x-patch , Size: 2022 bytes --]

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.

Re: Failed to detect config.intl at sim/*/configure

[Daniel Jacobowitz]

On Mon, Jun 12, 2006 at 06:48:57PM +0100, Richard Earnshaw wrote:
> Here's the patch I have.
> 
> R.
> 
> 2006/06/12  Richard Earnshaw  <rearnsha@arm.com>
>             Alexandre Oliva <aoliva@redhat.com>
> 
> 	* 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.

OK by me, and I think I can approve it.  Want to check it in?

(The changelogs for regenerating all of the sim configure scripts are a
real pain...)


-- 
Daniel Jacobowitz
CodeSourcery

Re: Failed to detect config.intl at sim/*/configure

[Alexandre Oliva]

On Jun 12, 2006, Richard Earnshaw <Richard.Earnshaw@buzzard.freeserve.co.uk> wrote:

> 2006/06/12  Richard Earnshaw  <rearnsha@arm.com>
>             Alexandre Oliva <aoliva@redhat.com>

> 	* 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.

Ok, thanks.  Just use dashes instead of slashes in the date, please.

-- 
Alexandre Oliva         http://www.lsd.ic.unicamp.br/~oliva/
Secretary for FSF Latin America        http://www.fsfla.org/
Red Hat Compiler Engineer   aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist  oliva@{lsd.ic.unicamp.br, gnu.org}

Re: Failed to detect config.intl at sim/*/configure

[Masaki Muranaka]

On 2006/06/13, at 2:48, Richard Earnshaw wrote:
> Here's the patch I have.
>
> R.
>
> 2006/06/12  Richard Earnshaw  <rearnsha@arm.com>
>             Alexandre Oliva <aoliva@redhat.com>
>
> 	* 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.
>
> <sim.patch>

It has succeeded to build with your patch on my OSX box.
(Strictly, there still has a minor trouble
at link time, but this is an another issue.)
Thanks.

--
Masaki Muranaka
Monami software