Don't define ENABLE_NLS unless we have a working NLS. (This should keep

Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>

	* acinclude.m4 (ac_result): Don't define ENABLE_NLS
	 unless we have a working NLS. (This should keep
	 libintl.h from being included when it doesn't
	 exist).

diff --git a/ChangeLog b/ChangeLog
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 043da65985475a418d8cfab37ff6701c8aac59fd..cb81f56ea55872d00473ad462bef1d3c24809ea7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Jan 25 15:47:46 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 (ac_result): Don't define ENABLE_NLS
+        unless we have a working NLS. (This should keep
+        libintl.h from being included when it doesn't
+        exist).
+
 Mon Jan 25 11:05:10 1999  George Lebl  <jirka@5z.com>
 
        * gtk/gtkbutton.c: set RECEIVES_DEFAULT on init, and a

diff --git a/acinclude.m4 b/acinclude.m4
index d04336e18d54a1fe1e71020acbc577c51ebcddeb..dc0cbf17149655960aad9057fff184558cd726ed 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -569,7 +569,7 @@ AC_DEFUN(AM_GTK_WITH_NLS,
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+#      AC_DEFINE(ENABLE_NLS)
 #      AC_MSG_CHECKING([whether included gettext is requested])
 #      AC_ARG_WITH(included-gettext,
 #        [  --with-included-gettext use the GNU gettext library included here],