aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-gettext.m44
2 files changed, 9 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index ba84ced9e4..f660ba698e 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-20 Martin Baulig <martin@home-of-linux.org>
+
+ * acinclude.m4 (ac_result): Unset CATOBJEXT so
+ that the macros and Makefiles correctly handle
+ disabling NLS when no gettext is found.
+
1999-01-19 Raja R Harinath <harinath@cs.umn.edu>
* gnome-cxx-check.m4 (GNOME_CHECK_CXX): Rewrite to be saner.
diff --git a/macros/gnome-gettext.m4 b/macros/gnome-gettext.m4
index 25c1f0963c..d811177c1e 100644
--- a/macros/gnome-gettext.m4
+++ b/macros/gnome-gettext.m4
@@ -132,7 +132,9 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
if test "$nls_cv_use_gnu_gettext" != "yes"; then
AC_DEFINE(ENABLE_NLS)
-# else
+ else
+ # Unset this variable since we use the non-zero value as a flag.
+ CATOBJEXT=
# dnl Mark actions used to generate GNU NLS library.
# INTLOBJS="\$(GETTOBJS)"
# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,