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.