hal ChangeLog,1.881,1.882 configure.in,1.125,1.126

[David Zeuthen]

Update of /cvs/hal/hal
In directory kemper:/tmp/cvs-serv6975

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-05-04  David Zeuthen  <davidz at redhat.com>

	Patch from Joe Marcus Clarke <marcus at freebsd.org>. Move sockets to
	/var/run/hald and create this directoy on 'make install'

	* configure.in:
	* hald/Makefile.am:
	* hald/hald_dbus.c: (hald_dbus_local_server_init):
	* hald/hald_runner.c:



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -d -r1.881 -r1.882
--- ChangeLog	1 May 2006 21:32:54 -0000	1.881
+++ ChangeLog	4 May 2006 19:40:16 -0000	1.882
@@ -1,3 +1,13 @@
+2006-05-04  David Zeuthen  <davidz at redhat.com>
+
+	Patch from Joe Marcus Clarke <marcus at freebsd.org>. Move sockets to
+	/var/run/hald and create this directoy on 'make install'
+
+	* configure.in:
+	* hald/Makefile.am:
+	* hald/hald_dbus.c: (hald_dbus_local_server_init):
+	* hald/hald_runner.c:
+
 2006-05-01  Kay Sievers  <kay.sievers at vrfy.org>
 
 	* hald/linux2/osspec.c: (set_suspend_hibernate_keys):

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- configure.in	13 Mar 2006 19:58:47 -0000	1.125
+++ configure.in	4 May 2006 19:40:16 -0000	1.126
@@ -38,6 +38,7 @@
 AC_ARG_WITH(os-type,     [  --with-os-type=<os>     Distribution or OS (redhat)])
 AC_ARG_WITH(pid-file,    [  --with-pid-file=<file>  PID file for HAL daemon])
 AC_ARG_WITH(hwdata,[  --with-hwdata=<dir>     where PCI and USB IDs are found (auto)])
+AC_ARG_WITH(socket-dir,[  --with-socket-dir=<dir>  Location of the HAL D-BUS listening sockets (auto)])
 if ! test -z "$with_hwdata" ; then
    HWDATA_DIR="$with_hwdata"
 else
@@ -371,6 +372,15 @@
 AC_SUBST(HALD_PID_FILE)
 AC_DEFINE_UNQUOTED(HALD_PID_FILE, "$HALD_PID_FILE", [pid file])
 
+if ! test -z "$with_socket_dir"; then
+    HALD_SOCKET_DIR=$with_socket_dir
+else
+    HALD_SOCKET_DIR=${LOCALSTATEDIR}/run/hald
+fi
+
+AC_SUBST(HALD_SOCKET_DIR)
+AC_DEFINE_UNQUOTED(HALD_SOCKET_DIR, "$HALD_SOCKET_DIR", [socket dir])
+
 # documentation target
 AC_ARG_WITH(doc-dir,   [  --with-doc-dir=[dirname]  directory to install documentation])
 if ! test -z "$with_doc_dir"; then
@@ -462,6 +472,7 @@
         User for HAL:               ${HAL_USER}
         Group for HAL:              ${HAL_GROUP}
         hald pidfile:               ${HALD_PID_FILE}
+        hald socket dir:            ${HALD_SOCKET_DIR}
         hald backend:               ${HALD_BACKEND}
         use acpi kernel interface:  ${acpi_proc}
         use acpid interface:        ${acpi_acpid}