diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rwxr-xr-x | bfd/configure | 6 | ||||
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rwxr-xr-x | gdb/configure | 6 | ||||
| -rw-r--r-- | gettext.m4 | 6 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rwxr-xr-x | opcodes/configure | 6 |
8 files changed, 31 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index be92a208373..ee2675fb405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-24 Andrew Cagney <cagney@gnu.org> + + * gettext.m4: Only fall back to ../intl/ when it's present. + 2005-01-17 Kelley Cook <kcook@gcc.gnu.org> * install-sh, config.sub: Import from upstream. diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 09dfc66e0a2..a73c5c64d5a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-01-24 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate, ../gettext.m4 was updated. + 2005-01-21 Ben Elliston <bje@au.ibm.com> * aout-encap.c: Remove unused file. diff --git a/bfd/configure b/bfd/configure index 232790023b9..73464ad7e2f 100755 --- a/bfd/configure +++ b/bfd/configure @@ -7861,8 +7861,10 @@ fi - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes + if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + # Neither gettext nor catgets in included in the C library. + # Fall back on GNU gettext library (assuming it is present). + nls_cv_use_gnu_gettext=yes fi fi diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 24ad5caa267..a861d2dcc09 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2005-01-24 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate, ../gettext.m4 was updated. + 2005-01-23 Mark Kettenis <kettenis@gnu.org> * NEWS: Mention new BSD user-level threads support. diff --git a/gdb/configure b/gdb/configure index d22a2df3ffc..1dc3ae2b908 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5554,8 +5554,10 @@ fi - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes + if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + # Neither gettext nor catgets in included in the C library. + # Fall back on GNU gettext library (assuming it is present). + nls_cv_use_gnu_gettext=yes fi fi diff --git a/gettext.m4 b/gettext.m4 index 6735696cb9a..6a48f4ac001 100644 --- a/gettext.m4 +++ b/gettext.m4 @@ -81,9 +81,9 @@ AC_DEFUN([CY_WITH_NLS], dnl In the standard gettext, we would now check for catgets. dnl However, we never want to use catgets for our releases. - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. + if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + # Neither gettext nor catgets in included in the C library. + # Fall back on GNU gettext library (assuming it is present). nls_cv_use_gnu_gettext=yes fi fi diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 913f465d1c0..02e25532d05 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2005-01-24 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate, ../gettext.m4 was updated. + 2005-01-21 Fred Fish <fnf@specifixinc.com> * mips-opc.c: Change INSN_ALIAS to INSN2_ALIAS. diff --git a/opcodes/configure b/opcodes/configure index 05e49e60a66..f3e47dd69db 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -7836,8 +7836,10 @@ fi - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes + if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + # Neither gettext nor catgets in included in the C library. + # Fall back on GNU gettext library (assuming it is present). + nls_cv_use_gnu_gettext=yes fi fi |