Unset CATOBJEXT so that the macros and Makefiles correctly handle

Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>

	* acinclude.m4 (ac_result): Unset CATOBJEXT so
	that the macros and Makefiles correctly handle
	disabling NLS when no gettext is found.

diff --git a/ChangeLog b/ChangeLog
index a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * 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 a4deec82944694a51ff570aa9599a53a00d081de..7e403c19d7ecbfdc65f47e3d9b9b8898157ebb65 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jan 13 21:18:41 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <timj@gtk.org>
 
        * gtk/gtkarg.c (gtk_arg_copy): in comparisions with GTK_TYPE_STRING, use

diff --git a/acinclude.m4 b/acinclude.m4
index 4ee50513d8430d70fee436f3918f263dd3256ae0..d04336e18d54a1fe1e71020acbc577c51ebcddeb 100644 (file)
--- 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,