Refresh patches.

3 files changed, 472 insertions, 516 deletions

diff --git a/debian/changelog b/debian/changelog
index 6505720..0e574ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ consolekit (0.4.2-1) UNRELEASED; urgency=low
     - debian/patches/01-dont_daemonize_when_activated.patch
     - debian/patches/02-dont_take_bus_name_until_ready.patch
     - debian/patches/04-dont_fail_with_invalid_seats_file.patch
+  * Refresh patches.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 20 Sep 2010 02:35:46 +0200
 
diff --git a/debian/patches/82-hurd_support.patch b/debian/patches/82-hurd_support.patch
index 46f931c..db710b6 100644
--- a/debian/patches/82-hurd_support.patch
+++ b/debian/patches/82-hurd_support.patch
@@ -11,8 +11,10 @@ Author: Pino Toscano <pino@kde.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552393
 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24738
 
---- consolekit-0.3.1.orig/configure.ac
-+++ consolekit-0.3.1/configure.ac
+Index: consolekit/configure.ac
+===================================================================
+--- consolekit.orig/configure.ac	2010-09-20 03:07:20.969097019 +0200
++++ consolekit/configure.ac	2010-09-20 03:07:22.189095438 +0200
 @@ -190,6 +190,9 @@
          *-*-solaris*)
          CK_BACKEND="solaris"
@@ -31,9 +33,11 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24738
  AC_SUBST(CK_BACKEND)
  
  dnl ---------------------------------------------------------------------------
---- consolekit-0.3.1.orig/src/Makefile.am
-+++ consolekit-0.3.1/src/Makefile.am
-@@ -56,11 +56,18 @@
+Index: consolekit/src/Makefile.am
+===================================================================
+--- consolekit.orig/src/Makefile.am	2010-09-20 03:07:09.397095424 +0200
++++ consolekit/src/Makefile.am	2010-09-20 03:07:22.189095438 +0200
+@@ -57,11 +57,18 @@
  	$(NULL)
  libck_la_LIBADD = $(KVM_LIBS)
  endif
@@ -52,8 +56,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24738
  	$(NULL)
  
  sbin_PROGRAMS = 		\
---- /dev/null
-+++ consolekit-0.3.1/src/ck-sysdeps-gnu.c
+Index: consolekit/src/ck-sysdeps-gnu.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ consolekit/src/ck-sysdeps-gnu.c	2010-09-20 03:07:22.189095438 +0200
 @@ -0,0 +1,396 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -451,8 +457,10 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24738
 +
 +        return ret;
 +}
---- consolekit-0.3.1.orig/pam-ck-connector/pam-ck-connector.c
-+++ consolekit-0.3.1/pam-ck-connector/pam-ck-connector.c
+Index: consolekit/pam-ck-connector/pam-ck-connector.c
+===================================================================
+--- consolekit.orig/pam-ck-connector/pam-ck-connector.c	2010-09-20 03:07:09.397095424 +0200
++++ consolekit/pam-ck-connector/pam-ck-connector.c	2010-09-20 03:07:22.201093895 +0200
 @@ -244,7 +244,7 @@
          const char *s;
          uid_t       uid;
diff --git a/debian/patches/99-autoreconf.patch b/debian/patches/99-autoreconf.patch
index 733d31b..6af8a55 100644
--- a/debian/patches/99-autoreconf.patch
+++ b/debian/patches/99-autoreconf.patch
@@ -1,8 +1,35 @@
 Index: consolekit/aclocal.m4
 ===================================================================
---- consolekit.orig/aclocal.m4	2009-11-04 19:45:33.562022249 +0100
-+++ consolekit/aclocal.m4	2009-11-04 19:44:43.682021633 +0100
-@@ -2933,6 +2933,18 @@
+--- consolekit.orig/aclocal.m4	2010-09-20 03:08:40.997095837 +0200
++++ consolekit/aclocal.m4	2010-09-20 03:07:49.397100192 +0200
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -2922,14 +2922,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2941,6 +2937,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -21,7 +48,7 @@ Index: consolekit/aclocal.m4
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -3524,7 +3536,7 @@
+@@ -3541,7 +3549,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -30,7 +57,7 @@ Index: consolekit/aclocal.m4
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -4205,7 +4217,7 @@
+@@ -4245,7 +4253,7 @@
  	    ;;
  	esac
  	;;
