hal: Branch 'master'

[Danny Kukawka]

 configure.in |   27 +--------------------------
 1 files changed, 1 insertion(+), 26 deletions(-)

New commits:
diff-tree 62771274a0440865d80c96c13cb77f56f8b9e70b (from d6daf8fb1b5005e06062236f0795cfa76a5ce1d8)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 26 23:00:01 2007 +0200

    fix configure for DELL stuff
    
    Fixed Dell releated libsmbios part in configure:
    
     Build the Dell backlight addon also for x86_64. No reason why we should
     build only for x86, libsmbios also build on x86_64 and the addon build
     also on 64bit.
    
     Removed BUILD_DELL_RFKILL related stuff since this has no effect because it
     get never used. We don't build a own version of the dellWirelessCtl (If we do
     this anytime, we can readd this to configure) in 0.5.9, hence there is no
     need to do anything for this on configure.

diff --git a/configure.in b/configure.in
index bfa8206..40d9048 100644
--- a/configure.in
+++ b/configure.in
@@ -755,7 +755,7 @@ elif test "x$with_dell_backlight" = "x" 
     case "${HALD_BACKEND}" in
       linux)
         case "${host}" in
-	  i[[3456]]86-*-*)
+	  i*86-*-*|x86_64-*-*)
             BUILD_DELL=yes
 	    ;;
 	  *)
@@ -769,30 +769,6 @@ elif test "x$with_dell_backlight" = "x" 
 fi
 AM_CONDITIONAL(BUILD_DELL, test x$BUILD_DELL = xyes)
 
-dnl Dell RF KILL
-AC_ARG_WITH(dell-rfkill,        [  --with-dell-rfkill      Whether to build Dell RF-kill support (auto)])
-BUILD_DELL_RFKILL=no
-if test "x$with_dell_rfkill" = "xyes" ; then
-   BUILD_DELL=yes
-elif test "x$with_dell_rfkill" = "x" ; then
-  if test "$USE_SMBIOS" = "yes" ; then
-    case "${HALD_BACKEND}" in
-      linux)
-        case "${host}" in
-	  i[[3456]]86-*-*)
-            BUILD_DELL_RFKILL=yes
-	    ;;
-	  *)
-	    ;;
-	esac
-        ;;
-      *)
-        ;;
-    esac
-   fi
-fi
-AM_CONDITIONAL(BUILD_DELL_RFKILL, test x$BUILD_DELL_RFKILL = xyes)
-
 dnl Sony PIC support
 AC_ARG_ENABLE(sonypic,
 		AC_HELP_STRING([--enable-sonypic],[Build with Sony PIC support]),
@@ -929,7 +905,6 @@ echo "
         CPU frequency scaling:      ${BUILD_CPUFREQ} (Linux only)
 	USB wireless mouse power:   ${BUILD_USBCSR} (Linux only, requires libusb)
 	Dell Backlight:             ${BUILD_DELL} (Linux only, requires libsmbios >= 0.13.4)
-	Dell RF Kill:               ${BUILD_DELL_RFKILL} (Linux only, requires libsmbios >= 0.13.4)
 
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building verbose mode:      ${enable_verbose_mode}