Set WANT_AUTOMAKE as appropriate per discussion in bug #271059. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

9 files changed, 27 insertions, 341 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index b06afd169076..4c25728bd472 100644
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/at-spi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.186 2009/05/10 07:21:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.187 2009/05/25 22:07:35 eva Exp $
+
+  25 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/at-spi-1.19.3-tests.patch, -at-spi-1.20.1.ebuild,
+  -files/at-spi-1.20.1-drop-gtk-doc.patch, -at-spi-1.22.1.ebuild,
+  -at-spi-1.24.0.ebuild, at-spi-1.24.1.ebuild, at-spi-1.26.0.ebuild:
+  Set WANT_AUTOMAKE as appropriate per discussion in bug #271059. Clean up
+  old revisions.
 
 *at-spi-1.26.0 (10 May 2009)
 
diff --git a/gnome-extra/at-spi/Manifest b/gnome-extra/at-spi/Manifest
index 1b378436ec60..7d10730c3784 100644
--- a/gnome-extra/at-spi/Manifest
+++ b/gnome-extra/at-spi/Manifest
@@ -1,15 +1,17 @@
-AUX at-spi-1.19.3-tests.patch 3541 RMD160 649f6381d4cef0dcd5ad00d76d935acaa91d7532 SHA1 2cdd95e89a9115d990b59c02ce0863b41c94332e SHA256 23ed4f7026969eba5df992cb7290740c8eb62fa701cdf50f9f06eec83b559f3d
-AUX at-spi-1.20.1-drop-gtk-doc.patch 909 RMD160 3467ca3549d316cc122604be735e51e7625f905f SHA1 a362ebd15190a847c043f9f875389fe96f4aa693 SHA256 963280f5a15c7477339eda46c5809343abb34aad031874f33cee1f3e9c422181
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX at-spi-1.22.0-tests.patch 3541 RMD160 649f6381d4cef0dcd5ad00d76d935acaa91d7532 SHA1 2cdd95e89a9115d990b59c02ce0863b41c94332e SHA256 23ed4f7026969eba5df992cb7290740c8eb62fa701cdf50f9f06eec83b559f3d
-DIST at-spi-1.20.1.tar.bz2 842254 RMD160 b5ea35bbda69de460ec1b846a462a083eff9f9fe SHA1 5ad1ecf8c299dcfc82ec4cf3db4c6fd5874676bc SHA256 d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e
-DIST at-spi-1.22.1.tar.bz2 851691 RMD160 8452186d902090e01a65cd365ac11ceecacb485b SHA1 b7dca093dbe9617e65a0c44ec0e255700a2ab048 SHA256 eaaedead8218197c8ccdc8b24d16f6f25ea82a7e0fd03e2eef29bd13619e0ecb
-DIST at-spi-1.24.0.tar.bz2 834708 RMD160 dcc78e63823ffd6be0fcccacf3152986506d5510 SHA1 9c1349e27617d7a2006e76101e5b12c721e07e1a SHA256 c7af75ad9d3b403a061373d23a31a300caa6745d73be7453303c699127c51c6b
 DIST at-spi-1.24.1.tar.bz2 821177 RMD160 fc6b666a3fe2dcbc1c7ea61cbc1e9ae7c881e254 SHA1 b67852af63d33c77d633490ce717d7c98249ef9a SHA256 f21746c4b4694aec821f545634a3f3bc2a627120fbb9b3aea546f59368025709
 DIST at-spi-1.26.0.tar.bz2 829621 RMD160 e8cc5da683ec4289f552bbc07a08ee70cac5c3c7 SHA1 814871ea8a04570d44003ceffc166cbe44a8bb7c SHA256 bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
