Test for Solaris native gettext in libc, seeing if it supports GNU catalog

Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>

	* m4macros/glib-gettext.m4: Test for Solaris native gettext
	in libc, seeing if it supports GNU catalog format (#85217).

diff --git a/ChangeLog b/ChangeLog
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7fb9790..1d1cccb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jun  6 10:24:23 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * m4macros/glib-gettext.m4: Test for Solaris native gettext 
+       in libc, seeing if it supports GNU catalog format (#85217).
+       
 Thu Jun  5 23:40:31 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c: When dispatching a source that is

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 488de21..7886a0c 100644 (file)
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -192,8 +192,24 @@ glib_DEFUN([GLIB_WITH_NLS],
                         return _nl_msg_cat_cntr],
            [CATOBJEXT=.gmo 
              DATADIRNAME=share],
-           [CATOBJEXT=.mo
-             DATADIRNAME=lib])
+           [case $host in
+           *-*-solaris*)
+           dnl On Solaris, if bind_textdomain_codeset is in libc,
+           dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+           dnl Hence, we'd like to go with DATADIRNAME=share and
+           dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+             [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+             [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+           ;;
+           *)
+           CATOBJEXT=.mo
+            DATADIRNAME=lib
+           ;;
+           esac])
          INSTOBJEXT=.mo
        else
          gt_cv_have_gettext=no