From 3bfb73d477c48843340bf08e82c6b4d9e90b5a4c Mon Sep 17 00:00:00 2001 From: Hidetoshi Tajima Date: Fri, 6 Jun 2003 17:31:50 +0000 Subject: [PATCH] Test for Solaris native gettext in libc, seeing if it supports GNU catalog Fri Jun 6 10:24:23 2003 Hidetoshi Tajima * m4macros/glib-gettext.m4: Test for Solaris native gettext in libc, seeing if it supports GNU catalog format (#85217). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ m4macros/glib-gettext.m4 | 20 ++++++++++++++++++-- 7 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7fb979051..1d1cccb6f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jun 6 10:24:23 2003 Hidetoshi Tajima + + * 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 * glib/gmain.c: When dispatching a source that is diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 index 488de2149..7886a0c07 100644 --- 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