diff options
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/common/aclocal.m4 | 2 | ||||
| -rw-r--r-- | sim/common/common.m4 | 2 | ||||
| -rwxr-xr-x | sim/common/configure | 5 |
4 files changed, 11 insertions, 4 deletions
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 |