Index: xfce4-session/Makefile.am
===================================================================
--- xfce4-session/Makefile.am	(revision 22462)
+++ xfce4-session/Makefile.am	(working copy)
@@ -47,6 +47,7 @@
 	@LIBX11_CFLAGS@							\
 	@LIBXFCE4MCS_CLIENT_CFLAGS@					\
 	@LIBXFCEGUI4_CFLAGS@						\
+	@DBUS_CFLAGS@							\
 	-DLIBDIR=\"$(libdir)\"						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
@@ -60,6 +61,7 @@
 	@LIBX11_LIBS@							\
 	@LIBXFCE4MCS_CLIENT_LIBS@					\
 	@LIBXFCEGUI4_LIBS@						\
+	@DBUS_LIBS@							\
 	@GNOME_LIBS@
 
 xfce4_session_DEPENDENCIES =						\
@@ -75,5 +77,6 @@
 	chooser-icon.png						\
 	xfsm-shutdown-helper-none.c					\
 	xfsm-shutdown-helper-redhat.c					\
+	xfsm-shutdown-helper-hal.c					\
 	xfsm-shutdown-helper-sudo.c
 
Index: configure.in.in
===================================================================
--- configure.in.in	(revision 22462)
+++ configure.in.in	(working copy)
@@ -79,6 +79,9 @@
 XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [libgnome-2.0], [2.4.0], [gnome],
                            [Assistive technologies support], [no])
 
+dnl Check for dbus for hal support
+XDT_CHECK_PACKAGE([DBUS], [dbus-1], [0.60])
+
 dnl Check for debugging support
 BM_DEBUG_SUPPORT()
 
@@ -124,11 +127,13 @@
 dnl Check for shutdown method
 AC_ARG_WITH([shutdown-style],
 AC_HELP_STRING([--with-shutdown-style=auto/none/sudo], [Shutdown style]),
-  [with_shutdown=$withval], [with_shutdown=auto])
+[  if test x"$withval" != x; then
+     with_shutdown=$withval
+   else 
+     with_shutdown="sudo"
+   fi
+])
 AC_MSG_CHECKING([what shutdown style should be used])
-if test x"$with_shutdown" != x"sudo" -a x"$with_shutdown" != x"none"; then
-  with_shutdown="sudo"
-fi
 AC_DEFINE_UNQUOTED([XFSM_SHUTDOWN_HELPER_IMPL_C],
                    [<xfce4-session/xfsm-shutdown-helper-$with_shutdown.c>],
                    [Shutdown helper implementation])