diff options
| author | Martin Baulig <martin@home-of-linux.org> | 1999-01-20 23:09:09 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-01-20 23:09:09 +0000 |
| commit | 5b527d5662b770cc2068130dd30503cecca16dfe (patch) | |
| tree | a7c613a612fb59f6f88473defbf57296c01c97d5 | |
| parent | 55a868c3dea6ee3c73055dcbee1d60bfd07aff62 (diff) | |
| download | gnome-common-5b527d5662b770cc2068130dd30503cecca16dfe.tar.gz | |
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=589
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/gnome-gettext.m4 | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index ba84ced..f660ba6 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 25c1f09..d811177 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, |