@@ -39,7 +66,7 @@ Index: consolekit/aclocal.m4
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4630,6 +4642,9 @@
+@@ -4685,6 +4693,9 @@
    cygwin* | mingw* | cegcc*)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -49,7 +76,7 @@ Index: consolekit/aclocal.m4
    *)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -4694,6 +4709,9 @@
+@@ -4749,6 +4760,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -59,7 +86,7 @@ Index: consolekit/aclocal.m4
    esac
  
    _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4876,7 +4894,7 @@
+@@ -4970,7 +4984,7 @@
        fi
        ;;
  
@@ -68,7 +95,7 @@ Index: consolekit/aclocal.m4
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -5051,6 +5069,7 @@
+@@ -5147,6 +5161,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -76,7 +103,7 @@ Index: consolekit/aclocal.m4
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -5289,7 +5308,7 @@
+@@ -5397,7 +5412,7 @@
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -85,48 +112,37 @@ Index: consolekit/aclocal.m4
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -8466,14 +8485,16 @@
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
--    pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
--    PKG_CHECK_EXISTS([$3],
--                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--		     [pkg_failed=yes])
-- else
--    pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-+        PKG_CHECK_EXISTS([$3],
-+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+			 [pkg_failed=yes])
-+    fi
-+else
-+	pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
-@@ -8517,9 +8538,9 @@
- if test $pkg_failed = yes; then
-         _PKG_SHORT_ERRORS_SUPPORTED
-         if test $_pkg_short_errors_supported = yes; then
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-         else 
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+@@ -8626,7 +8641,7 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT])
++_PKG_TEXT])dnl
+         ])
+ elif test $pkg_failed = untried; then
+      	AC_MSG_RESULT([no])
+@@ -8637,7 +8652,7 @@
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+         ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 Index: consolekit/configure
 ===================================================================
---- consolekit.orig/configure	2009-11-04 19:45:33.214032944 +0100
-+++ consolekit/configure	2009-11-04 19:44:55.010015927 +0100
-@@ -805,6 +805,8 @@
+--- consolekit.orig/configure	2010-09-20 03:08:41.721090604 +0200
++++ consolekit/configure	2010-09-20 03:07:57.305091267 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.66 for ConsoleKit 0.4.2.
++# Generated by GNU Autoconf 2.67 for ConsoleKit 0.4.2.
+ #
+ # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit>.
+ #
+@@ -629,6 +629,8 @@
  HAVE_PAM_FALSE
  HAVE_PAM_TRUE
  CK_BACKEND
@@ -135,24 +151,204 @@ Index: consolekit/configure
  CK_COMPILE_SOLARIS_FALSE
  CK_COMPILE_SOLARIS_TRUE
  CK_COMPILE_FREEBSD_FALSE
-@@ -6277,13 +6279,13 @@
+@@ -895,8 +897,9 @@
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1591,7 +1594,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ ConsoleKit configure 0.4.2
+-generated by GNU Autoconf 2.66
++generated by GNU Autoconf 2.67
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1663,7 +1666,7 @@
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+@@ -1726,7 +1729,7 @@
+ else
+   ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ 
+@@ -1960,7 +1963,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by ConsoleKit $as_me 0.4.2, which was
+-generated by GNU Autoconf 2.66.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2218,7 +2221,7 @@
+       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+   fi
+ done
+ 
+@@ -2445,11 +2448,11 @@
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+ 
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -3217,7 +3220,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3332,7 +3335,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
  else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:6280: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6282: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6283: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6285: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6286: output\"" >&5)
