hal: Branch 'master'

[Danny Kukawka]

 NEWS         |    3 ++-
 configure.in |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree ea5031665092d90050036b13821b8a88df46bb4c (from 91dfcc4763ad9cea8eb729eccec0b307144f5ecd)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Aug 7 15:06:53 2007 +0200

    fixed PolicyKit detection to check for >= 0.4
    
    Fixed configure to check for PolicyKit >= 0.4 as added by commit
    5509d858. Use now polkit_module in the checks. Also update the
    NEWS file for PolicyKit and set ConsoleKit to 'optional'.

diff --git a/NEWS b/NEWS
index 0976327..161bde1 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,8 @@ Requirements for HAL 0.5.10 "":
  - libsmbios        >= 0.13.4    (optional, for DELL machines, Linux only)
  - dellWirelessCtl  >= 0.13.4    (optional, for Dell machines, must live in /usr/bin/, Linux only)
  - gperf            >= ??????    (optional, for Re-map multimedia keys, Linux only)
- - ConsoleKit       >= 0.2.0
+ - PolicyKit        >= 0.4       (optional)
+ - ConsoleKit       >= 0.2.0     (optional, needed if use PolicyKit)
  - pm-utils         >= 0.99.2 or newer (optional)
 
 
diff --git a/configure.in b/configure.in
index 52b67b7..3ef1a99 100644
--- a/configure.in
+++ b/configure.in
@@ -513,7 +513,7 @@ if test "x$enable_policy_kit" != "xno"; 
    if test "x$enable_console_kit" = "xno"; then
       AC_MSG_ERROR([PolicyKit support requires building with ConsoleKit support too])
    fi
-   PKG_CHECK_MODULES([POLKIT], [polkit >= 0.3],
+   PKG_CHECK_MODULES([POLKIT], [$polkit_module],
 			[AM_CONDITIONAL(HAVE_POLKIT, [true])
 			 AC_DEFINE(HAVE_POLKIT, [], [Set if we use PolicyKit])]
 			[msg_polkit=yes],