-EBUILD at-spi-1.20.1.ebuild 1678 RMD160 140e3889dc2a035e7b0f334564405a1dfab7c70d SHA1 53ef814df4f970cea93f7f378455faba2d913393 SHA256 92284deb8d9ac109268e61cba2d0938c218a7baf862c7d78886fade68af2036a
-EBUILD at-spi-1.22.1.ebuild 1591 RMD160 5013dfe011b03875cf8ffe2203dc47c9324a470f SHA1 be1fd9d4c2a559bcaa36a40fbfec6d9ab99854c8 SHA256 4403154be6aa3ac72569ece95087fa258c4f9a14706ebcf21f2270e7c6bc74f4
-EBUILD at-spi-1.24.0.ebuild 1589 RMD160 1795e52f0ed76610b05e1f9c5d5da761484c7f0a SHA1 fbf190c2a7435c6baf8a9aad6b20275ebf4a45e6 SHA256 dec9d00a653b235564ae08df76c45468cb7d77a523c9ce4971e081dc2710d923
-EBUILD at-spi-1.24.1.ebuild 1619 RMD160 76dfe6964f6e38449fc147bc5c1f3f608d1b61b7 SHA1 a881641f056ca724c0846958ab7b91e1109c08b8 SHA256 1c2c592eddb71940485bb4cb099a42fcd65d7c5fb4e358a7e0136b91b177a446
-EBUILD at-spi-1.26.0.ebuild 1631 RMD160 264c782859c22d1880ca2ceca2da7c1f7f6b47d2 SHA1 d940d910f7ca37fb60bfce93f829842edc5fb92a SHA256 ca5bc357d56230e4853d643293f2fd12a98bcf6edf0126bd1987d6ef9880f74a
-MISC ChangeLog 21797 RMD160 3bde83f84674448740854e3752b1890568c00dc0 SHA1 63d24039ae0f591853e83d8d22e3f006726b0b37 SHA256 c657c799742a0136c3cc57434996e53358d785aa963f0a48a48f29abae8564f4
+EBUILD at-spi-1.24.1.ebuild 1637 RMD160 e8cea1afbc18101a932f136ae13fcbebdedbc98f SHA1 31e22709d55cb11a2845876d841b3e7b59e203d5 SHA256 cb20ed68c795129752061c28786e08258cb52e3f2637795f7cb58a35e0fc4bcc
+EBUILD at-spi-1.26.0.ebuild 1647 RMD160 7723b606a17cb48254f92d267a13f36ebffd2689 SHA1 22c67fb915668ae9800ac2e41ca4c351633e0d3c SHA256 216d07966074780137280fec517873d84ba8e74373d748e5c5891cbbc4c79049
+MISC ChangeLog 22133 RMD160 56df5ce6edc55577b407f0a02a905fb22e2a1a48 SHA1 a0181f1772b70dff142b4832d414e28e5360a08f SHA256 422ee3362f9761790f30bbff2c0cf83109a49ef6056dca7c25ec1107e5bec18a
 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkobFrQACgkQ1fmVwcYIWAbrAQCfXeMdEOOMxVJIUDenNdIfOSq6
