From c8ae0b92cae360316fe30f40e738bdf5a93c31b9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 14 Jan 1999 02:16:49 +0000 Subject: [PATCH] Unset CATOBJEXT so that the macros and Makefiles correctly handle Wed Jan 13 21:18:41 1999 Owen Taylor * acinclude.m4 (ac_result): Unset CATOBJEXT so that the macros and Makefiles correctly handle disabling NLS when no gettext is found. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ acinclude.m4 | 4 +++- 8 files changed, 45 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a4deec829..7e403c19d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a4deec829..7e403c19d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jan 13 21:18:41 1999 Owen Taylor + + * acinclude.m4 (ac_result): Unset CATOBJEXT so + that the macros and Makefiles correctly handle + disabling NLS when no gettext is found. + Wed Jan 13 20:14:32 1999 Tim Janik * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use diff --git a/acinclude.m4 b/acinclude.m4 index 4ee50513d..d04336e18 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -676,7 +676,9 @@ AC_DEFUN(AM_GTK_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, -- 2.43.2