2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bad48d..b6b2264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-31  Andrew Cagney  <cagney@gnu.org>
+
+	* gettext.m4: Only set ENABLE_NLS when gettext is present.
+
 2005-01-29  Hans-Peter Nilsson  <hp@axis.com>
 
 	* configure.in (noconfigdirs) <crisv32-*-*>: Match like cris-*-*.
diff --git a/gettext.m4 b/gettext.m4
index f3deafa..2c54fb8 100644
--- a/gettext.m4
+++ b/gettext.m4
@@ -24,7 +24,6 @@ AC_DEFUN([CY_WITH_NLS],
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -156,6 +155,9 @@ AC_DEFUN([CY_WITH_NLS],
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
+    if test "x$CATOBJEXT" != "x"; then
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
+    fi
   ])
 
 AC_DEFUN([CY_GNU_GETTEXT],