[Xfce4-commits] <xfce4-power-manager:master> Fix compilation error with --disable-polkit, patch from Lierdakil, bug #6568

[Ali Abdallah]

Updating branch refs/heads/master
         to 448d287873e60a46d59e8ffa347ec65aaaf5a7ca (commit)
       from ef267cd6ce562e65c59e55373572286c8d906545 (commit)

commit 448d287873e60a46d59e8ffa347ec65aaaf5a7ca
Author: Ali Abdallah <aliov at xfce.org>
Date:   Sun Dec 19 20:14:09 2010 +0100

    Fix compilation error with --disable-polkit, patch from
    Lierdakil, bug #6568

 configure.ac.in   |    4 ++--
 src/xfpm-polkit.c |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 936c6e8..899e938 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -85,10 +85,10 @@ XDT_CHECK_PACKAGE([XRANDR],[xrandr], [xrandr_minimum_version])
 AC_ARG_ENABLE([polkit],
         [AC_HELP_STRING([--disable-polkit],
                 [Do not enable PolicyKit support (default=enabled)])],
-        [],
+        [ac_cv_enable_polkit=$enableval],
         [ac_cv_enable_polkit=polkit])
     AC_MSG_CHECKING([whether to build with polkit support])
-if test "x$ac_cv_enable_polkit" = !"xyes"; then
+if test "x$ac_cv_enable_polkit" = "xno"; then
     AC_MSG_RESULT([no])
     polkit="no"
 else
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index e699e80..1d0d178 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -565,6 +565,8 @@ xfpm_polkit_get (void)
 
 gboolean xfpm_polkit_check_auth	(XfpmPolkit *polkit, const gchar *action_id)
 {
+#ifdef ENABLE_POLKIT
     xfpm_polkit_init_data (polkit);
+#endif
     return xfpm_polkit_check_auth_intern (polkit, action_id);
 }