[Xfce4-commits] <xfce4-session:master> Remove the consolekit, polkit, hal check.

[Nick Schermer]

Updating branch refs/heads/master
         to 12f6c4e533f419023d85a11a317158c8eff97fcb (commit)
       from b8694d1f3e5cdef719c2a4abbefc9506acfc0695 (commit)

commit 12f6c4e533f419023d85a11a317158c8eff97fcb
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Feb 25 10:53:06 2012 +0100

    Remove the consolekit, polkit, hal check.
    
    We only use consolekit over dbus, so no need to check things.

 configure.in.in |   79 -------------------------------------------------------
 1 files changed, 0 insertions(+), 79 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index d2c3697..962a90c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -142,70 +142,6 @@ else
   AC_MSG_RESULT([yes])
 fi
 
-dnl
-dnl        D-Bus RUNTIME Dependencies
-dnl
-
-dnl HAL?
-
-AC_ARG_ENABLE([hal],
-        [AC_HELP_STRING([--disable-hal],
-                [Do not enable HAL (default=enabled)])],
-        [],
-        [enable_hal=yes])
-AC_MSG_CHECKING([whether to build with HAL support])
-if test "x$enable_hal" != "xyes"; then
-    AC_MSG_RESULT([no])
-else
-    AC_DEFINE(ENABLE_HAL, 1 , [HAL support])
-    AC_MSG_RESULT([yes])
-fi
-
-dnl upower?
-
-AC_ARG_ENABLE([upower],
-        [AC_HELP_STRING([--disable-upower],
-                [Do not enable Upower support (formely devicekit-power) (default=enabled)])],
-        [],
-        [enable_upower=yes])
-AC_MSG_CHECKING([whether to build with UPower (formely devicekit-power) support])
-if test "x$enable_upower" != "xyes"; then
-    AC_MSG_RESULT([no])
-else
-    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)])],
-        [],
-        [enable_consolekit=yes])
-AC_MSG_CHECKING([whether to build with ConsoleKit support])
-if test "x$enable_consolekit" != "xyes"; then
-    AC_MSG_RESULT([no])
-else
-    AC_DEFINE(ENABLE_CONSOLE_KIT, 1 , [ConsoleKit support])
-    AC_MSG_RESULT([yes])
-fi
-
-dnl Polkit ?
-
-AC_ARG_ENABLE([polkit],
-        [AC_HELP_STRING([--disable-polkit],
-                [Do not enable PolicyKit support (default=enabled)])],
-        [],
-        [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_DEFINE(ENABLE_POLKIT, 1 , [PolicyKit support])
-    AC_MSG_RESULT([yes])
-fi
-
 dnl check for linux/ioprio.h, and also check that the header actually
 dnl works, as some kernels have bad headers.  using AC_CHECK_HEADERS()
 dnl prints a scary warning with a request to report a bug if it fails,
@@ -293,21 +229,6 @@ echo
 echo "Build Configuration:"
 echo
 echo " * Debugging support:              $enable_debug"
-if test x"$enable_upower" = x"yes"; then
-echo " * UPower support:                 yes"
-else
-echo " * UPower support:                 no"
-fi
-if test x"$enable_consolekit" = x"yes"; then
-echo " * Consolekit support:             yes"
-else
-echo " * Consolekit support:             no"
-fi
-if test x"$enable_polkit" = x"yes"; then
-echo " * Policykit support:              yes"
-else
-echo " * Policykit support:              no"
-fi
 if test x"$enable_legacy_sm" = x"yes"; then
 echo " * Legacy session management:      yes"
 else