--- a/configure.ac
+++ b/configure.ac
@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
 		 fi])
 fi
 
-AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
-
 # Checks for header files.
 AC_PATH_X
 AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
@@ -89,11 +87,21 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
-	AC_SUBST(CONSOLEKIT_CFLAGS)
-	AC_SUBST(CONSOLEKIT_LIBS)],[
-	echo "ConsoleKit devel package not found"
-	])
+AC_ARG_ENABLE(consolekit,
+AC_HELP_STRING([--enable-consolekit], [enable ConsoleKit support]),
+[case "${enableval}" in
+  yes)  enable_ck=yes ;;
+  no)   enable_ck=no ;;
+  *) AC_MSG_ERROR([bad value "${enableval}" for --enable-consolekit, use "yes" (default) or "no".]) ;;
+esac],[])
+if test "x$enable_ck" = "xyes" ; then
+	AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+	PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
+		AC_SUBST(CONSOLEKIT_CFLAGS)
+		AC_SUBST(CONSOLEKIT_LIBS)],[
+		echo "ConsoleKit devel package not found"
+		])
+fi
 
 AC_ARG_ENABLE(password,
 AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]),