aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Baulig <martin@home-of-linux.org>1999-01-21 07:09:09 +0800
committerMartin Baulig <martin@src.gnome.org>1999-01-21 07:09:09 +0800
commit2f77d8f40d4b67bf3e993d946bfb1153888d30c7 (patch)
tree600fda48627fc5c822eb63b733ae1904ae97c961
parente79ebe3019e4e30b6105f2a36b0372f8ff51bc93 (diff)
downloadgsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar.gz
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar.bz2
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar.lz
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar.xz
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.tar.zst
gsoc2013-evolution-2f77d8f40d4b67bf3e993d946bfb1153888d30c7.zip
Applied a patch from Owen Taylor to keep this in sync with
AC_GTK_GETTEXT from gtk+/acinclude.m4. 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. svn path=/trunk/; revision=616
-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,