hal: Branch 'master'

[Danny Kukawka]

 configure.in                  |    5 ++++-
 hald/linux/addons/Makefile.am |    7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
diff-tree 51572e8d102bb9cc73f797e1edd9f179ab37f4dd (from 9afee233753225e4884bc4caef58da048f07b4ef)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Mar 30 16:18:09 2007 +0200

    added configure option to enable build Toshiba ACPI button addon
    
    Added configure option (--enable-acpi-toshiba) to enable build the
    Toshiba ACPI button addon. By default the build is disabled, it need
    to get enabled to build.
    
    Fixed little typo in IBM ACPI related configure block.

diff --git a/configure.in b/configure.in
index 58dfec0..911c2bd 100644
--- a/configure.in
+++ b/configure.in
@@ -169,12 +169,14 @@ AC_SUBST(ACPI_PROC)
 AM_CONDITIONAL(ACPI_PROC, test x$acpi_proc = xyes)
 
 AC_ARG_ENABLE([acpi-ibm], AC_HELP_STRING([--enable-acpi-ibm], [catch IBM ACPI events]), [acpi_ibm=$enableval], [acpi_ibm=no])
-if test "x$acpi_proc" = "xyes" ; then
+if test "x$acpi_ibm" = "xyes" ; then
    AC_DEFINE(ACPI_IBM_EVENTS,1,[catch and forward IBM ACPI hotkey and button events])
 fi
 AC_SUBST(ACPI_IBM_EVENTS)
 AM_CONDITIONAL(ACPI_IBM_EVENTS, test x$acpi_ibm = xyes)
 
+AC_ARG_ENABLE([acpi-toshiba], AC_HELP_STRING([--enable-acpi-toshiba], [catch Toshiba ACPI events]), [acpi_toshiba=$enableval], [acpi_toshiba=no])
+AM_CONDITIONAL(BUILD_ACPI_TOSHIBA, test x$acpi_toshiba = xyes)
 
 
 dnl libparted
@@ -936,6 +938,7 @@ echo "
         OMAP utils:                 ${BUILD_OMAP} (Linux only, arm only)
         CPU frequency scaling:      ${BUILD_CPUFREQ} (Linux only)
         catch IBM acpi events:      ${acpi_ibm} (Linux only)
+        catch Toshiba acpi events:  ${acpi_toshiba} (Linux only)
 	USB wireless mouse power:   ${BUILD_USBCSR} (Linux only, requires libusb)
 	Dell Backlight:             ${BUILD_DELL} (Linux only, requires libsmbios >= 0.13.4)
 
diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index ffd4ea1..bc249a0 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -21,9 +21,12 @@ endif
 
 if HAVE_ACPI
 libexec_PROGRAMS  += 			\
-	hald-addon-acpi 		\
+	hald-addon-acpi 		
+if BUILD_ACPI_TOSHIBA
+libexec_PROGRAMS  +=                    \
 	hald-addon-acpi-buttons-toshiba
 endif
+endif
 
 if BUILD_OMAP
 libexec_PROGRAMS  +=			\
@@ -67,8 +70,10 @@ endif
 hald_addon_acpi_SOURCES = addon-acpi.c ../../logger.c ../../util_helper.c
 hald_addon_acpi_LDADD = $(top_builddir)/libhal/libhal.la
 
+if BUILD_ACPI_TOSHIBA
 hald_addon_acpi_buttons_toshiba_SOURCES = addon-acpi-buttons-toshiba.c ../../logger.c ../../util_helper.c
 hald_addon_acpi_buttons_toshiba_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
+endif
 
 hald_addon_hid_ups_SOURCES = addon-hid-ups.c ../../logger.c ../../util_helper.c ../../util_pm.c
 hald_addon_hid_ups_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@