* 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 ed6664c3ed9..3e0a28c0bf1 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 ffe14126cd3..201644f5c64 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 4940dab031b..1768b403326 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 c1c81645792..615f3306b70 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 da77325ad8c..8daf08e2317 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 f4b89e08fb8..d4bd3f8a505 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 991c03f905a..47065279f6d 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 877658b4597..342c1b62b81 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 8e0748f2bfe..239d97e4d5e 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 8653f8b7199..e885bda5ba4 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 621f44f90c4..2ff111e9ac3 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 b7e66ee93e3..122d1474780 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 94f23987ace..2c6ec2104dd 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 686bb335ba4..3e54a28e689 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 473bf0df0ae..52c895ca7d7 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 adfd49503ca..4cd6f251a28 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 e861006fce4..d858321c2da 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 e593f2b679b..2f1a37295e2 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 9c360caa8b6..9d8dd713dfa 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 32465390b8b..8a47048362b 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 0f830f337b6..efc2dc69605 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 d05ecaad44d..3797b17aa1e 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 2353f1ad234..1c8d9976fe9 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 c19734dec1b..6a3c1df00b0 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 f50955963c4..63f6cc35403 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 f4311ff5094..6ea29d6d713 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 87cf63c2960..5185b890730 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 0bd23f53e74..f0cccb94e44 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 4d88a2bd418..9000261029f 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 d4c0be0dbcf..47bf2aa0ff8 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 e43216f1766..e385ecea5d2 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 15ef7ed62c0..6b18c0b3266 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 f50955963c4..63f6cc35403 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 b8f6b9991b3..4eacc31d8a6 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 e4f1bb69dd1..c2934cda1a1 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