hal ChangeLog,1.585,1.586 configure.in,1.95,1.96

[Kay Sievers]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv24168

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-08-06  Kay Sievers  <kay.sievers at vrfy.org>

        * configure.in:
        * hald/linux2/addons/addon-acpi.c: (main):
        Make the possible ACPI event sources configurable, cause binding
        the exclusive kernel socket instead of the proposed acpid socket
        may cause trouble.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- ChangeLog	5 Aug 2005 10:57:21 -0000	1.585
+++ ChangeLog	6 Aug 2005 13:15:41 -0000	1.586
@@ -1,8 +1,16 @@
+2005-08-06  Kay Sievers  <kay.sievers at vrfy.org>
+
+	* configure.in:
+	* hald/linux2/addons/addon-acpi.c: (main):
+	Make the possible ACPI event sources configurable, cause binding
+	the exclusive kernel socket instead of the proposed acpid socket
+	may cause trouble.
+
 2005-08-05  Danny Kukawka  <danny.kukawka at web.de>
 
 	* doc/spec/hal-spec.xml.in: Added new namespace for OSS devices
 	and updated ALSA namespace for new devices.
-	
+
 	* hald/linux2/classdev.c, hald/linux2/classdev.h (sound_add), 
 	(sound_compute_udi): Added OSS devices and ALSA/OSS global devices. 
 	OSS devices are only added if the kernel supports device links to the 

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- configure.in	28 Jul 2005 00:55:09 -0000	1.95
+++ configure.in	6 Aug 2005 13:15:42 -0000	1.96
@@ -121,6 +121,21 @@
 AC_SUBST(PCMCIA_STAB_FILE)
 AC_DEFINE_UNQUOTED(PCMCIA_STAB_FILE,"$PCMCIA_STAB_FILE", [PCMCIA socket table file])
 
+# ACPI event source
+AC_ARG_ENABLE(acpi-acpid, [  --disable-acpi-acpid     Use ACPI daemon event source],acpi_acpid=no,acpi_acpid=yes)
+if test "x$acpi_acpid" == "xyes" ; then
+   AC_DEFINE(ACPI_ACPID,1,[Common event source of ACPI events])
+fi
+AC_SUBST(ACPI_ACPID)
+AM_CONDITIONAL(ACPI_ACPID, test x$acpi_acpid != xyes)
+
+AC_ARG_ENABLE(acpi-proc, [  --disable-acpi-proc      Use ACPI kernel-interface directly(the kernel supports only one listener)],acpi_proc=no,acpi_proc=yes)
+if test "x$acpi_proc" == "xyes" ; then
+   AC_DEFINE(ACPI_PROC,1,[Direct kernel connection for ACPI events, the kernel interface is exclusiv to one user only])
+fi
+AC_SUBST(ACPI_PROC)
+AM_CONDITIONAL(ACPI_PROC, test x$acpi_proc == xyes)
+
 #### gcc warning flags
 
 if test "x$GCC" = "xyes"; then