[Xfce4-commits] <xfce4-session:master> Fix configure build options. (Patch from Matthew Turnbull)

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to d21e21188c3ed7ab59d7924b9f63f2ab52cc182d (commit)
       from f1b9618292a30e359e6870187af91e5b94976da7 (commit)

commit d21e21188c3ed7ab59d7924b9f63f2ab52cc182d
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Sep 29 09:11:56 2010 +0200

    Fix configure build options. (Patch from Matthew Turnbull)

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

diff --git a/configure.in.in b/configure.in.in
index 3a8223a..65ab1c7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -146,10 +146,9 @@ AC_ARG_ENABLE([hal],
         [AC_HELP_STRING([--disable-hal],
                 [Do not enable HAL (default=enabled)])],
         [],
-        [ac_cv_enable_hal=yes])
-	
+        [enable_hal=yes])
 AC_MSG_CHECKING([whether to build with HAL support])
-if test "x$ac_cv_enable_hal" != "xyes"; then
+if test "x$enable_hal" != "xyes"; then
     AC_MSG_RESULT([no])
 else
     AC_DEFINE(ENABLE_HAL, 1 , [HAL support])
@@ -162,25 +161,24 @@ AC_ARG_ENABLE([upower],
         [AC_HELP_STRING([--disable-upower],
                 [Do not enable Upower support (formely devicekit-power) (default=enabled)])],
         [],
-        [ac_cv_enable_upower=yes])
+        [enable_upower=yes])
 AC_MSG_CHECKING([whether to build with UPower (formely devicekit-power) support])
-if test "x$ac_cv_enable_upower" != "xyes"; then
+if test "x$enable_upower" != "xyes"; then
     AC_MSG_RESULT([no])
 else
-    AC_MSG_RESULT([yes])
     AC_DEFINE(ENABLE_UPOWER, 1 , [UPower support])
+    AC_MSG_RESULT([yes])
 fi
 
-
 dnl consolekit?
 
 AC_ARG_ENABLE([consolekit],
         [AC_HELP_STRING([--disable-consolekit],
                 [Do not enable ConsoleKit (default=enabled)])],
         [],
-        [ac_cv_enable_consolekit=yes])
+        [enable_consolekit=yes])
 AC_MSG_CHECKING([whether to build with ConsoleKit support])
-if test "x$ac_cv_enable_consolekit" != "xyes"; then
+if test "x$enable_consolekit" != "xyes"; then
     AC_MSG_RESULT([no])
 else
     AC_DEFINE(ENABLE_CONSOLE_KIT, 1 , [ConsoleKit support])
@@ -188,17 +186,18 @@ else
 fi
 
 dnl Polkit ?
+
 AC_ARG_ENABLE([polkit],
         [AC_HELP_STRING([--disable-polkit],
                 [Do not enable PolicyKit support (default=enabled)])],
         [],
-        [ac_cv_enable_polkit=polkit])
-    AC_MSG_CHECKING([whether to build with polkit support])
-if test "x$ac_cv_enable_polkit" = !"xyes"; then
+        [enable_polkit=yes])
+AC_MSG_CHECKING([whether to build with polkit support])
+if test "x$enable_polkit" != "xyes"; then
     AC_MSG_RESULT([no])
 else
-    AC_MSG_RESULT([yes])
     AC_DEFINE(ENABLE_POLKIT, 1 , [PolicyKit support])
+    AC_MSG_RESULT([yes])
 fi
 
 dnl check for linux/ioprio.h, and also check that the header actually