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

	* gettext.m4: Don't use NONE as a default for CATOBJEXT.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 36b50a8b554e1d5b7034e8666989c86d30c604ae..e41242e3452921fcae214eb8f21dd5930a0f3d50 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-27  Andrew Cagney  <cagney@gnu.org>
+
+       * configure: Regenerate to track ../gettext.m4 change.
+
 2005-01-27  Jan Beulich  <jbeulich@novell.com>
 
        * config/tc-ia64.c (emit_one_bundle): Change "?imbf??" to "?ibmfxx".

diff --git a/gas/configure b/gas/configure
index 5dc5646f96279404fc12c801b637ea2f3cc07748..d4994f4a3623673c3790063baddd1346c990020d 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -8057,7 +8057,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                                        nls_cv_header_intl=
        nls_cv_header_libgt=
-       CATOBJEXT=NONE
+       CATOBJEXT=
 
        if test "${ac_cv_header_libintl_h+set}" = set; then
   echo "$as_me:$LINENO: checking for libintl.h" >&5
@@ -8655,8 +8655,10 @@ fi
 
 
 
-        if test "$CATOBJEXT" = "NONE"; then
-                         nls_cv_use_gnu_gettext=yes
+        if test x"$CATOBJEXT" = x && 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/gprof/ChangeLog b/gprof/ChangeLog
index c1c74a5ca8c6b6f463876c66167526f1b745dc5f..7cad2a3b84fcbbe441047e3c761e113bc2184e44 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-27  Andrew Cagney  <cagney@gnu.org>
+
+       * configure: Regenerate to track ../gettext.m4 change.
+
 2005-01-21  Ben Elliston  <bje@au.ibm.com>
 
        * gmon.h, alpha.c, vax.c: Remove #if 0'd chunks.

diff --git a/gprof/configure b/gprof/configure
index 112aa5f51b6dad681a4ceb1c9655660c191873c0..e772159c0b78290612a5ff8f1a3325b53790e04b 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -7117,7 +7117,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                                        nls_cv_header_intl=
        nls_cv_header_libgt=
-       CATOBJEXT=NONE
+       CATOBJEXT=
 
        if test "${ac_cv_header_libintl_h+set}" = set; then
   echo "$as_me:$LINENO: checking for libintl.h" >&5
@@ -7715,8 +7715,10 @@ fi
 
 
 
-        if test "$CATOBJEXT" = "NONE"; then
-                         nls_cv_use_gnu_gettext=yes
+        if test x"$CATOBJEXT" = x && 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