+gPQAoMSbc+dOa5jmbAQvkMBtp7Lx2VIB
+=QXUq
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/at-spi/at-spi-1.20.1.ebuild b/gnome-extra/at-spi/at-spi-1.20.1.ebuild
deleted file mode 100644
index 758a7e72a02a..000000000000
--- a/gnome-extra/at-spi/at-spi-1.20.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.20.1.ebuild,v 1.10 2009/03/24 15:55:49 dang Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit virtualx autotools eutils gnome2 python
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-#next bump: check if we should activate Xevie or not
-
-RDEPEND=">=dev-libs/atk-1.17
-	>=x11-libs/gtk+-2.10.0
-	>=gnome-base/gail-1.9.0
-	>=gnome-base/libbonobo-1.107
-	>=gnome-base/orbit-2
-	dev-libs/popt
-	>=dev-lang/python-2.4
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=gnome-base/gnome-common-2.20
-
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# bug number ?
-	epatch "${FILESDIR}"/${PN}-1.19.3-tests.patch
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# drop gtk-doc for autoreconf
-	use doc || epatch "${FILESDIR}/${P}-drop-gtk-doc.patch"
-
-	eautoreconf
-}
-
-src_test() {
-	Xemake check || die "Testing phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
diff --git a/gnome-extra/at-spi/at-spi-1.22.1.ebuild b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
deleted file mode 100644
index 3a87e5f6a84b..000000000000
--- a/gnome-extra/at-spi/at-spi-1.22.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.1.ebuild,v 1.9 2009/03/24 15:55:49 dang Exp $
-
-inherit autotools eutils gnome2 python virtualx
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/atk-1.17
-	>=x11-libs/gtk+-2.10.0
-	>=gnome-base/gail-1.9.0
-	>=gnome-base/libbonobo-1.107
-	>=gnome-base/orbit-2
-	dev-libs/popt
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=gnome-base/gnome-common-2.20
-
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-# needs a live properly configured environment. Not really suited to
-# an ebuild restricted environment
-RESTRICT="test"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# should fix tests
-	epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch
-
-	eautomake
-}
-
-src_test() {
-	Xemake check || die "Testing phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
-}
diff --git a/gnome-extra/at-spi/at-spi-1.24.0.ebuild b/gnome-extra/at-spi/at-spi-1.24.0.ebuild
deleted file mode 100644
index a62ad4c9a8df..000000000000
--- a/gnome-extra/at-spi/at-spi-1.24.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.24.0.ebuild,v 1.1 2008/09/30 22:46:43 leio Exp $
-
-inherit autotools eutils gnome2 python virtualx
-
-DESCRIPTION="The Gnome Accessibility Toolkit"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/atk-1.17
-	>=x11-libs/gtk+-2.10.0
-	>=gnome-base/gail-1.9.0
-	>=gnome-base/libbonobo-1.107
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	dev-libs/popt
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1 )
-
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-# needs a live properly configured environment. Not really suited to
-# an ebuild restricted environment
-RESTRICT="test"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# should fix tests
-	epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch
-
-	eautomake
-}
-
-src_test() {
-	Xemake check || die "Testing phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
-}
diff --git a/gnome-extra/at-spi/at-spi-1.24.1.ebuild b/gnome-extra/at-spi/at-spi-1.24.1.ebuild
index 3bdff3a020f5..50d9d55bc8fb 100644
--- a/gnome-extra/at-spi/at-spi-1.24.1.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.24.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.24.1.ebuild,v 1.12 2009/04/28 14:38:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.24.1.ebuild,v 1.13 2009/05/25 22:07:35 eva Exp $
+
+WANT_AUTOMAKE="1.10"
 
 inherit autotools eutils gnome2 python virtualx
 
diff --git a/gnome-extra/at-spi/at-spi-1.26.0.ebuild b/gnome-extra/at-spi/at-spi-1.26.0.ebuild
index 6c0084b88b86..dae3539253a7 100644
--- a/gnome-extra/at-spi/at-spi-1.26.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.26.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.26.0.ebuild,v 1.1 2009/05/10 07:21:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.26.0.ebuild,v 1.2 2009/05/25 22:07:35 eva Exp $
+
+WANT_AUTOMAKE="1.9"
 
 inherit autotools eutils gnome2 python virtualx
 
diff --git a/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch b/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch
deleted file mode 100644
index 4840284f01e7..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/atk-bridge/bridge.c at-spi-1.19.3/atk-bridge/bridge.c
---- at-spi-1.19.3.orig/atk-bridge/bridge.c	2007-04-28 02:56:51.000000000 -0400
-+++ at-spi-1.19.3/atk-bridge/bridge.c	2007-06-04 13:29:46.000000000 -0400
-@@ -435,10 +435,23 @@ spi_atk_bridge_get_registry (void)
- 	  
-       if (ev._major != CORBA_NO_EXCEPTION)
-         {
-+		  gchar *err_desc = NULL;
-+		  const CORBA_char *id = CORBA_exception_id (&ev);
-+
-+		  if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0)
-+		  {
-+			  Bonobo_GeneralError* ge = CORBA_exception_value (&ev);
-+			  err_desc = g_strdup_printf ("bonobo activation problem: %s",
-+				  ge->description);
-+		  }
-+
-           g_error ("Accessibility app error: exception during "
--		   "registry activation from id: %s\n",
--		   CORBA_exception_id (&ev));
-+			   "registry activation from id: %s\n"
-+			   "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc);
-+
-           CORBA_exception_free (&ev);
-+		  if (err_desc != NULL)
-+			  g_free (err_desc);
-         }
- 	  
-       if (registry_died && registry) 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/Makefile.am at-spi-1.19.3/test/Makefile.am
---- at-spi-1.19.3.orig/test/Makefile.am	2007-05-22 05:40:43.000000000 -0400
-+++ at-spi-1.19.3/test/Makefile.am	2007-06-04 13:31:11.000000000 -0400
-@@ -37,11 +37,18 @@ INCLUDES = -I$(top_srcdir)           \
- 	   $(TESTS_CFLAGS)	     \
- 	   $(DEBUG_CFLAGS)
- 
--LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
-+LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la ../atk-bridge/libatk-bridge.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
- 
- TESTS = test-simple
- 
- TESTS_ENVIRONMENT =					\
--	LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/	\
--	PATH=$(top_builddir)/registryd/.libs/:$(PATH)
-+	BONOBO_ACTIVATION_PATH=$(top_builddir)/test
-+
-+BUILT_SOURCES = Accessibility_Registry.server
-+
-+Accessibility_Registry.server:
-+	rm -f Accessibility_Registry.server
-+	sed -e "s,@REGISTRYD_PATH\@,`which libtool` --mode=execute `pwd`/../registryd,g" \
-+		$(top_builddir)/registryd/Accessibility_Registry.server.in.in > \
-+		Accessibility_Registry.server
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/test-simple.c at-spi-1.19.3/test/test-simple.c
---- at-spi-1.19.3.orig/test/test-simple.c	2007-01-09 22:08:21.000000000 -0500
-+++ at-spi-1.19.3/test/test-simple.c	2007-06-04 13:29:46.000000000 -0400
-@@ -714,7 +714,7 @@ test_keylisteners (void)
- 	key_listener = SPI_createAccessibleKeystrokeListener (
- 		key_listener_cb, &stroke);
- 
--	test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL);
-+	test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL);
- 
- 	g_assert (SPI_registerAccessibleKeystrokeListener (
- 		key_listener,
-@@ -725,11 +725,11 @@ test_keylisteners (void)
- 
- 	for (i = 0; i < 3; i++) {
- 		memset (&stroke, 0, sizeof (AccessibleKeystroke));
--		g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM));
-+		g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM));
- 		while (!(key_press_received))
- 			g_main_context_iteration (NULL, TRUE);
- 		fprintf (stderr, "p [%s]", stroke.keystring);
--	        g_assert (!strcmp (stroke.keystring, "="));
-+	        g_assert (!strcmp (stroke.keystring, "t"));
- 		while (!(key_release_received))
- 			g_main_context_iteration (NULL, TRUE);
- 		fprintf (stderr, "r [%s]", stroke.keystring);
diff --git a/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch b/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
deleted file mode 100644
index a0f5007ed955..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.old	2008-02-18 12:12:11.000000000 +0100
-+++ configure.in	2008-02-18 12:13:02.000000000 +0100
-@@ -66,8 +66,14 @@
- localedir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(localedir)
- 
-+dnl Crazy hack for dropping the dep on gtk-doc
-+AC_DEFUN(GTK_DOC_CHECK, [])
- GTK_DOC_CHECK([1.0])
- 
-+dnl Crazy hack for dropping the dep on gtk-doc
-+AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
-+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
-+
- AC_PATH_XTRA
- 
- if test x$no_x = xyes ; then
---- Makefile.am.old	2008-02-18 12:13:08.000000000 +0100
-+++ Makefile.am	2008-02-18 12:13:59.000000000 +0100
-@@ -1,4 +1,8 @@
--SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test po
-+SUBDIRS = idl libspi login-helper registryd atk-bridge cspi pyatspi test po
-+
-+if ENABLE_GTK_DOC
-+SUBDIRS += docs
-+endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc