hal: Branch 'master'

[Danny Kukawka]

 configure.in |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b38d6526206df73f10ad5db89fa60fa156a9b743
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 4 19:35:44 2008 +0100

    fixed killswitch related configure information
    
    Fixed killswitch related configure information: ThinkPad bluetooth
    switch need HAL >= 0.5.11, added more info to the AC_ARG_ENABLE()
    for the different (kill-)switch related parts of configure.

diff --git a/configure.in b/configure.in
index b457da5..6f1ade4 100644
--- a/configure.in
+++ b/configure.in
@@ -37,37 +37,37 @@ AM_CONDITIONAL(BUILD_KEYMAPS, test x$enable_keymaps == xyes)
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable WLAN killswitch support for Dell laptops?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_wlan, [  --enable-killswitch-dell-wlan   Include support for WLAN killswitch],enable_killswitch_dell_wlan=$enableval,enable_killswitch_dell_wlan=yes)
+AC_ARG_ENABLE(killswitch_dell_wlan, [  --enable-killswitch-dell-wlan   Include support for Dell WLAN killswitch],enable_killswitch_dell_wlan=$enableval,enable_killswitch_dell_wlan=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WLAN, test x$enable_killswitch_dell_wlan == xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable Bluetooth killswitch support for Dell laptops?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_bluetooth, [  --enable-killswitch-dell-bluetooth   Include support for Bluetooth killswitch],enable_killswitch_dell_bluetooth=$enableval,enable_killswitch_dell_bluetooth=yes)
+AC_ARG_ENABLE(killswitch_dell_bluetooth, [  --enable-killswitch-dell-bluetooth   Include support for Dell Bluetooth killswitch],enable_killswitch_dell_bluetooth=$enableval,enable_killswitch_dell_bluetooth=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_BLUETOOTH, test x$enable_killswitch_dell_bluetooth == xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable WWAN killswitch support for Dell laptops?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_wwan, [  --enable-killswitch-dell-wwan   Include support for WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
+AC_ARG_ENABLE(killswitch_dell_wwan, [  --enable-killswitch-dell-wwan   Include support for Dell WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WWAN, test x$enable_killswitch_dell_wwan == xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable Bluetooth killswitch support for Sony laptops?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_sony_bluetooth, [  --enable-killswitch-sony-bluetooth   Include support for Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
+AC_ARG_ENABLE(killswitch_sony_bluetooth, [  --enable-killswitch-sony-bluetooth   Include support for Sony Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_SONY_BLUETOOTH, test x$enable_killswitch_sony_bluetooth == xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable Bluetooth killswitch support for ThinkPad laptops?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_thinkpad_bluetooth, [  --enable-killswitch-thinkpad-bluetooth   Include support for Bluetooth killswitch],enable_killswitch_thinkpad_bluetooth=$enableval,enable_killswitch_thinkpad_bluetooth=yes)
+AC_ARG_ENABLE(killswitch_thinkpad_bluetooth, [  --enable-killswitch-thinkpad-bluetooth   Include support for Thinkpad Bluetooth killswitch (requires hal >= 0.5.11)],enable_killswitch_thinkpad_bluetooth=$enableval,enable_killswitch_thinkpad_bluetooth=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_THINKPAD_BLUETOOTH, test x$enable_killswitch_thinkpad_bluetooth == xyes)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we enable WLAN killswitch support for ipw chipsets?
 dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_ipw_wlan, [  --enable-killswitch-ipw-wlan   Include support for WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
+AC_ARG_ENABLE(killswitch_ipw_wlan, [  --enable-killswitch-ipw-wlan   Include support for IPW WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
 AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
 
 AC_OUTPUT([
@@ -104,6 +104,6 @@ echo "
         killswitch support for Dell Bluetooth:      ${enable_killswitch_dell_bluetooth}
         killswitch support for Dell wwan:           ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
         killswitch support for Sony Bluetooth:      ${enable_killswitch_sony_bluetooth}
-	killswitch support for ThinkPad Bluetooth:  ${enable_killswitch_thinkpad_bluetooth}
+        killswitch support for ThinkPad Bluetooth:  ${enable_killswitch_thinkpad_bluetooth} (requires hal >= 0.5.11)
         killswitch support for IPW wlan:            ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
 "