bonobo-activation changes landed

[Havoc Pennington <hp redhat com>]

Hi,

Patch appended, let me know if it's broken.

(I know some libs that depend on it are broken, I'm committing the
fixes now.)

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
retrieving revision 1.223
diff -u -p -u -r1.223 ChangeLog
--- ChangeLog	2001/09/14 17:49:16	1.223
+++ ChangeLog	2001/09/19 18:49:30
@@ -1,3 +1,16 @@
+2001-09-17  Havoc Pennington  <hp redhat com>
+
+	* bonobo-activation-2.0.pc.in (idldir): update
+
+	* idl/Makefile.am (idldir): install IDL to 
+	datadir/idl/bonobo-activation-2.0
+
+2001-09-13  Havoc Pennington  <hp redhat com>
+	
+	* utils/bonobo-activation-sysconf.c: fix more libxml headers
+
+	* server/Makefile.am (LDADD): change name of name server lib
+
 Fri Sep 14 10:52:33 2001  George Lebl <jirka 5z com>
 
 	* utils/bonobo-activation-sysconf.c: the libxml headers are in
Index: bonobo-activation-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/bonobo-activation/bonobo-activation-2.0.pc.in,v
retrieving revision 1.11
diff -u -p -u -r1.11 bonobo-activation-2.0.pc.in
--- bonobo-activation-2.0.pc.in	2001/08/01 22:01:39	1.11
+++ bonobo-activation-2.0.pc.in	2001/09/19 18:49:30
@@ -3,7 +3,7 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@/bonobo-activation-2.0
 datadir= datadir@
-idldir= datadir@/idl
+idldir= datadir@/idl/bonobo-activation-2.0
 
 Name: Bonobo Activation
 Version: @VERSION@
Index: idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-activation/idl/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- idl/Makefile.am	2001/08/15 08:17:45	1.6
+++ idl/Makefile.am	2001/09/19 18:49:30
@@ -1,3 +1,3 @@
-idldir=$(datadir)/idl
+idldir=$(datadir)/idl/bonobo-activation-2.0
 idl_DATA=Bonobo_Unknown.idl Bonobo_GenericFactory.idl Bonobo_Activation_types.idl Bonobo_ObjectDirectory.idl Bonobo_ActivationContext.idl
 EXTRA_DIST=$(idl_DATA)
Index: server/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-activation/server/Makefile.am,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile.am
--- server/Makefile.am	2001/08/23 00:06:36	1.36
+++ server/Makefile.am	2001/09/19 18:49:30
@@ -31,7 +31,7 @@ bonobo_activation_server_SOURCES=				\
 	server.h
 
 LDADD=../bonobo-activation/libbonobo-activation.la \
-	$(SERVER_LIBS) -lname-server @INTLLIBS@
+	$(SERVER_LIBS) -lname-server-2 @INTLLIBS@
 
 activation_client_SOURCES=client.c
 
Index: utils/bonobo-activation-sysconf.c
===================================================================
RCS file: /cvs/gnome/bonobo-activation/utils/bonobo-activation-sysconf.c,v
retrieving revision 1.6
diff -u -p -u -r1.6 bonobo-activation-sysconf.c
--- utils/bonobo-activation-sysconf.c	2001/09/14 17:49:17	1.6
+++ utils/bonobo-activation-sysconf.c	2001/09/19 18:49:30
@@ -26,9 +26,9 @@
 #include "config.h"
 #include <string.h>
 #include <glib.h>
-#include <libxml/tree.h>        /* gnome-xml */
-#include <libxml/parser.h>      /* gnome-xml */
-#include <libxml/xmlmemory.h>   /* gnome-xml */
+#include <libxml/tree.h>   
+#include <libxml/parser.h>  
+#include <libxml/xmlmemory.h>
 #include <popt.h>        /* popt :) */
 
 #include <bonobo-activation/bonobo-activation.h>