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

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

Index: gettext.m4
===================================================================
RCS file: /cvs/src/src/gettext.m4,v
retrieving revision 1.3
diff -p -u -r1.3 gettext.m4
--- gettext.m4	14 Jan 2004 13:41:36 -0000	1.3
+++ gettext.m4	17 Jan 2005 23:56:17 -0000
@@ -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