Fix problem with --disable-nls.

Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>

	* acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.

diff --git a/ChangeLog b/ChangeLog
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3caeb43..14de7e9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Jan 31 13:46:58 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * acinclude.m4 glib-gettext.m4: Fix problem with --disable-nls.
+
 2001-01-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c, gthread.h: Added g_static_mutex_free to allow using
@@ -59,7 +63,7 @@
        * tests/makefile.mingw.in: Remove superfluous compilation command
        line.
 
-2001-01-23    <alexl@redhat.com>
+2001-01-23  Alex Larsson  <alexl@redhat.com>
 
        * gmain.c (g_source_callback_unref): Free the callback
        (g_source_set_callback): Initialize the callback refcount

diff --git a/acinclude.m4 b/acinclude.m4
index d2ea6b2..b133d71 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -611,10 +611,10 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+#      nls_cv_header_intl=intl/libintl.h
+#      nls_cv_header_libgt=intl/libgettext.h
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+#    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

diff --git a/glib-gettext.m4 b/glib-gettext.m4
index a9155cb..5ef4d33 100644 (file)
--- a/glib-gettext.m4
+++ b/glib-gettext.m4
@@ -182,10 +182,10 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+#      nls_cv_header_intl=intl/libintl.h
+#      nls_cv_header_libgt=intl/libgettext.h
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+#    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index a9155cb..5ef4d33 100644 (file)
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -182,10 +182,10 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+#      nls_cv_header_intl=intl/libintl.h
+#      nls_cv_header_libgt=intl/libgettext.h
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+#    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
     AC_OUTPUT_COMMANDS(
      [case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile