2001-08-15 Michael Meeks <michael@ximian.com>

	* registryd/Makefile.am: s/oaf/server/ relocate info file.

	* configure.in: upd.

	* configure.in: depend on a recent bonobo-activation that
	will find our server files ...

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

diff --git a/ChangeLog b/ChangeLog
index 00a2017..2e800cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-15  Michael Meeks  <michael@ximian.com>
+
+       * registryd/Makefile.am: s/oaf/server/ relocate info file.
+
+       * configure.in: upd.
+
+       * configure.in: depend on a recent bonobo-activation that
+       will find our server files ...
+
 2001-08-16  Bill Haneman <bill.haneman@sun.com>
 
        * libspi/accessible.c : accessible_new() :

diff --git a/configure.in b/configure.in
index 4b46c6f..ad91a38 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,19 +51,19 @@ ALL_LINGUAS=""
 AM_GNOME2_GETTEXT
 
 dnl Checks for libraries
-PKG_CHECK_MODULES(LIBSPI, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.91 atk >= 0.2)
+PKG_CHECK_MODULES(LIBSPI, bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 >= 2.3.91 atk >= 0.2)
 AC_SUBST(LIBSPI_LIBS)
 AC_SUBST(LIBSPI_CFLAGS)
 
-PKG_CHECK_MODULES(REGISTRYD, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 atk >= 0.2)
+PKG_CHECK_MODULES(REGISTRYD, bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 atk >= 0.2)
 AC_SUBST(REGISTRYD_LIBS)
 AC_SUBST(REGISTRYD_CFLAGS)
 
-PKG_CHECK_MODULES(TESTS, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
+PKG_CHECK_MODULES(TESTS, bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
 AC_SUBST(TESTS_LIBS)
 AC_SUBST(TESTS_CFLAGS)
 
-PKG_CHECK_MODULES(AT_BRIDGE, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
+PKG_CHECK_MODULES(AT_BRIDGE, bonobo-activation-2.0 >= 0.9.1 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
 AC_SUBST(AT_BRIDGE_LIBS)
 AC_SUBST(AT_BRIDGE_CFLAGS)
 
@@ -89,7 +89,7 @@ docs/Makefile
 idl/Makefile
 libspi/Makefile
 registryd/Makefile
-registryd/Accessibility_Registry.oaf
+registryd/Accessibility_Registry.server
 at-bridge/Makefile
 test/Makefile
 ])

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 19017a2..2aa2246 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -10,9 +10,9 @@ registryd_SOURCES = registryd.c
 
 LDADD = ../libspi/libspi.la $(REGISTRYD_LIBS)
 
-oafinfodir = $(datadir)/oaf
-oafinfo_DATA = Accessibility_Registry.oaf
+serverinfodir = $(libdir)/bonobo/servers
+serverinfo_DATA = Accessibility_Registry.server
 
-@XML_I18N_MERGE_OAF_RULE@
+@XML_I18N_MERGE_SERVER_RULE@
 
-EXTRA_DIST = Accessibility_Registry.oaf.in $(oafinfo_DATA)
+EXTRA_DIST = Accessibility_Registry.server.in $(serverinfo_DATA)