Refresh 99-autoreconf.patch to apply cleanly.

1 files changed, 528 insertions, 247 deletions

diff --git a/debian/patches/99-autoreconf.patch b/debian/patches/99-autoreconf.patch
index 3acfa71..733d31b 100644
--- a/debian/patches/99-autoreconf.patch
+++ b/debian/patches/99-autoreconf.patch
@@ -1,121 +1,131 @@
 Index: consolekit/aclocal.m4
 ===================================================================
---- consolekit.orig/aclocal.m4	2009-10-26 00:46:11.000000000 +0100
-+++ consolekit/aclocal.m4	2009-10-26 00:45:42.000000000 +0100
-@@ -8866,61 +8866,59 @@
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--#serial 5
-+#serial 4
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
--  # Autoconf 2.62 quotes --file arguments for eval, but not when files
--  # are listed without --file.  Let's play safe and only enable the eval
--  # if we detect the quoting.
--  case $CONFIG_FILES in
--  *\'*) eval set x "$CONFIG_FILES" ;;
--  *)   set x $CONFIG_FILES ;;
--  esac
--  shift
--  for mf
--  do
--    # Strip MF so we end up with the name of the file.
--    mf=`echo "$mf" | sed -e 's/:.*$//'`
--    # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
--    # some people rename them; so instead we look at the file content.
--    # Grep'ing the first line is not enough: some people post-process
--    # each Makefile.in and add a new line on top of each file to say so.
--    # Grep'ing the whole file is not good either: AIX grep has a line
--    # limit of 2048, but all sed's we know have understand at least 4000.
--    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
--      dirpart=`AS_DIRNAME("$mf")`
--    else
--      continue
--    fi
--    # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
--    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--    test -z "$DEPDIR" && continue
--    am__include=`sed -n 's/^am__include = //p' < "$mf"`
--    test -z "am__include" && continue
--    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
--    # Find all dependency output files, they are included files with
--    # $(DEPDIR) in their names.  We invoke sed twice because it is the
--    # simplest approach to changing $(DEPDIR) to its actual value in the
--    # expansion.
--    for file in `sed -n "
--      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--      # Make sure the directory exists.
--      test -f "$dirpart/$file" && continue
--      fdir=`AS_DIRNAME(["$file"])`
--      AS_MKDIR_P([$dirpart/$fdir])
--      # echo "creating $dirpart/$file"
--      echo '# dummy' > "$dirpart/$file"
--    done
-+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-+# are listed without --file.  Let's play safe and only enable the eval
-+# if we detect the quoting.
-+case $CONFIG_FILES in
-+*\'*) eval set x "$CONFIG_FILES" ;;
-+*)   set x $CONFIG_FILES ;;
-+esac
-+shift
-+for mf
-+do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-   done
--}
-+done
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+--- 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 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -3524,7 +3536,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -4630,6 +4642,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'
+   ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++  ;;
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -4694,6 +4709,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4876,7 +4894,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	_LT_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5289,7 +5308,7 @@
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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
 Index: consolekit/configure
 ===================================================================
---- consolekit.orig/configure	2009-10-26 00:46:11.000000000 +0100
-+++ consolekit/configure	2009-10-26 00:45:50.000000000 +0100
+--- 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 @@
  HAVE_PAM_FALSE
  HAVE_PAM_TRUE
@@ -142,6 +152,15 @@ Index: consolekit/configure
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
+@@ -6753,7 +6755,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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*)
@@ -207,25 +226,412 @@ Index: consolekit/configure
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -12138,7 +12140,7 @@
+@@ -9441,6 +9443,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs=no
++    ;;
+   esac
+ 
+   ld_shlibs=yes
+@@ -9623,7 +9628,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -10212,7 +10218,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       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 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ 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 12141 "configure"
+-#line 12125 "configure"
 +#line 12143 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12234,7 +12236,7 @@
+@@ -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 12237 "configure"
+-#line 12221 "configure"
 +#line 12239 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -16273,7 +16275,7 @@
+@@ -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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
  CK_BACKEND=""
  KVM_LIBS=""
  case "$host" in
@@ -234,7 +640,7 @@ Index: consolekit/configure
          CK_BACKEND="freebsd"
          { $as_echo "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5
  $as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; }
-@@ -16358,6 +16360,9 @@
+@@ -16322,6 +16360,9 @@
          *-*-solaris*)
          CK_BACKEND="solaris"
          ;;
@@ -244,7 +650,7 @@ Index: consolekit/configure
  	*)
  	{ { $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;}
-@@ -16391,6 +16396,14 @@
+@@ -16355,6 +16396,14 @@
    CK_COMPILE_SOLARIS_FALSE=
  fi
  
@@ -259,7 +665,7 @@ Index: consolekit/configure
  
  
  
-@@ -17424,6 +17437,13 @@
+@@ -17388,6 +17437,13 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -273,135 +679,10 @@ Index: consolekit/configure
  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
-@@ -18887,28 +18907,27 @@
- 
- 
-   case $ac_file$ac_mode in
--    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
--  # Autoconf 2.62 quotes --file arguments for eval, but not when files
--  # are listed without --file.  Let's play safe and only enable the eval
--  # if we detect the quoting.
--  case $CONFIG_FILES in
--  *\'*) eval set x "$CONFIG_FILES" ;;
--  *)   set x $CONFIG_FILES ;;
--  esac
--  shift
--  for mf
--  do
--    # Strip MF so we end up with the name of the file.
--    mf=`echo "$mf" | sed -e 's/:.*$//'`
--    # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
--    # some people rename them; so instead we look at the file content.
--    # Grep'ing the first line is not enough: some people post-process
--    # each Makefile.in and add a new line on top of each file to say so.
--    # Grep'ing the whole file is not good either: AIX grep has a line
--    # limit of 2048, but all sed's we know have understand at least 4000.
--    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
--      dirpart=`$as_dirname -- "$mf" ||
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+# are listed without --file.  Let's play safe and only enable the eval
-+# if we detect the quoting.
-+case $CONFIG_FILES in
-+*\'*) eval set x "$CONFIG_FILES" ;;
-+*)   set x $CONFIG_FILES ;;
-+esac
-+shift
-+for mf
-+do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+    dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
-@@ -18931,28 +18950,28 @@
- 	    q
- 	  }
- 	  s/.*/./; q'`
--    else
--      continue
--    fi
--    # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
--    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--    test -z "$DEPDIR" && continue
--    am__include=`sed -n 's/^am__include = //p' < "$mf"`
--    test -z "am__include" && continue
--    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
--    # Find all dependency output files, they are included files with
--    # $(DEPDIR) in their names.  We invoke sed twice because it is the
--    # simplest approach to changing $(DEPDIR) to its actual value in the
--    # expansion.
--    for file in `sed -n "
--      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--      # Make sure the directory exists.
--      test -f "$dirpart/$file" && continue
--      fdir=`$as_dirname -- "$file" ||
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
-@@ -18975,7 +18994,7 @@
- 	    q
- 	  }
- 	  s/.*/./; q'`
--      { as_dir=$dirpart/$fdir
-+    { as_dir=$dirpart/$fdir
-   case $as_dir in #(
-   -*) as_dir=./$as_dir;;
-   esac
-@@ -19016,11 +19035,10 @@
-   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--      # echo "creating $dirpart/$file"
--      echo '# dummy' > "$dirpart/$file"
--    done
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-   done
--}
-+done
-  ;;
-     "libtool":C)
- 
 Index: consolekit/src/Makefile.in
 ===================================================================
---- consolekit.orig/src/Makefile.in	2009-10-26 00:46:12.000000000 +0100
-+++ consolekit/src/Makefile.in	2009-10-26 00:45:52.000000000 +0100
+--- 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 @@
  @CK_COMPILE_FREEBSD_TRUE@	ck-sysdeps-freebsd.c	\
  @CK_COMPILE_FREEBSD_TRUE@	$(NULL)