-+  (eval echo "\"\$as_me:6288: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6753,7 +6755,7 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3375,7 +3378,7 @@
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3434,7 +3437,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+     fi
+   fi
+ fi
+@@ -3486,7 +3489,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3876,7 +3879,7 @@
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -3892,11 +3895,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -3935,7 +3938,7 @@
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -3951,18 +3954,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ 
+ ac_ext=c
+@@ -4651,7 +4654,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -5207,7 +5210,7 @@
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5240,7 +5243,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -6278,7 +6281,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -161,72 +357,7 @@ Index: consolekit/configure
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7488,7 +7490,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7491 "configure"' > conftest.$ac_ext
-+  echo '#line 7493 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -8823,11 +8825,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8826: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8830: \$? = $ac_status" >&5
-+   echo "$as_me:8832: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9162,11 +9164,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9165: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9167: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9169: \$? = $ac_status" >&5
-+   echo "$as_me:9171: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9267,11 +9269,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9270: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9272: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9274: \$? = $ac_status" >&5
-+   echo "$as_me:9276: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -9322,11 +9324,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9325: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9327: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9329: \$? = $ac_status" >&5
-+   echo "$as_me:9331: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -9441,6 +9443,9 @@
+@@ -8894,6 +8897,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -236,7 +367,7 @@ Index: consolekit/configure
    esac
  
    ld_shlibs=yes
-@@ -9623,7 +9628,7 @@
+@@ -9115,7 +9121,7 @@
        fi
        ;;
  
@@ -245,7 +376,7 @@ Index: consolekit/configure
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -9798,6 +9803,7 @@
+@@ -9292,6 +9298,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -253,7 +384,7 @@ Index: consolekit/configure
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10212,7 +10218,7 @@
+@@ -9666,7 +9673,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -262,7 +393,23 @@ Index: consolekit/configure
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11189,6 +11195,18 @@
+@@ -10628,14 +10635,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10647,6 +10650,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -281,366 +428,88 @@ Index: consolekit/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -12122,7 +12140,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12125 "configure"
-+#line 12143 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12218,7 +12236,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12221 "configure"
-+#line 12239 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15109,10 +15127,11 @@
- { $as_echo "$as_me:$LINENO: checking for CONSOLE_KIT" >&5
- $as_echo_n "checking for CONSOLE_KIT... " >&6; }
- 
--if test -n "$CONSOLE_KIT_CFLAGS"; then
--    pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$CONSOLE_KIT_CFLAGS"; then
-+        pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
-   gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-   gthread-2.0 >= \$GLIB_REQUIRED_VERSION
-@@ -15131,13 +15150,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$CONSOLE_KIT_LIBS"; then
--    pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$CONSOLE_KIT_LIBS"; then
-+        pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
-   gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-   gthread-2.0 >= \$GLIB_REQUIRED_VERSION
-@@ -15156,8 +15177,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -15170,15 +15192,15 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-+	        CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-   gobject-2.0 >= $GLIB_REQUIRED_VERSION
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+"`
-         else
--	        CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-+	        CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-   gobject-2.0 >= $GLIB_REQUIRED_VERSION
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$CONSOLE_KIT_PKG_ERRORS" >&5
-@@ -15249,10 +15271,11 @@
- { $as_echo "$as_me:$LINENO: checking for POLKIT" >&5
- $as_echo_n "checking for POLKIT... " >&6; }
- 
--if test -n "$POLKIT_CFLAGS"; then
--    pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$POLKIT_CFLAGS"; then
-+        pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5
-   ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
-   ac_status=$?
-@@ -15262,13 +15285,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$POLKIT_LIBS"; then
--    pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$POLKIT_LIBS"; then
-+        pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5
-   ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
-   ac_status=$?
-@@ -15278,8 +15303,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -15292,9 +15318,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
-+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
-         else
--	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
-+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$POLKIT_PKG_ERRORS" >&5
-@@ -15333,10 +15359,11 @@
- { $as_echo "$as_me:$LINENO: checking for LIBDBUS" >&5
- $as_echo_n "checking for LIBDBUS... " >&6; }
- 
--if test -n "$LIBDBUS_CFLAGS"; then
--    pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDBUS_CFLAGS"; then
-+        pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
-@@ -15349,13 +15376,15 @@
+@@ -12760,7 +12775,6 @@
+ Alternatively, you may set the environment variables CONSOLE_KIT_CFLAGS
+ and CONSOLE_KIT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -12775,8 +12789,7 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
  else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$LIBDBUS_LIBS"; then
--    pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDBUS_LIBS"; then
-+        pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
-@@ -15368,8 +15397,9 @@
+ 	CONSOLE_KIT_CFLAGS=$pkg_cv_CONSOLE_KIT_CFLAGS
+ 	CONSOLE_KIT_LIBS=$pkg_cv_CONSOLE_KIT_LIBS
+@@ -12945,7 +12958,6 @@
+ Alternatively, you may set the environment variables LIBDBUS_CFLAGS
+ and LIBDBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -12960,8 +12972,7 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
  else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -15382,11 +15412,11 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
--" 2>&1`
-+	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
-+"`
-         else
--	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
--" 2>&1`
-+	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
-+"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBDBUS_PKG_ERRORS" >&5
-@@ -15452,10 +15482,11 @@
- { $as_echo "$as_me:$LINENO: checking for TOOLS" >&5
- $as_echo_n "checking for TOOLS... " >&6; }
- 
--if test -n "$TOOLS_CFLAGS"; then
--    pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TOOLS_CFLAGS"; then
-+        pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION
-   glib-2.0 >= \$GLIB_REQUIRED_VERSION
- \"") >&5
-@@ -15471,13 +15502,15 @@
+ 	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
+ 	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
+@@ -13054,7 +13065,6 @@
+ Alternatively, you may set the environment variables TOOLS_CFLAGS
+ and TOOLS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -13069,8 +13079,7 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
  else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$TOOLS_LIBS"; then
