dbus ChangeLog,1.578,1.579 configure.in,1.98,1.99

[John Palmieri]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv32362

Modified Files:
	ChangeLog configure.in 
Log Message:
John (J5) Palmieri  <johnp at redhat.com>

        * dbus/dbus-sysdeps.c (fill_user_info): On errors do not free
        the DBusUserInfo structure since this is passed into the function.
        This would cause a double free when the function that allocated
        the structure would try to free it when an error occured.

        * (bus/session.conf.in, bus/Makefile.am, dbus/configure.in):
        use /usr/share/dbus-1/services instead of /usr/lib/dbus-1.0/services
        for service activation to avoid 32bit/64bit parallel install issues


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -d -r1.578 -r1.579
--- ChangeLog	22 Oct 2004 02:14:00 -0000	1.578
+++ ChangeLog	25 Oct 2004 18:48:58 -0000	1.579
@@ -1,3 +1,14 @@
+2004-10-25  John (J5) Palmieri  <johnp at redhat.com>
+
+	* dbus/dbus-sysdeps.c (fill_user_info): On errors do not free
+	the DBusUserInfo structure since this is passed into the function.
+	This would cause a double free when the function that allocated
+	the structure would try to free it when an error occured.
+
+	* (bus/session.conf.in, bus/Makefile.am, dbus/configure.in):
+	use /usr/share/dbus-1/services instead of /usr/lib/dbus-1.0/services
+	for service activation to avoid 32bit/64bit parallel install issues
+
 2004-10-21  Colin Walters  <walters at verbum.org>
 
 	* AUTHORS: Fix my email address, the @gnu.org one

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- configure.in	23 Aug 2004 16:09:54 -0000	1.98
+++ configure.in	25 Oct 2004 18:48:58 -0000	1.99
@@ -984,6 +984,10 @@
 EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP`
 AC_SUBST(EXPANDED_LIBDIR)
 
+DATADIR_TMP="$datadir"
+EXPANDED_DATADIR=`eval echo $DATADIR_TMP`
+AC_SUBST(EXPANDED_DATADIR)
+
 ## put prefix and exec_prefix back
 prefix=$old_prefix
 exec_prefix=$old_exec_prefix
@@ -1168,6 +1172,7 @@
         bindir:                   ${EXPANDED_BINDIR}
         sysconfdir:               ${EXPANDED_SYSCONFDIR}
         localstatedir:            ${EXPANDED_LOCALSTATEDIR}
+	datadir:              ${EXPANDED_DATADIR}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 	cflags:		          ${CFLAGS}