From e80937925fd99e09392fe3f76e4cce1b1b42105f Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 27 Jan 2005 15:24:10 +0000 Subject: [PATCH] 2005-01-27 Andrew Cagney * gettext.m4: Don't use NONE as a default for CATOBJEXT. --- gas/ChangeLog | 4 ++++ gas/configure | 8 +++++--- gprof/ChangeLog | 4 ++++ gprof/configure | 8 +++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 36b50a8b55..e41242e345 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * configure: Regenerate to track ../gettext.m4 change. + 2005-01-27 Jan Beulich * config/tc-ia64.c (emit_one_bundle): Change "?imbf??" to "?ibmfxx". diff --git a/gas/configure b/gas/configure index 5dc5646f96..d4994f4a36 100755 --- 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 c1c74a5ca8..7cad2a3b84 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * configure: Regenerate to track ../gettext.m4 change. + 2005-01-21 Ben Elliston * gmon.h, alpha.c, vax.c: Remove #if 0'd chunks. diff --git a/gprof/configure b/gprof/configure index 112aa5f51b..e772159c0b 100755 --- 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