--    pkg_cv_TOOLS_LIBS="$TOOLS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TOOLS_LIBS"; then
-+        pkg_cv_TOOLS_LIBS="$TOOLS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION
-   glib-2.0 >= \$GLIB_REQUIRED_VERSION
- \"") >&5
-@@ -15493,8 +15526,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -15507,13 +15541,13 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 >= $X11_REQUIRED_VERSION
-+	        TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION
-   glib-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+"`
-         else
--	        TOOLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 >= $X11_REQUIRED_VERSION
-+	        TOOLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION
-   glib-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$TOOLS_PKG_ERRORS" >&5
-@@ -15582,10 +15616,11 @@
- { $as_echo "$as_me:$LINENO: checking for HISTORY" >&5
- $as_echo_n "checking for HISTORY... " >&6; }
- 
--if test -n "$HISTORY_CFLAGS"; then
--    pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HISTORY_CFLAGS"; then
-+        pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-@@ -15598,13 +15633,15 @@
+ 	TOOLS_CFLAGS=$pkg_cv_TOOLS_CFLAGS
+ 	TOOLS_LIBS=$pkg_cv_TOOLS_LIBS
+@@ -13155,7 +13164,6 @@
+ Alternatively, you may set the environment variables HISTORY_CFLAGS
+ and HISTORY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -13170,8 +13178,7 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
  else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$HISTORY_LIBS"; then
--    pkg_cv_HISTORY_LIBS="$HISTORY_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HISTORY_LIBS"; then
-+        pkg_cv_HISTORY_LIBS="$HISTORY_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-@@ -15617,8 +15654,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -15631,11 +15669,11 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-+"`
-         else
--	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
--" 2>&1`
-+	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
-+"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$HISTORY_PKG_ERRORS" >&5
-@@ -16237,7 +16275,7 @@
+ 	HISTORY_CFLAGS=$pkg_cv_HISTORY_CFLAGS
+ 	HISTORY_LIBS=$pkg_cv_HISTORY_LIBS
+@@ -13502,7 +13509,7 @@
  CK_BACKEND=""
  KVM_LIBS=""
  case "$host" in
 -        *-*-freebsd*)
 +        *-*-freebsd* | *-*-kfreebsd*-gnu)
          CK_BACKEND="freebsd"
-         { $as_echo "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_openfiles in -lkvm" >&5
  $as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; }
-@@ -16322,6 +16360,9 @@
+@@ -13556,6 +13563,9 @@
          *-*-solaris*)
          CK_BACKEND="solaris"
          ;;
@@ -648,9 +517,9 @@ Index: consolekit/configure
 +        CK_BACKEND="gnu"
 +        ;;
  	*)
- 	{ { $as_echo "$as_me:$LINENO: error: No sysdeps back-end implemented for host $host" >&5
- $as_echo "$as_me: error: No sysdeps back-end implemented for host $host" >&2;}
-@@ -16355,6 +16396,14 @@
+ 	as_fn_error $? "No sysdeps back-end implemented for host $host" "$LINENO" 5
+ 	;;
+@@ -13587,6 +13597,14 @@
    CK_COMPILE_SOLARIS_FALSE=
  fi
  
@@ -665,25 +534,102 @@ Index: consolekit/configure
  
  
  
-@@ -17388,6 +17437,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+@@ -14177,6 +14195,10 @@
+   as_fn_error $? "conditional \"CK_COMPILE_SOLARIS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
 +if test -z "${CK_COMPILE_GNU_TRUE}" && test -z "${CK_COMPILE_GNU_FALSE}"; then
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"CK_COMPILE_GNU\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"CK_COMPILE_GNU\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
++  as_fn_error $? "conditional \"CK_COMPILE_GNU\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
 +fi
  if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PAM\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+   as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -14606,7 +14628,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by ConsoleKit $as_me 0.4.2, which was
+-generated by GNU Autoconf 2.66.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -14672,7 +14694,7 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ ConsoleKit config.status 0.4.2
+-configured by $0, generated by GNU Autoconf 2.66,
++configured by $0, generated by GNU Autoconf 2.67,
+   with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -14693,11 +14715,16 @@
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -14719,6 +14746,7 @@
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     esac
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+@@ -15073,7 +15101,7 @@
+     "pam-ck-connector/Makefile") CONFIG_FILES="$CONFIG_FILES pam-ck-connector/Makefile" ;;
+     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ 
+-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+   esac
+ done
+ 
+@@ -15389,7 +15417,7 @@
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -15417,7 +15445,7 @@
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       as_fn_append ac_file_inputs " '$ac_f'"
+@@ -15444,7 +15472,7 @@
+ 
+     case $ac_tag in
+     *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+     esac
+     ;;
+   esac
 Index: consolekit/src/Makefile.in
 ===================================================================
