From a53bf5062454ed1308388b951b461a042d6d21bd Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 27 Jan 2005 14:48:23 +0000 Subject: [PATCH] 2005-01-27 Andrew Cagney * gettext.m4: Don't use NONE as a default for CATOBJEXT. --- ChangeLog | 4 ++++ bfd/ChangeLog | 4 ++++ bfd/configure | 4 ++-- gdb/ChangeLog | 4 ++++ gdb/configure | 4 ++-- gettext.m4 | 4 ++-- opcodes/ChangeLog | 4 ++++ opcodes/configure | 4 ++-- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee2675f..d648eb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * gettext.m4: Don't use NONE as a default for CATOBJEXT. + 2005-01-24 Andrew Cagney * gettext.m4: Only fall back to ../intl/ when it's present. diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3e84f8a..a8f8a33 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * configure: Regenerate to track ../gettext.m4 change. + 2005-01-25 Mark Mitchell * elf32-arm.c (elf_backend_default_use_rela_p): Define to zero for diff --git a/bfd/configure b/bfd/configure index 73464ad..b961248 100755 --- a/bfd/configure +++ b/bfd/configure @@ -7263,7 +7263,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 @@ -7861,7 +7861,7 @@ fi - if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + 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 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index afc88da..ac08c45 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * configure: Regenerate to track ../gettext.m4 change. + 2005-01-26 Andrew Cagney * rs6000-tdep.c: Include "reggroups.h". diff --git a/gdb/configure b/gdb/configure index 1dc3ae2..c87733b 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4956,7 +4956,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 @@ -5554,7 +5554,7 @@ fi - if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + 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 diff --git a/gettext.m4 b/gettext.m4 index 6a48f4a..f3deafa 100644 --- a/gettext.m4 +++ b/gettext.m4 @@ -40,7 +40,7 @@ AC_DEFUN([CY_WITH_NLS], dnl catgets is only used if permitted by option --with-catgets. nls_cv_header_intl= nls_cv_header_libgt= - CATOBJEXT=NONE + CATOBJEXT= AC_CHECK_HEADER(libintl.h, [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, @@ -81,7 +81,7 @@ 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" && test -d $srcdir/../intl; then + 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 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b91673f..1b1d95f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2005-01-27 Andrew Cagney + + * configure: Regenerate to track ../gettext.m4 change. + 2005-01-25 Alexandre Oliva 2004-11-10 Alexandre Oliva diff --git a/opcodes/configure b/opcodes/configure index f3e47dd..6f1847f 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -7238,7 +7238,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 @@ -7836,7 +7836,7 @@ fi - if test "$CATOBJEXT" = "NONE" && test -d $srcdir/../intl; then + 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 -- 2.7.4