Bug#373643: Proposed patch and test case

Jurij Smakov jurij at wooyd.org
Tue Oct 24 09:17:05 CEST 2006


Hi,

Attached is the proposed patch (intltool.patch) and a test case 
archive (test.tar.gz). The patch just implements the same logic as in 
glib-gettext.m4 to set DATADIRNAME variable if it is not set already.

To test that it works:

* tar xzf test.tar.gz
* cd test
* ./autogen.sh (you'll need to press Enter once during its run)
* ./configure
* Check out the po/Makefile. With current version of intltool the 
DATADIRNAME variable is not substituted. With the patch applied it is 
set to 'share'.

Here are the versions of the packages I have installed:

ii  autoconf         2.60a-4          automatic configure script builder
ii  automake1.9      1.9.6+nogfdl-2   A tool for generating GNU Standards-compliant Ma
ii  autotools-dev    20060920.1       Update infrastructure for config.{guess,sub} fil
ii  gettext          0.15-2           GNU Internationalization utilities
ii  intltool         0.35.0-2         Utility scripts for internationalizing XML

Best regards,
-- 
Jurij Smakov                                           jurij at wooyd.org
Key: http://www.wooyd.org/pgpkey/                      KeyID: C99E03CC
-------------- next part --------------
--- a/intltool.m4	2006-05-15 09:08:03.000000000 -0700
+++ b/intltool.m4	2006-10-24 00:01:37.000000000 -0700
@@ -113,7 +113,30 @@
 
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
-    
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+                 return _nl_msg_cat_cntr],
+    [DATADIRNAME=share],
+    [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
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
 IT_PO_SUBDIR([po])
 
 dnl The following is very similar to
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test.tar.gz
Type: application/octet-stream
Size: 1562 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20061024/6d784f61/test.tar-0003.obj


More information about the Pkg-gnome-maintainers mailing list