--- a/configure.in	2010-09-05 07:36:57.000000000 -0400
+++ b/configure.in	2010-09-05 21:18:12.476834689 -0400
@@ -151,10 +151,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])
@@ -167,25 +166,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])
@@ -193,17 +191,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