hal: Branch 'master'

[Danny Kukawka]

 configure.in |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
diff-tree c6ec0f90642ce8862cd3701e3862a72805e8fe4f (from 287c5c0f48bd655de484951860ca8c452da7464d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Sep 21 08:01:12 2007 +0200

    fixed check for HAL dependency
    
    Removed the check for dependeny to HAL >= 0.5.10 needed for the killswitch
    feature. Added new general dependeny to HAL >= 0.5.10 due to new, with this
    version introduced, FDI directives (as *_outof).

diff --git a/configure.in b/configure.in
index 7442a11..d438aae 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,10 @@ AC_PROG_LN_S
 
 PKG_PROG_PKG_CONFIG
 
+if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then
+   AC_MSG_ERROR([hal 0.5.10 or later is required for this version of hal-info])
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl - Should we ship the recall data
 dnl ---------------------------------------------------------------------------
@@ -49,17 +53,8 @@ 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)
-
-if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then
-   if test x$enable_killswitch_ipw_wlan == xyes ; then
-      AC_MSG_WARN([hal 0.5.10 or later is required for ipw killswitch. Disabling this feature.])
-      enable_killswitch_ipw_wlan=no
-   fi
-fi
-
 AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
 
-
 AC_OUTPUT([
 Makefile
 fdi/Makefile