diff options
| author | Andrew Cagney <cagney@redhat.com> | 2005-01-27 15:24:10 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2005-01-27 15:24:10 +0000 |
| commit | e80937925fd99e09392fe3f76e4cce1b1b42105f (patch) | |
| tree | c0c9df386cf14ee08304604f2e0e0374c0ea8d60 /gas | |
| parent | a53bf5062454ed1308388b951b461a042d6d21bd (diff) | |
2005-01-27 Andrew Cagney <cagney@gnu.org>
* gettext.m4: Don't use NONE as a default for CATOBJEXT.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rwxr-xr-x | gas/configure | 8 |
2 files changed, 9 insertions, 3 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 <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 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 |