dbus ChangeLog,1.1065,1.1066 configure.in,1.162,1.163

[John Palmieri]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv29038

Modified Files:
	ChangeLog configure.in 
Log Message:
* configure.in:
* tools/Makefile.am:
* tools/dbus-launch.c:
* bus/Makefile.am:
  allow --with-dbus-daemondir switch to be used to make the
  daemon install to a seperate bindir like /usr/libexec
  (patch from Brian Cameron <brian dot cameron at sun dot com) 


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -d -r1.1065 -r1.1066
--- ChangeLog	8 Aug 2006 21:15:56 -0000	1.1065
+++ ChangeLog	8 Aug 2006 21:30:31 -0000	1.1066
@@ -1,5 +1,15 @@
 2006-08-08  John (J5) Palmieri  <johnp at redhat.com>
 
+	* configure.in:
+	* tools/Makefile.am:
+	* tools/dbus-launch.c:
+	* bus/Makefile.am:
+	allow --with-dbus-daemondir switch to be used to make the
+	daemon install to a seperate bindir like /usr/libexec
+	(patch from Brian Cameron <brian dot cameron at sun dot com)
+
+2006-08-08  John (J5) Palmieri  <johnp at redhat.com>
+
 	* bus/Makefile.am (install-data-hook): removed the slash after 
 	$(DESTDIR) so we don't get the double slash which does not work
 	in windows (patch from Andras Porjesz 

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- configure.in	8 Aug 2006 15:36:59 -0000	1.162
+++ configure.in	8 Aug 2006 21:30:31 -0000	1.163
@@ -68,6 +68,7 @@
 AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
 AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
 AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
+AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
 
 
 dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
@@ -965,6 +966,15 @@
 AC_SUBST(DBUS_USER)
 AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon])
 
+#### Directory to install dbus-daemon
+if test -z "$with_dbus_daemondir" ; then
+    DBUS_DAEMONDIR="${bindir}"
+else
+    DBUS_DAEMONDIR=$with_dbus_daemondir
+fi
+AC_SUBST(DBUS_DAEMONDIR)
+AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon])
+
 #### Tell tests where to find certain stuff in builddir
 ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`