2005-01-24 Andrew Cagney <cagney@gnu.org>

	* gettext.m4: Only fall back to ../intl/ when it's present.

diff --git a/ChangeLog b/ChangeLog
index be92a208373757bf276bfb8947614de485f4f399..ee2675fb405d2a8c850c5d824d2a68de298b192e 100644 (file)
--- 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 09dfc66e0a2bf0c4cf4cbb62888a506dbbb030e6..a73c5c64d5a45ac78959fb317504602ec928b4a6 100644 (file)
--- 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 232790023b91166beddef5591b231d3e75ce812f..73464ad7e2f31e970a8cfb87e1cbb38d5ae5543f 100755 (executable)
--- 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 24ad5caa2671c1ed9898c0c12b8cdaab59f1326a..a861d2dcc093443bb841af178708bb8bf6f539a4 100644 (file)
--- 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 d22a2df3ffcf9c3cd603504c9e92f5a87b26109d..1dc3ae2b9081aaeb34919e64538b330137c78eba 100755 (executable)
--- 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 6735696cb9ac8caf5fdbfd470765426401ec34a5..6a48f4ac001945a8333fab8848690754b467c31a 100644 (file)
--- 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 913f465d1c048909d881cef00cb97a636ab6049d..02e25532d05793a880dab71c66588e46695f1cc5 100644 (file)
--- 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 05e49e60a6638d98be421c006a62d612761636c8..f3e47dd69db998df7afedfc9760786b179bd29f2 100755 (executable)
--- 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