hal: Branch 'origin'

[Richard Hughes]

 configure.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

New commits:
diff-tree 00ded4be1c4037cf06c04230ff05745dccdc929d (from f6a3238fa22256e17864c27e37167830aa8fc4d4)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Jul 10 14:34:32 2007 -0400

    automatically disable 0.5.10 features when building against 0.5.9
    
    For this to work the hal pkg-config file will need to be in the
    Buildroot; on Fedora systems this means that BuildRequire:hal-devel is
    required.

diff --git a/configure.in b/configure.in
index 5681e61..587ebbc 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,8 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_LN_S
 
+PKG_PROG_PKG_CONFIG
+
 dnl ---------------------------------------------------------------------------
 dnl - Should we ship the recall data
 dnl ---------------------------------------------------------------------------
@@ -47,8 +49,17 @@ 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
@@ -74,5 +85,5 @@ echo "
         killswitch support for Dell wlan:       ${enable_killswitch_dell_wlan}
         killswitch support for Dell Bluetooth:  ${enable_killswitch_dell_bluetooth}
         killswitch support for Sony Bluetooth:  ${enable_killswitch_sony_bluetooth}
-        killswitch support for IPW wlan:        ${enable_killswitch_ipw_wlan}
+        killswitch support for IPW wlan:        ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
 "