aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gettext.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee2675f..d648eb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-27 Andrew Cagney <cagney@gnu.org>
+
+ * gettext.m4: Don't use NONE as a default for CATOBJEXT.
+
2005-01-24 Andrew Cagney <cagney@gnu.org>
* gettext.m4: Only fall back to ../intl/ when it's present.
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