Reinstated translation; removed Accessibility_Registry.server from dist

(bug #331484).

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

diff --git a/ChangeLog b/ChangeLog
index 074e964..5076016 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-20  Bill Haneman <billh@gnome.org>
+
+       * configure.in: Rev to 1.7.5.
+       Reinstate localization of this module.  Thanks for Rodney
+       Dawes for fixing my patch.
+
+       * registryd/Makefile.am: Remove Accessibility_Registry.server 
+       from dist, since it needs to be re-created at configure time.
+       Fixes bug #3331484.
+       

 2006-01-31  Bill Haneman <billh@gnome.org>
 
        * configure.in: Rev to 1.7.4 (to include build fix below).
 2006-01-31  Bill Haneman <billh@gnome.org>
 
        * configure.in: Rev to 1.7.4 (to include build fix below).

diff --git a/Makefile.am b/Makefile.am
index 1999ae5..2ef1724 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi test
+SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi test po

 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc

diff --git a/autogen.sh b/autogen.sh
index 058c571..e1cbd26 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,6 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="at-spi"
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="at-spi"

-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.9

 
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
 
 USE_GNOME2_MACROS=1 . gnome-autogen.sh

diff --git a/configure.in b/configure.in
index 438e780..5b74e3c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=7
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=7

-AT_SPI_MICRO_VERSION=4
+AT_SPI_MICRO_VERSION=5

 AT_SPI_INTERFACE_AGE=0
 AT_SPI_BINARY_AGE=0
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
 AT_SPI_INTERFACE_AGE=0
 AT_SPI_BINARY_AGE=0
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"


@@ -26,7 +26,7 @@ AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
 dnl required versions of other tools.
 AC_SUBST(LT_AGE)
 
 dnl required versions of other tools.

-m4_define([req_ver_atk],       [1.7.2])
+m4_define([req_ver_atk],       [1.9.0])

 m4_define([req_ver_libbonobo], [1.107.0])
 m4_define([req_ver_gail],      [1.3.0])
 m4_define([req_ver_gtk],       [2.0.0])
 m4_define([req_ver_libbonobo], [1.107.0])
 m4_define([req_ver_gail],      [1.3.0])
 m4_define([req_ver_gtk],       [2.0.0])


@@ -37,8 +37,8 @@ AM_CONFIG_HEADER(config.h)
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 

-dnl we don't need translation of any at-spi strings
-dnl AC_PROG_INTLTOOL
+dnl translation of any at-spi strings: used only for .server
+AC_PROG_INTLTOOL([0.31])

 
 dnl Checks for programs
 AC_PROG_CC
 
 dnl Checks for programs
 AC_PROG_CC


@@ -52,11 +52,16 @@ dnl Initialize libtool
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 

-dnl DO NOT PUT THIS BACK: at-spi DOES NOT INCLUDE TRANSLATABLE STRINGS. wph 2006.
-dnl
+GETTEXT_PACKAGE="${PACKAGE}"
+AC_SUBST(GETTEXT_PACKAGE)

 dnl internationalization support; uncomment if translatable strings are reintroduced
 dnl internationalization support; uncomment if translatable strings are reintroduced

-dnl ALL_LINGUAS="ar az be bg bn bs ca cs cy da de 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 no 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"
-dnl AM_GLIB_GNU_GETTEXT
+ALL_LINGUAS="ar az be bg bn bs ca cs cy da de 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 no 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
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)

 
 GTK_DOC_CHECK([1.0])
 
 
 GTK_DOC_CHECK([1.0])
 


@@ -205,6 +210,7 @@ AC_SUBST(REBUILD)
 
 AC_OUTPUT([
 Makefile
 
 AC_OUTPUT([
 Makefile

+po/Makefile.in

 libspi-1.0.pc
 libspi-1.0-uninstalled.pc
 libloginhelper-1.0.pc
 libspi-1.0.pc
 libspi-1.0-uninstalled.pc
 libloginhelper-1.0.pc

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 2fe3a77..877b258 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -1,6 +1,6 @@
-server = Accessibility_Registry.server
+server_dot_in = Accessibility_Registry.server.in

 
 

-$(server): $(server).in.in
+$(server_dot_in): $(server_dot_in).in

        sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ 
 
 libexec_PROGRAMS = at-spi-registryd
        sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ 
 
 libexec_PROGRAMS = at-spi-registryd


@@ -26,5 +26,7 @@ LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(
 serverinfodir = $(libdir)/bonobo/servers
 serverinfo_DATA = Accessibility_Registry.server
 
 serverinfodir = $(libdir)/bonobo/servers
 serverinfo_DATA = Accessibility_Registry.server
 

-EXTRA_DIST = Accessibility_Registry.server.in.in $(serverinfo_DATA)
+@INTLTOOL_SERVER_RULE@
+
+EXTRA_DIST = Accessibility_Registry.server.in.in

 CLEANFILES = $(serverinfo_DATA) $(server_dot_in)
 CLEANFILES = $(serverinfo_DATA) $(server_dot_in)