---- consolekit.orig/src/Makefile.in	2009-11-04 19:45:33.418020671 +0100
-+++ consolekit/src/Makefile.in	2009-11-04 19:44:57.430016634 +0100
-@@ -46,6 +46,10 @@
+--- consolekit.orig/src/Makefile.in	2010-09-20 03:08:41.129094222 +0200
++++ consolekit/src/Makefile.in	2010-09-20 03:08:01.029091854 +0200
+@@ -48,6 +48,10 @@
  @CK_COMPILE_FREEBSD_TRUE@	ck-sysdeps-freebsd.c	\
  @CK_COMPILE_FREEBSD_TRUE@	$(NULL)
  
@@ -694,7 +640,7 @@ Index: consolekit/src/Makefile.in
  sbin_PROGRAMS = console-kit-daemon$(EXEEXT) $(am__EXEEXT_1)
  noinst_PROGRAMS = test-event-logger$(EXEEXT) \
  	test-tty-idle-monitor$(EXEEXT) test-vt-monitor$(EXEEXT) \
-@@ -69,15 +73,19 @@
+@@ -75,15 +79,19 @@
  @CK_COMPILE_FREEBSD_TRUE@libck_la_DEPENDENCIES =  \
  @CK_COMPILE_FREEBSD_TRUE@	$(am__DEPENDENCIES_1)
  am__libck_la_SOURCES_DIST = ck-sysdeps.h ck-sysdeps-unix.c \
@@ -716,7 +662,7 @@ Index: consolekit/src/Makefile.in
  libck_la_OBJECTS = $(am_libck_la_OBJECTS)
  am__EXEEXT_1 =
  am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(dbusifdir)"
-@@ -92,16 +100,16 @@
+@@ -97,16 +105,16 @@
  	ck-manager-glue.h ck-seat-glue.h ck-session-glue.h \
  	ck-marshal.c ck-marshal.h ck-file-monitor-dummy.c \
  	ck-file-monitor-inotify.c
@@ -737,7 +683,7 @@ Index: consolekit/src/Makefile.in
  console_kit_daemon_OBJECTS = $(am_console_kit_daemon_OBJECTS)
  console_kit_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libck.la \
-@@ -117,7 +125,7 @@
+@@ -122,7 +130,7 @@
  	ck-file-monitor-dummy.c ck-file-monitor-inotify.c \
  	test-tty-idle-monitor.c
  am_test_tty_idle_monitor_OBJECTS = ck-tty-idle-monitor.$(OBJEXT) \
@@ -746,7 +692,7 @@ Index: consolekit/src/Makefile.in
  	$(am__objects_1)
  test_tty_idle_monitor_OBJECTS = $(am_test_tty_idle_monitor_OBJECTS)
  test_tty_idle_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -363,12 +371,15 @@
+@@ -428,13 +436,16 @@
  	$(NULL)
  
  libck_la_SOURCES = ck-sysdeps.h ck-sysdeps-unix.c $(NULL) \
@@ -755,6 +701,7 @@ Index: consolekit/src/Makefile.in
 +	$(am__append_4)
  @CK_COMPILE_FREEBSD_TRUE@libck_la_LIBADD = $(KVM_LIBS)
 +@CK_COMPILE_GNU_TRUE@libck_la_LIBADD = -lps
+ @CK_COMPILE_SOLARIS_TRUE@libck_la_LIBADD = -lscf
  EXTRA_libck_la_SOURCES = \
  	ck-sysdeps-linux.c		\
  	ck-sysdeps-solaris.c		\
@@ -763,7 +710,7 @@ Index: consolekit/src/Makefile.in
  	$(NULL)
  
  BUILT_SOURCES = \
-@@ -574,6 +585,7 @@
+@@ -658,6 +669,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session-leader.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-freebsd.Plo@am__quote@