* common/aclocal.m4: Pass ../../intl to ZW_GNU_GETTEXT_SISTER_DIR.

        * common/common.m4: Likewise.
	* */configure: Regenerate.

35 files changed, 119 insertions, 36 deletions

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index ed6664c..3e0a28c 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/arm/configure b/sim/arm/configure
index ffe1412..201644f 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 4940dab..1768b40 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* aclocal.m4: Pass ../../intl to ZW_GNU_GETTEXT_SISTER_DIR.
+	* common.m4: Likewise.
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* aclocal.m4: Use ZW_GNU_GETTEXT_SISTER_DIR.
diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index c1c8164..615f330 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -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.
diff --git a/sim/common/common.m4 b/sim/common/common.m4
index da77325..8daf08e 100644
--- a/sim/common/common.m4
+++ b/sim/common/common.m4
@@ -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.
diff --git a/sim/common/configure b/sim/common/configure
index f4b89e0..d4bd3f8 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -2562,8 +2562,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/cris/configure b/sim/cris/configure
index 991c03f..4706527 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -2693,8 +2693,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 877658b..342c1b6 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 8e0748f..239d97e 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -2685,8 +2685,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 8653f8b..e885bda 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 621f44f..2ff111e 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index b7e66ee..122d147 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/frv/configure b/sim/frv/configure
index 94f2398..2c6ec21 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -2691,8 +2691,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 686bb33..3e54a28 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 473bf0d..52c895c 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index adfd495..4cd6f25 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index e861006..d858321 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -2691,8 +2691,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index e593f2b..2f1a372 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 9c360ca..9d8dd71 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 3246539..8a47048 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 0f830f3..efc2dc6 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -2691,8 +2691,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index d05ecaa..3797b17 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 2353f1a..1c8d997 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -2689,8 +2689,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index c19734d..6a3c1df 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/mcore/configure b/sim/mcore/configure
index f509559..63f6cc3 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index f4311ff..6ea29d6 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/mips/configure b/sim/mips/configure
index 87cf63c..5185b89 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -2703,8 +2703,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 0bd23f5..f0cccb9 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 4d88a2b..9000261 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -2692,8 +2692,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index d4c0be0..47bf2aa 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.in: Replace INTLLIBS and INTLDEPS with LIBINTL
diff --git a/sim/ppc/configure b/sim/ppc/configure
index e43216f..e385ece 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -2387,8 +2387,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 15ef7ed..6b18c0b 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/sh/configure b/sim/sh/configure
index f509559..63f6cc3 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -2683,8 +2683,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index b8f6b99..4eacc31 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure: Regenerated.
+
 2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/sim/v850/configure b/sim/v850/configure
index e4f1bb6..c2934cd 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -2690,8 +2690,9 @@ INCINTL=
 XGETTEXT=
 GMSGFMT=
 POSUB=
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if 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