Patches from Brian Pepple and Samuel Thibault - use LINGUAS,

and remove gtk+ dependency in .pc.in files.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@817 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 19c76cc..57ba4d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        * configure.in: Require atk-1.12.0, to pick up
        new API. (bug #344412).
+
+       * libspi-1.0-uninstalled.pc.in:
+       * libspi-1.0.pc.in:
+       * libloginhelper-1.0.pc.in: Remove gtk+ dependency.
+       Fix for #341488 from Samual Thibault.
+
+       * configure.in, LINGUAS: Use LINGUAS, bug #338023.
+       Thanks to Brian Pepple.
        
 2006-06-09  Bill Haneman <bill.haneman@sun.com>
 

diff --git a/LINGUAS b/LINGUAS
new file mode 100644 (file)
index 0000000..7c8cbd4
--- /dev/null
+++ b/LINGUAS
@@ -0,0 +1,68 @@
+# please keep this list sorted alphabetically
+#
+ar
+az
+be
+bg
+bn
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fr
+gl
+gu
+he
+hi
+hr
+hu
+id
+is
+it
+ja
+ka
+ko
+lt
+mn
+mr
+ms
+nb
+ne
+nl
+nn
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+sk
+sl
+sq
+sr@ije
+sr@Latn
+sr
+sv
+th
+ug
+uk
+vi
+wa
+xh
+zh_CN
+zh_HK
+zh_TW

diff --git a/configure.in b/configure.in
index 3771727..2107db0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
 dnl translation of any at-spi strings: used only for .server
-AC_PROG_INTLTOOL([0.31])
+IT_PROG_INTLTOOL([0.35.0])
 
 dnl Checks for programs
 AC_PROG_CC
@@ -55,7 +55,6 @@ AM_PROG_LIBTOOL
 GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
 dnl internationalization support; uncomment if translatable strings are reintroduced
-ALL_LINGUAS="ar az be bg bn bs ca cs cy da de dz el en_CA en_GB eo es et eu fa fi fr gl gu he hi hr hu id is it ja ka ko lt mn mr ms nb ne nl nn or pa pl pt_BR pt ro ru rw sk sl sq sr@ije sr@Latn sr sv th ug uk vi wa xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 # AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME

diff --git a/libloginhelper-1.0.pc.in b/libloginhelper-1.0.pc.in
index 6d8ccf7..d8b338d 100644 (file)
--- a/libloginhelper-1.0.pc.in
+++ b/libloginhelper-1.0.pc.in
@@ -6,7 +6,7 @@ idldir=@datadir@/idl/at-spi-1.0
 
 Name: liblogin-helper
 Description: Login-Helper library for assistive technologies
-Requires: libbonobo-2.0 atk gtk+-2.0 libspi-1.0
+Requires: libbonobo-2.0 atk libspi-1.0
 Version: @VERSION@
 Libs: -L${libdir} -lloginhelper
 Cflags: -I${includedir}/at-spi-1.0

diff --git a/libspi-1.0-uninstalled.pc.in b/libspi-1.0-uninstalled.pc.in
index a65ec16..d8f4d69 100644 (file)
--- a/libspi-1.0-uninstalled.pc.in
+++ b/libspi-1.0-uninstalled.pc.in
@@ -2,7 +2,7 @@ idldir=${pc_top_builddir}/${pcfiledir}/idl
 
 Name: libspi
 Description: Accessibility Technology software library
-Requires: libbonobo-2.0 atk gtk+-2.0
+Requires: libbonobo-2.0 atk
 Version: @VERSION@
 Libs: ${pc_top_builddir}/${pcfiledir}/libspi/libspi.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}

diff --git a/libspi-1.0.pc.in b/libspi-1.0.pc.in
index 2936a95..eaced17 100644 (file)
--- a/libspi-1.0.pc.in
+++ b/libspi-1.0.pc.in
@@ -6,7 +6,7 @@ idldir=@datadir@/idl/at-spi-1.0
 
 Name: libspi
 Description: Accessibility Technology software library
-Requires: libbonobo-2.0 atk gtk+-2.0
+Requires: libbonobo-2.0 atk
 Version: @VERSION@
 Libs: -L${libdir} -lspi
 Cflags: -I${includedir}/at-spi-1.0