Merge branch 'master' of git://git.debian.org/git/pkg-utopia/consolekit

Conflicts:
	debian/changelog
	debian/rules

48 files changed, 8002 insertions, 5107 deletions

diff --git a/ChangeLog b/ChangeLog
index 98440d1..e73c0e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,162 @@
-commit 4a1e58fd29c7cdf48dea879191a45db2cfcca0d1
+commit af75e100dc4d4fac2e1633aa134e40e390d38918 (HEAD, tag: 0.4.6, master)
+Author: Michael Biebl <biebl@debian.org>
+Date:   Fri Jul 19 06:29:40 2013 +0200
+
+    Update NEWS
+
+    NOTE: ConsoleKit is no longer actively maintained and this will most
+    likely be the final release. You are advised to switch to logind:
+
+    http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html
+
+ NEWS | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+commit efe30907ee25fc52805dbb5395ad0bccb1dc8f34
+Author: Michael Biebl <biebl@debian.org>
+Date:   Fri Jul 19 06:24:51 2013 +0200
+
+    build-sys: Use xz compression
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9be71acfd404cb145c0a3b306ee93f401d42fdaa (origin/master,
+origin/HEAD)
+Author: Samuli Suominen <ssuominen@gentoo.org>
+Date:   Tue Mar 20 16:48:11 2012 +0100
+
+    build-sys: install run-seat.d symlink for udev-acl
+
+ tools/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 53d03d644e105595a390d8923e512e2322eb880f
+Author: Samuli Suominen <ssuominen@gentoo.org>
+Date:   Tue Mar 20 08:10:27 2012 +0100
+
+    build-sys: missing AC_SUBST for UDEVDIR
+
+    Without this the UDEVDIR never gets substituted and the rules file is
+    installed to root filesystem /rules.d/ as opposed to
+    /lib/udev/rules.d/
+
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4d06b16b69f8e9323ce128c92db4bb3e99cbd3aa
+Author: Pino Toscano <pino@kde.org>
+Date:   Mon Mar 19 16:46:29 2012 +0100
+
+    Fix unconditional PATH_MAX usage
+
+    Fix the unconditional PATH_MAX usage in
+    pam-ck-connector/pam-ck-connector.c by
+    using a variable-length malloc'ed buffer.
+
+    Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552393
+    https://bugs.freedesktop.org/show_bug.cgi?id=24738
+
+ pam-ck-connector/pam-ck-connector.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+commit e722b11a8240991b57bc4f5269c4f375fb6d29af
+Author: Pino Toscano <pino@kde.org>
+Date:   Mon Mar 19 16:43:19 2012 +0100
+
+    Add support for GNU/Hurd
+
+    Currently consolekit fails to build on GNU/Hurd mainly because
+    there's no
+    sysdeps backend for the GNU OS implemented.
+    The attached patch proposes a sysdeps-gnu backend, which implements
+    the process
+    management using Hurd's libps, the *ttyent API for the part of
+    the console
+    implementation and the rest using similar (valid) approaches of
+    other backends.
+
+    Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552393
+    https://bugs.freedesktop.org/show_bug.cgi?id=24738
+
+ configure.ac         |   4 +
+ src/Makefile.am      |   7 +
+ src/ck-sysdeps-gnu.c | 402
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 413 insertions(+)
+
+commit 67cff230cff6b838d5a473f6bc44b28bcacc3a17
+Author: Michael Biebl <biebl@debian.org>
+Date:   Mon Mar 19 16:18:29 2012 +0100
+
+    build-sys: don't install systemd units when using
+    --without-systemdsystemunitdir
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=33924
+
+ configure.ac | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+commit 0177dadbce60176eda8571ebedc59af15d17a13f
+Author: Michael Biebl <biebl@debian.org>
+Date:   Mon Mar 19 01:32:49 2012 +0100
+
+    build-sys: run autoupdate
+
+ configure.ac | 46 ++++++++++++++++------------------------------
+ 1 file changed, 16 insertions(+), 30 deletions(-)
+
+commit f42cafcce978c402bdbc9c6e03a0c90bb0924b89
+Author: Michael Biebl <biebl@debian.org>
+Date:   Mon Mar 19 01:29:57 2012 +0100
+
+    build-sys: remove useless dbus version check
+
+ configure.ac | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+commit d491e4017d3a098b6a2a4fe5a73989c172dfa035
+Author: Michael Biebl <biebl@debian.org>
+Date:   Mon Mar 19 01:25:57 2012 +0100
+
+    Import udev-acl tool from udev
+
+    The udev-acl tool has been removed from udev in version 182.
+    Add this tool to ConsoleKit for systems which don't use
+    systemd-logind.
+
+ configure.ac            |  21 +++
+ tools/.gitignore        |   1 +
+ tools/70-udev-acl.rules |  76 +++++++++
+ tools/Makefile.am       |  11 ++
+ tools/udev-acl.c        | 430
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 539 insertions(+)
+
+commit 803cbdfbd78b66b17ead45b1584d65a258e785bf
+Author: Ray Strode <rstrode@redhat.com>
+Date:   Tue May 24 20:58:10 2011 -0400
+
+    ck-history: don't truncate --frequent output to 8 chars
+
+    GDM screenscrapes the output and so we need the full username.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=650330
+
+ tools/ck-history.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b4eff485ddb8c0dc020593effc188741b964b5a4
+Author: Lennart Poettering <lennart@poettering.net>
+Date:   Tue May 3 02:19:09 2011 +0200
+
+    post release bump
+
+ NEWS         | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+commit 4a1e58fd29c7cdf48dea879191a45db2cfcca0d1 (tag: 0.4.5)
 Author: Colin Watson <cjwatson@ubuntu.com>
 Date:   Sat Nov 20 17:57:22 2010 +0100
 
@@ -22,8 +180,8 @@ Date:   Sat Nov 20 17:57:22 2010 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=31790
 
- src/ck-sysdeps-unix.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
+ src/ck-sysdeps-unix.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
 
 commit 14d5ef815d3f1a1a7d72bdc242c7ebb085372c8d
 Author: Lennart Poettering <lennart@poettering.net>
@@ -35,10 +193,10 @@ Date:   Thu Apr 14 01:12:51 2011 +0200
     mode or suchlike) ensure that we don't try to start sysinit.target
     before shutting down.
 
- data/console-kit-log-system-restart.service.in |    1 -
- data/console-kit-log-system-start.service.in   |    1 -
- data/console-kit-log-system-stop.service.in    |    1 -
- 3 files changed, 0 insertions(+), 3 deletions(-)
+ data/console-kit-log-system-restart.service.in | 1 -
+ data/console-kit-log-system-start.service.in   | 1 -
+ data/console-kit-log-system-stop.service.in    | 1 -
+ 3 files changed, 3 deletions(-)
 
 commit 91c73e774a033b6399624d8d5991543c70623ee0
 Author: Lennart Poettering <lennart@poettering.net>
@@ -46,11 +204,11 @@ Date:   Thu Feb 17 01:37:33 2011 +0100
 
     build-sys: post release version bump
 
- NEWS         |    6 ++++++
- configure.ac |    3 +--
+ NEWS         | 6 ++++++
+ configure.ac | 3 +--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
-commit f19bd45476536439b0f9fe01808f5d118238c5b1
+commit f19bd45476536439b0f9fe01808f5d118238c5b1 (tag: 0.4.4)
 Author: Lennart Poettering <lennart@poettering.net>
 Date:   Thu Feb 17 00:53:54 2011 +0100
 
@@ -58,8 +216,8 @@ Date:   Thu Feb 17 00:53:54 2011 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=32130
 
- data/Makefile.am |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ data/Makefile.am | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 commit a3db5f00cfb924d3d93da5eca0914d23d7102fcd
 Author: Lennart Poettering <lennart@poettering.net>
@@ -67,8 +225,8 @@ Date:   Thu Jan 20 19:19:46 2011 +0100
 
     systemd: fix reference to systemd units
 
- data/console-kit-log-system-restart.service.in |    2 +-
- data/console-kit-log-system-stop.service.in    |    2 +-
+ data/console-kit-log-system-restart.service.in | 2 +-
+ data/console-kit-log-system-stop.service.in    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit bdd4b0ca1c7e766649349a4b2a131f1f795d6ad6
@@ -81,8 +239,8 @@ Date:   Fri Dec 17 15:23:35 2010 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=18427
 
- libck-connector/ck-connector.pc.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ libck-connector/ck-connector.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit ad93ff6f212815f7b8cdd4b0f6796965f61f26a3
 Author: Lennart Poettering <lennart@poettering.net>
@@ -90,9 +248,9 @@ Date:   Fri Nov 19 02:33:52 2010 +0100
 
     systemd: fix name of unit
 
- data/console-kit-log-system-restart.service.in |    2 +-
- data/console-kit-log-system-start.service.in   |    2 +-
- data/console-kit-log-system-stop.service.in    |    2 +-
+ data/console-kit-log-system-restart.service.in | 2 +-
+ data/console-kit-log-system-start.service.in   | 2 +-
+ data/console-kit-log-system-stop.service.in    | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 14bab7395cad34e1780c984b9028fdd5555f6165
@@ -101,17 +259,17 @@ Date:   Fri Nov 19 02:33:42 2010 +0100
 
     build-sys: post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit bea922dbab5fb65997c62a98585a35741cbb1a5a
+commit bea922dbab5fb65997c62a98585a35741cbb1a5a (tag: 0.4.3)
 Author: Lennart Poettering <lennart@poettering.net>
 Date:   Wed Nov 17 02:03:34 2010 +0100
 
     update NEWS
 
- NEWS |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ NEWS | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 commit 72bc55ded76c567adee241094ba3147c72706f79
 Author: Lennart Poettering <lennart@poettering.net>
@@ -128,10 +286,10 @@ Date:   Wed Nov 17 01:50:46 2010 +0100
     VT_WAITEVENT
     are lost completely.
 
- NEWS                  |    1 -
- src/ck-sysdeps-unix.c |   44 --------------------------------------------
- src/ck-sysdeps.h      |    2 --
- src/ck-vt-monitor.c   |   48
+ NEWS                  |  1 -
+ src/ck-sysdeps-unix.c | 44 --------------------------------------------
+ src/ck-sysdeps.h      |  2 --
+ src/ck-vt-monitor.c   | 48
  ++++++++----------------------------------------
  4 files changed, 8 insertions(+), 87 deletions(-)
 
@@ -149,9 +307,9 @@ Date:   Wed Nov 17 01:49:37 2010 +0100
     VT_WAITEVENT
     are lost completely.
 
- src/ck-vt-monitor.c |   58
- ++++++++-------------------------------------------
- 1 files changed, 9 insertions(+), 49 deletions(-)
+ src/ck-vt-monitor.c | 58
+ +++++++++--------------------------------------------
+ 1 file changed, 9 insertions(+), 49 deletions(-)
 
 commit e74c174728bfa582d8187392bdbc11fe940c2df3
 Author: Lennart Poettering <lennart@poettering.net>
@@ -159,9 +317,9 @@ Date:   Wed Nov 17 00:45:40 2010 +0100
 
     systemd: simplify unit files a little
 
- data/console-kit-log-system-restart.service.in |    6 +++---
- data/console-kit-log-system-start.service.in   |    6 +++---
- data/console-kit-log-system-stop.service.in    |    6 +++---
+ data/console-kit-log-system-restart.service.in | 6 +++---
+ data/console-kit-log-system-start.service.in   | 6 +++---
+ data/console-kit-log-system-stop.service.in    | 6 +++---
  3 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 8564260aa0a2ab18f908079f886f7689844bfad5
@@ -170,8 +328,8 @@ Date:   Wed Nov 17 00:45:16 2010 +0100
 
     systemd: log shutdown when doing kexec reboot
 
- data/Makefile.am |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ data/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 25b5d47b961542ceca5f589cc69041b2d941c054
 Author: Michael Biebl <biebl@debian.org>
@@ -182,15 +340,15 @@ Date:   Sun Sep 19 21:17:26 2010 +0200
     dbus-glib >= 0.82 requires dbus >= 1.1 so we can safely remove
     DBUS_API_SUBJECT_TO_CHANGE.
 
- configure.ac            |    2 +-
- src/ck-manager.c        |    1 -
- src/ck-seat.c           |    1 -
- src/ck-session-leader.c |    1 -
- src/ck-session.c        |    1 -
- src/ck-vt-monitor.c     |    1 -
- src/main.c              |    1 -
- tools/list-sessions.c   |    1 -
- 8 files changed, 1 insertions(+), 8 deletions(-)
+ configure.ac            | 2 +-
+ src/ck-manager.c        | 1 -
+ src/ck-seat.c           | 1 -
+ src/ck-session-leader.c | 1 -
+ src/ck-session.c        | 1 -
+ src/ck-vt-monitor.c     | 1 -
+ src/main.c              | 1 -
+ tools/list-sessions.c   | 1 -
+ 8 files changed, 1 insertion(+), 8 deletions(-)
 
 commit 24dc214f55e7c7c17d888d0ccf94cd3625767462
 Author: Michael Biebl <biebl@debian.org>
@@ -204,9 +362,9 @@ Date:   Mon Sep 20 00:45:16 2010 +0200
     to the
     old behaviour of creating a thread for every possible vt.
 
- src/ck-vt-monitor.c |   58
- +++++++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 49 insertions(+), 9 deletions(-)
+ src/ck-vt-monitor.c | 58
+ ++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 49 insertions(+), 9 deletions(-)
 
 commit 2d16bc565247b8d8653e7eb4a7a6b0d940142bb6
 Author: Michael Biebl <biebl@debian.org>
@@ -216,8 +374,8 @@ Date:   Mon Sep 6 22:52:25 2010 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=30041
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 95ba1f7d70251830cf1dc0e0516ea0a4715272df
 Author: Luca Favatella <slackydeb@gmail.com>
@@ -228,8 +386,8 @@ Date:   Mon Sep 20 00:13:33 2010 +0200
     https://bugs.freedesktop.org/show_bug.cgi?id=30051
     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511270
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c163d26a97f4f69422ec4ea0cfe4c7e211d824c1
 Author: Lennart Poettering <lennart@poettering.net>
@@ -238,9 +396,9 @@ Date:   Tue Sep 14 01:08:06 2010 +0200
     systemd: make sure the file system is writable before we write
     log data
 
- data/console-kit-log-system-restart.service.in |    3 ++-
- data/console-kit-log-system-start.service.in   |    3 ++-
- data/console-kit-log-system-stop.service.in    |    3 ++-
+ data/console-kit-log-system-restart.service.in | 3 ++-
+ data/console-kit-log-system-start.service.in   | 3 ++-
+ data/console-kit-log-system-stop.service.in    | 3 ++-
  3 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 146e68f5c39653ba5878c6f32b3700d7fbabf777
@@ -249,18 +407,18 @@ Date:   Tue Sep 7 02:58:59 2010 +0200
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 55803876769bd0903cb0efda597bfd5a657adb86
+commit 55803876769bd0903cb0efda597bfd5a657adb86 (tag: 0.4.2)
 Author: Lennart Poettering <lennart@poettering.net>
 Date:   Mon Sep 6 16:34:13 2010 +0200
 
     systemd: keep around console-kit-log-system-start.service after it
     was run to avoid that it can be triggered twice
 
- data/console-kit-log-system-start.service.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ data/console-kit-log-system-start.service.in | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 2782cc8d4950effbc4407455e72bd4750cef6e11
 Author: Kan-Ru Chen <koster@debian.org>
@@ -273,10 +431,10 @@ Date:   Thu Aug 19 13:45:03 2010 +0800
 
     https://bugs.freedesktop.org/show_bug.cgi?id=17720
 
- NEWS                  |    1 +
- src/ck-sysdeps-unix.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
- src/ck-sysdeps.h      |    2 ++
- src/ck-vt-monitor.c   |   48
+ NEWS                  |  1 +
+ src/ck-sysdeps-unix.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps.h      |  2 ++
+ src/ck-vt-monitor.c   | 48
  ++++++++++++++++++++++++++++++++++++++++--------
  4 files changed, 87 insertions(+), 8 deletions(-)
 
@@ -286,8 +444,8 @@ Date:   Sun Sep 5 23:28:45 2010 +0200
 
     NEWS: update for 0.4.2
 
- NEWS |   13 ++++++++++++-
- 1 files changed, 12 insertions(+), 1 deletions(-)
+ NEWS | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
 
 commit afedbb80497e0a26f2026336943b1e37a8e696af
 Author: Lennart Poettering <lennart@poettering.net>
@@ -297,12 +455,12 @@ Date:   Fri Sep 3 19:24:18 2010 +0200
 
     This follows the basic scheme of the Upstart scripts we already ship
 
- data/.gitignore                                |    3 ++
- data/Makefile.am                               |   38
- ++++++++++++++++++++++-
- data/console-kit-log-system-restart.service.in |    9 +++++
- data/console-kit-log-system-start.service.in   |    9 +++++
- data/console-kit-log-system-stop.service.in    |    9 +++++
+ data/.gitignore                                |  3 ++
+ data/Makefile.am                               | 38
+ ++++++++++++++++++++++++--
+ data/console-kit-log-system-restart.service.in |  9 ++++++
+ data/console-kit-log-system-start.service.in   |  9 ++++++
+ data/console-kit-log-system-stop.service.in    |  9 ++++++
  5 files changed, 66 insertions(+), 2 deletions(-)
 
 commit 5a81bb666df3d8469d282e63d452ac2dea96b313
@@ -311,13 +469,13 @@ Date:   Wed Jul 21 16:55:44 2010 +0200
 
     systemd: install systemd unit files
 
- Makefile.am                                |    3 +++
- configure.ac                               |    9 +++++++++
- data/.gitignore                            |    1 +
- data/Makefile.am                           |   12 +++++++++++-
- data/console-kit-daemon.service.in         |   15 +++++++++++++++
- data/org.freedesktop.ConsoleKit.service.in |    1 +
- 6 files changed, 40 insertions(+), 1 deletions(-)
+ Makefile.am                                |  3 +++
+ configure.ac                               |  9 +++++++++
+ data/.gitignore                            |  1 +
+ data/Makefile.am                           | 12 +++++++++++-
+ data/console-kit-daemon.service.in         | 15 +++++++++++++++
+ data/org.freedesktop.ConsoleKit.service.in |  1 +
+ 6 files changed, 40 insertions(+), 1 deletion(-)
 
 commit 30f0968b9a7f544d1afc8908888dc403be6112b8
 Author: William Jon McCann <jmccann@redhat.com>
@@ -325,8 +483,8 @@ Date:   Tue Aug 3 15:26:58 2010 -0400
 
     Only load seat files with a .seat extension
 
- src/ck-manager.c |   10 ++++++----
- src/ck-seat.c    |    2 ++
+ src/ck-manager.c | 10 ++++++----
+ src/ck-seat.c    |  2 ++
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 7b9212fa6aff55420c58f2cacd0a941762920337
@@ -337,9 +495,9 @@ Date:   Tue Aug 3 15:07:39 2010 -0400
 
     https://bugs.freedesktop.org/show_bug.cgi?id=26227
 
- src/ck-manager.c |    7 +++++++
- src/ck-session.c |    3 ++-
- 2 files changed, 9 insertions(+), 1 deletions(-)
+ src/ck-manager.c | 7 +++++++
+ src/ck-session.c | 3 ++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 4f88228f31a63c026c424a92827f26ad7535275c
 Author: William Jon McCann <jmccann@redhat.com>
@@ -349,9 +507,9 @@ Date:   Thu Jun 3 20:02:35 2010 -0400
 
     https://bugs.freedesktop.org/show_bug.cgi?id=28377
 
- src/ck-manager.c                |  166
- ++++++++++++++++++++++++++++++++++++++-
- tools/ck-collect-session-info.c |   10 +--
+ src/ck-manager.c                | 166
+ +++++++++++++++++++++++++++++++++++++++-
+ tools/ck-collect-session-info.c |  10 +--
  2 files changed, 165 insertions(+), 11 deletions(-)
 
 commit c9f2292339540d4b9d8940bcef16b7485480c8d9
@@ -365,9 +523,9 @@ Date:   Fri Jun 11 15:53:22 2010 -0400
 
     https://bugs.freedesktop.org/show_bug.cgi?id=25660
 
- tools/ck-history.c |   96
- ++++++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 74 insertions(+), 22 deletions(-)
+ tools/ck-history.c | 96
+ +++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 74 insertions(+), 22 deletions(-)
 
 commit b8a961f91105df661957f6b86922f744bac8b91c
 Author: Halton Huo <halton.huo@sun.com>
@@ -382,12 +540,12 @@ Date:   Wed May 19 12:46:25 2010 +0800
 
     https://bugs.freedesktop.org/show_bug.cgi?id=26055
 
- src/Makefile.am          |    1 +
- src/ck-sysdeps-freebsd.c |    6 ++++++
- src/ck-sysdeps-linux.c   |    6 ++++++
- src/ck-sysdeps-solaris.c |   18 ++++++++++++++++++
- src/ck-sysdeps.h         |    1 +
- 5 files changed, 32 insertions(+), 0 deletions(-)
+ src/Makefile.am          |  1 +
+ src/ck-sysdeps-freebsd.c |  6 ++++++
+ src/ck-sysdeps-linux.c   |  6 ++++++
+ src/ck-sysdeps-solaris.c | 18 ++++++++++++++++++
+ src/ck-sysdeps.h         |  1 +
+ 5 files changed, 32 insertions(+)
 
 commit 9f7ded3fb41f7f656895373463e5aa3ca04f86bc
 Author: Halton Huo <halton.huo@sun.com>
@@ -397,10 +555,10 @@ Date:   Thu May 20 10:48:09 2010 +0800
 
     This reverts commit b2e65a0ab7f4c417c85433e3e9bf97befbe6da3b.
 
- configure.ac    |   13 -------------
- src/Makefile.am |    1 -
- src/ck-seat.c   |   26 +-------------------------
- 3 files changed, 1 insertions(+), 39 deletions(-)
+ configure.ac    | 13 -------------
+ src/Makefile.am |  1 -
+ src/ck-seat.c   | 26 +-------------------------
+ 3 files changed, 1 insertion(+), 39 deletions(-)
 
 commit b2e65a0ab7f4c417c85433e3e9bf97befbe6da3b
 Author: Halton Huo <halton.huo@sun.com>
@@ -415,10 +573,10 @@ Date:   Fri Jan 15 14:06:32 2010 +0800
 
     https://bugs.freedesktop.org/show_bug.cgi?id=26055
 
- configure.ac    |   13 +++++++++++++
- src/Makefile.am |    1 +
- src/ck-seat.c   |   26 +++++++++++++++++++++++++-
- 3 files changed, 39 insertions(+), 1 deletions(-)
+ configure.ac    | 13 +++++++++++++
+ src/Makefile.am |  1 +
+ src/ck-seat.c   | 26 +++++++++++++++++++++++++-
+ 3 files changed, 39 insertions(+), 1 deletion(-)
 
 commit e7f3952632f077ff647e303bd08950085c293297
 Author: Frederic Crozat <fcrozat@mandriva.com>
@@ -428,8 +586,8 @@ Date:   Fri Jan 29 06:43:29 2010 -0500
 
     Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24152
 
- src/ck-log-event.c |   16 ++++++++--------
- src/main.c         |    2 +-
+ src/ck-log-event.c | 16 ++++++++--------
+ src/main.c         |  2 +-
  2 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 42315147af68f5e64f86d794061e8c03e2b8dc01
@@ -440,8 +598,8 @@ Date:   Thu Jan 28 18:24:49 2010 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=25703
 
- src/ck-session.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-session.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f01e054a419d7aaf10c1da321bfbff554ffc3c54
 Author: Michael Biebl <mbiebl@gmail.com>
@@ -451,8 +609,8 @@ Date:   Thu Jan 28 18:11:54 2010 -0500
 
     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561106
 
- src/ck-manager.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ src/ck-manager.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit 2418840248f07025ad0edc96ed17e03ce5e47f3e
 Author: Ray Strode <rstrode@redhat.com>
@@ -468,8 +626,8 @@ Date:   Mon Dec 21 11:14:54 2009 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=25744
 
- src/main.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ src/main.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64
 Author: Matthias Clasen <mclasen@redhat.com>
@@ -482,8 +640,8 @@ Date:   Mon Dec 21 11:13:23 2009 -0500
 
     http://bugs.freedesktop.org/show_bug.cgi?id=25642
 
- data/org.freedesktop.ConsoleKit.service.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ data/org.freedesktop.ConsoleKit.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 48b4b2d1174db98ee87ea4e71f4a21221043ca3f
 Author: Halton Huo <halton.huo@sun.com>
@@ -493,8 +651,8 @@ Date:   Tue Nov 10 14:38:29 2009 +0800
 
     Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24992
 
- src/ck-manager.c |   31 ++++++++++++++++++++++---------
- 1 files changed, 22 insertions(+), 9 deletions(-)
+ src/ck-manager.c | 31 ++++++++++++++++++++++---------
+ 1 file changed, 22 insertions(+), 9 deletions(-)
 
 commit 42a909bbc8ede5c27e3d40606a98ab1251511dfc
 Author: Halton Huo <halton.huo@sun.com>
@@ -504,8 +662,8 @@ Date:   Tue Nov 3 11:42:07 2009 +0800
     Fixes bug http://defect.opensolaris.org/bz/show_bug.cgi?id=12322
     This is solaris only bug, won't affect other platform.
 
- src/ck-sysdeps-solaris.c |   22 +++++++++++++++++++++-
- 1 files changed, 21 insertions(+), 1 deletions(-)
+ src/ck-sysdeps-solaris.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 commit b00450b3f9284d997e2e25fd470e7df7336f03ec
 Author: Halton Huo <halton.huo@sun.com>
@@ -514,8 +672,8 @@ Date:   Fri Oct 16 11:10:37 2009 +0800
     Fix bug console-kit-daemon exit when receiving  SIGPOLL on Solaris.
     Refer to bug http://defect.opensolaris.org/bz/show_bug.cgi?id=11612
 
- src/ck-vt-monitor.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ src/ck-vt-monitor.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit 909bb5d08a50384ae2a521b80768c283363dbb86
 Author: Halton Huo <halton.huo@sun.com>
@@ -523,8 +681,8 @@ Date:   Fri Oct 16 11:09:58 2009 +0800
 
     Correct tty return value after VT support is integrated in Solaris.
 
- src/ck-sysdeps-solaris.c |   19 -------------------
- 1 files changed, 0 insertions(+), 19 deletions(-)
+ src/ck-sysdeps-solaris.c | 19 -------------------
+ 1 file changed, 19 deletions(-)
 
 commit 4661908c6dc7964c87f698edc7bbeb30ab37c986
 Author: Ray Strode <rstrode@redhat.com>
@@ -535,8 +693,8 @@ Date:   Fri Sep 25 15:33:23 2009 -0400
     It's all the rage these days and makes seeing warnings much
     easier.
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3719fa53557d39d9b8a024d1cc7542ab6f9981d6
 Author: William Jon McCann <jmccann@redhat.com>
@@ -544,8 +702,8 @@ Date:   Thu Sep 24 02:34:31 2009 -0400
 
     fix style
 
- src/ck-seat.c |   21 ++++++++++++++-------
- 1 files changed, 14 insertions(+), 7 deletions(-)
+ src/ck-seat.c | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
 
 commit f40de949f72bb0da2c64776fdda039a855ea0374
 Author: William Jon McCann <jmccann@redhat.com>
@@ -553,17 +711,17 @@ Date:   Thu Sep 24 02:31:49 2009 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 9ddc8aa9549425ead3bfeb2dc22f0c07ddca7718
+commit 9ddc8aa9549425ead3bfeb2dc22f0c07ddca7718 (tag: 0.4.1)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:   Thu Sep 24 02:29:46 2009 -0400
 
     Another?  So soon?
 
- NEWS |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ NEWS | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 commit 6bc4a3bf403acb762dfaa0cf4eb8288b73e6aa2d
 Author: William Jon McCann <jmccann@redhat.com>
@@ -571,8 +729,8 @@ Date:   Thu Sep 24 02:15:59 2009 -0400
 
     Fix a crasher
 
- src/ck-seat.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ src/ck-seat.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 commit d9f4838baff87ad39f1726200e1b0812b7813808
 Author: Matthias Clasen <mclasen@redhat.com>
@@ -580,8 +738,8 @@ Date:   Thu Sep 24 01:11:16 2009 -0400
 
     fix a small memory leak
 
- src/ck-manager.c |    7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
+ src/ck-manager.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit 76fba3d10411fc62a89d636ec2592cdf8015fbb2
 Author: William Jon McCann <jmccann@redhat.com>
@@ -589,8 +747,8 @@ Date:   Thu Sep 24 01:06:07 2009 -0400
 
     update email address
 
- doc/dbus/ConsoleKit.xml.in |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ doc/dbus/ConsoleKit.xml.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 2f5a8a128ac423d444882bbed5d186bc7e0d3188
 Author: William Jon McCann <jmccann@redhat.com>
@@ -598,18 +756,18 @@ Date:   Thu Sep 24 00:47:04 2009 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit bf1adae39b41009a54b91389b0d625fd81fdb39c
+commit bf1adae39b41009a54b91389b0d625fd81fdb39c (tag: 0.4.0)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:   Thu Sep 24 00:45:46 2009 -0400
 
     Update for release
 
- .gitignore          |    3 ++-
- NEWS                |   18 +++++++++++++++++-
- doc/dbus/.gitignore |    1 +
+ .gitignore          |  3 ++-
+ NEWS                | 18 +++++++++++++++++-
+ doc/dbus/.gitignore |  1 +
  3 files changed, 20 insertions(+), 2 deletions(-)
 
 commit ca74581668475c69fba6b5ccc1be453c8cdde8e9
@@ -618,8 +776,8 @@ Date:   Thu Sep 24 00:27:15 2009 -0400
 
     bump version before new release
 
- AUTHORS      |    2 +-
- configure.ac |    2 +-
+ AUTHORS      | 2 +-
+ configure.ac | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit ee7f189f604d2a976ab0861e11e902755c2ea6ae
@@ -634,8 +792,8 @@ Date:   Mon Sep 14 20:26:36 2009 -0400
 
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22986
 
- src/ck-sysdeps-solaris.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/ck-sysdeps-solaris.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 528ff2ceb4efd5db89e5e677517c6c487deb196a
 Author: William Jon McCann <jmccann@redhat.com>
@@ -647,11 +805,11 @@ Date:   Mon Sep 14 20:14:41 2009 -0400
 
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23948
 
- src/ck-log-event.c          |   42
+ src/ck-log-event.c          | 42
  +++++++++++++++++++++++++++++++++++++++++-
- src/ck-log-event.h          |    3 ++-
- tools/ck-history.c          |    5 ++---
- tools/ck-log-system-start.c |   32 ++++++++++++++++++++++++++++++++
+ src/ck-log-event.h          |  3 ++-
+ tools/ck-history.c          |  5 ++---
+ tools/ck-log-system-start.c | 32 ++++++++++++++++++++++++++++++++
  4 files changed, 77 insertions(+), 5 deletions(-)
 
 commit 85cfd65a204477e22b258b01d29ab78503074290
@@ -663,8 +821,8 @@ Date:   Mon Sep 14 18:18:41 2009 -0400
     This is consistent with how we write the wtmp records in GDM.
     https://bugs.freedesktop.org/show_bug.cgi?id=23944
 
- tools/ck-history.c |   22 +++++++++++++++-------
- 1 files changed, 15 insertions(+), 7 deletions(-)
+ tools/ck-history.c | 22 +++++++++++++++-------
+ 1 file changed, 15 insertions(+), 7 deletions(-)
 
 commit 725e76c91823ee01729890ac1fe71a97754512e4
 Author: William Jon McCann <jmccann@redhat.com>
@@ -674,8 +832,8 @@ Date:   Mon Sep 14 17:12:07 2009 -0400
 
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23279
 
- tools/ck-history.c |   41 +++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 39 insertions(+), 2 deletions(-)
+ tools/ck-history.c | 41 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 39 insertions(+), 2 deletions(-)
 
 commit 3afb5dc9c0a8ee8e1259fea6bd4b6d5fdede2d5f
 Author: William Jon McCann <jmccann@redhat.com>
@@ -695,8 +853,8 @@ Date:   Mon Sep 14 16:08:16 2009 -0400
 
     "Thu Sep  3 21:28 - down   (20:20)"
 
- tools/ck-history.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ tools/ck-history.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 81435b3d10d4b124c0a6b4649b4cf74378a26323
 Author: William Jon McCann <jmccann@redhat.com>
@@ -706,8 +864,8 @@ Date:   Mon Sep 14 15:54:33 2009 -0400
 
     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23939
 
- src/ck-seat.c |   15 ++++++++++-----
- 1 files changed, 10 insertions(+), 5 deletions(-)
+ src/ck-seat.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit b4f893eb294883909759fc9fd825eade1a9f308c
 Author: Lennart Poettering <lennart@poettering.net>
@@ -764,12 +922,12 @@ Date:   Tue Aug 11 04:02:33 2009 +0200
     duplification necessary to not confuse dbus-glib. For a similar reason
     'active-session-changed' is duplicated as well.
 
- src/Makefile.am     |	  2 +
- src/ck-manager.c    |	 56 +++++++++++++-----
- src/ck-marshal.list |	  1 +
- src/ck-seat.c	     |	161
- +++++++++++++++++++++++++++++++++++++++++++++++---
- src/ck-seat.h	     |	  5 ++
+ src/Makefile.am     |	 2 +
+ src/ck-manager.c    |	56 +++++++++++++-----
+ src/ck-marshal.list |	 1 +
+ src/ck-seat.c	     | 161
+ ++++++++++++++++++++++++++++++++++++++++++++++++----
+ src/ck-seat.h	     |	 5 ++
  5 files changed, 200 insertions(+), 25 deletions(-)
 
 commit 76f0578e7a497e569438316703df254f84b548a0
@@ -813,8 +971,8 @@ Date:	Tue Aug 11 03:57:27 2009 +0200
     only rely on 'session_added'/'session_removed' will continue to work
     fine, and will continue to be supported.
 
- NEWS		  |    8 +++++++-
- src/ck-session.c |    2 --
+ NEWS		  | 8 +++++++-
+ src/ck-session.c | 2 --
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 8535db29009c48a37fc2559ca0fcc5b366e1e122
@@ -829,9 +987,9 @@ Date:	Mon Jul 27 18:16:15 2009 +0200
     guaranteed that the signal handlers are run in the same order as they
     are registered, so this should be safe and have the desired effect.
 
- src/ck-manager.c |   29 +++++++++++++++++++----------
- src/ck-seat.c	  |   19 ++-----------------
- src/ck-seat.h	  |    2 ++
+ src/ck-manager.c | 29 +++++++++++++++++++----------
+ src/ck-seat.c	  | 19 ++-----------------
+ src/ck-seat.h	  |  2 ++
  3 files changed, 23 insertions(+), 27 deletions(-)
 
 commit 17fe9ecafedffde111fd0ac95d5688bf5a330972
@@ -844,8 +1002,8 @@ Date:	Tue Aug 11 03:58:45 2009 +0200
     var array
     size.
 
- src/ck-session.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ src/ck-session.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit 90ddcd8249e81341ec05fdb508b6768684ce178b
 Author: Lennart Poettering <lennart@poettering.net>
@@ -853,8 +1011,8 @@ Date:	Tue Aug 11 04:01:09 2009 +0200
 
     when printing size_t use %z format string
 
- src/ck-seat.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-seat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 242971667b66fea86d4cfb5a4d0a396e5a7b5e8b
 Author: Lennart Poettering <lennart@poettering.net>
@@ -868,10 +1026,10 @@ Date:	Tue Aug 11 03:54:57 2009 +0200
     To make sure this leaks no information this drops the session cookie
     from the database.
 
- src/ck-manager.c	 |    2 +-
- src/ck-session-leader.c |    1 -
- src/ck-session.c	 |    4 ----
- 3 files changed, 1 insertions(+), 6 deletions(-)
+ src/ck-manager.c	 | 2 +-
+ src/ck-session-leader.c | 1 -
+ src/ck-session.c	 | 4 ----
+ 3 files changed, 1 insertion(+), 6 deletions(-)
 
 commit 6d4959b9a573c55fe56bbaf2394f492384f19c67
 Author: Lennart Poettering <lennart@poettering.net>
@@ -880,8 +1038,8 @@ Date:	Tue Aug 11 03:56:48 2009 +0200
     get rid of ck_seat_set_active_session() prototype since no such
     function exists
 
- src/ck-seat.h |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ src/ck-seat.h | 3 ---
+ 1 file changed, 3 deletions(-)
 
 commit d4c986776d0626fc5e1d6d67232a312f9ec6ad75
 Author: Lennart Poettering <lennart@poettering.net>
@@ -891,8 +1049,8 @@ Date:	Tue Aug 11 03:53:40 2009 +0200
 
     It's a method of CkSession hence it belongs in ck-session.h
 
- src/ck-run-programs.h |    3 ---
- src/ck-session.h      |    3 +++
+ src/ck-run-programs.h | 3 ---
+ src/ck-session.h      | 3 +++
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit ced836b356bd3235c69754e82fe8510ee377d58c
@@ -901,10 +1059,10 @@ Date:	Wed Jul 22 16:54:01 2009 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit a727d971f3dffc98bae043b69a95e02d3ab3eb88
+commit a727d971f3dffc98bae043b69a95e02d3ab3eb88 (tag: 0.3.1)
 Author: Ray Strode <rstrode@redhat.com>
 Date:	Wed Jul 22 15:13:40 2009 -0400
 
@@ -913,8 +1071,8 @@ Date:	Wed Jul 22 15:13:40 2009 -0400
     It was trying to write the log message way too early,
     before the root filesystem was mounted.
 
- NEWS			  |    2 +-
- data/ck-log-system-start |    2 +-
+ NEWS			  | 2 +-
+ data/ck-log-system-start | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 0f5a014b1e722998e85a3e8482a1cc7654066b8f
@@ -923,8 +1081,8 @@ Date:	Tue Jul 21 11:00:52 2009 -0400
 
     Update NEWS for 0.3.1 release
 
- NEWS |   21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ NEWS | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
 
 commit 671d3100d48af77eb03b79c73d20e7a4611339df
 Author: Ray Strode <rstrode@redhat.com>
@@ -939,8 +1097,8 @@ Date:	Tue Jul 21 10:38:26 2009 -0400
     This commit makes ConsoleKit.xml load the entities from
     srcdir, which fixes make distcheck.
 
- doc/dbus/ConsoleKit.xml.in |	12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ doc/dbus/ConsoleKit.xml.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit bf40cd1b17e0bb55c606301f7d8ed65ae6791e54
 Author: Ray Strode <rstrode@redhat.com>
@@ -951,8 +1109,8 @@ Date:	Tue Jul 21 10:07:49 2009 -0400
     git-log (with a hyphen) is an obsolete way to call
     git log.
 
- Makefile.am |	  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 23ab6a2ef30fb6fb56f33ac44ecda5887d2b1f94
 Author: Martin Pitt <martin.pitt@ubuntu.com>
@@ -964,8 +1122,8 @@ Date:	Mon Jul 20 17:09:36 2009 -0400
 
     e0d9cc359b3099307067107b59ec691418e280b8
 
- data/ConsoleKit.conf |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ data/ConsoleKit.conf | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 commit 89b9256ad86ddc2a9fd12d3359bc431df45c6b25
 Author: Matthias Clasen <mclasen@redhat.com>
@@ -973,13 +1131,13 @@ Date:	Mon Jul 20 17:08:23 2009 -0400
 
     Port to PolicyKit 1.0 apis
 
- configure.ac				    |	 5 +-
- data/Makefile.am			    |	 2 +-
- data/org.freedesktop.consolekit.policy     |	 4 +-
- src/ck-manager.c			    |  673
- +++++++++-------------------
- src/ck-manager.h			    |	 5 +
- src/org.freedesktop.ConsoleKit.Manager.xml |	10 +
+ configure.ac				    |	5 +-
+ data/Makefile.am			    |	2 +-
+ data/org.freedesktop.consolekit.policy     |	4 +-
+ src/ck-manager.c			    | 673
+ +++++++++--------------------
+ src/ck-manager.h			    |	5 +
+ src/org.freedesktop.ConsoleKit.Manager.xml |  10 +
  6 files changed, 226 insertions(+), 473 deletions(-)
 
 commit 282c47eb102f839cbf3bee646ba2841362284760
@@ -995,9 +1153,9 @@ Date:	Mon Jul 20 16:37:45 2009 -0400
     We can do this because we know the display is a local display
     since we've already gotten peer credentials from its socket.
 
- tools/ck-get-x11-display-device.c |   72
- +++++++++++++++++++++++++++++++++++++
- 1 files changed, 72 insertions(+), 0 deletions(-)
+ tools/ck-get-x11-display-device.c | 72
+ +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 72 insertions(+)
 
 commit bcc18427eec07139c9d907ac3995f2c157a7c715
 Author: Halton Huo <halton.huo@sun.com>
@@ -1010,8 +1168,8 @@ Date:	Mon Jul 20 16:29:46 2009 -0400
 
     bug 22361
 
- pam-ck-connector/pam-ck-connector.c |	  7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 7 -------
+ 1 file changed, 7 deletions(-)
 
 commit bb5c86f61775039dca779959eb5822cb1d453bbd
 Author: Vincent Untz <vuntz@gnome.org>
@@ -1027,8 +1185,8 @@ Date:	Mon Jul 20 16:22:43 2009 -0400
 
     See http://bugs.freedesktop.org/show_bug.cgi?id=20471
 
- data/ConsoleKit.conf |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ data/ConsoleKit.conf | 3 +++
+ 1 file changed, 3 insertions(+)
 
 commit 0f5390165fd68322d077e13d828af8f32fc09327
 Author: Matthias Clasen <mclasen@redhat.com>
@@ -1038,8 +1196,8 @@ Date:	Thu Jul 16 17:19:30 2009 -0400
 
     https://bugs.freedesktop.org/show_bug.cgi?id=21310
 
- src/ck-manager.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cbfd9578d73f93e47b282bdf4e298067c4a9bf79
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1049,13 +1207,13 @@ Date:	Thu Jul 16 17:15:14 2009 -0400
 
     https://bugs.freedesktop.org/show_bug.cgi?id=20232
 
- configure.ac				    |	 3 +
- doc/dbus/Makefile.am			    |	 5 ++-
- doc/dbus/ck-design.xml			    |	58 +++++++++++-----------
- doc/dbus/spec-to-docbook.xsl		    |	72
- ++++++++++++++++------------
- src/org.freedesktop.ConsoleKit.Manager.xml |	 2 +-
- src/org.freedesktop.ConsoleKit.Seat.xml    |	 5 +-
+ configure.ac				    |  3 ++
+ doc/dbus/Makefile.am			    |  5 ++-
+ doc/dbus/ck-design.xml			    | 58 ++++++++++++------------
+ doc/dbus/spec-to-docbook.xsl		    | 72
+ +++++++++++++++++-------------
+ src/org.freedesktop.ConsoleKit.Manager.xml |  2 +-
+ src/org.freedesktop.ConsoleKit.Seat.xml    |  5 ++-
  6 files changed, 82 insertions(+), 63 deletions(-)
 
 commit 25145f35ab527a2219604e1710eb65e2178f6978
@@ -1064,8 +1222,8 @@ Date:	Thu Feb 12 14:59:15 2009 -0500
 
     fix parsing log entries with no body
 
- src/ck-log-event.c |	25 +++++++++++++++++--------
- 1 files changed, 17 insertions(+), 8 deletions(-)
+ src/ck-log-event.c | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
 
 commit b550333228b73bb3ed4a55ec74baade1bdded0ff
 Author: Daniel Macks <dmacks@netspace.org>
@@ -1075,8 +1233,8 @@ Date:	Wed Feb 11 21:56:55 2009 -0500
 
     Error if no backend for target host
 
- configure.ac |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
 
 commit 87703597e24ba94c400ac8878a6835d86571da91
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1084,8 +1242,8 @@ Date:	Wed Feb 11 21:51:41 2009 -0500
 
     parse gecos field to get real name
 
- tools/list-sessions.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
+ tools/list-sessions.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
 
 commit 739b39203166eda0174672541a06ceeb182b6ed3
 Author: James Westby <jw+debian@jameswestby.net>
@@ -1093,8 +1251,8 @@ Date:	Wed Feb 11 21:39:46 2009 -0500
 
     don't leak dbus proxy
 
- src/ck-session.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ src/ck-session.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit fef7d6f777b017878ba225395fe4199af5f1c581
 Author: Halton Huo <halton.huo@sun.com>
@@ -1141,9 +1299,9 @@ Date:	Wed Feb 11 20:39:18 2009 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=18173
 
- pam-ck-connector/Makefile.am	     |	  2 ++
- pam-ck-connector/pam-ck-connector.c |	 18 +++++++++++++++++-
- 2 files changed, 19 insertions(+), 1 deletions(-)
+ pam-ck-connector/Makefile.am	     |	2 ++
+ pam-ck-connector/pam-ck-connector.c | 18 +++++++++++++++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit da3a3fe00ad4c4e750e467db58d383ebf4da978f
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1153,8 +1311,8 @@ Date:	Wed Feb 11 20:30:50 2009 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=18149
 
- src/ck-log-event.h |	 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ src/ck-log-event.h | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit 2ca61880db1da2b15fe83d0fe94b95245ace77b0
 Author: James Westby <jw+debian@jameswestby.net>
@@ -1177,9 +1335,9 @@ Date:	Wed Feb 11 20:18:24 2009 -0500
     before doing anything with inotify, as I hoped that this would
     just optimise this case.
 
- src/ck-file-monitor-inotify.c |  126
- ++++++++++++++++++++++++++++++----------
- 1 files changed, 94 insertions(+), 32 deletions(-)
+ src/ck-file-monitor-inotify.c | 126
+ +++++++++++++++++++++++++++++++-----------
+ 1 file changed, 94 insertions(+), 32 deletions(-)
 
 commit 1ddd056da19a9e99b10601a557ebbcaf101d0de9
 Author: Steve Langasek <steve.langasek@canonical.com>
@@ -1199,8 +1357,8 @@ Date:	Wed Feb 11 18:36:34 2009 -0500
 
     The attached patch corrects this.
 
- src/ck-run-programs.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/ck-run-programs.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit a00c329d81be8691e13915ed36f5053bd0f820f3
 Author: Martin Pitt <martin.pitt@ubuntu.com>
@@ -1216,9 +1374,9 @@ Date:	Wed Feb 11 16:30:34 2009 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=16746
 
- pam-ck-connector/pam-ck-connector.c |	  7 +++++++
- pam-ck-connector/pam_ck_connector.8 |	  4 ++++
- 2 files changed, 11 insertions(+), 0 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 7 +++++++
+ pam-ck-connector/pam_ck_connector.8 | 4 ++++
+ 2 files changed, 11 insertions(+)
 
 commit 946c2daf3f654475e767ae98e52cbcd69e2c3320
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1229,11 +1387,11 @@ Date:	Wed Feb 11 16:06:04 2009 -0500
     These can be used to add system start/stop/restart logging
     but hooking into Upstart event mechanism.
 
- data/Makefile.am	    |	 3 +++
- data/ck-log-system-restart |	 8 ++++++++
- data/ck-log-system-start   |	 8 ++++++++
- data/ck-log-system-stop    |	 8 ++++++++
- 4 files changed, 27 insertions(+), 0 deletions(-)
+ data/Makefile.am	    | 3 +++
+ data/ck-log-system-restart | 8 ++++++++
+ data/ck-log-system-start   | 8 ++++++++
+ data/ck-log-system-stop    | 8 ++++++++
+ 4 files changed, 27 insertions(+)
 
 commit e0d9cc359b3099307067107b59ec691418e280b8
 Author: Colin Walters <walters@verbum.org>
@@ -1241,9 +1399,9 @@ Date:	Sun Jan 18 13:06:37 2009 -0500
 
     fix up D-Bus permissions
 
- data/ConsoleKit.conf |  120
- +++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 80 insertions(+), 40 deletions(-)
+ data/ConsoleKit.conf | 120
+ ++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 80 insertions(+), 40 deletions(-)
 
 commit 6ef0f62dc8b41c6904099c2d2836747da38d69df
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1251,8 +1409,8 @@ Date:	Thu Oct 2 14:18:16 2008 -0400
 
     check the result of the fchown call
 
- src/ck-event-logger.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ src/ck-event-logger.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit a58a4bff451dcf8a6019aed1b2fb276e9836b0f4
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1262,8 +1420,8 @@ Date:	Thu Oct 2 14:15:10 2008 -0400
 
     Fixes #17866
 
- src/ck-event-logger.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
+ src/ck-event-logger.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 35794ece08bc678a537d0c2a680b79f9232dfe36
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1273,8 +1431,8 @@ Date:	Thu Oct 2 13:56:58 2008 -0400
 
     Fixes #17741
 
- libck-connector/ck-connector.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ libck-connector/ck-connector.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f0fb2d1cfd0f0ea3ad922175e895a9e751498a03
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1282,8 +1440,8 @@ Date:	Wed Aug 20 19:48:08 2008 -0400
 
     allow calling method SetIdleHint by default
 
- data/ConsoleKit.conf |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ data/ConsoleKit.conf | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit cb445f89d64d2171c1050dbf8ba1280f2260bc9c
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1291,17 +1449,17 @@ Date:	Wed Jul 30 20:56:43 2008 -0400
 
     post release bump again
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 9555166f23499642b64b247bd7106287c5b415c2
+commit 9555166f23499642b64b247bd7106287c5b415c2 (tag: 0.3.0)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:	Wed Jul 30 20:56:22 2008 -0400
 
     undo
 
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6e26aa3e9ae08b4c35539100d1605cd7c3f29a25
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1309,8 +1467,8 @@ Date:	Wed Jul 30 20:55:28 2008 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 129efd6638cab89a3bc75a2b5f252e613a30163d
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1318,9 +1476,9 @@ Date:	Wed Jul 30 20:38:21 2008 -0400
 
     update for 0.3.0 release
 
- NEWS		  |   42 ++++++++++++++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- src/ck-session.c |    2 +-
+ NEWS		  | 42 ++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ src/ck-session.c |  2 +-
  3 files changed, 44 insertions(+), 2 deletions(-)
 
 commit 456065f3f8d9ba785b0d2d9dc247fc9fb4fe9ba0
@@ -1329,8 +1487,8 @@ Date:	Wed Jul 30 18:06:31 2008 -0400
 
     don't allow reboot if PolicyKit and RBAC are disabled
 
- configure.ac	  |   11 ++++++++++-
- src/ck-manager.c |   27 ++++++++++++++-------------
+ configure.ac	  | 11 ++++++++++-
+ src/ck-manager.c | 27 ++++++++++++++-------------
  2 files changed, 24 insertions(+), 14 deletions(-)
 
 commit 53d7c964bcdd29d6d22c4e78afe1ee5a2937bf95
@@ -1339,8 +1497,8 @@ Date:	Wed Jul 30 17:45:07 2008 -0400
 
     fix path in includes
 
- doc/dbus/ConsoleKit.xml.in |	12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ doc/dbus/ConsoleKit.xml.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit edad750e967458f55b9e761af966f325213ce9fe
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1348,23 +1506,31 @@ Date:	Wed Jul 30 17:37:24 2008 -0400
 
     reorganize the docs a bit
 
- configure.ac				 |    4 +-
- doc/.gitignore				 |    2 -
- doc/Makefile.am			 |   41
- +---------------------------
- doc/{ => dbus}/.gitignore		 |    0
- doc/{ => dbus}/ConsoleKit.xml.in	 |    0
- doc/dbus/Makefile.am			 |   46
- +++++++++++++++++++++++++++++++
- doc/{xml => dbus}/ck-design.xml	 |    0
- doc/{xml => dbus}/ck-introduction.xml	 |    0
- doc/{xml => dbus}/ck-terms.xml		 |    0
- doc/{ => dbus}/config.xsl		 |    0
- doc/{ => dbus}/dbus-introspect-docs.dtd |    0
- doc/{ => dbus}/docbook.css		 |    0
- doc/{xml => dbus}/spec-to-docbook.xsl	 |    0
- doc/xml/Makefile.am			 |   20 -------------
- 14 files changed, 49 insertions(+), 64 deletions(-)
+ configure.ac			   |   4 +-
+ doc/.gitignore			   |   2 -
+ doc/ConsoleKit.xml.in		   |  74 ------
+ doc/Makefile.am		   |  41 +--
+ doc/config.xsl			   |   6 -
+ doc/dbus-introspect-docs.dtd	   |  32 ---
+ doc/dbus/.gitignore		   |   6 +
+ doc/dbus/ConsoleKit.xml.in	   |  74 ++++++
+ doc/dbus/Makefile.am		   |  46 ++++
+ doc/dbus/ck-design.xml		   | 180 +++++++++++++
+ doc/dbus/ck-introduction.xml	   |  28 ++
+ doc/dbus/ck-terms.xml		   |  67 +++++
+ doc/dbus/config.xsl		   |   6 +
+ doc/dbus/dbus-introspect-docs.dtd |  32 +++
+ doc/dbus/docbook.css		   |  78 ++++++
+ doc/dbus/spec-to-docbook.xsl	   | 543
+ ++++++++++++++++++++++++++++++++++++++
+ doc/docbook.css		   |  78 ------
+ doc/xml/Makefile.am		   |  20 --
+ doc/xml/ck-design.xml		   | 180 -------------
+ doc/xml/ck-introduction.xml	   |  28 --
+ doc/xml/ck-terms.xml		   |  67 -----
+ doc/xml/spec-to-docbook.xsl	   | 543
+ --------------------------------------
+ 22 files changed, 1063 insertions(+), 1072 deletions(-)
 
 commit 77fe8e2e89af7cd21357116e9668b23d958fb2a5
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1372,9 +1538,9 @@ Date:	Thu Jul 24 00:32:21 2008 -0400
 
     pull updated DTD and xsl from DeviceKit-disks
 
- doc/dbus-introspect-docs.dtd |    4 +-
- doc/xml/spec-to-docbook.xsl  |  171
- ++++++++++++++++++++++++++++++++++--------
+ doc/dbus-introspect-docs.dtd |   4 +-
+ doc/xml/spec-to-docbook.xsl  | 171
+ +++++++++++++++++++++++++++++++++++--------
  2 files changed, 141 insertions(+), 34 deletions(-)
 
 commit 3133a9ad1a1eb05ad6717d8ee8ede782b833ee67
@@ -1383,9 +1549,9 @@ Date:	Thu Jul 24 00:18:32 2008 -0400
 
     fix distcheck
 
- doc/Makefile.am     |	  1 +
- doc/xml/Makefile.am |	  2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ doc/Makefile.am     | 1 +
+ doc/xml/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit aad5b87b7e2f993aef418822d52d8dca5345fce5
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1393,8 +1559,8 @@ Date:	Thu Jul 24 00:06:57 2008 -0400
 
     still having problems using xinclude
 
- doc/ConsoleKit.xml.in |   23 ++++++++++++++++-------
- doc/xml/Makefile.am   |    5 +----
+ doc/ConsoleKit.xml.in | 23 ++++++++++++++++-------
+ doc/xml/Makefile.am   |  5 +----
  2 files changed, 17 insertions(+), 11 deletions(-)
 
 commit cda2111bd2a12fc246c6e7973ae7fae4ff779bca
@@ -1403,10 +1569,11 @@ Date:	Wed Jul 23 23:42:17 2008 -0400
 
     fix the includes
 
- doc/ConsoleKit.xml.in			|   23 +++++++----------------
- doc/{xml => }/dbus-introspect-docs.dtd |    0
- doc/xml/Makefile.am			|    6 +++---
- 3 files changed, 10 insertions(+), 19 deletions(-)
+ doc/ConsoleKit.xml.in		  | 23 +++++++----------------
+ doc/dbus-introspect-docs.dtd	  | 32 ++++++++++++++++++++++++++++++++
+ doc/xml/Makefile.am		  |  6 +++---
+ doc/xml/dbus-introspect-docs.dtd | 32 --------------------------------
+ 4 files changed, 42 insertions(+), 51 deletions(-)
 
 commit 460d6c9e42e84d3d66bfcadfbaa77a0e059caae7
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1414,9 +1581,9 @@ Date:	Wed Jul 23 23:31:48 2008 -0400
 
     add missing bits
 
- doc/Makefile.am     |	  2 ++
- doc/xml/Makefile.am |	 23 +++++++++++++++++++++++
- 2 files changed, 25 insertions(+), 0 deletions(-)
+ doc/Makefile.am     |	2 ++
+ doc/xml/Makefile.am | 23 +++++++++++++++++++++++
+ 2 files changed, 25 insertions(+)
 
 commit e54095996b9066120ebf20011eba199d25422c2f
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1430,26 +1597,34 @@ Date:	Wed Jul 23 23:22:36 2008 -0400
     unknown tags.  Apparently this is now fixed.  Also install the xml to
     /usr/share/dbus-1/interfaces.
 
- configure.ac					    |	 6 +
- doc/Makefile.am				    |	 6 +-
- doc/tools/spec-strip-docs			    |	34 ---
- doc/tools/spec-strip-docs.xsl			    |	36 ---
- doc/tools/spec-to-docbook			    |	34 ---
- doc/tools/update-from-spec			    |	25 --
- doc/{ => xml}/dbus-introspect-docs.dtd		    |	 0
- doc/xml/ref-ck-manager.xml			    |  199 ---------------
- doc/xml/ref-ck-seat.xml			    |	87 -------
- doc/xml/ref-ck-session.xml			    |  258
- --------------------
- doc/{tools => xml}/spec-to-docbook.xsl		    |	 0
- src/Makefile.am				    |	23 +-
- src/ck-manager.xml				    |	70 ------
- src/ck-seat.xml				    |	39 ---
- src/ck-session.xml				    |	81 ------
- .../org.freedesktop.ConsoleKit.Manager.xml	    |	 0
- .../org.freedesktop.ConsoleKit.Seat.xml	    |	 0
- .../org.freedesktop.ConsoleKit.Session.xml	    |	 0
- 18 files changed, 23 insertions(+), 875 deletions(-)
+ configure.ac				    |	6 +
+ doc/Makefile.am			    |	6 +-
+ doc/dbus-introspect-docs.dtd		    |  32 ---
+ doc/spec/ck-manager.xml		    | 343 -----------------------
+ doc/spec/ck-seat.xml			    | 163 -----------
+ doc/spec/ck-session.xml		    | 435
+ ----------------------------
+ doc/tools/spec-strip-docs		    |  34 ---
+ doc/tools/spec-strip-docs.xsl		    |  36 ---
+ doc/tools/spec-to-docbook		    |  34 ---
+ doc/tools/spec-to-docbook.xsl		    | 436
+ -----------------------------
+ doc/tools/update-from-spec		    |  25 --
+ doc/xml/dbus-introspect-docs.dtd	    |  32 +++
+ doc/xml/ref-ck-manager.xml		    | 199 -------------
+ doc/xml/ref-ck-seat.xml		    |  87 ------
+ doc/xml/ref-ck-session.xml		    | 258 -----------------
+ doc/xml/spec-to-docbook.xsl		    | 436
+ +++++++++++++++++++++++++++++
+ src/Makefile.am			    |  23 +-
+ src/ck-manager.xml			    |  70 -----
+ src/ck-seat.xml			    |  39 ---
+ src/ck-session.xml			    |  81 ------
+ src/org.freedesktop.ConsoleKit.Manager.xml | 343 +++++++++++++++++++++++
+ src/org.freedesktop.ConsoleKit.Seat.xml    | 163 +++++++++++
+ src/org.freedesktop.ConsoleKit.Session.xml | 435
+ ++++++++++++++++++++++++++++
+ 23 files changed, 1432 insertions(+), 2284 deletions(-)
 
 commit 34cefc96f7661ed92927bffa1cf7cbc79a84e5ab
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1457,8 +1632,8 @@ Date:	Tue Jul 22 18:28:06 2008 -0400
 
     use object paths for seat added/removed signals per spec
 
- src/ck-manager.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ src/ck-manager.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 25546d381557f5da8dd8db54c857442193c5340b
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1466,9 +1641,9 @@ Date:	Tue Jul 22 17:23:59 2008 -0400
 
     regenerate the docs and xml from the spec
 
- doc/xml/ref-ck-session.xml |	 6 +++++-
- src/ck-session.xml	    |	 3 +++
- 2 files changed, 8 insertions(+), 1 deletions(-)
+ doc/xml/ref-ck-session.xml | 6 +++++-
+ src/ck-session.xml	    | 3 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit f0dbc3ee0c8fb53f2b9eed000d72fb923a83a474
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1476,8 +1651,8 @@ Date:	Tue Jul 22 14:30:22 2008 -0400
 
     add GetLoginSessionId to exported interface
 
- doc/spec/ck-session.xml |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
+ doc/spec/ck-session.xml | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
 
 commit e1cfb5cb97eee87ce34ba5ce586bf1e90f485874
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1485,8 +1660,8 @@ Date:	Tue Jul 22 14:29:54 2008 -0400
 
     fix use of unix-user as int
 
- tools/list-sessions.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ tools/list-sessions.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit f757f22786dfa0bf034c5c1d66d47ecafc871606
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1494,8 +1669,8 @@ Date:	Mon Jul 21 16:48:21 2008 -0400
 
     use fortify source flag when building from git
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 34291722aa95394b7470099394b936dfc70022eb
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1503,8 +1678,8 @@ Date:	Mon Jul 21 14:28:09 2008 -0400
 
     fix location of scripts again
 
- tools/linux/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ tools/linux/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fa2bad04422d8c34974121cae68069a9e2d2e841
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1512,8 +1687,8 @@ Date:	Mon Jul 21 13:55:16 2008 -0400
 
     dist bzip by default
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8e6002b4bcf441e6a650d0adacf4a1eafe34cd54
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1521,8 +1696,8 @@ Date:	Mon Jul 21 13:50:55 2008 -0400
 
     fix up signal definition
 
- src/ck-seat.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ src/ck-seat.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit bab014f7f827c0d5306d029d08bf234b7a452282
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1532,9 +1707,9 @@ Date:	Wed Jun 11 12:00:03 2008 -0400
 
     Pointed out by Lennart Poettering
 
- doc/spec/ck-session.xml    |	 4 ++--
- doc/xml/ref-ck-session.xml |	 8 ++++----
- src/ck-session.xml	    |	 7 ++-----
+ doc/spec/ck-session.xml    | 4 ++--
+ doc/xml/ref-ck-session.xml | 8 ++++----
+ src/ck-session.xml	    | 7 ++-----
  3 files changed, 8 insertions(+), 11 deletions(-)
 
 commit 25663a88377d76f9e722635bec96627ed0db4e43
@@ -1545,8 +1720,8 @@ Date:	Wed Jun 11 11:46:59 2008 -0400
 
     Pointed out by Lennart Poettering
 
- src/ck-seat.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ src/ck-seat.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit dfcab49480565a7bcf71752c5b39eb367df81a19
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1554,8 +1729,8 @@ Date:	Mon May 5 15:12:39 2008 -0400
 
     cleanly shutdown event logging thread
 
- src/ck-event-logger.c |   28 +++++++++++++++++++++++++---
- src/ck-log-event.h    |    8 +++++++-
+ src/ck-event-logger.c | 28 +++++++++++++++++++++++++---
+ src/ck-log-event.h    |  8 +++++++-
  2 files changed, 32 insertions(+), 4 deletions(-)
 
 commit 844de7d4b6d29d57a5425dcc7d0d3f6d4b005311
@@ -1564,13 +1739,13 @@ Date:	Mon May 5 14:20:25 2008 -0400
 
     export login session id to the bus
 
- data/ConsoleKit.conf	       |    2 ++
- src/ck-manager.c	       |    9 +++++++++
- src/ck-session.c	       |    2 +-
- src/ck-session.h	       |    6 +++---
- src/ck-session.xml	       |    3 +++
- src/test-method-access-policy |   13 +++++++++++++
- tools/list-sessions.c	       |    9 +++++++--
+ data/ConsoleKit.conf	       |  2 ++
+ src/ck-manager.c	       |  9 +++++++++
+ src/ck-session.c	       |  2 +-
+ src/ck-session.h	       |  6 +++---
+ src/ck-session.xml	       |  3 +++
+ src/test-method-access-policy | 13 +++++++++++++
+ tools/list-sessions.c	       |  9 +++++++--
  7 files changed, 38 insertions(+), 6 deletions(-)
 
 commit 8ec523138671a8fe93748a0b75adaaca96e2392e
@@ -1579,9 +1754,9 @@ Date:	Mon May 5 13:34:08 2008 -0400
 
     exit with the bus now that we're activated by the bus
 
- src/main.c |	65
- +++++++----------------------------------------------------
- 1 files changed, 8 insertions(+), 57 deletions(-)
+ src/main.c | 65
+ ++++++++------------------------------------------------------
+ 1 file changed, 8 insertions(+), 57 deletions(-)
 
 commit c7116a525f643dead46873a81cf7a03bf5c54d55
 Author: David Zeuthen <davidz@redhat.com>
@@ -1589,8 +1764,8 @@ Date:	Sun Apr 20 16:01:13 2008 -0400
 
     allow retaining authorizations for {stop,restart}-multiple-users
 
- data/org.freedesktop.consolekit.policy |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ data/org.freedesktop.consolekit.policy | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5d62baaba55a1777b60284802d83d3e9befe60c9
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1598,9 +1773,8 @@ Date:	Sat Apr 19 01:28:27 2008 -0400
 
     make sure to add all override parameters
 
- src/ck-session-leader.c	       |   30
- ++++++++++++++++++++++--------
- src/test-open-session-with-parameters |    2 +-
+ src/ck-session-leader.c	       | 30 ++++++++++++++++++++++--------
+ src/test-open-session-with-parameters |  2 +-
  2 files changed, 23 insertions(+), 9 deletions(-)
 
 commit 5dbbfa91469135f59351cf3bffcf2d51b40f912f
@@ -1609,8 +1783,8 @@ Date:	Sat Apr 19 01:05:42 2008 -0400
 
     fix the script to work with recent dbus-python api changes
 
- src/ck-job.c			       |    1 -
- src/test-open-session-with-parameters |   20 ++++++++++----------
+ src/ck-job.c			       |  1 -
+ src/test-open-session-with-parameters | 20 ++++++++++----------
  2 files changed, 10 insertions(+), 11 deletions(-)
 
 commit fbb42449670f21cdeb7f0106fc617e276d7e229c
@@ -1622,11 +1796,11 @@ Date:	Sat Apr 19 00:48:10 2008 -0400
     Treat the parameters passed in via OpenSessionWithParameters
     as overrides.
 
- src/ck-manager.c	 |   16 ++----
- src/ck-session-leader.c |  120
- +++++++++++++++++++++++++++++++++++++++++++++-
- src/ck-session-leader.h |   63 +++++++++++++------------
- src/ck-vt-monitor.c	 |    1 -
+ src/ck-manager.c	 |  16 ++-----
+ src/ck-session-leader.c | 120
+ ++++++++++++++++++++++++++++++++++++++++++++++--
+ src/ck-session-leader.h |  63 +++++++++++++------------
+ src/ck-vt-monitor.c	 |   1 -
  4 files changed, 155 insertions(+), 45 deletions(-)
 
 commit e30bc7486fe4e872a7b91f1566bc2c880deb63b7
@@ -1635,8 +1809,8 @@ Date:	Fri Apr 18 16:19:35 2008 -0400
 
     oops one more place
 
- tools/solaris/Makefile.am |	2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ tools/solaris/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3c8db75b2ffdba1627a7030a4b57ce7ee8e474f2
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1646,12 +1820,12 @@ Date:	Fri Apr 18 16:11:59 2008 -0400
 
     We don't want scripts going into lib64...
 
- src/Makefile.am	   |	2 +-
- src/ck-manager.c	   |	4 ++--
- src/ck-session.c	   |	2 +-
- tools/freebsd/Makefile.am |	2 +-
- tools/linux/Makefile.am   |	2 +-
- tools/solaris/Makefile.am |	2 +-
+ src/Makefile.am	   | 2 +-
+ src/ck-manager.c	   | 4 ++--
+ src/ck-session.c	   | 2 +-
+ tools/freebsd/Makefile.am | 2 +-
+ tools/linux/Makefile.am   | 2 +-
+ tools/solaris/Makefile.am | 2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 commit f2bcc2a62015f6762eb426c25b7350ddf828bb0c
@@ -1660,8 +1834,8 @@ Date:	Wed Apr 16 17:32:50 2008 -0400
 
     return PolicyKit results when not privileged for action
 
- src/ck-manager.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ src/ck-manager.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 933b89337028006b508e3ed964803753dea027c0
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1669,8 +1843,8 @@ Date:	Wed Apr 16 17:30:15 2008 -0400
 
     fix typo
 
- data/org.freedesktop.consolekit.policy |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ data/org.freedesktop.consolekit.policy | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e633be1b9a81cfb7993e469066e50af47f563575
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1684,16 +1858,16 @@ Date:	Thu Apr 3 22:09:26 2008 -0400
     * add to event log
     * figure out how to add it to non-generated sessions
 
- src/ck-session-leader.c	 |    1 +
- src/ck-session.c		 |   48 ++++++++++++++++++++++++++++
- src/ck-session.h		 |    6 +++
- src/ck-sysdeps-freebsd.c	 |    9 +++++
- src/ck-sysdeps-linux.c		 |   66
- +++++++++++++++++++++++++++++++++++++++
- src/ck-sysdeps-solaris.c	 |    9 +++++
- src/ck-sysdeps.h		 |    2 +
- tools/ck-collect-session-info.c |   10 ++++++
- 8 files changed, 151 insertions(+), 0 deletions(-)
+ src/ck-session-leader.c	 |  1 +
+ src/ck-session.c		 | 48 ++++++++++++++++++++++++++++++
+ src/ck-session.h		 |  6 ++++
+ src/ck-sysdeps-freebsd.c	 |  9 ++++++
+ src/ck-sysdeps-linux.c		 | 66
+ +++++++++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps-solaris.c	 |  9 ++++++
+ src/ck-sysdeps.h		 |  2 ++
+ tools/ck-collect-session-info.c | 10 +++++++
+ 8 files changed, 151 insertions(+)
 
 commit 4740245c6f6137175ef51be2207c35185f4d98f1
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1701,8 +1875,8 @@ Date:	Fri Feb 29 15:25:54 2008 -0500
 
     display uid as unix-user to match api
 
- tools/list-sessions.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ tools/list-sessions.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 970fbb66cb86c2a8b0ecbccbf8107c85b72343ae
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1710,8 +1884,8 @@ Date:	Fri Feb 29 15:25:43 2008 -0500
 
     fix packaging of policy file
 
- data/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 72a2abee7a963bef52561766131e1b52a85409a3
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1719,8 +1893,11 @@ Date:	Tue Feb 26 14:18:22 2008 -0500
 
     rename policy file
 
- ...it.policy => org.freedesktop.consolekit.policy} |	 0
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ data/ConsoleKit.policy			| 48
+ ----------------------------------
+ data/org.freedesktop.consolekit.policy | 48
+ ++++++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+), 48 deletions(-)
 
 commit 1d7b97d3a393996ffb95d9c23b081b4cf6c54ed0
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1728,17 +1905,17 @@ Date:	Mon Feb 25 19:43:04 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit c57bc09f5c1eaa216c8850ae64cc1735ce5c2bb1
+commit c57bc09f5c1eaa216c8850ae64cc1735ce5c2bb1 (tag: 0.2.10)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:	Mon Feb 25 19:41:56 2008 -0500
 
     update for release
 
- NEWS |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ NEWS | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
 
 commit 9e78825cef3db4e13cffbfd024bda365403aa6ba
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1746,10 +1923,10 @@ Date:	Mon Feb 25 19:19:31 2008 -0500
 
     always create the directories we need
 
- src/ck-event-logger.c |   22 ++++++++++++++--
- src/ck-manager.c      |   63
- ++++++++++++++++++++++++++++++------------------
- src/main.c	       |   50 ++++++++++++++++++++++++++++----------
+ src/ck-event-logger.c | 22 +++++++++++++++---
+ src/ck-manager.c      | 63
+ +++++++++++++++++++++++++++++++--------------------
+ src/main.c	       | 50 +++++++++++++++++++++++++++++-----------
  3 files changed, 95 insertions(+), 40 deletions(-)
 
 commit 414f7cc1e62474da69058884c5b683dc20e3a8f6
@@ -1770,8 +1947,8 @@ Date:	Mon Feb 25 17:14:11 2008 -0500
       /dev/vt/3 --- VT #3
       /dev/vt/N --- VT #4
 
- src/ck-sysdeps-solaris.c |   16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
+ src/ck-sysdeps-solaris.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit 5315cd9e36f86f9d1ea1419c6521524a68801d4a
 Author: Brian Cameron <brian.cameron@sun.com>
@@ -1783,8 +1960,8 @@ Date:	Mon Feb 25 16:37:03 2008 -0500
     so it sets x11-display-device to "/dev/console" when not using
     VT.
 
- src/ck-sysdeps-solaris.c |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
+ src/ck-sysdeps-solaris.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 commit fc9abc6db6616b6960db070c98bad21f990a040e
 Author: Brian Cameron <Brian.Cameron@sun.com>
@@ -1792,8 +1969,8 @@ Date:	Mon Feb 25 15:17:10 2008 -0500
 
     solaris doesn't like printing null
 
- src/ck-seat.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-seat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f993c1d8970e3aae7de7dea6e1ae5c6d325865b2
 Author: Brian Cameron <Brian.Cameron@sun.com>
@@ -1808,8 +1985,8 @@ Date:	Mon Feb 25 15:11:02 2008 -0500
 
     Which is obviously wrong if not using VT at all.
 
- src/ck-sysdeps-solaris.c |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ src/ck-sysdeps-solaris.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit f39d3756e1d9da62de923ba470d3312b89bea6be
 Author: Brian Cameron <Brian.Cameron@sun.com>
@@ -1821,8 +1998,8 @@ Date:	Mon Feb 25 15:05:44 2008 -0500
     Simon Zhang sent you earlier so that it builds on machines
     without VT.
 
- src/ck-vt-monitor.c |	  8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ src/ck-vt-monitor.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit f551717e1830e86a8ccf5312f79ce8882af9f352
 Author: Simon Zheng <Simon.Zheng@sun.com>
@@ -1844,10 +2021,10 @@ Date:	Tue Feb 19 11:34:15 2008 -0500
 
     - Change a little command line of getting maximum vt console numbers.
 
- src/ck-sysdeps-solaris.c |    2 +-
- src/ck-vt-monitor.c	  |   59
- ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 60 insertions(+), 1 deletions(-)
+ src/ck-sysdeps-solaris.c |  2 +-
+ src/ck-vt-monitor.c	  | 59
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 60 insertions(+), 1 deletion(-)
 
 commit 94d4dd225c6d161411f33396aec23a33a6661da6
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1855,9 +2032,9 @@ Date:	Tue Feb 19 11:04:51 2008 -0500
 
     don't include paths.h on systems that don't have it
 
- src/ck-event-logger.c	   |	1 -
- tools/ck-launch-session.c |	5 +++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ src/ck-event-logger.c	   | 1 -
+ tools/ck-launch-session.c | 5 +++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 190aed4effbfb9a982f46250c82994f58f4e5fb5
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1865,8 +2042,8 @@ Date:	Wed Feb 13 11:37:20 2008 -0500
 
     create the log file with S_IROTH and don't touch the log on build
 
- src/Makefile.am       |    2 --
- src/ck-event-logger.c |    3 ++-
+ src/Makefile.am       | 2 --
+ src/ck-event-logger.c | 3 ++-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 6dda865f8fbe87a10a6047eb2db2c4fd1c94af17
@@ -1875,18 +2052,18 @@ Date:	Tue Feb 12 22:55:58 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 72ce8d82848a6ee9634d9dd1610c5ba0074db4ae
+commit 72ce8d82848a6ee9634d9dd1610c5ba0074db4ae (tag: 0.2.9)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:	Tue Feb 12 22:54:24 2008 -0500
 
     update for release
 
- NEWS		   |	3 +++
- tools/Makefile.am |	2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
+ NEWS		   | 3 +++
+ tools/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 5ab3eee820e97d632aa9401cbd2d25dc828ee1f0
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1897,9 +2074,9 @@ Date:	Tue Feb 12 22:30:05 2008 -0500
     Da bus no likey nulls for object paths.  Return false and set
     error if there is no active session.
 
- src/ck-manager.c	       |   31 +++++++++++--------------------
- src/ck-seat.c		       |   26 +++++++++++++++++++++++---
- src/test-method-access-policy |    2 +-
+ src/ck-manager.c	       | 31 +++++++++++--------------------
+ src/ck-seat.c		       | 26 +++++++++++++++++++++++---
+ src/test-method-access-policy |  2 +-
  3 files changed, 35 insertions(+), 24 deletions(-)
 
 commit 885708f75f493b85fb67114d112e950b6bfac652
@@ -1910,9 +2087,9 @@ Date:	Tue Feb 12 15:32:15 2008 -0500
 
     Also make criticals fatal when starting with --debug.
 
- src/ck-seat.c	  |    6 +++++-
- src/ck-session.c |   47 ++++++++++++++++++++++++++++++++++++++---------
- src/main.c	  |    5 +++++
+ src/ck-seat.c	  |  6 +++++-
+ src/ck-session.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ src/main.c	  |  5 +++++
  3 files changed, 48 insertions(+), 10 deletions(-)
 
 commit 40dff5a03c7b085e34a7052efd23651d5be7674f
@@ -1924,10 +2101,10 @@ Date:	Tue Feb 12 15:00:46 2008 -0500
     Deny first and then allow.	Add a simple test
     script to check method access policy.
 
- NEWS			       |    7 +
- data/ConsoleKit.conf	       |   94 ++++++--
- src/test-method-access-policy |  517
- +++++++++++++++++++++++++++++++++++++++++
+ NEWS			       |   7 +
+ data/ConsoleKit.conf	       |  94 ++++++--
+ src/test-method-access-policy | 517
+ ++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 598 insertions(+), 20 deletions(-)
 
 commit 685f2cbf9d69da556907ba6c935fe6ab1d2eeda3
@@ -1938,12 +2115,12 @@ Date:	Mon Feb 11 15:31:42 2008 -0500
 
     This tool opens a session with ConsoleKit and runs a command in it.
 
- Makefile.am		   |	2 +-
- tools/.gitignore	   |	1 +
- tools/Makefile.am	   |   11 ++++++
- tools/ck-launch-session.c |   87
- +++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 100 insertions(+), 1 deletions(-)
+ Makefile.am		   |  2 +-
+ tools/.gitignore	   |  1 +
+ tools/Makefile.am	   | 11 ++++++
+ tools/ck-launch-session.c | 87
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 100 insertions(+), 1 deletion(-)
 
 commit e2fa0c66a6ef8dafa8b503d0b077deb17f3fc512
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1951,8 +2128,8 @@ Date:	Mon Feb 11 14:51:21 2008 -0500
 
     don't set the session-type to the command name
 
- tools/ck-collect-session-info.c |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
+ tools/ck-collect-session-info.c | 6 ------
+ 1 file changed, 6 deletions(-)
 
 commit e0f13df14e4f7289c35ebb376eaf7e1ffb2a2317
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1960,18 +2137,18 @@ Date:	Mon Feb 11 13:09:56 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit bceedd666cd25abf0aa09807bdb17ddf87f503f9
+commit bceedd666cd25abf0aa09807bdb17ddf87f503f9 (tag: 0.2.8)
 Author: William Jon McCann <jmccann@redhat.com>
 Date:	Mon Feb 11 13:08:13 2008 -0500
 
     update for release
 
- NEWS		  |   11 +++++++++++
- tools/.gitignore |    2 ++
- 2 files changed, 13 insertions(+), 0 deletions(-)
+ NEWS		  | 11 +++++++++++
+ tools/.gitignore |  2 ++
+ 2 files changed, 13 insertions(+)
 
 commit 3f178c6d15daed161fe3bd7f5d9019a592cc564a
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1982,12 +2159,12 @@ Date:	Mon Feb 11 12:33:16 2008 -0500
     This should probably be used by init instead of
     logging the event from CK.
 
- tools/Makefile.am	       |   20 +++++
- tools/ck-log-system-restart.c |  174
- +++++++++++++++++++++++++++++++++++++++++
- tools/ck-log-system-stop.c    |  174
- +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 368 insertions(+), 0 deletions(-)
+ tools/Makefile.am	       |  20 +++++
+ tools/ck-log-system-restart.c | 174
+ ++++++++++++++++++++++++++++++++++++++++++
+ tools/ck-log-system-stop.c    | 174
+ ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 368 insertions(+)
 
 commit 710a4f5404049762ea49644c74aadb59737be37d
 Author: William Jon McCann <jmccann@redhat.com>
@@ -1995,8 +2172,8 @@ Date:	Mon Feb 11 11:11:45 2008 -0500
 
     fix typo in dbus policy file
 
- data/ConsoleKit.conf		       |    2 +-
- src/test-open-session-with-parameters |    2 +-
+ data/ConsoleKit.conf		       | 2 +-
+ src/test-open-session-with-parameters | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit e59d5e9a9974a14043c98c292936584cefa930d3
@@ -2005,8 +2182,8 @@ Date:	Thu Feb 7 19:29:34 2008 -0500
 
     touch the history file to create it for people not using packages
 
- src/Makefile.am |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit a7a00ec7f7237bd0150ed98dba5e796236135e28
 Author: William Jon McCann <jmccann@redhat.com>
@@ -2014,8 +2191,8 @@ Date:	Wed Feb 6 17:04:14 2008 -0500
 
     mkdir /var/log/ConsoleKit at install time
 
- src/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit edd2422e91f80850c1adfcd3d6d6c723b7947ccf
 Author: William Jon McCann <jmccann@redhat.com>
@@ -2024,8 +2201,8 @@ Date:	Tue Feb 5 11:12:33 2008 -0500
     set a global flag so that D-Bus does not change the SIGPIPE handler
     in the PAM module
 
- pam-ck-connector/pam-ck-connector.c |	  9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 076d63698c204427b210a2da76dc1b7e6640bbb9
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2033,8 +2210,8 @@ Date:	Fri Feb 1 14:20:00 2008 -0500
 
     when a parsing error occurs don't return an empty event
 
- src/ck-log-event.c |	21 +++++++++++++--------
- tools/ck-history.c |	12 ++++++------
+ src/ck-log-event.c | 21 +++++++++++++--------
+ tools/ck-history.c | 12 ++++++------
  2 files changed, 19 insertions(+), 14 deletions(-)
 
 commit 185c0f5169dbcb55854491d9ab642c7b5c6418ca
@@ -2043,17 +2220,17 @@ Date:	Wed Jan 30 20:12:47 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 53e2ffa946b09dc29d40d822a290e30fbe169888
+commit 53e2ffa946b09dc29d40d822a290e30fbe169888 (tag: 0.2.7)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Wed Jan 30 20:11:47 2008 -0500
 
     update for 0.2.7 release
 
- NEWS |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ NEWS | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
 commit a034e3992b4c9c2d3723b14003483d4b39eab118
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2061,10 +2238,10 @@ Date:	Tue Jan 29 16:16:35 2008 -0500
 
     update gitignore files
 
- data/.gitignore  |    1 +
- src/.gitignore   |    1 +
- tools/.gitignore |    4 +++-
- 3 files changed, 5 insertions(+), 1 deletions(-)
+ data/.gitignore  | 1 +
+ src/.gitignore   | 1 +
+ tools/.gitignore | 4 +++-
+ 3 files changed, 5 insertions(+), 1 deletion(-)
 
 commit c08f52a53901cda1082a010cb2d6b013f3ae50a4
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2072,11 +2249,11 @@ Date:	Tue Jan 29 16:14:04 2008 -0500
 
     add a helper to write a system start record to the CK history
 
- src/ck-log-event.c	     |	  2 +-
- tools/Makefile.am	     |	 13 +++
- tools/ck-log-system-start.c |	174
- +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 188 insertions(+), 1 deletions(-)
+ src/ck-log-event.c	     |	 2 +-
+ tools/Makefile.am	     |	13 ++++
+ tools/ck-log-system-start.c | 174
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 188 insertions(+), 1 deletion(-)
 
 commit 1a545ba0744532f2936899806523214d3a067769
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2086,11 +2263,11 @@ Date:	Tue Jan 29 14:06:45 2008 -0500
 
     Also enable reporting this information with ck-history.
 
- src/ck-log-event.c |  211 ++++++++++++++++++++++++-
- src/ck-log-event.h |	19 ++-
- src/ck-manager.c   |	59 +++++++-
- tools/ck-history.c |  444
- ++++++++++++++++++++++++++++++++++------------------
+ src/ck-log-event.c | 211 ++++++++++++++++++++++++-
+ src/ck-log-event.h |  19 ++-
+ src/ck-manager.c   |  59 ++++++-
+ tools/ck-history.c | 444
+ ++++++++++++++++++++++++++++++++++-------------------
  4 files changed, 564 insertions(+), 169 deletions(-)
 
 commit d8dcc8755a87a238ba37bc5275f142c92535915e
@@ -2099,8 +2276,8 @@ Date:	Mon Jan 28 22:26:53 2008 -0500
 
     fix typo in man page
 
- pam-ck-connector/pam_ck_connector.8 |	  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ pam-ck-connector/pam_ck_connector.8 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f38aba5d2a26b7c9ea0b7a5631281ed7cf678de4
 Author: Marc-Andre Lureau <marcandre.lureau@gmail.com>
@@ -2110,9 +2287,9 @@ Date:	Mon Jan 28 22:23:35 2008 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=14175
 
- autogen.sh		     |	179
- +++++--------------------------------------
- libck-connector/Makefile.am |	  2 +-
+ autogen.sh		     | 179
+ +++++---------------------------------------
+ libck-connector/Makefile.am |	 2 +-
  2 files changed, 19 insertions(+), 162 deletions(-)
 
 commit 48519104df6037f8653ec62497796ba781dc0040
@@ -2121,8 +2298,8 @@ Date:	Mon Jan 28 19:56:19 2008 -0500
 
     allow session type filtering for all report formats
 
- tools/ck-history.c |	31 ++++++++++++++++++++++---------
- 1 files changed, 22 insertions(+), 9 deletions(-)
+ tools/ck-history.c | 31 ++++++++++++++++++++++---------
+ 1 file changed, 22 insertions(+), 9 deletions(-)
 
 commit 5895396bc583ae08c5041f5b81f5f9d0a2888e22
 Author: Brian Cameron <brian.cameron@sun.com>
@@ -2144,13 +2321,13 @@ Date:	Mon Jan 28 17:43:05 2008 -0500
     and tools/solaris/ck-system-stop scripts to call "/sbin/init 6"
     and "/sbin/init 5", which are the right commands for Solaris.
 
- configure.ac			 |   30 ++++++++++++++++-
- data/Makefile.am		 |    2 +
- src/Makefile.am		 |    7 ++++
- src/ck-manager.c		 |   71
- ++++++++++++++++++++++++++++++++++++++-
- tools/solaris/ck-system-restart |   11 +-----
- tools/solaris/ck-system-stop	 |   11 +-----
+ configure.ac			 | 30 ++++++++++++++++-
+ data/Makefile.am		 |  2 ++
+ src/Makefile.am		 |  7 ++++
+ src/ck-manager.c		 | 71
+ ++++++++++++++++++++++++++++++++++++++++-
+ tools/solaris/ck-system-restart | 11 +------
+ tools/solaris/ck-system-stop	 | 11 +------
  6 files changed, 110 insertions(+), 22 deletions(-)
 
 commit 96d613ee9a4850753e8f93113ab28ed3045f73f3
@@ -2167,8 +2344,8 @@ Date:	Mon Jan 28 17:30:47 2008 -0500
     function where we weren't parsing the data right and
     causing the hash to not get set properly.
 
- src/ck-session.c	  |    3 ++-
- src/ck-sysdeps-solaris.c |    2 +-
+ src/ck-session.c	  | 3 ++-
+ src/ck-sysdeps-solaris.c | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 9aca4062ec226c8099b5d46467ad72792e9977dc
@@ -2177,8 +2354,8 @@ Date:	Mon Jan 28 17:17:13 2008 -0500
 
     add session-type filtering to ck-history
 
- src/ck-seat.c	    |	 2 ++
- tools/ck-history.c |	22 ++++++++++++++--------
+ src/ck-seat.c	    |  2 ++
+ tools/ck-history.c | 22 ++++++++++++++--------
  2 files changed, 16 insertions(+), 8 deletions(-)
 
 commit 6fe785aaddda2537aa4335e88c0606eda36b75ee
@@ -2187,8 +2364,8 @@ Date:	Mon Jan 28 10:59:04 2008 -0500
 
     try to activate x11-display-device not only display-device
 
- src/ck-seat.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
+ src/ck-seat.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit af7dbbc29151ccfe063625159ea531fbbfc85a07
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2196,17 +2373,17 @@ Date:	Thu Jan 24 09:38:26 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 2064706053eb73d88655c0e1bc8dd7d1e144034e
+commit 2064706053eb73d88655c0e1bc8dd7d1e144034e (tag: 0.2.6)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Thu Jan 24 09:37:16 2008 -0500
 
     update for 0.2.6 release
 
- NEWS |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ NEWS | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
 commit d3e1069434bfff5e0c6236cbdec20db2a7d68d2c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2214,9 +2391,9 @@ Date:	Wed Jan 23 23:12:02 2008 -0500
 
     be a little smarter about how we compute the number of users
 
- src/ck-manager.c |   96
- ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 94 insertions(+), 2 deletions(-)
+ src/ck-manager.c | 96
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 94 insertions(+), 2 deletions(-)
 
 commit 8dd0bb52b3cabf8673ecd3ede820b48ab6f6436f
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2224,8 +2401,8 @@ Date:	Wed Jan 23 21:59:48 2008 -0500
 
     fix policy action name
 
- data/ConsoleKit.policy |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ data/ConsoleKit.policy | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4833651f336ee8f1cb266cf0c61fe527d3d5f713
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2233,17 +2410,17 @@ Date:	Wed Jan 23 16:26:22 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 40d21bbea73ae15afb4823d58cada8ab9399235f
+commit 40d21bbea73ae15afb4823d58cada8ab9399235f (tag: 0.2.5)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Wed Jan 23 16:25:23 2008 -0500
 
     release 0.2.5
 
- NEWS |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ NEWS | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 commit 3c618213b2ada61496b49c4d8c5612df4f082d14
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2251,9 +2428,9 @@ Date:	Wed Jan 23 16:07:15 2008 -0500
 
     history should log to /var/log not /var/run
 
- src/ck-event-logger.c |    2 +-
- src/ck-manager.c      |    2 +-
- tools/ck-history.c    |    2 +-
+ src/ck-event-logger.c | 2 +-
+ src/ck-manager.c      | 2 +-
+ tools/ck-history.c    | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit b1d56d43f357185594e5730d6bfb7e7db1f633c3
@@ -2262,18 +2439,18 @@ Date:	Wed Jan 23 15:06:02 2008 -0500
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 8ec349dc86f617c8055c091fd5a9be80889d96f1
+commit 8ec349dc86f617c8055c091fd5a9be80889d96f1 (tag: 0.2.4)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Wed Jan 23 14:30:48 2008 -0500
 
     release 0.2.4
 
- NEWS	      |   36 ++++++++++++++++++++++++++++++++++++
- configure.ac |    2 ++
- 2 files changed, 38 insertions(+), 0 deletions(-)
+ NEWS	      | 36 ++++++++++++++++++++++++++++++++++++
+ configure.ac |  2 ++
+ 2 files changed, 38 insertions(+)
 
 commit 8148ef7a28e3f52f7bd91a0f85fd47ce0cb1d11f
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2281,8 +2458,8 @@ Date:	Wed Jan 23 13:16:30 2008 -0500
 
     actually register the error type with dbus
 
- src/ck-manager.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/ck-manager.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 6ad7516f69f08c9c5e30332f95b50c0dd0cd1cb1
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2290,12 +2467,12 @@ Date:	Wed Jan 23 11:04:23 2008 -0500
 
     add GetSessions method to Manager interface
 
- doc/spec/ck-manager.xml    |	17 +++++++++++++++++
- doc/xml/ref-ck-manager.xml |	10 +++++++++-
- src/ck-manager.c	    |	25 +++++++++++++++++++++++++
- src/ck-manager.h	    |	 3 +++
- src/ck-manager.xml	    |	 3 +++
- 5 files changed, 57 insertions(+), 1 deletions(-)
+ doc/spec/ck-manager.xml    | 17 +++++++++++++++++
+ doc/xml/ref-ck-manager.xml | 10 +++++++++-
+ src/ck-manager.c	    | 25 +++++++++++++++++++++++++
+ src/ck-manager.h	    |  3 +++
+ src/ck-manager.xml	    |  3 +++
+ 5 files changed, 57 insertions(+), 1 deletion(-)
 
 commit 4b866a4af70fb19e8b0652637815ab24ad630065
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2303,9 +2480,9 @@ Date:	Wed Jan 23 09:37:55 2008 -0500
 
     add error type to manager
 
- src/ck-manager.c |   22 ++++++++++++++++++++++
- src/ck-manager.h |    6 +++++-
- 2 files changed, 27 insertions(+), 1 deletions(-)
+ src/ck-manager.c | 22 ++++++++++++++++++++++
+ src/ck-manager.h |  6 +++++-
+ 2 files changed, 27 insertions(+), 1 deletion(-)
 
 commit 5ce97e6f22fd25279793fbc75211d2e86413ae73
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2317,25 +2494,25 @@ Date:	Tue Jan 22 17:03:46 2008 -0500
     Manager object to System in the near future.  Use libpolkit to
     determine authorization.
 
- configure.ac			 |    2 +
- data/ConsoleKit.policy		 |   48 +++
- data/Makefile.am		 |    4 +
- doc/spec/ck-manager.xml	 |   18 +
- doc/xml/ref-ck-manager.xml	 |   10 +-
- src/ck-manager.c		 |  667
- +++++++++++++++++++++++++++++++++++----
- src/ck-manager.h		 |   10 +-
- src/ck-manager.xml		 |    6 +
- tools/Makefile.am		 |   10 +
- tools/freebsd/Makefile.am	 |   38 +++
- tools/freebsd/ck-system-restart |   12 +
- tools/freebsd/ck-system-stop	 |   18 +
- tools/linux/Makefile.am	 |   38 ++-
- tools/linux/ck-system-restart	 |   12 +
- tools/linux/ck-system-stop	 |   12 +
- tools/solaris/Makefile.am	 |   38 +++
- tools/solaris/ck-system-restart |   12 +
- tools/solaris/ck-system-stop	 |   12 +
+ configure.ac			 |   2 +
+ data/ConsoleKit.policy		 |  48 +++
+ data/Makefile.am		 |   4 +
+ doc/spec/ck-manager.xml	 |  18 ++
+ doc/xml/ref-ck-manager.xml	 |  10 +-
+ src/ck-manager.c		 | 667
+ ++++++++++++++++++++++++++++++++++++----
+ src/ck-manager.h		 |  10 +-
+ src/ck-manager.xml		 |   6 +
+ tools/Makefile.am		 |  10 +
+ tools/freebsd/Makefile.am	 |  38 +++
+ tools/freebsd/ck-system-restart |  12 +
+ tools/freebsd/ck-system-stop	 |  18 ++
+ tools/linux/Makefile.am	 |  38 ++-
+ tools/linux/ck-system-restart	 |  12 +
+ tools/linux/ck-system-stop	 |  12 +
+ tools/solaris/Makefile.am	 |  38 +++
+ tools/solaris/ck-system-restart |  12 +
+ tools/solaris/ck-system-stop	 |  12 +
  18 files changed, 890 insertions(+), 77 deletions(-)
 
 commit 2fba24e67597bf59ae00db2867df7a348c81b094
@@ -2360,8 +2537,8 @@ Date:	Sat Dec 8 23:04:03 2007 -0500
     to the list
     of files to try before /dev/console.
 
- src/ck-sysdeps-unix.c |   13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
+ src/ck-sysdeps-unix.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit 751b95f2aa2eb2cea7fe9e0dec0848865d118ad0
 Author: Michael Biebl <mbiebl@gmail.com>
@@ -2374,10 +2551,10 @@ Date:	Sat Dec 8 22:50:17 2007 -0500
     distros will not use this init script anyways as they have special
     policies for their init script and provide their own.
 
- data/ConsoleKit.in |	70
- ----------------------------------------------------
- data/Makefile.am   |	15 +----------
- 2 files changed, 1 insertions(+), 84 deletions(-)
+ data/ConsoleKit.in | 70
+ ------------------------------------------------------
+ data/Makefile.am   | 15 +-----------
+ 2 files changed, 1 insertion(+), 84 deletions(-)
 
 commit eb610a07a17db29138df50cafa4cf131a645332e
 Author: Michael Biebl <mbiebl@gmail.com>
@@ -2390,9 +2567,9 @@ Date:	Sat Dec 8 22:45:42 2007 -0500
     init script obsolete.
     Requirements are dbus >= 1.1.2
 
- data/Makefile.am			    |	 9 ++++++++-
- data/org.freedesktop.ConsoleKit.service.in |	 4 ++++
- 2 files changed, 12 insertions(+), 1 deletions(-)
+ data/Makefile.am			    | 9 ++++++++-
+ data/org.freedesktop.ConsoleKit.service.in | 4 ++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 7d167e65868cb2aa40273ee8ccd33cca5968438b
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2400,8 +2577,8 @@ Date:	Mon Oct 22 21:23:08 2007 -0400
 
     dump session leader info
 
- src/ck-manager.c	 |    9 +++++++++
- src/ck-session-leader.c |   15 ++++++++++++---
+ src/ck-manager.c	 |  9 +++++++++
+ src/ck-session-leader.c | 15 ++++++++++++---
  2 files changed, 21 insertions(+), 3 deletions(-)
 
 commit 7b65ac249a1e28c9af25eb91919d898c3e0f8162
@@ -2410,8 +2587,8 @@ Date:	Mon Oct 22 21:00:16 2007 -0400
 
     error out if unknown options are passed on command line
 
- src/main.c |	11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
+ src/main.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit 5db2f7fdc2d1c5a45bc33d916d82c23178568923
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2421,11 +2598,11 @@ Date:	Mon Oct 22 20:54:10 2007 -0400
 
     This will make it easier to dump/restore.
 
- src/Makefile.am	 |    2 +
- src/ck-manager.c	 |  482 +++++++++--------------------------------
- src/ck-session-leader.c |  558
- +++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-session-leader.h |   97 ++++++++
+ src/Makefile.am	 |   2 +
+ src/ck-manager.c	 | 482 +++++++++--------------------------------
+ src/ck-session-leader.c | 558
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-session-leader.h |  97 +++++++++
  4 files changed, 762 insertions(+), 377 deletions(-)
 
 commit 252f542201036d36aa01ade9bd381624391cfb34
@@ -2434,9 +2611,9 @@ Date:	Mon Oct 22 16:57:47 2007 -0400
 
     try to handle log rotation
 
- src/ck-event-logger.c |   53
- +++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 45 insertions(+), 8 deletions(-)
+ src/ck-event-logger.c | 53
+ +++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 45 insertions(+), 8 deletions(-)
 
 commit 4c842f1e108a0e9a412ac599cc4cfc954d801e62
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2444,11 +2621,11 @@ Date:	Mon Oct 22 16:14:07 2007 -0400
 
     add support for reporting from logrotated files
 
- configure.ac	       |   30 +++++++++--
- src/ck-event-logger.c |    9 +++-
- tools/Makefile.am     |    6 ++-
- tools/ck-history.c    |  128
- +++++++++++++++++++++++++++++++++++++++++++++----
+ configure.ac	       |  30 +++++++++---
+ src/ck-event-logger.c |   9 +++-
+ tools/Makefile.am     |   6 ++-
+ tools/ck-history.c    | 128
+ ++++++++++++++++++++++++++++++++++++++++++++++----
  4 files changed, 154 insertions(+), 19 deletions(-)
 
 commit 7e30b7d07d2f6216b6a8d2f75f3494d3947f0584
@@ -2457,9 +2634,9 @@ Date:	Mon Oct 22 11:34:02 2007 -0400
 
     add a basic --frequent report
 
- tools/ck-history.c |  109
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 109 insertions(+), 0 deletions(-)
+ tools/ck-history.c | 109
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 109 insertions(+)
 
 commit 73f5875de6c8d2e3f79fcb2c5d570836f6df74d5
 Merge: e419ced 7b834cb
@@ -2474,9 +2651,9 @@ Date:	Sun Oct 21 23:59:32 2007 -0400
 
     add last mode, filtering by user/seat; shorten logged ids
 
- src/ck-manager.c   |	34 +++++++---
- tools/ck-history.c |  177
- ++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/ck-manager.c   |  34 +++++++---
+ tools/ck-history.c | 177
+ +++++++++++++++++++++++++++++++++++++++++++++++++----
  2 files changed, 190 insertions(+), 21 deletions(-)
 
 commit 7b834cbcc29a2a8423569a738cef3bce3c9f10bd
@@ -2485,8 +2662,8 @@ Date:	Sat Oct 20 19:17:52 2007 -0400
 
     add bugzilla url
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7880c2eacaa45196b83a9032371f487f6fe312e4
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2494,8 +2671,8 @@ Date:	Fri Oct 19 16:46:43 2007 -0400
 
     check for oldest being null
 
- tools/ck-history.c |	 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ tools/ck-history.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 2ef61beadf1b4c938bb13bb3b460f69bcc720193
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2503,8 +2680,8 @@ Date:	Fri Oct 19 16:30:52 2007 -0400
 
     rename --last to --last-compat
 
- tools/ck-history.c |	 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ tools/ck-history.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 92c036e50f2d0989651c43e2db78110a2a2fd5b0
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2512,8 +2689,8 @@ Date:	Fri Oct 19 16:28:24 2007 -0400
 
     a few fixes for last patch
 
- tools/ck-history.c |	29 +++++++++++++++++++++++++----
- 1 files changed, 25 insertions(+), 4 deletions(-)
+ tools/ck-history.c | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
 
 commit 489396ba206bb1e3b82bb504151b0a83d405b33d
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2521,9 +2698,9 @@ Date:	Fri Oct 19 16:16:18 2007 -0400
 
     add a last compatible outout format to ck-history
 
- tools/ck-history.c |  175
- ++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 169 insertions(+), 6 deletions(-)
+ tools/ck-history.c | 175
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 169 insertions(+), 6 deletions(-)
 
 commit 36419b9ca34a89721746950eb78bb78c4bfb6206
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2531,8 +2708,8 @@ Date:	Thu Oct 18 16:43:00 2007 -0400
 
     use AC_GNU_SOURCE instead of #define
 
- configure.ac	       |    3 +++
- src/ck-event-logger.c |    2 --
+ configure.ac	       | 3 +++
+ src/ck-event-logger.c | 2 --
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 1773b5f77b9c575ab8fc3e3d692e8a7056fe2959
@@ -2545,8 +2722,8 @@ Date:	Wed Oct 17 17:09:03 2007 -0400
     moment the command only prints the events.
 
  src/Makefile.am	 |   10 +-
- src/ck-event-logger.c	 |  486 +---------------------
- src/ck-event-logger.h	 |   99 +-----
+ src/ck-event-logger.c	 |  486 +--------------------
+ src/ck-event-logger.h	 |   99 +----
  src/ck-log-event.c	 | 1084
  +++++++++++++++++++++++++++++++++++++++++++++++
  src/ck-log-event.h	 |  131 ++++++
@@ -2554,7 +2731,7 @@ Date:	Wed Oct 17 17:09:03 2007 -0400
  src/test-event-logger.c |   10 +-
  tools/Makefile.am	 |   10 +
  tools/ck-history.c	 |  157 +++++++
- tools/list-sessions.c	 |   58 ++--
+ tools/list-sessions.c	 |   58 +--
  10 files changed, 1458 insertions(+), 629 deletions(-)
 
 commit 0011a7aa94a9dbb00a322a1c08d5ac6a6dfdc21c
@@ -2569,12 +2746,12 @@ Date:	Tue Oct 16 16:40:44 2007 -0400
     for creating graphical logins that remember the most recent/frequent
     logins.
 
- src/Makefile.am	 |   13 +
- src/ck-event-logger.c	 |  828
- +++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-event-logger.h	 |  161 +++++++++
- src/ck-manager.c	 |  340 +++++++++++++++++++-
- src/test-event-logger.c |   94 ++++++
+ src/Makefile.am	 |  13 +
+ src/ck-event-logger.c	 | 828
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-event-logger.h	 | 161 ++++++++++
+ src/ck-manager.c	 | 340 +++++++++++++++++++-
+ src/test-event-logger.c |  94 ++++++
  5 files changed, 1430 insertions(+), 6 deletions(-)
 
 commit a0a1ff87b1f4c93c147d5222a164138cb83ba149
@@ -2583,8 +2760,8 @@ Date:	Thu Oct 11 15:06:14 2007 -0400
 
     remove emacs modeline
 
- configure.ac |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
 
 commit b2be103bd606291319dc312f07d1f3fcbfdf634c
 Author: David Zeuthen <davidz@redhat.com>
@@ -2598,13 +2775,13 @@ Date:	Wed Oct 10 13:39:15 2007 -0400
 
     For security reasons the file is only readable for the super user.
 
- src/Makefile.am  |    2 +
- src/ck-manager.c |  204
- ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- src/ck-seat.c	  |   86 ++++++++++++++++++++++-
- src/ck-seat.h	  |    4 +
- src/ck-session.c |   38 ++++++++++
- src/ck-session.h |    3 +
+ src/Makefile.am  |   2 +
+ src/ck-manager.c | 204
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ src/ck-seat.c	  |  86 ++++++++++++++++++++++-
+ src/ck-seat.h	  |   4 ++
+ src/ck-session.c |  38 +++++++++++
+ src/ck-session.h |   3 +
  6 files changed, 330 insertions(+), 7 deletions(-)
 
 commit bd43c78b3ab2ec7f85b17cca46d4b46f8671cd29
@@ -2617,9 +2794,9 @@ Date:	Wed Oct 10 12:53:45 2007 -0400
     calling out or emitting a signal.  We steal from the lists
     and then unref the objects when the signal is complete.
 
- src/ck-manager.c |   57
- ++++++++++++++++++++++++++++++++++++++++++-----------
- src/ck-seat.c	  |   28 +++++++++++++++++++------
+ src/ck-manager.c | 57
+ ++++++++++++++++++++++++++++++++++++++++++++------------
+ src/ck-seat.c	  | 28 +++++++++++++++++++++-------
  2 files changed, 66 insertions(+), 19 deletions(-)
 
 commit a90ecd3544f03c16f6c5a97aafb1c0b33b58101c
@@ -2686,13 +2863,13 @@ Date:	Thu Oct 4 20:39:09 2007 -0400
     responsive when the program is running - this is to ensure that the
     program itself can call into the org.freedesktop.ConsoleKit service.
 
- src/Makefile.am       |    6 ++
- src/ck-run-programs.c |  230
- +++++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-run-programs.h |   38 ++++++++
- src/ck-seat.c	       |    5 +
- src/ck-session.c      |   39 ++++++++
- 5 files changed, 318 insertions(+), 0 deletions(-)
+ src/Makefile.am       |   6 ++
+ src/ck-run-programs.c | 230
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-run-programs.h |  38 +++++++++
+ src/ck-seat.c	       |   5 ++
+ src/ck-session.c      |  39 +++++++++
+ 5 files changed, 318 insertions(+)
 
 commit ad9dbd345dbec43ffc24481a0d21c261e49347fb
 Author: Brian Cameron <brian.camerson@sun.com>
@@ -2700,8 +2877,8 @@ Date:	Wed Sep 19 21:19:31 2007 -0400
 
     don't use VT_GETSTATE when VT is unavailable
 
- src/ck-sysdeps-solaris.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ src/ck-sysdeps-solaris.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 commit 03c9196f59c849515f650e2eb1a190a10908a8ee
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2709,8 +2886,8 @@ Date:	Wed Sep 19 11:13:31 2007 -0400
 
     try to make things work for systems that don't support VT_ACTIVATE etc
 
- configure.ac	       |    2 ++
- src/ck-sysdeps-unix.c |   27 +++++++++++++++++++++++----
+ configure.ac	       |  2 ++
+ src/ck-sysdeps-unix.c | 27 +++++++++++++++++++++++----
  2 files changed, 25 insertions(+), 4 deletions(-)
 
 commit 54582a7287f036bd6b65434e4b4888405972130d
@@ -2719,8 +2896,8 @@ Date:	Wed Sep 19 10:03:22 2007 -0400
 
     add wiki to readme
 
- README |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ README | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 024fe2c942e1b3e5ddec8e829242017c9842393e
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2728,17 +2905,17 @@ Date:	Tue Sep 18 11:12:54 2007 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit eacf90d95c91db99c5946f00c95484fb66ec1b2a
+commit eacf90d95c91db99c5946f00c95484fb66ec1b2a (tag: 0.2.3)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Tue Sep 18 11:11:38 2007 -0400
 
     update for brown bag release
 
- NEWS |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ NEWS | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 commit f35dee9696d81630216e283bcd91ca491febe153
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2746,8 +2923,8 @@ Date:	Tue Sep 18 01:09:04 2007 -0400
 
     use unix-user instead of user
 
- pam-ck-connector/pam-ck-connector.c |	  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6b8dc7403c105dc12dbe93616321850b8f160a8e
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2755,17 +2932,17 @@ Date:	Mon Sep 17 18:27:54 2007 -0400
 
     post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit e9c5548af759cb9968acb11e1b09dfc34fe13781
+commit e9c5548af759cb9968acb11e1b09dfc34fe13781 (tag: 0.2.2)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Mon Sep 17 18:24:11 2007 -0400
 
     update NEWS for release
 
- NEWS |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
+ NEWS | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
 
 commit 3708b8b25a8e48b627920eb0876203cac81eb36e
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2773,8 +2950,8 @@ Date:	Wed Aug 29 15:56:06 2007 -0400
 
     remove policy for gdm user
 
- data/ConsoleKit.conf |   15 ---------------
- 1 files changed, 0 insertions(+), 15 deletions(-)
+ data/ConsoleKit.conf | 15 ---------------
+ 1 file changed, 15 deletions(-)
 
 commit 1c9456a82126f56f4bebca0e7b6671ca844db322
 Author: Joe Marcus Clarke <marcus@FreeBSD.org>
@@ -2789,8 +2966,8 @@ Date:	Wed Aug 29 10:10:17 2007 -0400
     is returned
     for a given process stat.
 
- src/ck-sysdeps-freebsd.c |   22 ++++++++++++++--------
- 1 files changed, 14 insertions(+), 8 deletions(-)
+ src/ck-sysdeps-freebsd.c | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
 
 commit b508cf9b49ecd1f4810f69e785ebf40a2e5d5677
 Author: William Jon McCann <mccann@jhu.edu>
@@ -2798,11 +2975,11 @@ Date:	Tue Aug 28 13:20:35 2007 -0400
 
     untabify
 
- src/ck-file-monitor-inotify.c |    2 +-
- src/ck-manager.c	       |   16 ++++++++--------
- src/ck-session.c	       |    8 ++++----
- src/ck-sysdeps-unix.c	       |    6 +++---
- src/main.c		       |   12 ++++++------
+ src/ck-file-monitor-inotify.c |  2 +-
+ src/ck-manager.c	       | 16 ++++++++--------
+ src/ck-session.c	       |  8 ++++----
+ src/ck-sysdeps-unix.c	       |  6 +++---
+ src/main.c		       | 12 ++++++------
  5 files changed, 22 insertions(+), 22 deletions(-)
 
 commit 1523b599eeba119c1258e887b7df9b018ce10351
@@ -2813,9 +2990,9 @@ Date:	Tue Aug 28 11:48:11 2007 -0400
 
     Based on patch from Joe Marcus Clarke
 
- src/ck-sysdeps-freebsd.c |  188
- +++++++++++++++++++---------------------------
- src/ck-sysdeps-solaris.c |    8 +-
+ src/ck-sysdeps-freebsd.c | 188
+ +++++++++++++++++++----------------------------
+ src/ck-sysdeps-solaris.c |   8 +-
  2 files changed, 81 insertions(+), 115 deletions(-)
 
 commit 5e0f4848e5bfd325840d405582bdedf3a27b98f8
@@ -2824,14 +3001,14 @@ Date:	Mon Aug 27 16:34:45 2007 -0400
 
     move some of the freebsd specific stuff into sysdeps
 
- src/ck-sysdeps-freebsd.c    |	 37 ++++++++++++++++
- src/ck-sysdeps-linux.c      |	 49 ++++++++++++++++++++++
- src/ck-sysdeps-solaris.c    |	 48 +++++++++++++++++++++
- src/ck-sysdeps-unix.c	     |	 69 +++++++++++++++++++++++++++++++
- src/ck-sysdeps.h	     |	  6 +++
- src/ck-vt-monitor.c	     |	 96
- ++++++++----------------------------------
- src/test-tty-idle-monitor.c |	 14 +------
+ src/ck-sysdeps-freebsd.c    | 37 +++++++++++++++++
+ src/ck-sysdeps-linux.c      | 49 +++++++++++++++++++++++
+ src/ck-sysdeps-solaris.c    | 48 +++++++++++++++++++++++
+ src/ck-sysdeps-unix.c	     | 69 ++++++++++++++++++++++++++++++++
+ src/ck-sysdeps.h	     |	6 +++
+ src/ck-vt-monitor.c	     | 96
+ +++++++++------------------------------------
+ src/test-tty-idle-monitor.c | 14 +------
  7 files changed, 229 insertions(+), 90 deletions(-)
 
 commit 54b545beb4b7e65f852f03dd5da025d5eae7ef8f
@@ -2845,8 +3022,8 @@ Date:	Mon Aug 27 14:31:53 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- data/Makefile.am |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ data/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit d6fa350994ac2c56644332fd5931a4a56d2f32d9
 Author: Florent Thoumie <flz@FreeBSD.org>
@@ -2859,8 +3036,8 @@ Date:	Sun Aug 26 13:25:23 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- data/Makefile.am |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ data/Makefile.am | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 commit a0a4451df57693a7cd4f69befd4cf17239013161
 Author: Joe Marcus Clarke <marcus@shumai.marcuscom.com>
@@ -2872,8 +3049,8 @@ Date:	Sat Aug 25 20:23:36 2007 -0400
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- src/test-tty-idle-monitor.c |	  4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ src/test-tty-idle-monitor.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit d643acbb50eb2cccc50df8b27bd2c08bdc405622
 Author: Joe Marcus Clarke <marcus@shumai.marcuscom.com>
@@ -2886,8 +3063,8 @@ Date:	Sat Aug 25 20:10:37 2007 -0400
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- src/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit a2426fc2791a896c79d5eb14c2b518df7aca3dcf
 Author: Florent Thoumie <flz@FreeBSD.org>
@@ -2902,8 +3079,8 @@ Date:	Sat Aug 25 21:05:32 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- src/ck-sysdeps-freebsd.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/ck-sysdeps-freebsd.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 59d8b48dc3358057859c22588580e926aa68a3ee
 Author: Florent Thoumie <flz@FreeBSD.org>
@@ -2915,8 +3092,8 @@ Date:	Sat Aug 25 19:50:54 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- src/ck-sysdeps-unix.c |   14 +++++++++++---
- src/ck-vt-monitor.c   |   35 ++++++++++++++++++++++-------------
+ src/ck-sysdeps-unix.c | 14 +++++++++++---
+ src/ck-vt-monitor.c   | 35 ++++++++++++++++++++++-------------
  2 files changed, 33 insertions(+), 16 deletions(-)
 
 commit 1a16c740e0eab279eeca443c1a1c276e5e125852
@@ -2933,11 +3110,11 @@ Date:	Sat Aug 25 18:22:02 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- TODO			  |    2 -
- configure.ac		  |    8 +
- src/Makefile.am	  |    1 +
- src/ck-sysdeps-freebsd.c |  592
- ++++++++++++++--------------------------------
+ TODO			  |   2 -
+ configure.ac		  |   8 +
+ src/Makefile.am	  |   1 +
+ src/ck-sysdeps-freebsd.c | 592
+ ++++++++++++++---------------------------------
  4 files changed, 182 insertions(+), 421 deletions(-)
 
 commit a910e8cc1ad8df738a8160c4f710b04810dfe99d
@@ -2951,8 +3128,8 @@ Date:	Sat Aug 25 17:19:09 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- TODO |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ TODO | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit 342f4d1b60850daad422bd683978a88cb6a7eed7
 Author: Florent Thoumie <flz@FreeBSD.org>
@@ -2966,11 +3143,11 @@ Date:	Sat Aug 25 17:08:20 2007 +0100
 
     Signed-off-by: Florent Thoumie <flz@FreeBSD.org>
 
- src/Makefile.am	  |    5 +
- src/ck-job.c		  |    1 +
- src/ck-sysdeps-freebsd.c |  659
- ++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-vt-monitor.c	  |   16 +-
+ src/Makefile.am	  |   5 +
+ src/ck-job.c		  |   1 +
+ src/ck-sysdeps-freebsd.c | 659
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-vt-monitor.c	  |  16 +-
  4 files changed, 679 insertions(+), 2 deletions(-)
 
 commit f19761b0e2e6649836d3514fbd007b9365756f32
@@ -2979,8 +3156,8 @@ Date:	Wed Aug 22 09:48:30 2007 -0400
 
     more build fixes for solaris
 
- src/ck-sysdeps-linux.c   |    5 ++++-
- src/ck-sysdeps-solaris.c |    9 +++++++--
+ src/ck-sysdeps-linux.c   | 5 ++++-
+ src/ck-sysdeps-solaris.c | 9 +++++++--
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 commit de3718f03a6e1a83c1024dad0dea5b070b1b27b4
@@ -2989,10 +3166,10 @@ Date:	Tue Aug 21 11:50:08 2007 -0400
 
     abstract out the tty device basename stuff
 
- src/ck-seat.c		  |   15 ++++++---------
- src/ck-sysdeps-linux.c   |   35 +++++++++++++++++++++++++++++++++++
- src/ck-sysdeps-solaris.c |   35 +++++++++++++++++++++++++++++++++++
- src/ck-sysdeps.h	  |    8 ++++----
+ src/ck-seat.c		  | 15 ++++++---------
+ src/ck-sysdeps-linux.c   | 35 +++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps-solaris.c | 35 +++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps.h	  |  8 ++++----
  4 files changed, 80 insertions(+), 13 deletions(-)
 
 commit 0145691112f14352ef15b49c1ea3079a8e80f6e8
@@ -3003,12 +3180,12 @@ Date:	Tue Aug 21 11:27:04 2007 -0400
 
     based on patch from Brian Cameron.
 
- src/ck-sysdeps-linux.c   |   14 ++++++
- src/ck-sysdeps-solaris.c |  109
- +++++++++++++++++++++++++++++++++++-----------
- src/ck-sysdeps-unix.c	  |   40 ++++++++++++-----
- src/ck-sysdeps.h	  |    2 +
- src/ck-vt-monitor.c	  |   14 +++---
+ src/ck-sysdeps-linux.c   |  14 ++++++
+ src/ck-sysdeps-solaris.c | 109
+ ++++++++++++++++++++++++++++++++++++-----------
+ src/ck-sysdeps-unix.c	  |  40 ++++++++++++-----
+ src/ck-sysdeps.h	  |   2 +
+ src/ck-vt-monitor.c	  |  14 +++---
  5 files changed, 136 insertions(+), 43 deletions(-)
 
 commit 3e6bbcaea6d441956c9c1173d7586bd346a8c77b
@@ -3017,8 +3194,8 @@ Date:	Fri Aug 17 13:09:34 2007 -0400
 
     display the current vt
 
- src/test-vt-monitor.c |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
+ src/test-vt-monitor.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 commit 3d907714c526c4c685bb8c5dc13f91df22331cdb
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3026,8 +3203,8 @@ Date:	Fri Aug 17 13:00:16 2007 -0400
 
     add test-vt-monitor
 
- src/.gitignore |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ src/.gitignore | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 3423ce3039033e8bf54860a2b955fdf8c1f21be7
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3036,15 +3213,15 @@ Date:	Fri Aug 17 12:59:41 2007 -0400
     add a vt monitor test, move getfd to sysdeps, add a check for the
     root user
 
- src/Makefile.am	     |	 14 +++++-
- src/ck-sysdeps-unix.c	     |	114
- ++++++++++++++++++++++++++++++++++++++++++-
- src/ck-sysdeps.h	     |	 11 ++++
- src/ck-vt-monitor.c	     |	  5 +-
- src/getfd.c		     |	 97 ------------------------------------
- src/main.c		     |	  6 ++
- src/test-tty-idle-monitor.c |	 12 +----
- src/test-vt-monitor.c	     |	 83 +++++++++++++++++++++++++++++++
+ src/Makefile.am	     |	14 +++++-
+ src/ck-sysdeps-unix.c	     | 114
+ +++++++++++++++++++++++++++++++++++++++++++-
+ src/ck-sysdeps.h	     |	11 +++++
+ src/ck-vt-monitor.c	     |	 5 +-
+ src/getfd.c		     |	97 -------------------------------------
+ src/main.c		     |	 6 +++
+ src/test-tty-idle-monitor.c |	12 +----
+ src/test-vt-monitor.c	     |	83 ++++++++++++++++++++++++++++++++
  8 files changed, 230 insertions(+), 112 deletions(-)
 
 commit bec4b4163ae65fa271845da6b748456346987c26
@@ -3053,8 +3230,8 @@ Date:	Fri Aug 17 11:54:21 2007 -0400
 
     oops add docs for new seat interfaces
 
- doc/spec/ck-seat.xml	 |   41 +++++++++++++++++++++++++++++++++++++++++
- doc/xml/ref-ck-seat.xml |   33 +++++++++++++++++++++++----------
+ doc/spec/ck-seat.xml	 | 41 +++++++++++++++++++++++++++++++++++++++++
+ doc/xml/ref-ck-seat.xml | 33 +++++++++++++++++++++++----------
  2 files changed, 64 insertions(+), 10 deletions(-)
 
 commit c0c74f8064392598cd29401142804fcc241841ed
@@ -3063,9 +3240,9 @@ Date:	Fri Aug 17 10:52:19 2007 -0400
 
     a few fixes for peer cred stuff
 
- src/ck-sysdeps-unix.c		   |   26 ++++++++++++++++++++------
- tools/ck-get-x11-display-device.c |   13 ++++++-------
- tools/ck-get-x11-server-pid.c	   |	4 +++-
+ src/ck-sysdeps-unix.c		   | 26 ++++++++++++++++++++------
+ tools/ck-get-x11-display-device.c | 13 ++++++-------
+ tools/ck-get-x11-server-pid.c	   |  4 +++-
  3 files changed, 29 insertions(+), 14 deletions(-)
 
 commit 577099aea3ed75c1298d7a4cfa32784a1800bb09
@@ -3074,13 +3251,13 @@ Date:	Thu Aug 16 23:09:44 2007 -0400
 
     move peercred stuff into sysdeps.  add solaris support.
 
- configure.ac			   |	2 +
- src/Makefile.am		   |	1 +
- src/ck-sysdeps-unix.c		   |   84
- +++++++++++++++++++++++++++++++++++++
- src/ck-sysdeps.h		   |	7 +++
- tools/ck-get-x11-display-device.c |   34 ++-------------
- tools/ck-get-x11-server-pid.c	   |   31 ++++----------
+ configure.ac			   |  2 +
+ src/Makefile.am		   |  1 +
+ src/ck-sysdeps-unix.c		   | 84
+ +++++++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps.h		   |  7 ++++
+ tools/ck-get-x11-display-device.c | 34 +++-------------
+ tools/ck-get-x11-server-pid.c	   | 31 ++++-----------
  6 files changed, 107 insertions(+), 52 deletions(-)
 
 commit fcb0f32632f74950c361a0a23128ebca05efdca0
@@ -3089,18 +3266,20 @@ Date:	Thu Aug 16 22:29:18 2007 -0400
 
     move all proc stuff into ck-sysdeps
 
- src/Makefile.am			      |   23 +++++-----
- src/ck-manager.c			      |   52
- ++++++++++++-----------
- src/{proc-linux.c => ck-sysdeps-linux.c}     |   60
- +++++++++++++-------------
- src/{proc-solaris.c => ck-sysdeps-solaris.c} |   40 +++++++++---------
- src/ck-sysdeps.h			      |   49 +++++++++++++++++++++
- src/proc.h				      |   48 --------------------
- tools/Makefile.am			      |    6 +-
- tools/ck-collect-session-info.c	      |   36 ++++++++--------
- tools/ck-get-x11-display-device.c	      |   18 ++++----
- 9 files changed, 167 insertions(+), 165 deletions(-)
+ src/Makefile.am		   |  23 +-
+ src/ck-manager.c		   |  52 ++--
+ src/ck-sysdeps-linux.c		   | 605
+ ++++++++++++++++++++++++++++++++++++++
+ src/ck-sysdeps-solaris.c	   | 324 ++++++++++++++++++++
+ src/ck-sysdeps.h		   |  49 +++
+ src/proc-linux.c		   | 605
+ --------------------------------------
+ src/proc-solaris.c		   | 324 --------------------
+ src/proc.h			   |  48 ---
+ tools/Makefile.am		   |   6 +-
+ tools/ck-collect-session-info.c   |  36 +--
+ tools/ck-get-x11-display-device.c |  18 +-
+ 11 files changed, 1046 insertions(+), 1044 deletions(-)
 
 commit e56a95f64c9c9f57adebf6cb3e6c88790cec40e4
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3109,15 +3288,18 @@ Date:	Tue Aug 14 17:03:00 2007 -0400
     move tools out of linux subdirectory since they apparently work
     on solaris
 
- tools/.gitignore			       |    3 ++
- tools/Makefile.am			       |   36
- +++++++++++++++++++++++++
- tools/{linux => }/ck-collect-session-info.c   |    0
- tools/{linux => }/ck-get-x11-display-device.c |    0
- tools/{linux => }/ck-get-x11-server-pid.c     |    0
- tools/linux/Makefile.am		       |   32
- ----------------------
- 6 files changed, 39 insertions(+), 32 deletions(-)
+ tools/.gitignore			 |   3 +
+ tools/Makefile.am			 |  36 +++
+ tools/ck-collect-session-info.c	 | 410
+ ++++++++++++++++++++++++++++++++
+ tools/ck-get-x11-display-device.c	 | 152 ++++++++++++
+ tools/ck-get-x11-server-pid.c		 | 100 ++++++++
+ tools/linux/Makefile.am		 |  32 ---
+ tools/linux/ck-collect-session-info.c	 | 410
+ --------------------------------
+ tools/linux/ck-get-x11-display-device.c | 152 ------------
+ tools/linux/ck-get-x11-server-pid.c	 | 100 --------
+ 9 files changed, 701 insertions(+), 694 deletions(-)
 
 commit dc97e6caabc9932922d26f3400424626462f5ad2
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3125,8 +3307,8 @@ Date:	Tue Aug 14 16:55:24 2007 -0400
 
     make a lt library for proc stuff
 
- src/Makefile.am	 |   39 +++++++++++++++++++++++++--------------
- tools/linux/Makefile.am |    7 +++----
+ src/Makefile.am	 | 39 +++++++++++++++++++++++++--------------
+ tools/linux/Makefile.am |  7 +++----
  2 files changed, 28 insertions(+), 18 deletions(-)
 
 commit e6cf0e022d391154baed5ec30e857baffe52b437
@@ -3135,8 +3317,8 @@ Date:	Tue Aug 14 12:30:34 2007 -0400
 
     remove example device from seat config
 
- data/00-primary.seat |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ data/00-primary.seat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d4033604529b64156d5dd0f03fbe733ec7ae8246
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3144,9 +3326,9 @@ Date:	Tue Aug 14 12:12:38 2007 -0400
 
     make sure the device is a console and add some instructions
 
- src/test-tty-idle-monitor.c |	 44
- +++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 44 insertions(+), 0 deletions(-)
+ src/test-tty-idle-monitor.c | 44
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
 
 commit 396363e70765af215f7302964ac9543305733a2b
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3154,8 +3336,8 @@ Date:	Tue Aug 14 11:59:37 2007 -0400
 
     don't bail if /proc/self/fd/0 is not a link
 
- src/test-tty-idle-monitor.c |	  3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ src/test-tty-idle-monitor.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 383ea823871bf3768e85d1a3ca061e775c6aedf1
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3165,11 +3347,11 @@ Date:	Tue Aug 14 11:50:54 2007 -0400
 
     Based on a patch from Brian Cameron.
 
- configure.ac	    |	 2 +
- src/Makefile.am    |	 9 ++
- src/getfd.c	    |	20 +++-
- src/proc-solaris.c |  324
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	    |	2 +
+ src/Makefile.am    |	9 ++
+ src/getfd.c	    |  20 +++-
+ src/proc-solaris.c | 324
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 352 insertions(+), 3 deletions(-)
 
 commit e054c0f8b86f27f94d9316bac065a94081f4be32
@@ -3178,8 +3360,8 @@ Date:	Wed Aug 8 16:07:01 2007 -0400
 
     print out tools libs after configure
 
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 03590bfe7cc0346c9a36ee01fd3737aa009f0273
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3187,8 +3369,8 @@ Date:	Tue Aug 7 11:21:47 2007 -0400
 
     don't use PERROR if not available
 
- src/ck-log.c |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ src/ck-log.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 90e87a110c648cb93c2bde0ace9626d5ce58167a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3196,8 +3378,8 @@ Date:	Tue Aug 7 11:21:31 2007 -0400
 
     don't use stderr or stdout as variable names
 
- src/ck-job.c |   22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
+ src/ck-job.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 commit 488520e5c0d7d3684f7c91f11da52e9ef08d42c9
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3205,8 +3387,8 @@ Date:	Wed Aug 1 10:44:21 2007 -0400
 
     change user to unix-user
 
- libck-connector/test-connector.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ libck-connector/test-connector.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7d77af48ae9dbacde77d9337fe3a202d23467a6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3214,8 +3396,8 @@ Date:	Wed Aug 1 10:42:44 2007 -0400
 
     use unix-user instead of user
 
- libck-connector/ck-connector.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ libck-connector/ck-connector.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 289fff6aaaa206572efa768c4063111582d79f9d
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3223,13 +3405,13 @@ Date:	Fri Jul 20 17:42:01 2007 -0400
 
     Add preliminary support for seats with devices
 
- data/00-primary.seat |    5 +
- data/Makefile.am     |    4 +
- src/ck-manager.c     |   54 ++++++++++++-
- src/ck-seat.c	      |  219
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-seat.h	      |   36 +++++++--
- src/ck-seat.xml      |    9 ++
+ data/00-primary.seat |   5 ++
+ data/Makefile.am     |   4 +
+ src/ck-manager.c     |  54 ++++++++++++-
+ src/ck-seat.c	      | 219
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-seat.h	      |  36 +++++++--
+ src/ck-seat.xml      |   9 +++
  6 files changed, 319 insertions(+), 8 deletions(-)
 
 commit f6027221567fcb9ead1823e2da4eb9783f2db9ce
@@ -3238,8 +3420,8 @@ Date:	Fri Jul 20 17:41:32 2007 -0400
 
     Add --display option to tool.
 
- tools/linux/ck-get-x11-display-device.c |   22 ++++++++++++++++++----
- 1 files changed, 18 insertions(+), 4 deletions(-)
+ tools/linux/ck-get-x11-display-device.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
 
 commit a9aa00ff0fea79452a60a2448dd1f2714918884a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3247,10 +3429,10 @@ Date:	Wed Jul 18 17:24:00 2007 -0400
 
     Add new helper for getting tty from DISPLAY
 
- tools/linux/Makefile.am		 |   11 +++
- tools/linux/ck-get-x11-display-device.c |  138
- +++++++++++++++++++++++++++++++
- 2 files changed, 149 insertions(+), 0 deletions(-)
+ tools/linux/Makefile.am		 |  11 +++
+ tools/linux/ck-get-x11-display-device.c | 138
+ ++++++++++++++++++++++++++++++++
+ 2 files changed, 149 insertions(+)
 
 commit 17ff9ceb88e0b7f6dc5a7e6eac5ff98cb4a5cabe
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3279,8 +3461,8 @@ Date:	Tue May 15 11:15:12 2007 -0400
 
     Lennart
 
- src/getfd.c |	 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
+ src/getfd.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit fe29cc406719428bcc73d980299e4639a9bb37f1
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3288,17 +3470,17 @@ Date:	Tue Apr 10 16:03:19 2007 -0400
 
     bump version
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 2626a4405d19da40b98d526668bee7c92072e43b
+commit 2626a4405d19da40b98d526668bee7c92072e43b (tag: 0.2.1)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Tue Apr 10 16:01:15 2007 -0400
 
     update for release
 
- NEWS |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ NEWS | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
 commit c6cd8d7c66b2bd39edf7ca70948982a553128282
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3306,8 +3488,8 @@ Date:	Tue Apr 10 15:54:31 2007 -0400
 
     disable static libs
 
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit e0244a8f6dd0b7f8ebecc6bec52c013ce5286279
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3315,19 +3497,19 @@ Date:	Thu Apr 5 15:21:14 2007 -0400
 
     use inotify to detect activity on tty when possible
 
- .gitignore		       |    3 +-
- configure.ac		       |   26 ++-
- doc/.gitignore		       |    1 +
- src/.gitignore		       |    1 +
- src/Makefile.am	       |   32 ++
- src/ck-file-monitor-dummy.c   |  118 ++++++++
- src/ck-file-monitor-inotify.c |  669
- +++++++++++++++++++++++++++++++++++++++++
- src/ck-file-monitor.h	       |   84 +++++
- src/ck-session.c	       |   82 ++----
- src/ck-tty-idle-monitor.c     |  389 ++++++++++++++++++++++++
- src/ck-tty-idle-monitor.h     |   71 +++++
- src/test-tty-idle-monitor.c   |   82 +++++
+ .gitignore		       |   3 +-
+ configure.ac		       |  26 +-
+ doc/.gitignore		       |   1 +
+ src/.gitignore		       |   1 +
+ src/Makefile.am	       |  32 ++
+ src/ck-file-monitor-dummy.c   | 118 ++++++++
+ src/ck-file-monitor-inotify.c | 669
+ ++++++++++++++++++++++++++++++++++++++++++
+ src/ck-file-monitor.h	       |  84 ++++++
+ src/ck-session.c	       |  82 ++----
+ src/ck-tty-idle-monitor.c     | 389 ++++++++++++++++++++++++
+ src/ck-tty-idle-monitor.h     |  71 +++++
+ src/test-tty-idle-monitor.c   |  82 ++++++
  12 files changed, 1496 insertions(+), 62 deletions(-)
 
 commit 33dcd02c399e3255a7a64c1e90b258d79c14f2c4
@@ -3336,8 +3518,8 @@ Date:	Wed Apr 4 12:06:59 2007 -0400
 
     fix typos
 
- pam-ck-connector/pam_ck_connector.8 |	  4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ pam-ck-connector/pam_ck_connector.8 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c012fdf98a19e9e3d67a64ed308943a04c355dc8
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3348,8 +3530,8 @@ Date:	Wed Apr 4 12:04:16 2007 -0400
     In order to set the x11-display-device parameter on the new
     session.
 
- pam-ck-connector/pam-ck-connector.c |	 13 +++++++++++++
- pam-ck-connector/pam_ck_connector.8 |	 19 ++++++++++---------
+ pam-ck-connector/pam-ck-connector.c | 13 +++++++++++++
+ pam-ck-connector/pam_ck_connector.8 | 19 ++++++++++---------
  2 files changed, 23 insertions(+), 9 deletions(-)
 
 commit 42f6afb560859bf0dab898ae4c8f6d23070ef268
@@ -3358,8 +3540,8 @@ Date:	Tue Apr 3 14:48:36 2007 -0400
 
     make sure no values are NULL
 
- pam-ck-connector/pam-ck-connector.c |	  8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 commit bf9a5070a715f129e1182af149a46e55529edb61
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3367,8 +3549,8 @@ Date:	Tue Apr 3 14:38:33 2007 -0400
 
     check for empty string as well as null values
 
- pam-ck-connector/pam-ck-connector.c |	 17 +++++++++++------
- 1 files changed, 11 insertions(+), 6 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
 
 commit 8b1733abb942b4356485b4afcf1dc3bf04d1fedc
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3376,8 +3558,8 @@ Date:	Tue Apr 3 12:25:41 2007 -0400
 
     add some input validation
 
- src/proc-linux.c |   18 +++++++++++++++---
- 1 files changed, 15 insertions(+), 3 deletions(-)
+ src/proc-linux.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
 
 commit f073826f58541cbbe2b805f200a9d245d76c634c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3385,8 +3567,8 @@ Date:	Tue Apr 3 12:25:18 2007 -0400
 
     daemonize a little earlier
 
- src/main.c |	 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ src/main.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 80dc652115e275a95b05bb6809825cc324d9475a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3397,18 +3579,18 @@ Date:	Tue Apr 3 11:42:43 2007 -0400
     Also add ability to toggle debugging when SIGUSR1 is
     received.
 
- src/Makefile.am     |	  4 +-
- src/ck-debug.c      |	153 ---------------------------------------
- src/ck-debug.h      |	 72 -------------------
- src/ck-job.c	     |	 21 +++---
- src/ck-log.c	     |	197
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-log.h	     |	 41 +++++++++++
- src/ck-manager.c    |	 41 +++++------
- src/ck-seat.c	     |	 21 +++---
- src/ck-session.c    |	 31 ++++----
- src/ck-vt-monitor.c |	 30 +++-----
- src/main.c	     |	 66 +++++++++++++++--
+ src/Makefile.am     |	 4 +-
+ src/ck-debug.c      | 153 ----------------------------------------
+ src/ck-debug.h      |	72 -------------------
+ src/ck-job.c	     |	21 +++---
+ src/ck-log.c	     | 197
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-log.h	     |	41 +++++++++++
+ src/ck-manager.c    |	41 ++++++-----
+ src/ck-seat.c	     |	21 +++---
+ src/ck-session.c    |	31 ++++-----
+ src/ck-vt-monitor.c |	30 ++++----
+ src/main.c	     |	66 ++++++++++++++++--
  11 files changed, 366 insertions(+), 311 deletions(-)
 
 commit 02b7dac1de29b7e323d9457f14b639582d0a2e04
@@ -3417,8 +3599,8 @@ Date:	Tue Apr 3 11:40:47 2007 -0400
 
     bump the ac_prereq and use the docdir var
 
- configure.ac	 |   16 +---------------
- doc/Makefile.am |    2 +-
+ configure.ac	 | 16 +---------------
+ doc/Makefile.am |  2 +-
  2 files changed, 2 insertions(+), 16 deletions(-)
 
 commit b5c2e362c3ae4c932f4acdba13e53d80f63b1777
@@ -3427,8 +3609,8 @@ Date:	Mon Apr 2 18:38:51 2007 -0400
 
     daemonize properly
 
- src/main.c |	 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ src/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit b57d5c11612dbb896c53d65c01104bae586f6e17
 Author: Michael Biebl <mbiebl@gmail.com>
@@ -3457,15 +3639,15 @@ Date:	Mon Apr 2 16:16:16 2007 -0400
 
     Patch is tested and make distcheck works.
 
- acinclude.m4			    |	44 ----------
- configure.ac			    |  152
- ++++++++++++++++++------------------
- data/ConsoleKit.in		    |	10 +-
- data/Makefile.am		    |	13 +++
- libck-connector/Makefile.am	    |	 3 +-
- libck-connector/ck-connector.pc.in |	 2 +-
- pam-ck-connector/Makefile.am	    |	 3 +-
- src/Makefile.am		    |	 1 +
+ acinclude.m4			    |  44 -----------
+ configure.ac			    | 152
+ +++++++++++++++++++------------------
+ data/ConsoleKit.in		    |  10 +--
+ data/Makefile.am		    |  13 ++++
+ libck-connector/Makefile.am	    |	3 +-
+ libck-connector/ck-connector.pc.in |	2 +-
+ pam-ck-connector/Makefile.am	    |	3 +-
+ src/Makefile.am		    |	1 +
  8 files changed, 99 insertions(+), 129 deletions(-)
 
 commit 86740ea242d0b26758e8a8c43904a0fc88a195f6
@@ -3476,8 +3658,8 @@ Date:	Mon Apr 2 15:36:30 2007 -0400
 
     Oops.
 
- src/ck-manager.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 41c329309a5c78d31495f97b2f4324a462c60568
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3487,8 +3669,8 @@ Date:	Mon Apr 2 14:00:37 2007 -0400
 
     Apparently this is required.
 
- libck-connector/ck-connector.pc.in |	 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ libck-connector/ck-connector.pc.in | 2 ++
+ 1 file changed, 2 insertions(+)
 
 commit 5f3b3a7aec1c2ef81dfe28d6167049ef82e81860
 Author: Doug Goldstein <cardoe@gentoo.org>
@@ -3500,8 +3682,8 @@ Date:	Fri Mar 30 16:59:21 2007 -0400
     which isn't right. Attached is a patch that uses the value of slibdir
     for /lib/.
 
- pam-ck-connector/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ pam-ck-connector/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a2b51f00af2143a90138c6ce1df1e7e9b4ec8afa
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3509,9 +3691,9 @@ Date:	Mon Mar 26 14:39:44 2007 -0400
 
     use xlib directly instead of via gdk
 
- configure.ac			     |	  5 ++-
- tools/linux/ck-get-x11-server-pid.c |	 39
- ++++++++++++++++++++++++++++------
+ configure.ac			     |	5 +++--
+ tools/linux/ck-get-x11-server-pid.c | 39
+ ++++++++++++++++++++++++++++++-------
  2 files changed, 35 insertions(+), 9 deletions(-)
 
 commit 4c365a8e28adafd6619ada97d4239e9e6df429ab
@@ -3522,13 +3704,13 @@ Date:	Mon Mar 19 16:35:55 2007 -0400
 
     And associated documentation and added to test-fus.
 
- doc/spec/ck-seat.xml	 |   12 ++++++++++++
- doc/xml/ck-design.xml	 |    9 +++++++++
- doc/xml/ref-ck-seat.xml |   12 +++++++-----
- src/ck-seat.c		 |   14 ++++++++++++++
- src/ck-seat.h		 |   32 ++++++++++++++++----------------
- src/ck-seat.xml	 |    3 +++
- src/test-fus		 |    6 ++++++
+ doc/spec/ck-seat.xml	 | 12 ++++++++++++
+ doc/xml/ck-design.xml	 |  9 +++++++++
+ doc/xml/ref-ck-seat.xml | 12 +++++++-----
+ src/ck-seat.c		 | 14 ++++++++++++++
+ src/ck-seat.h		 | 32 ++++++++++++++++----------------
+ src/ck-seat.xml	 |  3 +++
+ src/test-fus		 |  6 ++++++
  7 files changed, 67 insertions(+), 21 deletions(-)
 
 commit c40a87c622ac1543dc2d9cdccc651e33affadcfa
@@ -3539,8 +3721,8 @@ Date:	Thu Mar 15 14:04:05 2007 -0400
 
     Also make the configure checks simpler.
 
- configure.ac			     |	  5 ++---
- pam-ck-connector/pam-ck-connector.c |	  6 +++---
+ configure.ac			     | 5 ++---
+ pam-ck-connector/pam-ck-connector.c | 6 +++---
  2 files changed, 5 insertions(+), 6 deletions(-)
 
 commit 4a947eddfad4f384bb02c8e4771a59a7ad01cd8b
@@ -3552,9 +3734,9 @@ Date:	Thu Mar 15 12:55:15 2007 -0400
     Only include what is available.  Use a alternative to pam_syslog
     if it isn't available.
 
- configure.ac			     |	  3 +
- pam-ck-connector/pam-ck-connector.c |	101
- ++++++++++++++++++++++++++++++-----
+ configure.ac			     |	 3 ++
+ pam-ck-connector/pam-ck-connector.c | 101
+ +++++++++++++++++++++++++++++++-----
  2 files changed, 90 insertions(+), 14 deletions(-)
 
 commit 54ad2d581ce690060a29fa8a4b94bf5dddbafc87
@@ -3563,8 +3745,8 @@ Date:	Thu Mar 15 10:05:37 2007 -0400
 
     more typos in docs
 
- doc/xml/ck-design.xml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ doc/xml/ck-design.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ac2061bfcbf5c38b6f82b307479064cd73274a9f
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3572,8 +3754,8 @@ Date:	Thu Mar 15 01:48:34 2007 -0400
 
     typo
 
- doc/xml/ck-terms.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ doc/xml/ck-terms.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2f434135af56d627a887c3cdc24020c4d9ecbde4
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3581,17 +3763,17 @@ Date:	Wed Mar 14 23:35:58 2007 -0400
 
     bump version
 
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-commit fee1f37461cd1e0abc479f263ecfd3e3570daa53
+commit fee1f37461cd1e0abc479f263ecfd3e3570daa53 (tag: 0.2.0)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Wed Mar 14 23:33:51 2007 -0400
 
     update for release
 
- NEWS |   18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
+ NEWS | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
 commit e8fbb76428bbaae2525347cddda8a2f526970451
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3599,8 +3781,8 @@ Date:	Wed Mar 14 23:21:33 2007 -0400
 
     bump the version arbitrarily
 
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a6f9d78d526892da92fdeef9bacd70ea6271b038
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3608,8 +3790,8 @@ Date:	Wed Mar 14 23:21:08 2007 -0400
 
     update todo
 
- TODO |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ TODO | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2e415f120e7652da842632cc822faa9bb16294f6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3617,10 +3799,10 @@ Date:	Wed Mar 14 23:18:13 2007 -0400
 
     add some more docs
 
- doc/xml/ck-design.xml	     |	166
- +++++++++++++++++++++++++++++++++++++++++++
- doc/xml/ck-introduction.xml |	  2 +
- doc/xml/ck-terms.xml	     |	 49 ++++++++++++-
+ doc/xml/ck-design.xml	     | 166
+ ++++++++++++++++++++++++++++++++++++++++++++
+ doc/xml/ck-introduction.xml |	 2 +
+ doc/xml/ck-terms.xml	     |	49 +++++++++++--
  3 files changed, 213 insertions(+), 4 deletions(-)
 
 commit 314b18ca8045eda3c48c0e7a5f2c0e26635ce5b8
@@ -3629,8 +3811,8 @@ Date:	Wed Mar 14 09:22:20 2007 -0400
 
     add missing instead attribute
 
- doc/dbus-introspect-docs.dtd |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ doc/dbus-introspect-docs.dtd | 1 +
+ 1 file changed, 1 insertion(+)
 
 commit 2f4b6ef24431fc9c4997e535f8b5e126eb5ae3db
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3638,10 +3820,10 @@ Date:	Wed Mar 14 08:46:08 2007 -0400
 
     don't include the generated html in git
 
- doc/ConsoleKit.html |	317
- ---------------------------------------------------
- doc/Makefile.am     |	  1 -
- 2 files changed, 0 insertions(+), 318 deletions(-)
+ doc/ConsoleKit.html | 317
+ ----------------------------------------------------
+ doc/Makefile.am     |	 1 -
+ 2 files changed, 318 deletions(-)
 
 commit f1ad1ddf9cd5898b4bca3875a698a9628313eb19
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3655,8 +3837,8 @@ Date:	Wed Mar 14 08:45:44 2007 -0400
     that either of them are set because we don't know which
     will be used.
 
- src/ck-session.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ src/ck-session.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c01153022b0fa850bd10503141ff081749f01d4d
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3664,10 +3846,10 @@ Date:	Tue Mar 13 17:29:46 2007 -0400
 
     missed a namespace on the permission tag
 
- doc/ConsoleKit.html	    |  132
- ++++++++++++++++++++++----------------------
- doc/spec/ck-session.xml    |	 4 +-
- doc/xml/ref-ck-session.xml |	 4 +-
+ doc/ConsoleKit.html	    | 132
+ ++++++++++++++++++++++-----------------------
+ doc/spec/ck-session.xml    |	4 +-
+ doc/xml/ref-ck-session.xml |	4 +-
  3 files changed, 70 insertions(+), 70 deletions(-)
 
 commit 4a531bc467c9a142cb2d05792e6f9e9330c199ff
@@ -3676,9 +3858,9 @@ Date:	Tue Mar 13 15:20:37 2007 -0400
 
     updated doc dtd
 
- doc/ConsoleKit.html	      |  128
- +++++++++++++++++++++---------------------
- doc/dbus-introspect-docs.dtd |    2 +-
+ doc/ConsoleKit.html	      | 128
+ +++++++++++++++++++++----------------------
+ doc/dbus-introspect-docs.dtd |   2 +-
  2 files changed, 65 insertions(+), 65 deletions(-)
 
 commit 608080a2f755254a590b4d052451461294fbcee4
@@ -3689,9 +3871,9 @@ Date:	Tue Mar 13 14:34:32 2007 -0400
 
     Turns out that just using libdir breaks the .pc file install.
 
- configure.ac			    |	15 +++++++++++++++
- libck-connector/Makefile.am	    |	 3 ++-
- libck-connector/ck-connector.pc.in |	 2 +-
+ configure.ac			    | 15 +++++++++++++++
+ libck-connector/Makefile.am	    |  3 ++-
+ libck-connector/ck-connector.pc.in |  2 +-
  3 files changed, 18 insertions(+), 2 deletions(-)
 
 commit 0f1d6b3b234a1f8d8c6b9dff38388ab58f695b64
@@ -3703,22 +3885,22 @@ Date:	Tue Mar 13 13:50:58 2007 -0400
     Also added deprecated notes to the docs.  New code should
     be using GetUnixUser instead of GetUser etc.
 
- doc/ConsoleKit.html		       |  141
- +++++++++++++++++++--------------
- doc/dbus-introspect-docs.dtd	       |    2 +-
- doc/spec/ck-manager.xml	       |   22 +++++
- doc/spec/ck-session.xml	       |   21 +++++
- doc/tools/spec-to-docbook.xsl	       |   75 +++++++++++++++--
- doc/xml/ref-ck-manager.xml	       |   15 +++-
- doc/xml/ref-ck-session.xml	       |   24 +++++-
- src/ck-manager.c		       |   25 ++++--
- src/ck-manager.h		       |    4 +
- src/ck-manager.xml		       |    5 +
- src/ck-session.c		       |   44 ++++++++--
- src/ck-session.h		       |    8 ++-
- src/ck-session.xml		       |    4 +
- tools/linux/ck-collect-session-info.c |    2 +-
- tools/list-sessions.c		       |    2 +-
+ doc/ConsoleKit.html		       | 141
+ +++++++++++++++++++---------------
+ doc/dbus-introspect-docs.dtd	       |   2 +-
+ doc/spec/ck-manager.xml	       |  22 ++++++
+ doc/spec/ck-session.xml	       |  21 +++++
+ doc/tools/spec-to-docbook.xsl	       |  75 +++++++++++++++---
+ doc/xml/ref-ck-manager.xml	       |  15 +++-
+ doc/xml/ref-ck-session.xml	       |  24 ++++--
+ src/ck-manager.c		       |  25 ++++--
+ src/ck-manager.h		       |   4 +
+ src/ck-manager.xml		       |   5 ++
+ src/ck-session.c		       |  44 ++++++++---
+ src/ck-session.h		       |   8 +-
+ src/ck-session.xml		       |   4 +
+ tools/linux/ck-collect-session-info.c |   2 +-
+ tools/list-sessions.c		       |   2 +-
  15 files changed, 295 insertions(+), 99 deletions(-)
 
 commit 921b5e02edf59117b64385edbe4d191819d90abd
@@ -3727,14 +3909,14 @@ Date:	Tue Mar 13 12:11:04 2007 -0400
 
     add more doc stubs
 
- doc/ConsoleKit.html			       |  122
- +++++++++++++------------
- doc/ConsoleKit.xml.in			       |    4 +
- doc/Makefile.am			       |    2 +
- doc/xml/ck-design.xml			       |    5 +
- doc/xml/ck-introduction.xml		       |    6 +
- doc/xml/{ck-introduction.xml => ck-terms.xml} |   14 ++-
- 6 files changed, 92 insertions(+), 61 deletions(-)
+ doc/ConsoleKit.html	     | 122
+ +++++++++++++++++++++++---------------------
+ doc/ConsoleKit.xml.in	     |	 4 ++
+ doc/Makefile.am	     |	 2 +
+ doc/xml/ck-design.xml	     |	 5 ++
+ doc/xml/ck-introduction.xml |	 6 +++
+ doc/xml/ck-terms.xml	     |	26 ++++++++++
+ 6 files changed, 108 insertions(+), 57 deletions(-)
 
 commit 4a639d92a6f1a5dd8f59d57ade37d4cff420b66a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3742,10 +3924,10 @@ Date:	Tue Mar 13 11:41:31 2007 -0400
 
     various leak fixes
 
- src/ck-manager.c |   38 +++++++++++++++++++++++++++++++++++---
- src/ck-seat.c	  |   15 +++++++++++----
- src/ck-session.c |   32 +++++++++++++++++++-------------
- src/main.c	  |    4 +++-
+ src/ck-manager.c | 38 +++++++++++++++++++++++++++++++++++---
+ src/ck-seat.c	  | 15 +++++++++++----
+ src/ck-session.c | 32 +++++++++++++++++++-------------
+ src/main.c	  |  4 +++-
  4 files changed, 68 insertions(+), 21 deletions(-)
 
 commit 1e7af7e9c648fb461e0d36d037d2920519159525
@@ -3756,10 +3938,10 @@ Date:	Tue Mar 13 10:05:31 2007 -0400
 
     Seems to fix some problems with invalid characters showing up.
 
- doc/ConsoleKit.html	       |  122
- +++++++++++++++++++++--------------------
- doc/Makefile.am	       |    2 +-
- doc/tools/spec-to-docbook.xsl |    2 +-
+ doc/ConsoleKit.html	       | 122
+ +++++++++++++++++++++---------------------
+ doc/Makefile.am	       |   2 +-
+ doc/tools/spec-to-docbook.xsl |   2 +-
  3 files changed, 64 insertions(+), 62 deletions(-)
 
 commit 8b42a4928a0a266c3b3ae6bb13997764bc7f6405
@@ -3772,33 +3954,35 @@ Date:	Tue Mar 13 03:42:04 2007 -0400
     docs.  There are tools to build docbook and strip
     the docs to make dbus introspect xml.
 
- doc/ConsoleKit.html				    |  336
- +++++++++++++----
- doc/ConsoleKit.xml.in				    |	 9 +-
- doc/Makefile.am				    |	 8 +-
- doc/dbus-introspect-docs.dtd			    |	31 ++
- doc/docbook.css				    |	 5 +
- doc/ref-ck-manager.xml				    |  181 ---------
- doc/ref-ck-seat.xml				    |  111 ------
- doc/ref-ck-session.xml				    |  350
- -----------------
- doc/spec/ck-manager.xml			    |  286 ++++++++++++++
- doc/spec/ck-seat.xml				    |  110 ++++++
- doc/spec/ck-session.xml			    |  401
- ++++++++++++++++++++
- doc/{docize-dbus-xml.sh => tools/spec-strip-docs}  |	 4 +-
- doc/tools/spec-strip-docs.xsl			    |	36 ++
- doc/{docize-dbus-xml.sh => tools/spec-to-docbook}  |	 2 +-
- .../spec-to-docbook.xsl}			    |  148 +++++++-
- doc/tools/update-from-spec			    |	25 ++
- doc/{ => xml}/ck-introduction.xml		    |	 3 -
- doc/xml/ref-ck-manager.xml			    |  174 +++++++++
- doc/xml/ref-ck-seat.xml			    |	72 ++++
- doc/xml/ref-ck-session.xml			    |  240 ++++++++++++
- src/ck-manager.xml				    |	16 +-
- src/ck-seat.xml				    |	14 +-
- src/ck-session.xml				    |	11 +-
- 23 files changed, 1800 insertions(+), 773 deletions(-)
+ doc/ConsoleKit.html	       | 336 +++++++++++++++++++++++++++--------
+ doc/ConsoleKit.xml.in	       |   9 +-
+ doc/Makefile.am	       |   8 +-
+ doc/ck-introduction.xml       |  23 ---
+ doc/dbus-introspect-docs.dtd  |  31 ++++
+ doc/docbook-dbus.xsl	       | 261 ---------------------------
+ doc/docbook.css	       |   5 +
+ doc/docize-dbus-xml.sh        |  34 ----
+ doc/ref-ck-manager.xml        | 181 -------------------
+ doc/ref-ck-seat.xml	       | 111 ------------
+ doc/ref-ck-session.xml        | 350 ------------------------------------
+ doc/spec/ck-manager.xml       | 286 ++++++++++++++++++++++++++++++
+ doc/spec/ck-seat.xml	       | 110 ++++++++++++
+ doc/spec/ck-session.xml       | 401
+ ++++++++++++++++++++++++++++++++++++++++++
+ doc/tools/spec-strip-docs     |  34 ++++
+ doc/tools/spec-strip-docs.xsl |  36 ++++
+ doc/tools/spec-to-docbook     |  34 ++++
+ doc/tools/spec-to-docbook.xsl | 379
+ +++++++++++++++++++++++++++++++++++++++
+ doc/tools/update-from-spec    |  25 +++
+ doc/xml/ck-introduction.xml   |  20 +++
+ doc/xml/ref-ck-manager.xml    | 174 ++++++++++++++++++
+ doc/xml/ref-ck-seat.xml       |  72 ++++++++
+ doc/xml/ref-ck-session.xml    | 240 +++++++++++++++++++++++++
+ src/ck-manager.xml	       |  16 +-
+ src/ck-seat.xml	       |  14 +-
+ src/ck-session.xml	       |  11 +-
+ 26 files changed, 2131 insertions(+), 1070 deletions(-)
 
 commit 4595ab3d4953d6257a6fedfe5b294df67ff3581f
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3812,8 +3996,8 @@ Date:	Tue Mar 13 03:39:52 2007 -0400
     isn't correct for 64 bit systems.  If you are a distro you
     should probably configure using --libdir=/lib.
 
- libck-connector/Makefile.am	    |	 3 +--
- libck-connector/ck-connector.pc.in |	 2 +-
+ libck-connector/Makefile.am	    | 3 +--
+ libck-connector/ck-connector.pc.in | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 29437f4aa9bd1bab54bde41cb1f6301803a2632e
@@ -3822,9 +4006,9 @@ Date:	Sat Mar 10 18:02:29 2007 -0500
 
     regenerate docs
 
- doc/ConsoleKit.html	|   72
- ++++++++++++++++++++++++------------------------
- doc/ref-ck-session.xml |   36 ++++++++++++------------
+ doc/ConsoleKit.html	| 72
+ +++++++++++++++++++++++++-------------------------
+ doc/ref-ck-session.xml | 36 ++++++++++++-------------
  2 files changed, 54 insertions(+), 54 deletions(-)
 
 commit 6ce9a74f69f611bc5aeeb57a4bf9efea19774938
@@ -3833,10 +4017,10 @@ Date:	Sat Mar 10 17:05:06 2007 -0500
 
     add the generated doc html
 
- doc/.gitignore      |	  1 -
- doc/ConsoleKit.html |	 96
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 96 insertions(+), 1 deletions(-)
+ doc/.gitignore      |	1 -
+ doc/ConsoleKit.html | 96
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 96 insertions(+), 1 deletion(-)
 
 commit 50ff6eda31c06cea4e3b8010d114e66cfdb3f6e6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3844,8 +4028,8 @@ Date:	Fri Mar 9 13:51:21 2007 -0500
 
     give root permission to use the property interface
 
- data/ConsoleKit.conf |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ data/ConsoleKit.conf | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 093539956ac0a5092a5fdc39f8b27475071032c4
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3853,8 +4037,8 @@ Date:	Fri Mar 9 13:50:10 2007 -0500
 
     fix the user prop type
 
- src/ck-session.xml |	18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ src/ck-session.xml | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit c8dbc4b6a38b99ed192f5ed2f73f57014a49d50a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3862,10 +4046,10 @@ Date:	Fri Mar 9 12:36:09 2007 -0500
 
     add a few more parameters to session idl
 
- doc/ref-ck-session.xml |   90
- +++++++++++++++++++++++++++++++++++++++++++++++-
- src/ck-session.xml	|    8 ++++
- 2 files changed, 97 insertions(+), 1 deletions(-)
+ doc/ref-ck-session.xml | 90
+ +++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/ck-session.xml	|  8 +++++
+ 2 files changed, 97 insertions(+), 1 deletion(-)
 
 commit d5061bf16725bc711f7ddcff02e77a94014107f5
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3873,8 +4057,8 @@ Date:	Fri Mar 9 12:35:30 2007 -0500
 
     add uuid to cookie
 
- src/ck-manager.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
+ src/ck-manager.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit 1d72374535de222cb816c74506555c71af10d429
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3887,21 +4071,21 @@ Date:	Fri Mar 9 11:40:59 2007 -0500
     Still need to add support for comments and actual
     descriptions ala gtk-doc.
 
- doc/ConsoleKit.xml.in	 |   10 ++-
- doc/Makefile.am	 |    6 +-
- doc/ck-dbus-manager.xml |   52 ---------
- doc/ck-dbus-seat.xml	 |   39 -------
- doc/ck-dbus-session.xml |   55 ----------
- doc/docbook-dbus.xsl	 |  261
- ++++++++++++++++++++++++++++++++++++++++++++++
- doc/docize-dbus-xml.sh  |   34 ++++++
- doc/ref-ck-manager.xml  |  181 ++++++++++++++++++++++++++++++++
- doc/ref-ck-seat.xml	 |  111 ++++++++++++++++++++
- doc/ref-ck-session.xml  |  262
+ doc/ConsoleKit.xml.in	 |  10 +-
+ doc/Makefile.am	 |   6 +-
+ doc/ck-dbus-manager.xml |  52 ----------
+ doc/ck-dbus-seat.xml	 |  39 -------
+ doc/ck-dbus-session.xml |  55 ----------
+ doc/docbook-dbus.xsl	 | 261
  +++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-manager.xml	 |   12 ++-
- src/ck-seat.xml	 |   12 ++-
- src/ck-session.xml	 |    9 ++-
+ doc/docize-dbus-xml.sh  |  34 +++++++
+ doc/ref-ck-manager.xml  | 181 +++++++++++++++++++++++++++++++++
+ doc/ref-ck-seat.xml	 | 111 ++++++++++++++++++++
+ doc/ref-ck-session.xml  | 262
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/ck-manager.xml	 |  12 ++-
+ src/ck-seat.xml	 |  12 ++-
+ src/ck-session.xml	 |   9 +-
  13 files changed, 884 insertions(+), 160 deletions(-)
 
 commit 15ad40c8d8abd86a4b83e445031fd467406b45d8
@@ -3910,9 +4094,9 @@ Date:	Thu Mar 8 22:09:41 2007 -0500
 
     tweak the css for the docs
 
- doc/ConsoleKit.xml.in |    4 --
- doc/docbook.css       |   77
- ++++++++++++++++++++++++++++++++++++++++++-------
+ doc/ConsoleKit.xml.in |  4 ---
+ doc/docbook.css       | 77
+ +++++++++++++++++++++++++++++++++++++++++++--------
  2 files changed, 66 insertions(+), 15 deletions(-)
 
 commit 54246537dfdcb89ee34dfbaa8b909b94ae2845b9
@@ -3921,12 +4105,12 @@ Date:	Thu Mar 8 21:24:25 2007 -0500
 
     update all .gitignore files
 
- .gitignore				|    1 +
- {tools => libck-connector}/.gitignore	|    3 ++-
- {tools => pam-ck-connector}/.gitignore |    2 +-
- tools/.gitignore			|    2 +-
- tools/{ => linux}/.gitignore		|    3 ++-
- 5 files changed, 7 insertions(+), 4 deletions(-)
+ .gitignore		     | 1 +
+ libck-connector/.gitignore  | 9 +++++++++
+ pam-ck-connector/.gitignore | 8 ++++++++
+ tools/.gitignore	     | 2 +-
+ tools/linux/.gitignore      | 9 +++++++++
+ 5 files changed, 28 insertions(+), 1 deletion(-)
 
 commit 1702970a3ea3de88f04623f69a3ab5260f77d2c5
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3934,18 +4118,18 @@ Date:	Thu Mar 8 21:16:40 2007 -0500
 
     add a stub for docbook documentation
 
- Makefile.am		 |    1 +
- configure.ac		 |  102
- +++++++++++++++++++++++++++++++++--------------
- doc/.gitignore		 |    6 +++
- doc/ConsoleKit.xml.in	 |   69 +++++++++++++++++++++++++++++++
- doc/Makefile.am	 |   37 +++++++++++++++++
- doc/ck-dbus-manager.xml |   52 ++++++++++++++++++++++++
- doc/ck-dbus-seat.xml	 |   39 ++++++++++++++++++
- doc/ck-dbus-session.xml |   55 +++++++++++++++++++++++++
- doc/ck-introduction.xml |   23 +++++++++++
- doc/config.xsl		 |    6 +++
- doc/docbook.css	 |   18 ++++++++
+ Makefile.am		 |   1 +
+ configure.ac		 | 102
+ ++++++++++++++++++++++++++++++++++--------------
+ doc/.gitignore		 |   6 +++
+ doc/ConsoleKit.xml.in	 |  69 ++++++++++++++++++++++++++++++++
+ doc/Makefile.am	 |  37 ++++++++++++++++++
+ doc/ck-dbus-manager.xml |  52 ++++++++++++++++++++++++
+ doc/ck-dbus-seat.xml	 |  39 ++++++++++++++++++
+ doc/ck-dbus-session.xml |  55 ++++++++++++++++++++++++++
+ doc/ck-introduction.xml |  23 +++++++++++
+ doc/config.xsl		 |   6 +++
+ doc/docbook.css	 |  18 +++++++++
  11 files changed, 378 insertions(+), 30 deletions(-)
 
 commit ef7ee407bc58ea24db828cad9e1e7d628e322067
@@ -3957,8 +4141,8 @@ Date:	Thu Mar 8 21:06:55 2007 -0500
     We don't want anyone to be able to directly modify properties.
     Also make these policies mandatory.
 
- data/ConsoleKit.conf |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ data/ConsoleKit.conf | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit f4173a08a83db8879ae9c82356f7a9702cb4f883
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3966,8 +4150,8 @@ Date:	Wed Mar 7 14:53:01 2007 -0500
 
     update todo
 
- TODO |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
+ TODO | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit ef83e4007f375db0ee8f240d2bf292331a5a76cb
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3975,8 +4159,8 @@ Date:	Tue Mar 6 18:46:25 2007 -0500
 
     remove debug noise
 
- src/ck-session.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-session.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 701349f1ad564242c143cab6773dde0de6396db8
 Author: William Jon McCann <mccann@jhu.edu>
@@ -3988,9 +4172,9 @@ Date:	Tue Mar 6 18:32:49 2007 -0500
     Rework the parameter parsing so it is a bit more robust and so that
     parameters can get passed to the constructor.
 
- src/ck-session.c		       |  223
- +++++++++++++++++++++++++++++----
- src/test-open-session-with-parameters |    5 +-
+ src/ck-session.c		       | 223
+ ++++++++++++++++++++++++++++++----
+ src/test-open-session-with-parameters |   5 +-
  2 files changed, 205 insertions(+), 23 deletions(-)
 
 commit dc5e9585215f34ec78b68fbb6da990a90d8f3a1b
@@ -3999,12 +4183,12 @@ Date:	Tue Mar 6 16:07:24 2007 -0500
 
     use paths.h if available
 
- configure.ac			     |	  2 ++
- pam-ck-connector/pam-ck-connector.c |	 14 ++++++++++++--
- pam-ck-connector/test-pam.c	     |	  8 +++++++-
- src/ck-seat.c			     |	 11 +++++++++--
- src/getfd.c			     |	 28 +++++++++++++++++++++-------
- src/proc-linux.c		     |	 10 +++++++---
+ configure.ac			     |	2 ++
+ pam-ck-connector/pam-ck-connector.c | 14 ++++++++++++--
+ pam-ck-connector/test-pam.c	     |	8 +++++++-
+ src/ck-seat.c			     | 11 +++++++++--
+ src/getfd.c			     | 28 +++++++++++++++++++++-------
+ src/proc-linux.c		     | 10 +++++++---
  6 files changed, 58 insertions(+), 15 deletions(-)
 
 commit ce4ee7b54d40faf13e005285e5b85a061f21e256
@@ -4013,8 +4197,8 @@ Date:	Tue Mar 6 15:36:56 2007 -0500
 
     add some items in a TODO file
 
- TODO |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
+ TODO | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
 
 commit 96d209ea26485c6b6f23a469ee1d2db672e6697a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4022,8 +4206,8 @@ Date:	Tue Mar 6 15:01:07 2007 -0500
 
     exit if we can't acquire name at startup and fix a glib warning
 
- src/main.c |	41 ++++++++++++++++++++++++++++++++---------
- 1 files changed, 32 insertions(+), 9 deletions(-)
+ src/main.c | 41 ++++++++++++++++++++++++++++++++---------
+ 1 file changed, 32 insertions(+), 9 deletions(-)
 
 commit 98ea3604c92a4c0317d2f9626f097bc384caf70a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4031,8 +4215,8 @@ Date:	Tue Mar 6 02:32:10 2007 -0500
 
     add is-local back to the pam module
 
- pam-ck-connector/pam-ck-connector.c |	  4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit 699923e665a4606a1b3f6822e4e4917f86a2a713
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4040,8 +4224,8 @@ Date:	Tue Mar 6 02:31:45 2007 -0500
 
     check for empty strings as well as null
 
- src/ck-manager.c |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
+ src/ck-manager.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit d9ca86ae5acb8a4a56e875c9ad0ed617f50abf65
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4050,9 +4234,9 @@ Date:	Tue Mar 6 00:25:06 2007 -0500
     use a slightly more sophisticated rule for adding sessions to
     static seat
 
- src/ck-manager.c		       |   37
- ++++++++++++++++++++++++++++----
- src/test-open-session-with-parameters |    1 +
+ src/ck-manager.c		       | 37
+ ++++++++++++++++++++++++++++++-----
+ src/test-open-session-with-parameters |  1 +
  2 files changed, 33 insertions(+), 5 deletions(-)
 
 commit a3cb617b1fd3be5199c0dfc08aee0af4b04d1a8b
@@ -4067,9 +4251,9 @@ Date:	Tue Mar 6 00:24:02 2007 -0500
      2. take the oldest session where x11-display-device == active
      VT device
 
- src/ck-seat.c |  160
- +++++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 145 insertions(+), 15 deletions(-)
+ src/ck-seat.c | 160
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 145 insertions(+), 15 deletions(-)
 
 commit 08436b041d6b334a5754266b11385941a71d3f81
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4077,8 +4261,8 @@ Date:	Mon Mar 5 21:56:52 2007 -0500
 
     add x11-display-device to parse table
 
- src/ck-manager.c      |   13 +++++++------
- src/test-open-session |    2 ++
+ src/ck-manager.c      | 13 +++++++------
+ src/test-open-session |  2 ++
  2 files changed, 9 insertions(+), 6 deletions(-)
 
 commit 5cc0ba8ec8c988d0068b07e4f67839d42b357537
@@ -4087,8 +4271,8 @@ Date:	Mon Mar 5 20:36:59 2007 -0500
 
     try to parse the real meaning of PAM_TTY
 
- pam-ck-connector/pam-ck-connector.c |	 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 commit 2e38a7026491595e6837fa8c02e077584fc71b71
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4096,8 +4280,8 @@ Date:	Mon Mar 5 19:14:14 2007 -0500
 
     fix the example code
 
- libck-connector/ck-connector.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ libck-connector/ck-connector.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit a9a48c07142025841a69da6fc30c6a1fbd29727a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4105,9 +4289,9 @@ Date:	Mon Mar 5 19:10:51 2007 -0500
 
     use with_parameters and add remote-host-name if available
 
- pam-ck-connector/pam-ck-connector.c |	 49
- +++++++++++++++++++++++++++-------
- 1 files changed, 39 insertions(+), 10 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 49
+ +++++++++++++++++++++++++++++--------
+ 1 file changed, 39 insertions(+), 10 deletions(-)
 
 commit 0293d43731d125b825fa8962976b527bf46b65d6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4115,10 +4299,10 @@ Date:	Mon Mar 5 19:10:02 2007 -0500
 
     add a with_parameters function to connector
 
- libck-connector/ck-connector.c   |  395
- +++++++++++++++++++++-----------------
- libck-connector/ck-connector.h   |   36 ++--
- libck-connector/test-connector.c |   18 ++-
+ libck-connector/ck-connector.c   | 395
+ +++++++++++++++++++++------------------
+ libck-connector/ck-connector.h   |  36 ++--
+ libck-connector/test-connector.c |  18 +-
  3 files changed, 255 insertions(+), 194 deletions(-)
 
 commit d588a897fef3af61a7368226986b384fce2524e7
@@ -4127,8 +4311,8 @@ Date:	Mon Mar 5 19:08:15 2007 -0500
 
     rename host-name in one more place
 
- src/ck-manager.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ src/ck-manager.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 7dfb9732b27778722214531d0c17b7e50e8a2fe1
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4136,13 +4320,13 @@ Date:	Mon Mar 5 15:24:56 2007 -0500
 
     rename host-name to remote-host-name to make it more intuitive
 
- libck-connector/ck-connector.c        |    8 -----
- src/ck-session.c		       |   49
- ++++++++++++++++++---------------
- src/ck-session.h		       |    6 ++--
- src/ck-session.xml		       |    4 +-
- tools/linux/ck-collect-session-info.c |   12 ++++----
- tools/list-sessions.c		       |   12 ++++----
+ libck-connector/ck-connector.c        |  8 ------
+ src/ck-session.c		       | 49
+ +++++++++++++++++++----------------
+ src/ck-session.h		       |  6 ++---
+ src/ck-session.xml		       |  4 +--
+ tools/linux/ck-collect-session-info.c | 12 ++++-----
+ tools/list-sessions.c		       | 12 ++++-----
  6 files changed, 44 insertions(+), 47 deletions(-)
 
 commit ed0e87a5f66d88d6f388229e1bf71632bb0f1308
@@ -4151,8 +4335,8 @@ Date:	Mon Mar 5 14:49:47 2007 -0500
 
     add x11-display-device to ck-list-sessions
 
- tools/list-sessions.c |   28 ++++++++++++++++++++++------
- 1 files changed, 22 insertions(+), 6 deletions(-)
+ tools/list-sessions.c | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
 
 commit 4749b0ecb6241517685a2a809695a85bd9f93432
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4160,10 +4344,10 @@ Date:	Mon Mar 5 14:39:07 2007 -0500
 
     add two more proc sysdep functions
 
- src/proc-linux.c |   53
+ src/proc-linux.c | 53
  +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/proc.h	  |    4 ++++
- 2 files changed, 57 insertions(+), 0 deletions(-)
+ src/proc.h	  |  4 ++++
+ 2 files changed, 57 insertions(+)
 
 commit 4b245b3113480d495440e1b7d32eb4dc6d564c8c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4175,11 +4359,11 @@ Date:	Mon Mar 5 12:12:59 2007 -0500
     (tty of session leader) from the x11-display-device (tty of xorg
     process).
 
- src/ck-session.c		       |   60 ++++++++++--
- src/ck-session.h		       |  172
- +++++++++++++++++----------------
- src/ck-session.xml		       |    3 +
- tools/linux/ck-collect-session-info.c |   29 ++++--
+ src/ck-session.c		       |  60 ++++++++++--
+ src/ck-session.h		       | 172
+ ++++++++++++++++++----------------
+ src/ck-session.xml		       |   3 +
+ tools/linux/ck-collect-session-info.c |  29 ++++--
  4 files changed, 164 insertions(+), 100 deletions(-)
 
 commit 67fa39aacf65117a85533035a71ee09b184003dc
@@ -4191,12 +4375,12 @@ Date:	Mon Mar 5 11:18:32 2007 -0500
     Use an async helper job to collect session info for the
     OpenSession() method.
 
- src/Makefile.am		       |    2 +
- src/ck-job.c			       |  392
- +++++++++++++++++++++++++++++++++
- src/ck-job.h			       |   76 +++++++
- src/ck-manager.c		       |  278 +++++++++++++++++-------
- tools/linux/ck-collect-session-info.c |   11 +-
+ src/Makefile.am		       |   2 +
+ src/ck-job.c			       | 392
+ ++++++++++++++++++++++++++++++++++
+ src/ck-job.h			       |  76 +++++++
+ src/ck-manager.c		       | 278 +++++++++++++++++-------
+ tools/linux/ck-collect-session-info.c |  11 +-
  5 files changed, 681 insertions(+), 78 deletions(-)
 
 commit f67761a042ff8b29d7689a043a53110d0bbbf6e9
@@ -4213,8 +4397,8 @@ Date:	Mon Mar 5 10:26:10 2007 -0500
 
        David
 
- libck-connector/ck-connector.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ libck-connector/ck-connector.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 commit 4f0911bf685f51b51d05a69a40d3950debb995a0
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4225,13 +4409,13 @@ Date:	Fri Mar 2 17:51:37 2007 -0500
     These tools will be used to generate and verify the parameters
     used to open a session.
 
- configure.ac			       |    5 +
- src/proc-linux.c		       |   57 +++++
- src/proc.h			       |   20 +-
- tools/linux/Makefile.am	       |   23 ++-
- tools/linux/ck-collect-session-info.c |  390
- +++++++++++++++++++++++++++++++++
- tools/linux/ck-get-x11-server-pid.c   |   75 +++++++
+ configure.ac			       |   5 +
+ src/proc-linux.c		       |  57 +++++
+ src/proc.h			       |  20 +-
+ tools/linux/Makefile.am	       |  23 +-
+ tools/linux/ck-collect-session-info.c | 390
+ ++++++++++++++++++++++++++++++++++
+ tools/linux/ck-get-x11-server-pid.c   |  75 +++++++
  6 files changed, 560 insertions(+), 10 deletions(-)
 
 commit 75ad4b862611bd6a39bda06db3db4c9737657dad
@@ -4240,8 +4424,8 @@ Date:	Thu Mar 1 15:23:14 2007 -0500
 
     dist the manual page for the PAM module
 
- pam-ck-connector/Makefile.am |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ pam-ck-connector/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 commit 1d1b98cd17764be77b1aee79efae8e89ce7faa04
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4252,11 +4436,11 @@ Date:	Thu Mar 1 14:24:27 2007 -0500
     Basically this is a mini login.  It authenticates, opens a session,
     sleeps 20 seconds, and then closes the session.
 
- configure.ac			     |	  4 +
- pam-ck-connector/Makefile.am	     |	 38 +++++++++-
- pam-ck-connector/pam-ck-connector.c |	  2 +-
- pam-ck-connector/test-pam.c	     |	135
- +++++++++++++++++++++++++++++++++++
+ configure.ac			     |	 4 ++
+ pam-ck-connector/Makefile.am	     |	38 ++++++++--
+ pam-ck-connector/pam-ck-connector.c |	 2 +-
+ pam-ck-connector/test-pam.c	     | 135
+ ++++++++++++++++++++++++++++++++++++
  4 files changed, 174 insertions(+), 5 deletions(-)
 
 commit e37a78dfc5abcb3b02cb5debaa24122fa9b949c4
@@ -4265,8 +4449,8 @@ Date:	Thu Mar 1 13:08:17 2007 -0500
 
     fix some typos
 
- pam-ck-connector/pam-ck-connector.c |	  7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ pam-ck-connector/pam-ck-connector.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 6eae9c8ba66c9a7469a2cdea88c16048fdbe2638
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4277,9 +4461,9 @@ Date:	Wed Feb 28 14:20:40 2007 -0500
     Add a simple test app for the connector.  Adapted from
     the example David put in the header.
 
- libck-connector/Makefile.am	  |   59 ++++++++++++++++++++++----
- libck-connector/test-connector.c |   85
- ++++++++++++++++++++++++++++++++++++++
+ libck-connector/Makefile.am	  | 59 +++++++++++++++++++++++-----
+ libck-connector/test-connector.c | 85
+ ++++++++++++++++++++++++++++++++++++++++
  2 files changed, 135 insertions(+), 9 deletions(-)
 
 commit 1905aa0cb4a680308949e366c21803bcf542d9e1
@@ -4298,10 +4482,10 @@ Date:	Wed Feb 28 14:19:44 2007 -0500
     I also made some changes to whitespace and style.  And converted
     descriptions to gtkdoc style comments.
 
- libck-connector/ck-connector.c      |	886
- +++++++++++++++++++++++------------
- libck-connector/ck-connector.h      |	108 +----
- pam-ck-connector/pam-ck-connector.c |	287 +++++++-----
+ libck-connector/ck-connector.c      | 886
+ +++++++++++++++++++++++-------------
+ libck-connector/ck-connector.h      | 108 +----
+ pam-ck-connector/pam-ck-connector.c | 287 ++++++------
  3 files changed, 762 insertions(+), 519 deletions(-)
 
 commit fed7e94f76c4279015354ff210bc72f1ac68af70
@@ -4321,17 +4505,17 @@ Date:	Wed Feb 28 13:52:17 2007 -0500
     under the MIT license as god knows what might want to use them. Sounds
     good to you?
 
- Makefile.am			     |	  2 +
- configure.ac			     |	 29 +++
- libck-connector/Makefile.am	     |	 22 ++
- libck-connector/ck-connector.c      |	381
- +++++++++++++++++++++++++++++++++++
- libck-connector/ck-connector.h      |	122 +++++++++++
- libck-connector/ck-connector.pc.in  |	  9 +
- pam-ck-connector/Makefile.am	     |	 17 ++
- pam-ck-connector/pam-ck-connector.c |	228 +++++++++++++++++++++
- pam-ck-connector/pam_ck_connector.8 |	 80 ++++++++
- 9 files changed, 890 insertions(+), 0 deletions(-)
+ Makefile.am			     |	 2 +
+ configure.ac			     |	29 +++
+ libck-connector/Makefile.am	     |	22 +++
+ libck-connector/ck-connector.c      | 381
+ ++++++++++++++++++++++++++++++++++++
+ libck-connector/ck-connector.h      | 122 ++++++++++++
+ libck-connector/ck-connector.pc.in  |	 9 +
+ pam-ck-connector/Makefile.am	     |	17 ++
+ pam-ck-connector/pam-ck-connector.c | 228 +++++++++++++++++++++
+ pam-ck-connector/pam_ck_connector.8 |	80 ++++++++
+ 9 files changed, 890 insertions(+)
 
 commit 8b33f57e8cd5f451d55fbb0f9bcc3c119a076326
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4341,10 +4525,10 @@ Date:	Wed Feb 28 10:50:46 2007 -0500
 
     System dependent tools will be built in subdirectories under tools.
 
- configure.ac		       |   23 +++++++++++++++++++++++
- tools/Makefile.am	       |    8 ++++++++
- tools/{ => linux}/Makefile.am |   13 ++-----------
- 3 files changed, 33 insertions(+), 11 deletions(-)
+ configure.ac		 | 23 +++++++++++++++++++++++
+ tools/Makefile.am	 |  8 ++++++++
+ tools/linux/Makefile.am | 33 +++++++++++++++++++++++++++++++++
+ 3 files changed, 64 insertions(+)
 
 commit 593d2ae454f225c545c35398ddfd2c92389e48a7
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4360,9 +4544,9 @@ Date:	Wed Feb 28 10:47:51 2007 -0500
     attributes.  This is less racy and the session will be complete
     and correct before any signals are emitted.
 
- src/ck-manager.c |  370
- +++++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 252 insertions(+), 118 deletions(-)
+ src/ck-manager.c | 370
+ +++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 252 insertions(+), 118 deletions(-)
 
 commit 160f1cdb75e631743312cfd26fb41831ed0f5c8c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4370,8 +4554,8 @@ Date:	Wed Feb 28 10:43:17 2007 -0500
 
     don't rely on evironment getting updated in python scripts
 
- src/test-open-session-with-parameters |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ src/test-open-session-with-parameters | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 7c64a3ab942df6232f1386808a817ff5ecad1311
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4379,8 +4563,8 @@ Date:	Tue Feb 27 12:44:58 2007 -0500
 
     install the list-sessions tool as ck-list-sessions
 
- tools/Makefile.am |	8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ tools/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 75c0717053780fe51471213cdb21ee8019bfbb6e
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4388,10 +4572,10 @@ Date:	Mon Feb 26 17:08:23 2007 -0500
 
     post release version bump
 
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-commit f772ad2e5c57010f3ca0bbd04a0b490e8f78c07d
+commit f772ad2e5c57010f3ca0bbd04a0b490e8f78c07d (tag: 0.1.2)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Mon Feb 26 17:07:06 2007 -0500
 
@@ -4399,9 +4583,9 @@ Date:	Mon Feb 26 17:07:06 2007 -0500
 
     Also fix a distcheck error.
 
- NEWS		 |   13 +++++++++++++
- src/Makefile.am |    3 ++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
+ NEWS		 | 13 +++++++++++++
+ src/Makefile.am |  3 ++-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 35b022fde7836d0edb5819d4f8be29bd1b9a20d9
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4412,10 +4596,10 @@ Date:	Mon Feb 26 15:18:49 2007 -0500
     Make the proc.h API more coherent.	Convert some warnings
     to debug statements.  Fix two leaks.  Add more error checking.
 
- src/ck-manager.c |  104
- ++++++++++++++++++++++++++++++++++--------------------
- src/proc-linux.c |   42 ++++++++++++---------
- src/proc.h	  |   17 +++++----
+ src/ck-manager.c | 104
+ +++++++++++++++++++++++++++++++++++--------------------
+ src/proc-linux.c |  42 ++++++++++++----------
+ src/proc.h	  |  17 ++++-----
  3 files changed, 99 insertions(+), 64 deletions(-)
 
 commit 8fa6f59953fbcae779008c7cdf12441e995b1ca3
@@ -4427,8 +4611,8 @@ Date:	Wed Feb 21 13:22:37 2007 -0500
     Copy the iso8601 function from glib to support versions less than
     2.12.
 
- src/ck-manager.c |   25 ++++++++++++++++++++++++-
- src/ck-session.c |   27 +++++++++++++++++++++++++--
+ src/ck-manager.c | 25 ++++++++++++++++++++++++-
+ src/ck-session.c | 27 +++++++++++++++++++++++++--
  2 files changed, 49 insertions(+), 3 deletions(-)
 
 commit 20d3103338d253d09ba7317e6a53310fa9680794
@@ -4437,10 +4621,14 @@ Date:	Wed Feb 21 11:31:54 2007 -0500
 
     make separate test scripts for open session methods
 
- src/ck-manager.c				    |	 1 +
- src/{test-session => test-open-session}	    |	13 +++++--------
- ...t-session => test-open-session-with-parameters} |	 0
- 3 files changed, 6 insertions(+), 8 deletions(-)
+ src/ck-manager.c		       |  1 +
+ src/test-open-session		       | 44
+ ++++++++++++++++++++++++++++++++
+ src/test-open-session-with-parameters | 47
+ +++++++++++++++++++++++++++++++++++
+ src/test-session		       | 47
+ -----------------------------------
+ 4 files changed, 92 insertions(+), 47 deletions(-)
 
 commit 0a8a82bf2701eadb3ef8c3ea927b1d61ea0f68ba
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4448,8 +4636,8 @@ Date:	Wed Feb 21 11:31:09 2007 -0500
 
     don't use null parameters
 
- src/ck-session.c |   32 +++++++++++++++++---------------
- 1 files changed, 17 insertions(+), 15 deletions(-)
+ src/ck-session.c | 32 +++++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
 
 commit eb9361c9b0b05c3bd51de7325c3327db79431fc9
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4462,10 +4650,10 @@ Date:	Tue Feb 20 14:45:40 2007 -0500
     So the system is idle when there are no sessions or all sessions
     are idle.
 
- src/ck-manager.c   |  160
- ++++++++++++++++++++++++++++++++++++++++++++++------
- src/ck-manager.h   |	20 +++++-
- src/ck-manager.xml |	 8 +++
+ src/ck-manager.c   | 160
+ +++++++++++++++++++++++++++++++++++++++++++++++------
+ src/ck-manager.h   |  20 +++++--
+ src/ck-manager.xml |	8 +++
  3 files changed, 166 insertions(+), 22 deletions(-)
 
 commit ef89bbdb1be20fbca2a83037fcc922b444b7b513
@@ -4477,9 +4665,9 @@ Date:	Tue Feb 20 14:43:27 2007 -0500
     This makes it easier to use from C code.  Also fix a bug where
     we weren't emitting the argument in the idle-hint-changed signal.
 
- src/ck-session.c   |	23 ++++++++++++++++-------
- src/ck-session.h   |	 6 ++++--
- src/ck-session.xml |	 2 --
+ src/ck-session.c   | 23 ++++++++++++++++-------
+ src/ck-session.h   |  6 ++++--
+ src/ck-session.xml |  2 --
  3 files changed, 20 insertions(+), 11 deletions(-)
 
 commit 10a6532e35f4e40135006329a6975942ee896817
@@ -4491,11 +4679,11 @@ Date:	Tue Feb 20 12:07:29 2007 -0500
     Rename GetIdle to GetIdleHint (etc) to make it clear that these
     are not authoritative properties.
 
- src/ck-session.c      |   62
- ++++++++++++++++++++++++------------------------
- src/ck-session.h      |   24 +++++++++---------
- src/ck-session.xml    |   12 ++++----
- tools/list-sessions.c |   12 ++++----
+ src/ck-session.c      | 62
+ +++++++++++++++++++++++++--------------------------
+ src/ck-session.h      | 24 ++++++++++----------
+ src/ck-session.xml    | 12 +++++-----
+ tools/list-sessions.c | 12 +++++-----
  4 files changed, 55 insertions(+), 55 deletions(-)
 
 commit 7f7124d4f7583347043b271472e570614d975f35
@@ -4506,8 +4694,8 @@ Date:	Mon Feb 19 17:59:54 2007 -0500
 
     Try to limit the use of errno in case it can change.
 
- src/ck-vt-monitor.c |	 15 ++++++++++-----
- 1 files changed, 10 insertions(+), 5 deletions(-)
+ src/ck-vt-monitor.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit 5376650940e9018a0d3e97367d2979f90af749bc
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4519,8 +4707,8 @@ Date:	Mon Feb 19 16:14:22 2007 -0500
     Also
     add a comment to note where getfd.c comes from.
 
- src/ck-vt-monitor.c |	 42 ++++++++++++++++++++++++++++++++----------
- src/getfd.c	     |	  6 ++++++
+ src/ck-vt-monitor.c | 42 ++++++++++++++++++++++++++++++++----------
+ src/getfd.c	     |	6 ++++++
  2 files changed, 38 insertions(+), 10 deletions(-)
 
 commit 4d7e3eec89f706cb9a46fd84359de3da1868245d
@@ -4535,9 +4723,9 @@ Date:	Mon Feb 19 15:42:37 2007 -0500
     possible by
     discarding all but the most recent VT activation event.
 
- src/ck-vt-monitor.c |	226
- +++++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 174 insertions(+), 52 deletions(-)
+ src/ck-vt-monitor.c | 226
+ ++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 174 insertions(+), 52 deletions(-)
 
 commit 51ff0be15b7bd4a48fd07ada4822f07ddc028af0
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4547,8 +4735,8 @@ Date:	Thu Feb 15 17:20:46 2007 -0500
 
     It was getting impossible to read all on one line.
 
- tools/list-sessions.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ tools/list-sessions.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 497cc86462934168ab8cd379ab1130d4ef5d039b
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4559,11 +4747,11 @@ Date:	Thu Feb 15 16:15:16 2007 -0500
     Added GetCreationTime and GetIdleSince methods.  And added the
     output to the list-sessions tool.
 
- src/ck-session.c      |   49
+ src/ck-session.c      | 49
  +++++++++++++++++++++++++++++++++++++++++++++++++
- src/ck-session.h      |    5 +++++
- src/ck-session.xml    |    7 +++++++
- tools/list-sessions.c |   17 +++++++++++++++--
+ src/ck-session.h      |  5 +++++
+ src/ck-session.xml    |  7 +++++++
+ tools/list-sessions.c | 17 +++++++++++++++--
  4 files changed, 76 insertions(+), 2 deletions(-)
 
 commit cbe9b9ba1ca59d25365593fdc1a66f9ffd3183ca
@@ -4575,10 +4763,10 @@ Date:	Thu Feb 15 15:28:27 2007 -0500
     Add the GetIdle and SetIdle methods, and the IdleChanged signal.
     SetIdle is restricted to the uid of the session in question.
 
- src/ck-session.c   |  166
- +++++++++++++++++++++++++++++++++++++++++++++++++---
- src/ck-session.h   |	 7 +-
- src/ck-session.xml |	11 ++++
+ src/ck-session.c   | 166
+ ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/ck-session.h   |	7 ++-
+ src/ck-session.xml |  11 ++++
  3 files changed, 173 insertions(+), 11 deletions(-)
 
 commit 66c740f30d36bac8f7b56261f0bd595b297d3dd2
@@ -4589,9 +4777,9 @@ Date:	Thu Feb 15 15:26:06 2007 -0500
 
     Only allow the uid and pid that opened the session to close it.
 
- src/ck-manager.c |   77
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 77 insertions(+), 0 deletions(-)
+ src/ck-manager.c | 77
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 77 insertions(+)
 
 commit be0751cd3ec3638082721b1556c07a4238c6c4ac
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4599,10 +4787,10 @@ Date:	Thu Feb 15 15:23:06 2007 -0500
 
     convert all tabs to spaces
 
- src/ck-manager.c |  154
- +++++++++++++++++++++++++++---------------------------
- src/ck-seat.c	  |   18 +++---
- src/ck-session.c |   14 +++---
+ src/ck-manager.c | 154
+ +++++++++++++++++++++++++++----------------------------
+ src/ck-seat.c	  |  18 +++----
+ src/ck-session.c |  14 ++---
  3 files changed, 93 insertions(+), 93 deletions(-)
 
 commit 4009566af9a47aa4a41dac689ff89f017d6dc8db
@@ -4611,8 +4799,8 @@ Date:	Thu Feb 15 15:22:20 2007 -0500
 
     fix compiler warning
 
- src/getfd.c |	  9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ src/getfd.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 6c532b986e2a05bf666a8409cf130651e8461874
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4620,8 +4808,8 @@ Date:	Tue Feb 13 08:07:19 2007 -0500
 
     fix warning from missing include
 
- src/ck-vt-monitor.c |	  2 +-
- src/main.c	     |	  9 +++++----
+ src/ck-vt-monitor.c | 2 +-
+ src/main.c	     | 9 +++++----
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 commit 4800bf1e4a3706b6829ccc875d040a64a8d17aad
@@ -4634,8 +4822,8 @@ Date:	Tue Feb 13 07:03:50 2007 -0500
     pid file, so
     if needed attached patch adds that with copy/paste from PolicyKit :).
 
- src/main.c |	25 ++++++++++++++++++++++++-
- 1 files changed, 24 insertions(+), 1 deletions(-)
+ src/main.c | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
 
 commit 1bd5d81ed1c69074d48158a337043fc569970b75
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4643,17 +4831,17 @@ Date:	Mon Feb 12 17:02:35 2007 -0500
 
     post release version bump
 
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-commit 87813890f09c1e1ac16f617e8baf7d523e971381
+commit 87813890f09c1e1ac16f617e8baf7d523e971381 (tag: 0.1.1)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Mon Feb 12 16:56:24 2007 -0500
 
     add more warnings when building from git
 
- configure.ac |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 32d47eb2f93f97c29b2582add77b54428aefef5a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4661,8 +4849,8 @@ Date:	Mon Feb 12 16:53:24 2007 -0500
 
     update for release
 
- NEWS |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 commit 3444585150a2f88ccfe92ba5f3959961428d597c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4673,8 +4861,8 @@ Date:	Mon Feb 12 16:15:51 2007 -0500
     Just the use vt number given by the vt-manager instead of
     asking for the current vt again.  A little bit less racy this way.
 
- src/ck-seat.c |   31 +++++++++++++++++++------------
- 1 files changed, 19 insertions(+), 12 deletions(-)
+ src/ck-seat.c | 31 +++++++++++++++++++------------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
 
 commit dc427221e1c5028465f4a78132374662341ca3b7
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4685,8 +4873,8 @@ Date:	Thu Feb 8 14:12:10 2007 -0500
     The minimum stack size 16k seems to crash glibc
     when we do printf in debug.
 
- src/ck-vt-monitor.c |	  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-vt-monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0c695fd6c3279e8b3f3336337bdc0d66689eff9a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4697,9 +4885,9 @@ Date:	Wed Feb 7 14:51:16 2007 -0500
     Instead of exiting on disconnect this attempts to reconnect.
     Based on patch from: Timo Hoenig <thoenig@suse.de>
 
- src/main.c |  198
- ++++++++++++++++++++++++++++++++++++++++++++++--------------
- 1 files changed, 153 insertions(+), 45 deletions(-)
+ src/main.c | 198
+ +++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 153 insertions(+), 45 deletions(-)
 
 commit 975ccd898da30b3904e287848d6d7661ed0a9dfe
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4709,8 +4897,8 @@ Date:	Wed Feb 7 14:49:05 2007 -0500
 
     Reduce the buffer size in the debugging code.
 
- src/ck-debug.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ src/ck-debug.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 4cf47cb3072a7995e6dc87fcc7dd4bafe76256f8
 Author: David Zeuthen <david@fubar.dk>
@@ -4722,8 +4910,8 @@ Date:	Wed Feb 7 11:01:52 2007 -0500
     HAL I'm working on); this patch does that for RH based systems. Please
     apply. Thanks!
 
- data/ConsoleKit.in |	 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ data/ConsoleKit.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7dcf31d02463faa3c59a9417dae654668d03fea9
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4733,8 +4921,8 @@ Date:	Wed Feb 7 10:57:55 2007 -0500
 
     Oops.
 
- HACKING |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ HACKING | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 98addf1933cd24f546177dd4b158c770ea404df0
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4745,9 +4933,9 @@ Date:	Wed Feb 7 10:53:30 2007 -0500
     Add more information that was stolen from the HAL HACKING file.
     The parts on how to use git are particularly useful.
 
- HACKING |   94
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 91 insertions(+), 3 deletions(-)
+ HACKING | 94
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 91 insertions(+), 3 deletions(-)
 
 commit 7e4ffe9ca1d65afeb094ee1bb71b0a7751e09e1c
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4757,8 +4945,8 @@ Date:	Tue Feb 6 11:49:35 2007 -0500
     a session registered on it.
     Patch from: David Zeuthen
 
- src/ck-seat.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ src/ck-seat.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit dc17c930b2ba7dd0a4d0c1ba12c75aa2db18d5a6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4766,8 +4954,8 @@ Date:	Tue Feb 6 11:46:48 2007 -0500
 
     Add some more debugging output
 
- src/ck-manager.c |    8 +++++++-
- src/ck-session.c |    4 +++-
+ src/ck-manager.c | 8 +++++++-
+ src/ck-session.c | 4 +++-
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 commit 89ee325cf6a0006e48ce702cd5626b7ef4021b04
@@ -4777,8 +4965,8 @@ Date:	Tue Feb 6 11:46:21 2007 -0500
     Make threads use minimum stack size rather than the default.
     Patch from: mclasen@redhat.com
 
- src/ck-vt-monitor.c |	  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/ck-vt-monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a7208ca3337fef21daa9cd39e0178fe46d31ab99
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4786,9 +4974,12 @@ Date:	Fri Jan 12 16:11:00 2007 -0500
 
     Rename dbus config file.
 
- data/{console-kit.conf => ConsoleKit.conf} |	 0
- data/Makefile.am			    |	 2 +-
- 2 files changed, 1 insertions(+), 1 deletions(-)
+ data/ConsoleKit.conf  | 49
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ data/Makefile.am      |  2 +-
+ data/console-kit.conf | 49
+ -------------------------------------------------
+ 3 files changed, 50 insertions(+), 50 deletions(-)
 
 commit be3fef886b70ccfd5ee48bcd5d9f4cb0256ecbdc
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4796,8 +4987,8 @@ Date:	Fri Jan 12 15:59:04 2007 -0500
 
     Change a console-kit to ConsoleKit in a few places
 
- configure.ac	    |	11 ++++++-----
- data/ConsoleKit.in |	 8 ++++----
+ configure.ac	    | 11 ++++++-----
+ data/ConsoleKit.in |  8 ++++----
  2 files changed, 10 insertions(+), 9 deletions(-)
 
 commit e7774625aa136e766c064f39d83d031c5af8d900
@@ -4806,18 +4997,18 @@ Date:	Thu Jan 11 11:03:30 2007 -0500
 
     Post release version bump
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 9ced94ab8b658ae31e8d2652d6cfe4d635459014
+commit 9ced94ab8b658ae31e8d2652d6cfe4d635459014 (tag: 0.1.0)
 Author: William Jon McCann <mccann@jhu.edu>
 Date:	Thu Jan 11 10:54:39 2007 -0500
 
     Update for 0.1.0 release
 
- NEWS	      |    7 +++++++
- configure.ac |    2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
+ NEWS	      | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit e6b013eb3b5310357d6a62a405fcc1da8aad0cf8
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4825,10 +5016,10 @@ Date:	Wed Jan 10 22:45:05 2007 -0500
 
     Add HACKING and README.
 
- HACKING     |	  8 ++++++++
- Makefile.am |	  1 +
- README      |	 26 ++++++++++++++++++++++++++
- 3 files changed, 35 insertions(+), 0 deletions(-)
+ HACKING     |	8 ++++++++
+ Makefile.am |	1 +
+ README      | 26 ++++++++++++++++++++++++++
+ 3 files changed, 35 insertions(+)
 
 commit 47b6509e6f386bf47244922b2c3cf5637be117a3
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4836,9 +5027,9 @@ Date:	Fri Nov 17 17:39:51 2006 -0500
 
     Dist the ChangeLog, sigh.
 
- Makefile.am  |    1 +
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ Makefile.am  | 1 +
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit c05a0ed330836b4f9569b6b6c96d853b8207c33a
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4847,12 +5038,13 @@ Date:	Fri Nov 17 17:33:22 2006 -0500
     Automatically generate ChangeLog.  Fix autogen.  Remove translation
     stuff.
 
- Makefile.am	|   26 ++-
- autogen.sh	|  549
- ++++++++++++++------------------------------------------
- configure.ac	|    2 -
- po/POTFILES.in |    3 -
- 4 files changed, 158 insertions(+), 422 deletions(-)
+ Makefile.am	|  26 ++-
+ autogen.sh	| 549
+ +++++++++++++++------------------------------------------
+ configure.ac	|   2 -
+ po/ChangeLog	|   0
+ po/POTFILES.in |   3 -
+ 5 files changed, 158 insertions(+), 422 deletions(-)
 
 commit babc733eff30a2be18fa3f99bc3ef4f14e35d259
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4860,11 +5052,11 @@ Date:	Mon Nov 6 15:28:41 2006 -0500
 
     Fix some small leaks.  Add --timed-exit to daemon for valgrinding.
 
- src/ck-manager.c |   11 ++++++++++-
- src/ck-session.c |    2 ++
- src/main.c	  |    3 ++-
- src/test-session |    3 ++-
- src/valgrind.sh  |    4 ++--
+ src/ck-manager.c | 11 ++++++++++-
+ src/ck-session.c |  2 ++
+ src/main.c	  |  3 ++-
+ src/test-session |  3 ++-
+ src/valgrind.sh  |  4 ++--
  5 files changed, 18 insertions(+), 5 deletions(-)
 
 commit be02d5de51072235c20d6974f0cccb485055a02e
@@ -4873,9 +5065,9 @@ Date:	Mon Nov 6 00:35:01 2006 -0500
 
     Show message even when error is NULL.  Fix valgrind script.
 
- src/ck-manager.c |    1 -
- src/main.c	  |    4 ++++
- src/valgrind.sh  |    4 ++--
+ src/ck-manager.c | 1 -
+ src/main.c	  | 4 ++++
+ src/valgrind.sh  | 4 ++--
  3 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 7e817628550ab4932baf6059b06049944893af7e
@@ -4884,8 +5076,8 @@ Date:	Tue Oct 31 23:38:41 2006 -0500
 
     Fake the presence of a ChangeLog to work around automake
 
- autogen.sh |	 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ autogen.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 26b40c39ef74eec4f0e9cc7834cfd033a4decbb3
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4894,10 +5086,10 @@ Date:	Tue Oct 31 22:40:34 2006 -0500
     Add a script to test FUS related functionality.
     Fix a problem where error was reported twice.
 
- src/ck-seat.c	  |    5 +++-
- src/test-fus	  |   63
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/test-session |   13 +++-------
+ src/ck-seat.c	  |  5 ++++-
+ src/test-fus	  | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/test-session | 13 ++++--------
  3 files changed, 71 insertions(+), 10 deletions(-)
 
 commit 1d77428175b9684acf582717e7b12b3775ec7e4e
@@ -4906,14 +5098,16 @@ Date:	Fri Oct 27 10:20:57 2006 -0400
 
     Add .gitignore files and rename tool.
 
- .gitignore				    |	45
- ++++++++++++++++++++++++++++
- data/.gitignore			    |	 3 ++
- src/.gitignore				    |	13 ++++++++
- tools/.gitignore			    |	 8 +++++
- tools/Makefile.am			    |	 8 ++--
- tools/{list-consoles.c => list-sessions.c} |	 0
- 6 files changed, 73 insertions(+), 4 deletions(-)
+ .gitignore	       |  45 +++++++
+ data/.gitignore       |   3 +
+ src/.gitignore        |  13 ++
+ tools/.gitignore      |   8 ++
+ tools/Makefile.am     |   8 +-
+ tools/list-consoles.c | 362
+ --------------------------------------------------
+ tools/list-sessions.c | 362
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 435 insertions(+), 366 deletions(-)
 
 commit 6b71d5dcaf9178645d83b4cbfc8febbb43ebe9c2
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4921,37 +5115,38 @@ Date:	Fri Oct 27 09:54:59 2006 -0400
 
     Actually remove files and remember to use commit -a.
 
- INSTALL	       |  236 -
- Makefile.am	       |    3 -
- Makefile.in	       |  723 --
- acinclude.m4	       |   88 +
- aclocal.m4	       | 8166 -----------------
- compile	       |  142 -
- config.guess	       | 1463 ---
- config.h.in	       |   97 -
- config.sub	       | 1579 ----
- configure	       |24456
- -------------------------------------------------
- configure.ac	       |    2 +-
- data/Makefile.am      |    4 +
- data/Makefile.in      |  443 -
- depcomp	       |  530 --
- install-sh	       |  323 -
- intltool-extract.in   |  853 --
- intltool-merge.in     | 1403 ---
- intltool-update.in    | 1089 ---
- ltmain.sh	       | 6863 --------------
- missing	       |  360 -
- mkinstalldirs	       |  158 -
- po/Makefile.in.in     |  221 -
- src/Makefile.in       |  724 --
- src/ck-manager-glue.h |  223 -
- src/ck-marshal.c      |  126 -
- src/ck-marshal.h      |   28 -
- src/ck-seat-glue.h    |  167 -
- src/ck-session-glue.h |  135 -
- tools/Makefile.in     |  632 --
- 29 files changed, 93 insertions(+), 51144 deletions(-)
+ ChangeLog	       |     0
+ INSTALL	       |   236 -
+ Makefile.am	       |     3 -
+ Makefile.in	       |   723 --
+ acinclude.m4	       |    88 +
+ aclocal.m4	       |  8166 ----------------
+ compile	       |   142 -
+ config.guess	       |  1463 ---
+ config.h.in	       |    97 -
+ config.sub	       |  1579 ----
+ configure	       | 24456
+ ------------------------------------------------
+ configure.ac	       |     2 +-
+ data/Makefile.am      |     4 +
+ data/Makefile.in      |   443 -
+ depcomp	       |   530 --
+ install-sh	       |   323 -
+ intltool-extract.in   |   853 --
+ intltool-merge.in     |  1403 ---
+ intltool-update.in    |  1089 ---
+ ltmain.sh	       |  6863 --------------
+ missing	       |   360 -
+ mkinstalldirs	       |   158 -
+ po/Makefile.in.in     |   221 -
+ src/Makefile.in       |   724 --
+ src/ck-manager-glue.h |   223 -
+ src/ck-marshal.c      |   126 -
+ src/ck-marshal.h      |    28 -
+ src/ck-seat-glue.h    |   167 -
+ src/ck-session-glue.h |   135 -
+ tools/Makefile.in     |   632 --
+ 30 files changed, 93 insertions(+), 51144 deletions(-)
 
 commit 0c2eba4ba67bcc52e9ce88e49a0dd74ce5ebdea6
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4959,9 +5154,9 @@ Date:	Thu Oct 26 21:58:54 2006 -0400
 
     Remove all the generated cruft from the tarball import.
 
- autogen.sh |  445
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 445 insertions(+), 0 deletions(-)
+ autogen.sh | 445
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 445 insertions(+)
 
 commit d8d6b694e11d9433495833dfe09dcb3cf6830c1d
 Author: William Jon McCann <mccann@jhu.edu>
@@ -4969,8 +5164,8 @@ Date:	Wed Oct 25 16:30:23 2006 -0400
 
     Bump version for git.
 
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a08530e838218b3c5859550058e78b8f1abee434
 Author: William Jon McCann <mccannwj@acsnb12.pha.jhu.edu>
@@ -4978,62 +5173,66 @@ Date:	Wed Oct 25 14:38:19 2006 -0400
 
     Initial import
 
- AUTHORS	       |    1 +
- COPYING	       |  340 +
- INSTALL	       |  236 +
- Makefile.am	       |   51 +
- Makefile.in	       |  723 ++
- acinclude.m4	       |   43 +
- aclocal.m4	       | 8166 +++++++++++++++++
- compile	       |  142 +
- config.guess	       | 1463 +++
- config.h.in	       |   97 +
- config.sub	       | 1579 ++++
- configure	       |24456
- +++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	       |  236 +
- data/ConsoleKit.in    |   70 +
- data/Makefile.am      |   14 +
- data/Makefile.in      |  443 +
- data/console-kit.conf |   49 +
- depcomp	       |  530 ++
- install-sh	       |  323 +
- intltool-extract.in   |  853 ++
- intltool-merge.in     | 1403 +++
- intltool-update.in    | 1089 +++
- ltmain.sh	       | 6863 ++++++++++++++
- missing	       |  360 +
- mkinstalldirs	       |  158 +
- po/Makefile.in.in     |  221 +
- po/POTFILES.in        |    3 +
- src/Makefile.am       |   90 +
- src/Makefile.in       |  724 ++
- src/ck-debug.c        |  153 +
- src/ck-debug.h        |   72 +
- src/ck-manager-glue.h |  223 +
- src/ck-manager.c      | 1017 ++
- src/ck-manager.h      |   97 +
- src/ck-manager.xml    |   48 +
- src/ck-marshal.c      |  126 +
- src/ck-marshal.h      |   28 +
- src/ck-marshal.list   |    2 +
- src/ck-seat-glue.h    |  167 +
- src/ck-seat.c	       |  724 ++
- src/ck-seat.h	       |  111 +
- src/ck-seat.xml       |   27 +
- src/ck-session-glue.h |  135 +
- src/ck-session.c      |  744 ++
- src/ck-session.h      |  156 +
- src/ck-session.xml    |   49 +
- src/ck-vt-monitor.c   |  360 +
- src/ck-vt-monitor.h   |   71 +
- src/getfd.c	       |   52 +
- src/main.c	       |  141 +
- src/proc-linux.c      |  473 +
- src/proc.h	       |   41 +
- src/test-session      |   51 +
- src/valgrind.sh       |   12 +
- tools/Makefile.am     |   42 +
- tools/Makefile.in     |  632 ++
- tools/list-consoles.c |  362 +
- 57 files changed, 56842 insertions(+), 0 deletions(-)
+ AUTHORS	       |     1 +
+ COPYING	       |   340 +
+ ChangeLog	       |     0
+ INSTALL	       |   236 +
+ Makefile.am	       |    51 +
+ Makefile.in	       |   723 ++
+ NEWS		       |     0
+ README		       |     0
+ acinclude.m4	       |    43 +
+ aclocal.m4	       |  8166 ++++++++++++++++
+ compile	       |   142 +
+ config.guess	       |  1463 +++
+ config.h.in	       |    97 +
+ config.sub	       |  1579 ++++
+ configure	       | 24456
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	       |   236 +
+ data/ConsoleKit.in    |    70 +
+ data/Makefile.am      |    14 +
+ data/Makefile.in      |   443 +
+ data/console-kit.conf |    49 +
+ depcomp	       |   530 ++
+ install-sh	       |   323 +
+ intltool-extract.in   |   853 ++
+ intltool-merge.in     |  1403 +++
+ intltool-update.in    |  1089 +++
+ ltmain.sh	       |  6863 ++++++++++++++
+ missing	       |   360 +
+ mkinstalldirs	       |   158 +
+ po/ChangeLog	       |     0
+ po/Makefile.in.in     |   221 +
+ po/POTFILES.in        |     3 +
+ src/Makefile.am       |    90 +
+ src/Makefile.in       |   724 ++
+ src/ck-debug.c        |   153 +
+ src/ck-debug.h        |    72 +
+ src/ck-manager-glue.h |   223 +
+ src/ck-manager.c      |  1017 ++
+ src/ck-manager.h      |    97 +
+ src/ck-manager.xml    |    48 +
+ src/ck-marshal.c      |   126 +
+ src/ck-marshal.h      |    28 +
+ src/ck-marshal.list   |     2 +
+ src/ck-seat-glue.h    |   167 +
+ src/ck-seat.c	       |   724 ++
+ src/ck-seat.h	       |   111 +
+ src/ck-seat.xml       |    27 +
+ src/ck-session-glue.h |   135 +
+ src/ck-session.c      |   744 ++
+ src/ck-session.h      |   156 +
+ src/ck-session.xml    |    49 +
+ src/ck-vt-monitor.c   |   360 +
+ src/ck-vt-monitor.h   |    71 +
+ src/getfd.c	       |    52 +
+ src/main.c	       |   141 +
+ src/proc-linux.c      |   473 +
+ src/proc.h	       |    41 +
+ src/test-session      |    51 +
+ src/valgrind.sh       |    12 +
+ tools/Makefile.am     |    42 +
+ tools/Makefile.in     |   632 ++
+ tools/list-consoles.c |   362 +
+ 61 files changed, 56842 insertions(+)
diff --git a/INSTALL b/INSTALL
index 7d1c323..007e939 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Makefile.in b/Makefile.in
index 2dbc88f..8bb8c5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 # This file will be processed with automake-1.7 to create Makefile.in
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,11 +80,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in COPYING TODO compile config.guess \
+	config.sub install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -52,36 +96,73 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -108,8 +189,11 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -132,7 +216,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -213,6 +296,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -323,7 +409,7 @@ all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -359,10 +445,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -385,22 +469,25 @@ distclean-libtool:
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -415,57 +502,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -481,12 +523,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -498,15 +535,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -515,9 +548,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -553,13 +608,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -588,35 +640,35 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -627,8 +679,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -638,9 +690,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -648,6 +700,7 @@ distcheck: dist
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -671,13 +724,21 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -708,10 +769,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -795,24 +861,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
 # Creating ChangeLog from git log (taken from cairo/Makefile.am):
diff --git a/NEWS b/NEWS
index 81c3225..024923c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,24 @@
 ==============
+Version 0.4.6
+==============
+
+ NOTE: ConsoleKit is no longer actively maintained and this will most
+ likely be the final release. You are advised to switch to logind:
+ http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html
+
+ * Don't truncate --frequent output to 8 chars in ck-history (Ray Strode)
+ * Import udev-acl tool from udev (Michael Biebl)
+ * Add support for GNU/Hurd (Pino Toscano)
+ * Build system fixes (Samuli Suominen)
+
+==============
+Version 0.4.5
+==============
+
+ * Loop around opening /dev/console to deal with BKL-less kernels (Colin Watson)
+ * systemd fixes (Lennart Poettering)
+
+==============
 Version 0.4.4
 ==============
 
diff --git a/aclocal.m4 b/aclocal.m4
index 1aece34..3cd5d39 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -260,6 +261,10 @@ msgstr ""
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -455,8 +460,8 @@ fi])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -465,8 +470,8 @@ fi])
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -600,6 +605,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1085,7 +1092,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -1249,6 +1256,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -1270,6 +1278,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1300,6 +1331,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -1402,7 +1437,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1410,6 +1451,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1421,6 +1463,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1438,7 +1481,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1483,8 +1528,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1495,6 +1540,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1728,7 +1775,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -1778,14 +1832,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1862,13 +1929,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2048,6 +2115,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2074,7 +2146,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2087,7 +2160,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2633,7 +2706,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2642,7 +2715,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2707,7 +2780,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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'
@@ -2846,7 +2919,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2854,10 +2927,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2865,7 +2934,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2883,7 +2952,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2902,18 +2971,8 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-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
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2974,7 +3033,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2990,7 +3049,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3027,9 +3086,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3058,14 +3117,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   # 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
@@ -3077,6 +3132,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   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
@@ -3096,7 +3163,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3165,7 +3232,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3190,7 +3257,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -3214,7 +3281,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3245,7 +3312,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3255,7 +3322,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -3636,10 +3703,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3677,12 +3740,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   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
@@ -4097,6 +4160,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4429,7 +4493,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4493,7 +4557,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4681,7 +4745,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4726,7 +4792,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4773,18 +4839,33 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4944,13 +5025,18 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | 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'
     ;;
@@ -4969,7 +5055,6 @@ m4_if([$1], [CXX], [
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5014,6 +5099,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5220,8 +5308,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5236,7 +5323,7 @@ _LT_EOF
       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=
@@ -5413,6 +5500,7 @@ _LT_EOF
 	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
@@ -5516,6 +5604,7 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5562,10 +5651,6 @@ _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5578,7 +5663,7 @@ _LT_EOF
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5617,7 +5702,6 @@ _LT_EOF
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5721,7 +5805,7 @@ _LT_EOF
       _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
@@ -6059,9 +6143,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -6215,7 +6296,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6585,7 +6665,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6601,9 +6681,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6765,7 +6842,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -7346,12 +7423,18 @@ public class foo {
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7548,7 +7631,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7681,7 +7763,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7864,6 +7945,73 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7933,6 +8081,13 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -8597,9 +8752,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -8771,15 +8941,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -8911,7 +9081,8 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -8957,7 +9128,8 @@ m4_define([_PKG_CONFIG],
     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_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -9005,9 +9177,9 @@ if test $pkg_failed = yes; then
    	AC_MSG_RESULT([no])
         _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 --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -9020,7 +9192,7 @@ $$1_PKG_ERRORS
 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])
@@ -9031,7 +9203,7 @@ path to pkg-config.
 
 _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
@@ -9041,7 +9213,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9053,10 +9225,10 @@ fi[]dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.13.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9072,22 +9244,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -9106,7 +9278,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -9132,22 +9304,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -9166,16 +9335,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -9185,7 +9352,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -9198,12 +9365,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -9211,8 +9379,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -9251,16 +9420,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -9269,16 +9438,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -9326,7 +9495,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -9336,34 +9505,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@@ -9376,7 +9550,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # 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
+    # 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.
@@ -9388,21 +9562,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # 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
+    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
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -9420,7 +9592,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -9430,15 +9602,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
@@ -9454,7 +9623,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9483,31 +9652,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -9518,28 +9696,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
@@ -9567,7 +9749,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9586,16 +9768,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -9612,20 +9792,17 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -9633,13 +9810,14 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -9647,18 +9825,14 @@ AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -9676,7 +9850,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -9701,17 +9875,46 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -9719,11 +9922,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -9736,63 +9938,35 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -9803,24 +9977,35 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -9831,32 +10016,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -9866,36 +10059,85 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9903,34 +10145,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -9938,24 +10178,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -9965,75 +10203,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/compile b/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.guess b/config.guess
index dc84c68..120cc0d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2013-05-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2009-11-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +501,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +515,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +572,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +615,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +751,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +790,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,30 +809,35 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -848,15 +874,22 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -866,52 +899,56 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -930,51 +967,57 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1026,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1062,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1090,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1131,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1175,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1204,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1178,6 +1221,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1204,19 +1250,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1230,7 +1278,10 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,13 +1326,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1299,11 +1350,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1321,11 +1372,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/config.h.in b/config.h.in
index 42f2129..9d6eb07 100644
--- a/config.h.in
+++ b/config.h.in
@@ -91,6 +91,9 @@
    */
 #undef LT_OBJDIR
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/config.sub b/config.sub
index 2a55a50..8b612ab 100755
--- a/config.sub
+++ b/config.sub
@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2013-04-24'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,13 +115,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -152,12 +149,12 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +170,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -221,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -245,20 +248,27 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -276,34 +286,45 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nios | nios2 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| or32 \
+	| open8 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +334,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -327,25 +363,30 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -363,29 +404,34 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nios-* | nios2-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +456,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +526,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +571,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +729,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,9 +786,13 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -771,10 +829,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +905,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +993,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -948,7 +1021,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1017,6 +1094,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1153,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1224,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1324,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1281,20 +1352,21 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1413,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1462,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1426,15 +1498,14 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1528,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1543,20 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1576,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1509,6 +1589,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1527,7 +1610,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index 283b93f..763c13d 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ConsoleKit 0.4.5.
+# Generated by GNU Autoconf 2.69 for ConsoleKit 0.4.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -340,6 +368,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -516,28 +556,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -571,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ConsoleKit'
 PACKAGE_TARNAME='ConsoleKit'
-PACKAGE_VERSION='0.4.5'
-PACKAGE_STRING='ConsoleKit 0.4.5'
+PACKAGE_VERSION='0.4.6'
+PACKAGE_STRING='ConsoleKit 0.4.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit'
 PACKAGE_URL=''
 
@@ -630,6 +650,11 @@ DOCBOOK_DOCS_ENABLED_FALSE
 DOCBOOK_DOCS_ENABLED_TRUE
 XMLTO
 PAM_MODULE_DIR
+ENABLE_UDEV_ACL_FALSE
+ENABLE_UDEV_ACL_TRUE
+UDEVDIR
+UDEV_ACL_LIBS
+UDEV_ACL_CFLAGS
 ENABLE_PAM_MODULE_FALSE
 ENABLE_PAM_MODULE_TRUE
 PAM_LIBS
@@ -637,6 +662,8 @@ HAVE_PAM
 HAVE_PAM_FALSE
 HAVE_PAM_TRUE
 CK_BACKEND
+CK_COMPILE_GNU_FALSE
+CK_COMPILE_GNU_TRUE
 CK_COMPILE_SOLARIS_FALSE
 CK_COMPILE_SOLARIS_TRUE
 CK_COMPILE_FREEBSD_FALSE
@@ -647,7 +674,6 @@ KVM_LIBS
 CONSOLE_KIT_PID_FILE
 Z_LIBS
 DBUS_SYS_DIR
-DBUS_CFLAGS
 WARN_CFLAGS
 GLIB_GENMARSHAL
 HISTORY_LIBS
@@ -716,6 +742,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -734,6 +761,8 @@ MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -814,6 +843,7 @@ with_dbus_sys
 with_dbus_services
 with_pid_file
 enable_pam_module
+enable_udev_acl
 with_pam_module_dir
 enable_docbook_docs
 enable_rbac_shutdown
@@ -843,6 +873,8 @@ TOOLS_CFLAGS
 TOOLS_LIBS
 HISTORY_CFLAGS
 HISTORY_LIBS
+UDEV_ACL_CFLAGS
+UDEV_ACL_LIBS
 XMLTO
 XMLTO_FLAGS'
 
@@ -1300,8 +1332,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1387,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ConsoleKit 0.4.5 to adapt to many kinds of systems.
+\`configure' configures ConsoleKit 0.4.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1457,7 +1487,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ConsoleKit 0.4.5:";;
+     short | recursive ) echo "Configuration of ConsoleKit 0.4.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1465,12 +1495,15 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1480,6 +1513,8 @@ Optional Features:
                           Turn on compiler warnings
   --enable-iso-c          Try to warn if code is not ISO C
   --enable-pam-module     build PAM module
+  --enable-udev-acl       enable local user acl permissions support
+                          [default=disabled]
   --enable-docbook-docs   build documentation (requires xmlto)
   --enable-rbac-shutdown=<key>
                           Build with RBAC support specifying shutdown/reboot
@@ -1490,7 +1525,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1536,6 +1571,10 @@ Some influential environment variables:
               C compiler flags for HISTORY, overriding pkg-config
   HISTORY_LIBS
               linker flags for HISTORY, overriding pkg-config
+  UDEV_ACL_CFLAGS
+              C compiler flags for UDEV_ACL, overriding pkg-config
+  UDEV_ACL_LIBS
+              linker flags for UDEV_ACL, overriding pkg-config
   XMLTO       Define/override the `xmlto' location.
   XMLTO_FLAGS Define/override `xmlto' options, like `--skip-validation'.
 
@@ -1605,10 +1644,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ConsoleKit configure 0.4.5
-generated by GNU Autoconf 2.68
+ConsoleKit configure 0.4.6
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1885,7 +1924,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1974,8 +2013,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ConsoleKit $as_me 0.4.5, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by ConsoleKit $as_me 0.4.6, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2325,7 +2364,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.11'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2393,7 +2432,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2451,9 +2490,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2464,32 +2500,40 @@ case `pwd` in
 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
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2501,6 +2545,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2523,12 +2577,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2540,10 +2594,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2562,7 +2616,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2602,7 +2656,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2653,7 +2707,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2682,12 +2736,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2706,7 +2754,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2770,6 +2818,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2792,7 +2879,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ConsoleKit'
- VERSION='0.4.5'
+ VERSION='0.4.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2820,13 +2907,140 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+      if test $am_uid -le $am_max_uid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         _am_tools=none
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+      if test $am_gid -le $am_max_gid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _am_tools=none
+      fi
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+      done
+      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x ustar -w "$$tardir"'
+      am__tar_='pax -L -x ustar -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+      am__untar='cpio -i -H ustar -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_ustar}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  if ${am_cv_prog_tar_ustar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_prog_tar_ustar=$_am_tool
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
@@ -2837,11 +3051,38 @@ if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -2888,7 +3129,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -2921,6 +3162,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -2953,7 +3195,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2993,7 +3235,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3046,7 +3288,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3087,7 +3329,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3145,7 +3387,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3189,7 +3431,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3635,8 +3877,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3732,8 +3973,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3767,16 +4009,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3785,16 +4027,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4003,7 +4245,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4069,7 +4311,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4276,8 +4518,8 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -4308,7 +4550,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
 if ${ac_cv_search_strerror+:} false; then :
@@ -4387,7 +4628,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4427,7 +4668,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4480,7 +4721,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4521,7 +4762,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4579,7 +4820,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4623,7 +4864,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4819,8 +5060,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4916,8 +5156,9 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4951,16 +5192,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4969,16 +5210,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5032,6 +5273,132 @@ else
 fi
 
 
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
@@ -5183,8 +5550,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5362,7 +5729,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -5441,7 +5808,7 @@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5697,7 +6064,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5741,7 +6108,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5899,6 +6266,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5925,7 +6297,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -5938,7 +6311,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6160,7 +6533,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6200,7 +6573,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6326,10 +6699,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6367,12 +6736,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   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
@@ -6506,7 +6875,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6546,7 +6915,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6649,7 +7018,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6693,7 +7062,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6818,7 +7187,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6858,7 +7227,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6917,7 +7286,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6957,7 +7326,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7007,13 +7376,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7160,6 +7529,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7464,7 +7834,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -7548,7 +7925,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7559,7 +7936,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7592,7 +7982,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7632,7 +8022,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7712,7 +8102,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7752,7 +8142,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7804,7 +8194,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7844,7 +8234,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7896,7 +8286,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7936,7 +8326,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7988,7 +8378,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8028,7 +8418,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8080,7 +8470,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8120,7 +8510,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8199,7 +8589,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8210,6 +8606,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8242,6 +8639,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8263,7 +8661,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8371,7 +8771,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8449,6 +8864,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8904,7 +9323,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8948,7 +9369,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8995,18 +9416,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9368,7 +9804,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9412,6 +9847,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -9618,8 +10056,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9634,7 +10071,7 @@ _LT_EOF
       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=
@@ -9811,6 +10248,7 @@ _LT_EOF
 	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
@@ -9998,6 +10436,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10043,6 +10482,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10071,10 +10511,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10087,7 +10523,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10126,7 +10562,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10267,7 +10702,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       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
@@ -10750,11 +11185,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10844,7 +11274,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10853,7 +11283,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10918,7 +11348,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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'
@@ -11057,7 +11487,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11065,10 +11495,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11076,7 +11502,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11094,7 +11520,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11113,18 +11539,8 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-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
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11185,7 +11601,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11201,7 +11617,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11238,9 +11654,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11288,14 +11704,10 @@ fi
   # 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
@@ -11307,6 +11719,18 @@ fi
   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
@@ -11326,7 +11750,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11395,7 +11819,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11420,7 +11844,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -11444,7 +11868,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11475,7 +11899,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11485,7 +11909,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   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
@@ -12267,6 +12691,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -12900,7 +13326,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12987,6 +13413,10 @@ else
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -13213,6 +13643,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -13233,7 +13664,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13276,7 +13707,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13350,6 +13781,7 @@ if test -n "$CONSOLE_KIT_CFLAGS"; then
   gobject-2.0 >= $GLIB_REQUIRED_VERSION
   gthread-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13375,6 +13807,7 @@ if test -n "$CONSOLE_KIT_LIBS"; then
   gobject-2.0 >= $GLIB_REQUIRED_VERSION
   gthread-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13394,12 +13827,12 @@ else
         _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 --print-errors --cflags --libs "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 --print-errors --cflags --libs "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
   gobject-2.0 >= $GLIB_REQUIRED_VERSION
   gthread-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>&1`
@@ -13420,7 +13853,6 @@ installed software in a non-standard prefix.
 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; }
@@ -13436,7 +13868,6 @@ 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; }
-
 else
 	CONSOLE_KIT_CFLAGS=$pkg_cv_CONSOLE_KIT_CFLAGS
 	CONSOLE_KIT_LIBS=$pkg_cv_CONSOLE_KIT_LIBS
@@ -13460,6 +13891,7 @@ if test -n "$POLKIT_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13476,6 +13908,7 @@ if test -n "$POLKIT_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13495,9 +13928,9 @@ else
         _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 --print-errors --cflags --libs "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
         else
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POLKIT_PKG_ERRORS" >&5
@@ -13547,6 +13980,7 @@ if test -n "$LIBDBUS_CFLAGS"; then
   test $ac_status = 0; }; then
   pkg_cv_LIBDBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13566,6 +14000,7 @@ if test -n "$LIBDBUS_LIBS"; then
   test $ac_status = 0; }; then
   pkg_cv_LIBDBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13585,10 +14020,10 @@ else
         _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
+	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED_VERSION
 " 2>&1`
         else
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
+	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED_VERSION
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -13605,7 +14040,6 @@ installed software in a non-standard prefix.
 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; }
@@ -13621,7 +14055,6 @@ 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; }
-
 else
 	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
 	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
@@ -13650,6 +14083,7 @@ if test -n "$TOOLS_CFLAGS"; then
   pkg_cv_TOOLS_CFLAGS=`$PKG_CONFIG --cflags "x11 >= $X11_REQUIRED_VERSION
   glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13672,6 +14106,7 @@ if test -n "$TOOLS_LIBS"; then
   pkg_cv_TOOLS_LIBS=`$PKG_CONFIG --libs "x11 >= $X11_REQUIRED_VERSION
   glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13691,11 +14126,11 @@ else
         _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 --print-errors --cflags --libs "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 --print-errors --cflags --libs "x11 >= $X11_REQUIRED_VERSION
   glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>&1`
         fi
@@ -13714,7 +14149,6 @@ installed software in a non-standard prefix.
 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; }
@@ -13730,7 +14164,6 @@ 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; }
-
 else
 	TOOLS_CFLAGS=$pkg_cv_TOOLS_CFLAGS
 	TOOLS_LIBS=$pkg_cv_TOOLS_LIBS
@@ -13757,6 +14190,7 @@ if test -n "$HISTORY_CFLAGS"; then
   test $ac_status = 0; }; then
   pkg_cv_HISTORY_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13776,6 +14210,7 @@ if test -n "$HISTORY_LIBS"; then
   test $ac_status = 0; }; then
   pkg_cv_HISTORY_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13795,10 +14230,10 @@ else
         _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
+	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>&1`
         else
-	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+	        HISTORY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -13815,7 +14250,6 @@ installed software in a non-standard prefix.
 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; }
@@ -13831,7 +14265,6 @@ 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; }
-
 else
 	HISTORY_CFLAGS=$pkg_cv_HISTORY_CFLAGS
 	HISTORY_LIBS=$pkg_cv_HISTORY_LIBS
@@ -13858,7 +14291,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14034,39 +14467,6 @@ fi
 	;;
 esac
 
-# Find out the version of DBUS we're using
-
-dbus_version=`pkg-config --modversion dbus-1`
-DBUS_VERSION_MAJOR=`echo $dbus_version | awk -F. '{print $1}'`
-DBUS_VERSION_MINOR=`echo $dbus_version | awk -F. '{print $2}'`
-DBUS_VERSION_MICRO=`echo $dbus_version | awk -F. '{print $3}'`
-if test "z$DBUS_VERSION_MAJOR" = "z"; then
-        DBUS_VERSION_MAJOR="0"
-fi
-if test "z$DBUS_VERSION_MINOR" = "z"; then
-        DBUS_VERSION_MINOR="0"
-fi
-if test "z$DBUS_VERSION_MICRO" = "z"; then
-        DBUS_VERSION_MICRO="0"
-fi
-
-if test "z$DBUS_VERSION_MAJOR" = "z0" -a "z$DBUS_VERSION_MINOR" = "z0" -a "z$DBUS_VERSION_MICRO" = "z0"; then        echo "Error: Couldn't determine the version of your DBUS package."
-        echo "  This is probably an error in this script, please report it"
-        echo "  along with the following information:"
-        echo "      Base DBUS version ='$dbus_version'"
-        echo "      DBUS_VERSION_MAJOR='$DBUS_VERSION_MAJOR'"
-        echo "      DBUS_VERSION_MINOR='$DBUS_VERSION_MINOR'"
-        echo "      DBUS_VERSION_MICRO='$DBUS_VERSION_MICRO'"
-        exit 1
-else
-
-        echo "Your dbus version is $DBUS_VERSION_MAJOR,$DBUS_VERSION_MINOR,$DBUS_VERSION_MICRO."
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR"
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR"
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO"
-
-
-fi
 
 
 
@@ -14216,6 +14616,9 @@ fi
         *-*-solaris*)
         CK_BACKEND="solaris"
         ;;
+        *-*-gnu*)
+        CK_BACKEND="gnu"
+        ;;
 	*)
 	as_fn_error $? "No sysdeps back-end implemented for host $host" "$LINENO" 5
 	;;
@@ -14247,6 +14650,14 @@ else
   CK_COMPILE_SOLARIS_FALSE=
 fi
 
+ if test x$CK_BACKEND = xgnu; then
+  CK_COMPILE_GNU_TRUE=
+  CK_COMPILE_GNU_FALSE='#'
+else
+  CK_COMPILE_GNU_TRUE='#'
+  CK_COMPILE_GNU_FALSE=
+fi
+
 
 
 
@@ -14388,6 +14799,174 @@ else
 fi
 
 
+# Check whether --enable-udev-acl was given.
+if test "${enable_udev_acl+set}" = set; then :
+  enableval=$enable_udev_acl;
+else
+  enable_udev_acl=no
+fi
+
+if test "x$enable_udev_acl" = "xyes"; then :
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV_ACL" >&5
+$as_echo_n "checking for UDEV_ACL... " >&6; }
+
+if test -n "$UDEV_ACL_CFLAGS"; then
+    pkg_cv_UDEV_ACL_CFLAGS="$UDEV_ACL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_UDEV_ACL_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$UDEV_ACL_LIBS"; then
+    pkg_cv_UDEV_ACL_LIBS="$UDEV_ACL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_UDEV_ACL_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        UDEV_ACL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev" 2>&1`
+        else
+	        UDEV_ACL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$UDEV_ACL_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev) were not met:
+
+$UDEV_ACL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables UDEV_ACL_CFLAGS
+and UDEV_ACL_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; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables UDEV_ACL_CFLAGS
+and UDEV_ACL_LIBS to avoid the need to call pkg-config.
+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; }
+else
+	UDEV_ACL_CFLAGS=$pkg_cv_UDEV_ACL_CFLAGS
+	UDEV_ACL_LIBS=$pkg_cv_UDEV_ACL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_init in -lacl" >&5
+$as_echo_n "checking for acl_init in -lacl... " >&6; }
+if ${ac_cv_lib_acl_acl_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lacl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_init ();
+int
+main ()
+{
+return acl_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_acl_acl_init=yes
+else
+  ac_cv_lib_acl_acl_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_init" >&5
+$as_echo "$ac_cv_lib_acl_acl_init" >&6; }
+if test "x$ac_cv_lib_acl_acl_init" = xyes; then :
+  UDEV_ACL_LIBS="$UDEV_ACL_LIBS -lacl"
+else
+  as_fn_error $? "libacl not found" "$LINENO" 5
+fi
+
+	ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default"
+if test "x$ac_cv_header_acl_libacl_h" = xyes; then :
+  :
+else
+  as_fn_error $? "libacl header not found" "$LINENO" 5
+fi
+
+
+	UDEVDIR=`$PKG_CONFIG --variable udevdir udev`
+	if test -z "$UDEVDIR" ; then
+		UDEVDIR="/lib/udev"
+	fi
+
+
+fi
+ if test "x$enable_udev_acl" = "xyes"; then
+  ENABLE_UDEV_ACL_TRUE=
+  ENABLE_UDEV_ACL_FALSE='#'
+else
+  ENABLE_UDEV_ACL_TRUE='#'
+  ENABLE_UDEV_ACL_FALSE=
+fi
+
+
+
 
 
 # Check whether --with-pam-module-dir was given.
@@ -14428,7 +15007,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14502,7 +15081,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14680,9 +15259,11 @@ else
   with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
 fi
 
-systemdsystemunitdir=$with_systemdsystemunitdir
+if test "x$with_systemdsystemunitdir" != "xno"; then :
+   systemdsystemunitdir=$with_systemdsystemunitdir
 
- if test -n "$with_systemdsystemunitdir"; then
+fi
+ if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno"; then
   HAVE_SYSTEMD_TRUE=
   HAVE_SYSTEMD_FALSE='#'
 else
@@ -14808,6 +15389,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -14848,6 +15437,10 @@ if test -z "${CK_COMPILE_SOLARIS_TRUE}" && test -z "${CK_COMPILE_SOLARIS_FALSE}"
   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_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_fn_error $? "conditional \"HAVE_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -14856,6 +15449,10 @@ if test -z "${ENABLE_PAM_MODULE_TRUE}" && test -z "${ENABLE_PAM_MODULE_FALSE}";
   as_fn_error $? "conditional \"ENABLE_PAM_MODULE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_UDEV_ACL_TRUE}" && test -z "${ENABLE_UDEV_ACL_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_UDEV_ACL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then
   as_fn_error $? "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15166,16 +15763,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -15235,28 +15832,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15277,8 +15862,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ConsoleKit $as_me 0.4.5, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by ConsoleKit $as_me 0.4.6, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15343,11 +15928,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ConsoleKit config.status 0.4.5
-configured by $0, generated by GNU Autoconf 2.68,
+ConsoleKit config.status 0.4.6
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15438,7 +16023,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -15480,6 +16065,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -15562,7 +16148,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -15618,6 +16203,7 @@ _LTECHO_EOF'
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -15668,7 +16254,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -16363,7 +16948,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   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
+  # Older Autoconf 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
@@ -16376,7 +16961,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # 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
+    # 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.
@@ -16410,21 +16995,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # 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
+    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
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -16478,8 +17061,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -16533,6 +17116,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -16834,10 +17420,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -17153,6 +17735,7 @@ echo "
         Build backend:            ${CK_BACKEND}
         PAM module dir:           ${PAM_MODULE_DIR}
         Build PAM module:         ${msg_pam_module}
+        Build udev-acl:           ${enable_udev_acl}
         Build docs:               ${enable_docbook_docs}
 
         PolicyKit support         ${have_polkit}
diff --git a/configure.ac b/configure.ac
index 0efc489..d099f92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,25 @@
 
-AC_PREREQ(2.59c)
+AC_PREREQ([2.68])
 AC_INIT([ConsoleKit],
-        [0.4.5],
+        [0.4.6],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit],
         [ConsoleKit])
 
 AC_CONFIG_SRCDIR([src/ck-manager.c])
 
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
 
 # for O_NOFOLLOW support
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
-AC_STDC_HEADERS
+AM_PROG_CC_C_O
+AC_HEADER_STDC
 AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_HEADER_STDC
 
@@ -88,50 +89,15 @@ case "$host" in
 	;;
 esac
 
-# Find out the version of DBUS we're using
-
-dbus_version=`pkg-config --modversion dbus-1`
-DBUS_VERSION_MAJOR=`echo $dbus_version | awk -F. '{print $1}'`
-DBUS_VERSION_MINOR=`echo $dbus_version | awk -F. '{print $2}'`
-DBUS_VERSION_MICRO=`echo $dbus_version | awk -F. '{print $3}'`
-if test "z$DBUS_VERSION_MAJOR" = "z"; then
-        DBUS_VERSION_MAJOR="0"
-fi
-if test "z$DBUS_VERSION_MINOR" = "z"; then
-        DBUS_VERSION_MINOR="0"
-fi
-if test "z$DBUS_VERSION_MICRO" = "z"; then
-        DBUS_VERSION_MICRO="0"
-fi
-
-if test "z$DBUS_VERSION_MAJOR" = "z0" -a "z$DBUS_VERSION_MINOR" = "z0" -a "z$DBUS_VERSION_MICRO" = "z0"; then        echo "Error: Couldn't determine the version of your DBUS package."
-        echo "  This is probably an error in this script, please report it"
-        echo "  along with the following information:"
-        echo "      Base DBUS version ='$dbus_version'"
-        echo "      DBUS_VERSION_MAJOR='$DBUS_VERSION_MAJOR'"
-        echo "      DBUS_VERSION_MINOR='$DBUS_VERSION_MINOR'"
-        echo "      DBUS_VERSION_MICRO='$DBUS_VERSION_MICRO'"
-        exit 1
-else
-
-        echo "Your dbus version is $DBUS_VERSION_MAJOR,$DBUS_VERSION_MINOR,$DBUS_VERSION_MICRO."
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR"
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR"
-        DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO"
-
-        AC_SUBST(DBUS_CFLAGS)
-fi
 
 dnl ---------------------------------------------------------------------------
 dnl - Are we specifying a different dbus root ?
 dnl ---------------------------------------------------------------------------
 
 AC_ARG_WITH(dbus-sys,
-	[AC_HELP_STRING([--with-dbus-sys=<dir>],
-	[where D-BUS system.d directory is])])
+	[AS_HELP_STRING([--with-dbus-sys=<dir>],[where D-BUS system.d directory is])])
 AC_ARG_WITH(dbus-services,
-	[AC_HELP_STRING([--with-dbus-services=<dir>],
-	[where D-BUS services directory is])])
+	[AS_HELP_STRING([--with-dbus-services=<dir>],[where D-BUS services directory is])])
 if ! test -z "$with_dbus_sys" ; then
         DBUS_SYS_DIR="$with_dbus_sys"
 else
@@ -158,8 +124,7 @@ dnl - PID file
 dnl ---------------------------------------------------------------------------
 
 AC_ARG_WITH(pid-file,
-	[AC_HELP_STRING([--with-pid-file=<file>],
-	[pid file location])])
+	[AS_HELP_STRING([--with-pid-file=<file>],[pid file location])])
 
 if ! test -z "$with_pid_file"; then
    CONSOLE_KIT_PID_FILE=$with_pid_file
@@ -190,6 +155,9 @@ case "$host" in
         *-*-solaris*)
         CK_BACKEND="solaris"
         ;;
+        *-*-gnu*)
+        CK_BACKEND="gnu"
+        ;;
 	*)
 	AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
 	;;
@@ -200,6 +168,7 @@ AC_SUBST(KVM_LIBS)
 AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
 AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
 AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
+AM_CONDITIONAL(CK_COMPILE_GNU, test x$CK_BACKEND = xgnu, [Compiling for GNU])
 AC_SUBST(CK_BACKEND)
 
 dnl ---------------------------------------------------------------------------
@@ -221,8 +190,7 @@ AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if yo
 # Check if we should build the PAM module
 msg_pam_module=no
 AC_ARG_ENABLE(pam-module,
-	[AC_HELP_STRING([--enable-pam-module],
-	[build PAM module])],
+	[AS_HELP_STRING([--enable-pam-module],[build PAM module])],
         , enable_pam_module=no)
 if test "x$enable_pam_module" = "xyes"; then
 	if test "x$have_pam" = "xno"; then
@@ -233,13 +201,32 @@ if test "x$enable_pam_module" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_PAM_MODULE, test "x$enable_pam_module" = "xyes")
 
+dnl ------------------------------------------------------------------------------
+dnl udev-acl - apply ACLs for users with local forground sessions
+dnl ------------------------------------------------------------------------------
+AC_ARG_ENABLE([udev-acl],
+	AS_HELP_STRING([--enable-udev-acl], [enable local user acl permissions support @<:@default=disabled@:>@]),
+	[], [enable_udev_acl=no])
+AS_IF([test "x$enable_udev_acl" = "xyes"], [
+
+	PKG_CHECK_MODULES([UDEV_ACL], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 libudev])
+	AC_CHECK_LIB([acl], [acl_init], [UDEV_ACL_LIBS="$UDEV_ACL_LIBS -lacl"], AC_MSG_ERROR([libacl not found]))
+	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
+	UDEVDIR=`$PKG_CONFIG --variable udevdir udev`
+	if test -z "$UDEVDIR" ; then
+		UDEVDIR="/lib/udev"
+	fi
+	AC_SUBST(UDEVDIR)
+])
+AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = "xyes"])
+
+
 dnl ---------------------------------------------------------------------------
 dnl - Install directory for PAM security module
 dnl ---------------------------------------------------------------------------
 
 AC_ARG_WITH(pam-module-dir,
-	[AC_HELP_STRING([--with-pam-module-dir=<dir>],
-	[directory to install PAM security module])])
+	[AS_HELP_STRING([--with-pam-module-dir=<dir>],[directory to install PAM security module])])
 if ! test -z "$with_pam_module_dir"; then
 	PAM_MODULE_DIR="$with_pam_module_dir"
 else
@@ -252,8 +239,7 @@ dnl - DocBook Documentation
 dnl ---------------------------------------------------------------------------
 
 AC_ARG_ENABLE(docbook-docs,
-	[AC_HELP_STRING([--enable-docbook-docs],
-	[build documentation (requires xmlto)])],
+	[AS_HELP_STRING([--enable-docbook-docs],[build documentation (requires xmlto)])],
 	enable_docbook_docs=$enableval,enable_docbook_docs=no)
 AC_PATH_PROG(XMLTO, xmlto, no)
 AC_MSG_CHECKING([whether to build DocBook documentation])
@@ -308,8 +294,7 @@ dnl ---------------------------------------------------------------------------
 
 msg_rbac_shutdown=no
 AC_ARG_ENABLE(rbac-shutdown,
-	[AC_HELP_STRING([--enable-rbac-shutdown=<key>],
-	[Build with RBAC support specifying shutdown/reboot RBAC authentication key])],
+	[AS_HELP_STRING([--enable-rbac-shutdown=<key>],[Build with RBAC support specifying shutdown/reboot RBAC authentication key])],
 	enable_rbac_shutdown=$enableval,enable_rbac_shutdown=no)
 if test "x$enable_rbac_shutdown" != "xno"; then
 	RBAC_LIBS="-lsecdb -lsocket -lnsl"
@@ -326,8 +311,7 @@ dnl ---------------------------------------------------------------------------
 # Turn on the additional warnings last, so -Werror doesn't affect other tests.
 
 AC_ARG_ENABLE(more-warnings,
-	[AC_HELP_STRING([--enable-more-warnings],
-	[Maximum compiler warnings])],
+	[AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings])],
 	set_more_warnings="$enableval",[
         	if test -d $srcdir/.git; then
         		set_more_warnings=yes
@@ -349,9 +333,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
                 SAVE_CFLAGS="$CFLAGS"
                 CFLAGS="$CFLAGS $option"
                 AC_MSG_CHECKING([whether gcc understands $option])
-                AC_TRY_COMPILE([], [],
-                        has_option=yes,
-                        has_option=no,)
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[has_option=yes],[has_option=no])
                 if test $has_option = no; then
                         CFLAGS="$SAVE_CFLAGS"
                 fi
@@ -368,8 +350,7 @@ fi
 # Enable Debug
 #
 AC_ARG_ENABLE(debug,
-	[AC_HELP_STRING([--enable-debug],
-	[turn on debugging])],
+	[AS_HELP_STRING([--enable-debug],[turn on debugging])],
 	, enable_debug=yes)
 if test "$enable_debug" = "yes"; then
 	DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
@@ -395,10 +376,9 @@ AC_SUBST(LDFLAGS)
 
 AC_ARG_WITH([systemdsystemunitdir],
         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-        [],
-        [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+        [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno"])
 
 # Files
 
@@ -445,6 +425,7 @@ echo "
         Build backend:            ${CK_BACKEND}
         PAM module dir:           ${PAM_MODULE_DIR}
         Build PAM module:         ${msg_pam_module}
+        Build udev-acl:           ${enable_udev_acl}
         Build docs:               ${enable_docbook_docs}
 
         PolicyKit support         ${have_polkit}
diff --git a/data/Makefile.in b/data/Makefile.in
index 1b45d4d..47173f5 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data
-DIST_COMMON = $(am__dist_polkit_policy_DATA_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(am__dist_polkit_policy_DATA_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -46,14 +90,25 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +130,19 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(dbusconfdir)" \
 	"$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(seatdir)" \
 	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdsystemunitdir)"
 am__dist_polkit_policy_DATA_DIST = org.freedesktop.consolekit.policy
 DATA = $(dbusconf_DATA) $(dist_polkit_policy_DATA) $(seat_DATA) \
 	$(service_DATA) $(systemdsystemunit_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -103,7 +165,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -184,6 +245,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -335,8 +399,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dbusconfDATA: $(dbusconf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dbusconfdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)"
 	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dbusconfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -350,13 +417,14 @@ uninstall-dbusconfDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(dbusconfdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(dbusconfdir)" && rm -f $$files
+	dir='$(DESTDIR)$(dbusconfdir)'; $(am__uninstall_files_from_dir)
 install-dist_polkit_policyDATA: $(dist_polkit_policy_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(polkit_policydir)" || $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)"
 	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(polkit_policydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -370,13 +438,14 @@ uninstall-dist_polkit_policyDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(polkit_policydir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(polkit_policydir)" && rm -f $$files
+	dir='$(DESTDIR)$(polkit_policydir)'; $(am__uninstall_files_from_dir)
 install-seatDATA: $(seat_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(seatdir)" || $(MKDIR_P) "$(DESTDIR)$(seatdir)"
 	@list='$(seat_DATA)'; test -n "$(seatdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(seatdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(seatdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -390,13 +459,14 @@ uninstall-seatDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(seat_DATA)'; test -n "$(seatdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(seatdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(seatdir)" && rm -f $$files
+	dir='$(DESTDIR)$(seatdir)'; $(am__uninstall_files_from_dir)
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -410,13 +480,14 @@ uninstall-serviceDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
 install-systemdsystemunitDATA: $(systemdsystemunit_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)"
 	@list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -430,14 +501,12 @@ uninstall-systemdsystemunitDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(systemdsystemunitdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(systemdsystemunitdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -487,10 +556,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -579,21 +653,21 @@ uninstall-am: uninstall-dbusconfDATA uninstall-dist_polkit_policyDATA \
 .MAKE: install-am install-data-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook \
-	install-dbusconfDATA install-dist_polkit_policyDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-seatDATA install-serviceDATA \
-	install-strip install-systemdsystemunitDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dbusconfDATA uninstall-dist_polkit_policyDATA \
-	uninstall-seatDATA uninstall-serviceDATA \
-	uninstall-systemdsystemunitDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dbusconfDATA \
+	install-dist_polkit_policyDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-seatDATA \
+	install-serviceDATA install-strip \
+	install-systemdsystemunitDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-dbusconfDATA \
+	uninstall-dist_polkit_policyDATA uninstall-seatDATA \
+	uninstall-serviceDATA uninstall-systemdsystemunitDATA
 
 
 $(service_DATA): $(service_in_files) Makefile
diff --git a/debian/changelog b/debian/changelog
index 4c24b9d..9d010ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+consolekit (0.4.6-2) experimental; urgency=low
+
+  * Acknowledge non-maintainer upload, thanks Christoph and Petr.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 19 Jul 2013 19:33:04 +0200
+
+consolekit (0.4.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * Track .xz tarballs instead of .gz.
+  * Remove patches which are now applied upstream.
+  * Enable support for udev-acl which has been removed from udev.
+  * Add necessary Breaks/Replaces for udev.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 19 Jul 2013 16:47:42 +0200
+
+consolekit (0.4.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Include patch by Petr Salinger to ignore empty environments.
+    (Closes: #570015)
+
+ -- Christoph Egger <christoph@debian.org>  Mon, 30 Jul 2012 13:57:55 +0200
+
 consolekit (0.4.5-3+dyson1) unstable; urgency=low
 
   * Built for Dyson
diff --git a/debian/control b/debian/control
index 9a2dea9..582c118 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,9 @@ Build-Depends: debhelper (>= 9),
  autotools-dev,
  pkg-config,
  libdbus-glib-1-dev (>= 0.30),
- libglib2.0-dev (>= 2.14.0),
+ libglib2.0-dev (>= 2.22.0),
+ libacl1-dev [linux-any],
+ libudev-dev [linux-any],
  libx11-dev (>= 1.0.0),
  libkvm-dev [kfreebsd-any],
  xmlto,
@@ -25,7 +27,8 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libck-connector0 (= ${binary:Version}), dbus (>= 1.1.2)
 Recommends: libpam-ck-connector
-Breaks: udev (<< 147)
+Breaks: udev (<< 204-1)
+Replaces: udev (<< 204-1)
 Description: framework for defining and tracking users, sessions and seats
  ConsoleKit is a system daemon for tracking what users are logged
  into the system and how they interact with the computer (e.g.
diff --git a/debian/patches/00git_truncate_frequent.patch b/debian/patches/00git_truncate_frequent.patch
deleted file mode 100644
index 4b48ae9..0000000
--- a/debian/patches/00git_truncate_frequent.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 803cbdfbd78b66b17ead45b1584d65a258e785bf Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 25 May 2011 00:58:10 +0000
-Subject: ck-history: don't truncate --frequent output to 8 chars
-
-GDM screenscrapes the output and so we need the full username.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650330
----
-diff --git a/tools/ck-history.c b/tools/ck-history.c
-index d02caaa..85d9e6f 100644
---- a/tools/ck-history.c
-+++ b/tools/ck-history.c
-@@ -804,7 +804,7 @@ generate_report_frequent (int         uid,
-                 data = user_counts->data;
- 
-                 username = get_user_name_for_uid (data->uid);
--                g_print ("%-8.8s %u\n", username, data->count);
-+                g_print ("%-8s %u\n", username, data->count);
-                 g_free (data);
-                 user_counts = g_list_delete_link (user_counts, user_counts);
-                 g_free (username);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/82-hurd_support.patch b/debian/patches/82-hurd_support.patch
deleted file mode 100644
index b86720c..0000000
--- a/debian/patches/82-hurd_support.patch
+++ /dev/null
@@ -1,509 +0,0 @@
-Description: Add support for GNU/Hurd
- currently consolekit fails to build on GNU/Hurd mainly because there's no
- sysdeps backend for the GNU OS implemented. Also there is an unconditional
- PATH_MAX usage.
- The attached patch proposes a sysdeps-gnu backend, which implements the process
- management using Hurd's libps, the *ttyent API for the part of the console
- implementation and the rest using similar (valid) approaches of other backends.
- Also, it fixes the PATH_MAX usage in pam-ck-connector/pam-ck-connector.c by
- using a variable-length malloc'ed buffer.
-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
-Last-Update: 2010-09-20
-
-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"
-         ;;
-+        *-*-gnu*)
-+        CK_BACKEND="gnu"
-+        ;;
- 	*)
- 	AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
- 	;;
-@@ -200,6 +203,7 @@
- AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
- AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
- AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
-+AM_CONDITIONAL(CK_COMPILE_GNU, test x$CK_BACKEND = xgnu, [Compiling for GNU])
- AC_SUBST(CK_BACKEND)
- 
- dnl ---------------------------------------------------------------------------
-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
-+if CK_COMPILE_GNU
-+libck_la_SOURCES +=		\
-+	ck-sysdeps-gnu.c	\
-+	$(NULL)
-+libck_la_LIBADD = -lps
-+endif
- 
- EXTRA_libck_la_SOURCES =		\
- 	ck-sysdeps-linux.c		\
- 	ck-sysdeps-solaris.c		\
- 	ck-sysdeps-freebsd.c		\
-+	ck-sysdeps-gnu.c		\
- 	$(NULL)
- 
- sbin_PROGRAMS = 		\
-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,402 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2009 Pino Toscano <pino@kde.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include <hurd.h>
-+#include <dirent.h>
-+#include <ps.h>
-+#include <ttyent.h>
-+
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif /* HAVE_PATHS_H */
-+
-+#include "ck-sysdeps.h"
-+
-+struct _CkProcessStat
-+{
-+        struct proc_stat *ps;           /* the statistics of a process */
-+};
-+
-+static struct ps_context *pc = NULL;
-+
-+static gboolean
-+get_proc_stat_from_pid (pid_t              pid,
-+                        ps_flags_t         flags,
-+                        struct proc_stat **res_ps)
-+{
-+        error_t           err;
-+        struct proc_stat *ps;
-+
-+        g_assert (pid >= 0);
-+        g_assert (res_ps != NULL);
-+
-+        if (pc == NULL) {
-+                err = ps_context_create (getproc (), &pc);
-+                if (err) {
-+                    return FALSE;
-+                }
-+        }
-+
-+        err = _proc_stat_create (pid, pc, &ps);
-+        if (err) {
-+                return FALSE;
-+        }
-+
-+        err = proc_stat_set_flags (ps, PSTAT_PID | flags);
-+        if (err) {
-+                return FALSE;
-+        }
-+
-+        *res_ps = ps;
-+        return TRUE;
-+}
-+
-+
-+pid_t
-+ck_process_stat_get_ppid (CkProcessStat *stat)
-+{
-+        g_return_val_if_fail (stat != NULL, -1);
-+
-+        return proc_stat_pid (stat->ps);
-+}
-+
-+char *
-+ck_process_stat_get_cmd (CkProcessStat *stat)
-+{
-+        g_return_val_if_fail (stat != NULL, NULL);
-+
-+        return g_strdup (proc_stat_args (stat->ps));
-+}
-+
-+char *
-+ck_process_stat_get_tty (CkProcessStat *stat)
-+{
-+        struct ps_tty    *tty;
-+
-+        g_return_val_if_fail (stat != NULL, NULL);
-+
-+        tty = proc_stat_tty (stat->ps);
-+
-+        return tty ? g_strdup (ps_tty_name (tty)) : NULL;
-+}
-+
-+gboolean
-+ck_process_stat_new_for_unix_pid (pid_t           pid,
-+                                  CkProcessStat **stat,
-+                                  GError        **error)
-+{
-+        gboolean          res;
-+        struct proc_stat *ps;
-+        CkProcessStat    *proc;
-+
-+        g_return_val_if_fail (pid > 1, FALSE);
-+
-+        if (stat == NULL) {
-+                return FALSE;
-+        }
-+
-+        *stat = NULL;
-+
-+        res = get_proc_stat_from_pid (pid, PSTAT_ARGS | PSTAT_TTY, &ps);
-+        if (!res) {
-+                return FALSE;
-+        }
-+
-+        proc = g_new0 (CkProcessStat, 1);
-+        proc->ps = ps;
-+        *stat = proc;
-+
-+        return TRUE;
-+}
-+
-+void
-+ck_process_stat_free (CkProcessStat *stat)
-+{
-+        _proc_stat_free (stat->ps);
-+
-+        g_free (stat);
-+}
-+
-+GHashTable *
-+ck_unix_pid_get_env_hash (pid_t pid)
-+{
-+        struct proc_stat *ps;
-+        char             *env_p;
-+        size_t            env_index;
-+        size_t            env_l;
-+        gboolean          res;
-+        GHashTable       *hash;
-+
-+        g_return_val_if_fail (pid > 1, NULL);
-+
-+        res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps);
-+        if (!res) {
-+                return NULL;
-+        }
-+
-+        hash = g_hash_table_new_full (g_str_hash,
-+                                      g_str_equal,
-+                                      g_free,
-+                                      g_free);
-+
-+        env_index = 0;
-+        env_l = 0;
-+        env_p = proc_stat_env (ps);
-+        while (env_index < proc_stat_env_len (ps)) {
-+                env_l = strlen (env_p);
-+                env_index += env_l + 1;
-+                if (env_l) {
-+                        char **vals;
-+                        vals = g_strsplit (env_p, "=", 2);
-+                        if (vals != NULL) {
-+                                g_hash_table_insert (hash,
-+                                                     g_strdup (vals[0]),
-+                                                     g_strdup (vals[1]));
-+                                g_strfreev (vals);
-+                        }
-+                }
-+                env_p = env_p + env_l + 1;
-+        }
-+
-+        _proc_stat_free (ps);
-+
-+        return hash;
-+}
-+
-+char *
-+ck_unix_pid_get_env (pid_t       pid,
-+                     const char *var)
-+{
-+        struct proc_stat *ps;
-+        char             *env_p;
-+        size_t            env_index;
-+        size_t            env_l;
-+        char             *prefix;
-+        int               prefix_len;
-+        char             *val;
-+        gboolean          res;
-+
-+        g_return_val_if_fail (pid > 1, NULL);
-+
-+        val = NULL;
-+
-+        res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps);
-+        if (!res) {
-+                return NULL;
-+        }
-+
-+        prefix = g_strdup_printf ("%s=", var);
-+        prefix_len = strlen (prefix);
-+
-+        env_index = 0;
-+        env_l = 0;
-+        env_p = proc_stat_env (ps);
-+        while (env_index < proc_stat_env_len (ps)) {
-+                env_l = strlen (env_p);
-+                env_index += env_l + 1;
-+                if (env_l && g_str_has_prefix (env_p, prefix)) {
-+                        val = g_strdup (env_p + prefix_len);
-+                        break;
-+                }
-+                env_p = env_p + env_l + 1;
-+        }
-+
-+        g_free (prefix);
-+
-+        _proc_stat_free (ps);
-+
-+        return val;
-+}
-+
-+uid_t
-+ck_unix_pid_get_uid (pid_t pid)
-+{
-+        struct proc_stat *ps;
-+        gboolean          res;
-+        uid_t             uid;
-+
-+        g_return_val_if_fail (pid > 1, 0);
-+
-+        res = get_proc_stat_from_pid (pid, PSTAT_OWNER_UID, &ps);
-+        if (!res) {
-+                return 0;
-+        }
-+
-+        uid = proc_stat_owner_uid (ps);
-+
-+        _proc_stat_free (ps);
-+
-+        return uid;
-+}
-+
-+pid_t
-+ck_unix_pid_get_ppid (pid_t pid)
-+{
-+        struct proc_stat *ps;
-+        gboolean          res;
-+        pid_t             ppid;
-+
-+        g_return_val_if_fail (pid > 1, 0);
-+
-+        res = get_proc_stat_from_pid (pid, PSTAT_PROC_INFO, &ps);
-+        if (!res) {
-+                return 0;
-+        }
-+
-+        ppid = proc_stat_proc_info (ps)->ppid;
-+
-+        _proc_stat_free (ps);
-+
-+        return ppid;
-+}
-+
-+gboolean
-+ck_unix_pid_get_login_session_id (pid_t  pid,
-+                                  char **idp)
-+{
-+        g_return_val_if_fail (pid > 1, FALSE);
-+
-+        return FALSE;
-+}
-+
-+gboolean
-+ck_get_max_num_consoles (guint *num)
-+{
-+        int      max_consoles;
-+        int      res;
-+        gboolean ret;
-+        struct ttyent *t;
-+
-+        ret = FALSE;
-+        max_consoles = 0;
-+
-+        res = setttyent ();
-+        if (res == 0) {
-+                goto done;
-+        }
-+
-+        while ((t = getttyent ()) != NULL) {
-+                if (t->ty_status & TTY_ON && strncmp (t->ty_name, "tty", 3) == 0)
-+                        max_consoles++;
-+        }
-+
-+        /* Increment one more so that all consoles are properly counted
-+         * this is arguable a bug in vt_add_watches().
-+         */
-+        max_consoles++;
-+
-+        ret = TRUE;
-+
-+        endttyent ();
-+
-+done:
-+        if (num != NULL) {
-+                *num = max_consoles;
-+        }
-+
-+        return ret;
-+}
-+
-+gboolean
-+ck_supports_activatable_consoles (void)
-+{
-+        return TRUE;
-+}
-+
-+char *
-+ck_get_console_device_for_num (guint num)
-+{
-+        char *device;
-+
-+        device = g_strdup_printf (_PATH_TTY "%u", num);
-+
-+        return device;
-+}
-+
-+gboolean
-+ck_get_console_num_from_device (const char *device,
-+                                guint      *num)
-+{
-+        guint    n;
-+        gboolean ret;
-+
-+        n = 0;
-+        ret = FALSE;
-+
-+        if (device == NULL) {
-+                return FALSE;
-+        }
-+
-+        if (sscanf (device, _PATH_TTY "%u", &n) == 1) {
-+                ret = TRUE;
-+        }
-+
-+        if (num != NULL) {
-+                *num = n;
-+        }
-+
-+        return ret;
-+}
-+
-+gboolean
-+ck_get_active_console_num (int    console_fd,
-+                           guint *num)
-+{
-+        gboolean       ret;
-+        int            res;
-+        long           cur_active;
-+        char           buf[30];
-+        guint          active;
-+
-+        g_assert (console_fd != -1);
-+
-+        active = 0;
-+        ret = FALSE;
-+
-+        res = readlink ("/dev/cons/vcs", buf, sizeof (buf));
-+        if (res > 0) {
-+                /* the resolved path is like "/dev/vcs/$number", so skip
-+                   the non-number part at the start */
-+                const char *p = buf;
-+                while ((*p) && ((*p < '0') || (*p > '9'))) {
-+                        ++p;
-+                }
-+                if (*p) {
-+                        cur_active = strtol (p, NULL, 10);
-+                        g_debug ("Current VT: tty%ld", cur_active);
-+                        active = cur_active;
-+                        ret = TRUE;
-+                }
-+        }
-+
-+        if (num != NULL) {
-+                *num = active;
-+        }
-+
-+        return ret;
-+}
-Index: consolekit/pam-ck-connector/pam-ck-connector.c
-===================================================================
---- consolekit.orig/pam-ck-connector/pam-ck-connector.c	2010-09-20 17:15:53.000000000 +0200
-+++ consolekit/pam-ck-connector/pam-ck-connector.c	2010-09-20 17:33:54.000000000 +0200
-@@ -244,12 +244,12 @@
-         const char *s;
-         uid_t       uid;
-         char        buf[256];
--        char        ttybuf[PATH_MAX];
-+        char       *ttybuf;
-         DBusError   error;
-         dbus_bool_t is_local;
- 
-         ret = PAM_IGNORE;
--
-+        ttybuf = NULL;
-         is_local = TRUE;
- 
-         _parse_pam_args (pamh, flags, argc, argv);
-@@ -295,7 +295,13 @@
-                 x11_display = display_device;
-                 display_device = "";
-         } else if (strncmp (_PATH_DEV, display_device, 5) != 0) {
--                snprintf (ttybuf, sizeof (ttybuf), _PATH_DEV "%s", display_device);
-+                int len = strlen (_PATH_DEV) + strlen (display_device) + 1;
-+                ttybuf = malloc (len);
-+                if (ttybuf == NULL) {
-+                        ck_pam_syslog (pamh, LOG_ERR, "oom allocating ttybuf");
-+                        goto out;
-+                }
-+                snprintf (ttybuf, len, _PATH_DEV "%s", display_device);
-                 display_device = ttybuf;
-         }
- 
-@@ -411,6 +417,8 @@
-         ret = PAM_SUCCESS;
- 
- out:
-+        free (ttybuf);
-+
-         return ret;
- }
- 
diff --git a/debian/patches/99-kfreebsd-empty-env.patch b/debian/patches/99-kfreebsd-empty-env.patch
new file mode 100644
index 0000000..4ed65ea
--- /dev/null
+++ b/debian/patches/99-kfreebsd-empty-env.patch
@@ -0,0 +1,11 @@
+--- consolekit/src/ck-sysdeps-freebsd.c
++++ consolekit/src/ck-sysdeps-freebsd.c
+@@ -261,6 +261,8 @@
+         for (i = 0; penv[i] != NULL; i++) {
+                 char **vals;
+
++                if (!penv[i][0]) continue;
++
+                 vals = g_strsplit (penv[i], "=", 2);
+                 if (vals != NULL) {
+                         g_hash_table_insert (hash,
diff --git a/debian/patches/series b/debian/patches/series
index a4645ef..7970731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 # Debian patches for consolekit
-00git_truncate_frequent.patch
 03-cleanup_console_tags.patch
-82-hurd_support.patch
+99-kfreebsd-empty-env.patch
diff --git a/debian/rules b/debian/rules
index 0269691..a2937c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,12 @@ else
 with-systemd :=
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CONFFLAGS = --enable-udev-acl
+endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	dh_auto_configure -- $(CONFFLAGS) \
 		--libexecdir="\$$(prefix)/lib/ConsoleKit" \
 		--enable-pam-module \
 		--enable-docbook-docs \
@@ -28,8 +31,7 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-ifeq (linux, $(DEB_HOST_ARCH_OS))
-	dh_install -pconsolekit lib/systemd
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	dh_install -pconsolekit debian/tmp/lib/udev/
 endif
 
-
diff --git a/debian/watch b/debian/watch
index c52efc8..7187ffd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-(.*)\.tar\.(?:gz|bz2)
+http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-(.*)\.tar\.(?:bz2|xz)
diff --git a/depcomp b/depcomp
index df8eea7..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,11 +39,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,66 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -80,18 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -114,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -123,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -137,31 +216,31 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -179,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -188,43 +266,41 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -237,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -248,44 +322,100 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -297,8 +427,8 @@ icc)
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -309,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -322,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -333,77 +461,107 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -422,7 +580,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,18 +600,18 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -503,12 +661,15 @@ makedepend)
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -525,7 +686,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -544,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -579,23 +740,23 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a167936..3ade5f4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,26 +88,58 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -114,7 +190,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -195,6 +270,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -298,22 +376,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +409,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +430,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +442,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +455,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +506,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -505,10 +544,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -586,22 +630,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/dbus/ConsoleKit.xml b/doc/dbus/ConsoleKit.xml
index 8762cd6..7ed639f 100644
--- a/doc/dbus/ConsoleKit.xml
+++ b/doc/dbus/ConsoleKit.xml
@@ -10,8 +10,8 @@
 
 <book id="index">
   <bookinfo>
-    <title>ConsoleKit 0.4.5 Documentation</title>
-    <releaseinfo>Version 0.4.5</releaseinfo>
+    <title>ConsoleKit 0.4.6 Documentation</title>
+    <releaseinfo>Version 0.4.6</releaseinfo>
     <authorgroup>
       <author>
         <firstname>William Jon</firstname>
diff --git a/doc/dbus/Makefile.in b/doc/dbus/Makefile.in
index b8a08d0..d99ae73 100644
--- a/doc/dbus/Makefile.in
+++ b/doc/dbus/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/dbus
-DIST_COMMON = $(srcdir)/ConsoleKit.xml.in $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/ConsoleKit.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -46,14 +90,25 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ConsoleKit.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,8 +130,15 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(htmldocdir)"
 DATA = $(htmldoc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -99,7 +161,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -180,6 +241,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -310,8 +374,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-htmldocDATA: $(htmldoc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldocdir)" || $(MKDIR_P) "$(DESTDIR)$(htmldocdir)"
 	@list='$(htmldoc_DATA)'; test -n "$(htmldocdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldocdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldocdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -325,14 +392,12 @@ uninstall-htmldocDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(htmldoc_DATA)'; test -n "$(htmldocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldocdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldocdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldocdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -383,10 +448,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -468,17 +538,17 @@ uninstall-am: uninstall-htmldocDATA
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
-	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmldocDATA install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-htmldocDATA
+	clean-libtool clean-local cscopelist-am ctags-am distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-htmldocDATA install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-htmldocDATA
 
 
 @DOCBOOK_DOCS_ENABLED_TRUE@ConsoleKit.html : $(SPEC_XML_FILES)
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
index 64237a8..a5ea7ee 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
@@ -8,35 +8,35 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Manager.Restart">Restart</link>                   ()
-<link linkend="Manager.CanRestart">CanRestart</link>                (out 'b'     can_restart)
-<link linkend="Manager.Stop">Stop</link>                      ()
-<link linkend="Manager.CanStop">CanStop</link>                   (out 'b'     can_stop)
-<link linkend="Manager.OpenSession">OpenSession</link>               (out 's'     cookie)
-<link linkend="Manager.OpenSessionWithParameters">OpenSessionWithParameters</link> (in  'a(sv)' parameters,
-                           out 's'     cookie)
-<link linkend="Manager.CloseSession">CloseSession</link>              (in  's'     cookie,
-                           out 'b'     result)
-<link linkend="Manager.GetSeats">GetSeats</link>                  (out 'ao'    seats)
-<link linkend="Manager.GetSessions">GetSessions</link>               (out 'ao'    sessions)
-<link linkend="Manager.GetSessionForCookie">GetSessionForCookie</link>       (in  's'     cookie,
-                           out 'o'     ssid)
-<link linkend="Manager.GetSessionForUnixProcess">GetSessionForUnixProcess</link>  (in  'u'     pid,
-                           out 'o'     ssid)
-<link linkend="Manager.GetCurrentSession">GetCurrentSession</link>         (out 'o'     ssid)
-<link linkend="Manager.GetSessionsForUnixUser">GetSessionsForUnixUser</link>    (in  'u'     uid,
-                           out 'ao'    sessions)
-<link linkend="Manager.GetSessionsForUser">GetSessionsForUser</link>        (in  'u'     uid,
-                           out 'ao'    sessions)
-<link linkend="Manager.GetSystemIdleHint">GetSystemIdleHint</link>         (out 'b'     idle_hint)
-<link linkend="Manager.GetSystemIdleSinceHint">GetSystemIdleSinceHint</link>    (out 's'     iso8601_datetime)
+    <synopsis><link linkend="Manager.Restart">Restart</link>()
+<link linkend="Manager.CanRestart">CanRestart</link>(out'b'can_restart)
+<link linkend="Manager.Stop">Stop</link>()
+<link linkend="Manager.CanStop">CanStop</link>(out'b'can_stop)
+<link linkend="Manager.OpenSession">OpenSession</link>(out's'cookie)
+<link linkend="Manager.OpenSessionWithParameters">OpenSessionWithParameters</link>(in'a(sv)'parameters,
+out's'cookie)
+<link linkend="Manager.CloseSession">CloseSession</link>(in's'cookie,
+out'b'result)
+<link linkend="Manager.GetSeats">GetSeats</link>(out'ao'seats)
+<link linkend="Manager.GetSessions">GetSessions</link>(out'ao'sessions)
+<link linkend="Manager.GetSessionForCookie">GetSessionForCookie</link>(in's'cookie,
+out'o'ssid)
+<link linkend="Manager.GetSessionForUnixProcess">GetSessionForUnixProcess</link>(in'u'pid,
+out'o'ssid)
+<link linkend="Manager.GetCurrentSession">GetCurrentSession</link>(out'o'ssid)
+<link linkend="Manager.GetSessionsForUnixUser">GetSessionsForUnixUser</link>(in'u'uid,
+out'ao'sessions)
+<link linkend="Manager.GetSessionsForUser">GetSessionsForUser</link>(in'u'uid,
+out'ao'sessions)
+<link linkend="Manager.GetSystemIdleHint">GetSystemIdleHint</link>(out'b'idle_hint)
+<link linkend="Manager.GetSystemIdleSinceHint">GetSystemIdleSinceHint</link>(out's'iso8601_datetime)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Manager::SeatAdded">SeatAdded</link>             ('o' sid)
-<link linkend="Manager::SeatRemoved">SeatRemoved</link>           ('o' sid)
-<link linkend="Manager::SystemIdleHintChanged">SystemIdleHintChanged</link> ('b' hint)
+    <synopsis><link linkend="Manager::SeatAdded">SeatAdded</link>('o'sid)
+<link linkend="Manager::SeatRemoved">SeatRemoved</link>('o'sid)
+<link linkend="Manager::SystemIdleHintChanged">SystemIdleHintChanged</link>('b'hint)
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -62,7 +62,7 @@
         <primary>CanRestart</primary>
         <secondary>Manager</secondary>
       </indexterm>
-      <programlisting>CanRestart (out 'b' can_restart)</programlisting>
+      <programlisting>CanRestart (out'b'can_restart)</programlisting>
       <variablelist role="params">
         <varlistentry>
           <term><parameter>can_restart</parameter>:</term>
@@ -81,7 +81,7 @@
         <primary>CanStop</primary>
         <secondary>Manager</secondary>
       </indexterm>
-      <programlisting>CanStop (out 'b' can_stop)</programlisting>
+      <programlisting>CanStop (out'b'can_stop)</programlisting>
       <variablelist role="params">
         <varlistentry>
           <term><parameter>can_stop</parameter>:</term>
@@ -91,7 +91,7 @@
         </varlistentry>
       </variablelist>
     </refsect2>
-    <refsect2><title><anchor role="function" id="Manager.OpenSession"/>OpenSession ()</title><indexterm><primary>OpenSession</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSession (out 's' cookie)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.OpenSession"/>OpenSession ()</title><indexterm><primary>OpenSession</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSession (out's'cookie)</programlisting>
           <para>This method requests that a new <link linkend="Session">Session</link>
           be created for the calling process.  The properties of this new Session are set automatically
           from information collected about the calling process.
@@ -139,8 +139,8 @@
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the new session</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Manager.OpenSessionWithParameters"><function>OpenSessionWithParameters()</function></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.OpenSessionWithParameters"/>OpenSessionWithParameters ()</title><indexterm><primary>OpenSessionWithParameters</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSessionWithParameters (in  'a(sv)' parameters,
-                           out 's'     cookie)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.OpenSessionWithParameters"/>OpenSessionWithParameters ()</title><indexterm><primary>OpenSessionWithParameters</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSessionWithParameters (in'a(sv)'parameters,
+out's'cookie)</programlisting>
           <para>This method requests that a new <link linkend="Session">Session</link>
           be created for the calling process.  The properties of this new Session are from the
           parameters provided.
@@ -157,14 +157,14 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>parameters</parameter>:</term><listitem><simpara>An array of sets of property names and values</simpara></listitem></varlistentry><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the new session</simpara></listitem></varlistentry></variablelist><note><title>Permissions</title><para role="permission">This method is restricted to privileged users by D-Bus policy.</para></note><para>
 See also:
 <link linkend="Session">org.freedesktop.ConsoleKit.Session</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.CloseSession"/>CloseSession ()</title><indexterm><primary>CloseSession</primary><secondary>Manager</secondary></indexterm><programlisting>CloseSession (in  's' cookie,
-              out 'b' result)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.CloseSession"/>CloseSession ()</title><indexterm><primary>CloseSession</primary><secondary>Manager</secondary></indexterm><programlisting>CloseSession (in's'cookie,
+out'b'result)</programlisting>
           <para>This method is used to close the session identified by the supplied cookie.
           </para>
           <para>The session can only be closed by the same process that opened the session.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the session</simpara></listitem></varlistentry><varlistentry><term><parameter>result</parameter>:</term><listitem><simpara>Whether the session was successfully closed</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSeats"/>GetSeats ()</title><indexterm><primary>GetSeats</primary><secondary>Manager</secondary></indexterm><programlisting>GetSeats (out 'ao' seats)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSeats"/>GetSeats ()</title><indexterm><primary>GetSeats</primary><secondary>Manager</secondary></indexterm><programlisting>GetSeats (out'ao'seats)</programlisting>
           <para>This gets a list of all the <link linkend="Seat">Seats</link>
           that are currently present on the system.</para>
           <para>Each Seat ID is an D-Bus object path for the object that implements the
@@ -172,7 +172,7 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>seats</parameter>:</term><listitem><simpara>an array of Seat IDs</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Seat">org.freedesktop.ConsoleKit.Seat</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessions (out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessions (out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently present on the system.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
@@ -180,18 +180,18 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session">org.freedesktop.ConsoleKit.Session</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionForCookie"/>GetSessionForCookie ()</title><indexterm><primary>GetSessionForCookie</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForCookie (in  's' cookie,
-                     out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionForCookie"/>GetSessionForCookie ()</title><indexterm><primary>GetSessionForCookie</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForCookie (in's'cookie,
+out'o'ssid)</programlisting>
           <para>Returns the session ID that is associated with the specified cookie.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the session</simpara></listitem></varlistentry><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionForUnixProcess"/>GetSessionForUnixProcess ()</title><indexterm><primary>GetSessionForUnixProcess</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForUnixProcess (in  'u' pid,
-                          out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionForUnixProcess"/>GetSessionForUnixProcess ()</title><indexterm><primary>GetSessionForUnixProcess</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForUnixProcess (in'u'pid,
+out'o'ssid)</programlisting>
           <para>Attempts to determine the session ID for the specified
           POSIX process ID (pid).
           </para>
         <variablelist role="params"><varlistentry><term><parameter>pid</parameter>:</term><listitem><simpara>The POSIX process ID</simpara></listitem></varlistentry><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetCurrentSession"/>GetCurrentSession ()</title><indexterm><primary>GetCurrentSession</primary><secondary>Manager</secondary></indexterm><programlisting>GetCurrentSession (out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetCurrentSession"/>GetCurrentSession ()</title><indexterm><primary>GetCurrentSession</primary><secondary>Manager</secondary></indexterm><programlisting>GetCurrentSession (out'o'ssid)</programlisting>
           <para>Attempts to determine the session ID that the caller belongs to.
           </para>
           <para>See this example of using dbus-send:
@@ -202,15 +202,15 @@ See also:
   org.freedesktop.ConsoleKit.Manager.GetCurrentSession
           </programlisting></informalexample></para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUnixUser"/>GetSessionsForUnixUser ()</title><indexterm><primary>GetSessionsForUnixUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUnixUser (in  'u'  uid,
-                        out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUnixUser"/>GetSessionsForUnixUser ()</title><indexterm><primary>GetSessionsForUnixUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUnixUser (in'u'uid,
+out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently open for the specified user.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
           <link linkend="Session">Session</link> interface.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>POSIX User identification</simpara></listitem></varlistentry><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUser"/>GetSessionsForUser ()</title><indexterm><primary>GetSessionsForUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUser (in  'u'  uid,
-                    out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUser"/>GetSessionsForUser ()</title><indexterm><primary>GetSessionsForUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUser (in'u'uid,
+out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently open for the specified user.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
@@ -219,12 +219,12 @@ See also:
 
   <link linkend="Manager.GetSessionsForUnixUser"><function>GetSessionsForUnixUser</function></link>
 instead.</para></warning></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleHint"/>GetSystemIdleHint ()</title><indexterm><primary>GetSystemIdleHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleHint (out 'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleHint"/>GetSystemIdleHint ()</title><indexterm><primary>GetSystemIdleHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleHint (out'b'idle_hint)</programlisting>
           <para>Returns TRUE if the <link linkend="Session:idle-hint"><literal>idle-hint</literal></link>
           property of every open session is TRUE or if there are no open sessions.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>idle_hint</parameter>:</term><listitem><simpara>The value of the system-idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleSinceHint"/>GetSystemIdleSinceHint ()</title><indexterm><primary>GetSystemIdleSinceHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleSinceHint (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleSinceHint"/>GetSystemIdleSinceHint ()</title><indexterm><primary>GetSystemIdleSinceHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleSinceHint (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time of the last change of the system-idle-hint.
           </para>
@@ -232,15 +232,15 @@ instead.</para></warning></para></refsect2>
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Manager::SeatAdded"/>The SeatAdded signal</title><indexterm><primary>SeatAdded</primary><secondary>Manager</secondary></indexterm><programlisting>SeatAdded ('o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SeatAdded"/>The SeatAdded signal</title><indexterm><primary>SeatAdded</primary><secondary>Manager</secondary></indexterm><programlisting>SeatAdded ('o'sid)</programlisting>
           <para>Emitted when a Seat has been added to the system.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>The Seat ID for the added seat</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager::SeatRemoved"/>The SeatRemoved signal</title><indexterm><primary>SeatRemoved</primary><secondary>Manager</secondary></indexterm><programlisting>SeatRemoved ('o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SeatRemoved"/>The SeatRemoved signal</title><indexterm><primary>SeatRemoved</primary><secondary>Manager</secondary></indexterm><programlisting>SeatRemoved ('o'sid)</programlisting>
           <para>Emitted when a Seat has been removed from the system.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>The Seat ID for the removed seat</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager::SystemIdleHintChanged"/>The SystemIdleHintChanged signal</title><indexterm><primary>SystemIdleHintChanged</primary><secondary>Manager</secondary></indexterm><programlisting>SystemIdleHintChanged ('b' hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SystemIdleHintChanged"/>The SystemIdleHintChanged signal</title><indexterm><primary>SystemIdleHintChanged</primary><secondary>Manager</secondary></indexterm><programlisting>SystemIdleHintChanged ('b'hint)</programlisting>
           <para>Emitted when the value of the system-idle-hint has changed.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>hint</parameter>:</term><listitem><simpara>The value of the system-idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
index 39ce3c6..41aefcb 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
@@ -8,21 +8,21 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Seat.GetId">GetId</link>               (out 'o'     sid)
-<link linkend="Seat.GetSessions">GetSessions</link>         (out 'ao'    sessions)
-<link linkend="Seat.GetDevices">GetDevices</link>          (out 'a(ss)' devices)
-<link linkend="Seat.GetActiveSession">GetActiveSession</link>    (out 'o'     ssid)
-<link linkend="Seat.CanActivateSessions">CanActivateSessions</link> (out 'b'     can_activate)
-<link linkend="Seat.ActivateSession">ActivateSession</link>     (in  'o'     ssid)
+    <synopsis><link linkend="Seat.GetId">GetId</link>(out'o'sid)
+<link linkend="Seat.GetSessions">GetSessions</link>(out'ao'sessions)
+<link linkend="Seat.GetDevices">GetDevices</link>(out'a(ss)'devices)
+<link linkend="Seat.GetActiveSession">GetActiveSession</link>(out'o'ssid)
+<link linkend="Seat.CanActivateSessions">CanActivateSessions</link>(out'b'can_activate)
+<link linkend="Seat.ActivateSession">ActivateSession</link>(in'o'ssid)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Seat::ActiveSessionChanged">ActiveSessionChanged</link> ('o'    ssid)
-<link linkend="Seat::SessionAdded">SessionAdded</link>         ('o'    ssid)
-<link linkend="Seat::SessionRemoved">SessionRemoved</link>       ('o'    ssid)
-<link linkend="Seat::DeviceAdded">DeviceAdded</link>          ('(ss)' device)
-<link linkend="Seat::DeviceRemoved">DeviceRemoved</link>        ('(ss)' device)
+    <synopsis><link linkend="Seat::ActiveSessionChanged">ActiveSessionChanged</link>('o'ssid)
+<link linkend="Seat::SessionAdded">SessionAdded</link>('o'ssid)
+<link linkend="Seat::SessionRemoved">SessionRemoved</link>('o'ssid)
+<link linkend="Seat::DeviceAdded">DeviceAdded</link>('(ss)'device)
+<link linkend="Seat::DeviceRemoved">DeviceRemoved</link>('(ss)'device)
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -42,29 +42,29 @@ seat at a time.</para>
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Seat.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Seat</secondary></indexterm><programlisting>GetId (out 'o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Seat</secondary></indexterm><programlisting>GetId (out'o'sid)</programlisting>
           <para>Returns the ID for Seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>Seat ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Seat</secondary></indexterm><programlisting>GetSessions (out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Seat</secondary></indexterm><programlisting>GetSessions (out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently attached to this seat.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
           <link linkend="Session">Session</link> interface.</para>
         <variablelist role="params"><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetDevices"/>GetDevices ()</title><indexterm><primary>GetDevices</primary><secondary>Seat</secondary></indexterm><programlisting>GetDevices (out 'a(ss)' devices)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetDevices"/>GetDevices ()</title><indexterm><primary>GetDevices</primary><secondary>Seat</secondary></indexterm><programlisting>GetDevices (out'a(ss)'devices)</programlisting>
           <para>This gets a list of all the devices
           that are currently associated with this seat.</para>
           <para>Each device is an D-Bus structure that represents
           the device type and the device id.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>devices</parameter>:</term><listitem><simpara>an array of devices</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetActiveSession"/>GetActiveSession ()</title><indexterm><primary>GetActiveSession</primary><secondary>Seat</secondary></indexterm><programlisting>GetActiveSession (out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetActiveSession"/>GetActiveSession ()</title><indexterm><primary>GetActiveSession</primary><secondary>Seat</secondary></indexterm><programlisting>GetActiveSession (out'o'ssid)</programlisting>
           <para>Gets the Session ID that is currently active on this Seat.</para>
           <para>Returns NULL if there is no active session.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.CanActivateSessions"/>CanActivateSessions ()</title><indexterm><primary>CanActivateSessions</primary><secondary>Seat</secondary></indexterm><programlisting>CanActivateSessions (out 'b' can_activate)</programlisting><para>Used to determine whether the seat supports session activation.</para>
+    <refsect2><title><anchor role="function" id="Seat.CanActivateSessions"/>CanActivateSessions ()</title><indexterm><primary>CanActivateSessions</primary><secondary>Seat</secondary></indexterm><programlisting>CanActivateSessions (out'b'can_activate)</programlisting><para>Used to determine whether the seat supports session activation.</para>
         <variablelist role="params"><varlistentry><term><parameter>can_activate</parameter>:</term><listitem><simpara>TRUE if seat supports session activation</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.ActivateSession"/>ActivateSession ()</title><indexterm><primary>ActivateSession</primary><secondary>Seat</secondary></indexterm><programlisting>ActivateSession (in  'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.ActivateSession"/>ActivateSession ()</title><indexterm><primary>ActivateSession</primary><secondary>Seat</secondary></indexterm><programlisting>ActivateSession (in'o'ssid)</programlisting>
           <para>Attempt to activate the specified session.  In most
           cases, if successful, this will cause the session to
           become visible and take control of the hardware that is
@@ -75,19 +75,19 @@ See also:
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Seat::ActiveSessionChanged"/>The ActiveSessionChanged signal</title><indexterm><primary>ActiveSessionChanged</primary><secondary>Seat</secondary></indexterm><programlisting>ActiveSessionChanged ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::ActiveSessionChanged"/>The ActiveSessionChanged signal</title><indexterm><primary>ActiveSessionChanged</primary><secondary>Seat</secondary></indexterm><programlisting>ActiveSessionChanged ('o'ssid)</programlisting>
           <para>Emitted when the active session has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::SessionAdded"/>The SessionAdded signal</title><indexterm><primary>SessionAdded</primary><secondary>Seat</secondary></indexterm><programlisting>SessionAdded ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::SessionAdded"/>The SessionAdded signal</title><indexterm><primary>SessionAdded</primary><secondary>Seat</secondary></indexterm><programlisting>SessionAdded ('o'ssid)</programlisting>
           <para>Emitted when a session has been added to the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::SessionRemoved"/>The SessionRemoved signal</title><indexterm><primary>SessionRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>SessionRemoved ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::SessionRemoved"/>The SessionRemoved signal</title><indexterm><primary>SessionRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>SessionRemoved ('o'ssid)</programlisting>
           <para>Emitted when a session has been removed from the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::DeviceAdded"/>The DeviceAdded signal</title><indexterm><primary>DeviceAdded</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceAdded ('(ss)' device)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::DeviceAdded"/>The DeviceAdded signal</title><indexterm><primary>DeviceAdded</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceAdded ('(ss)'device)</programlisting>
           <para>Emitted when a device has been associated with the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>device</parameter>:</term><listitem><simpara>Device structure</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::DeviceRemoved"/>The DeviceRemoved signal</title><indexterm><primary>DeviceRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceRemoved ('(ss)' device)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::DeviceRemoved"/>The DeviceRemoved signal</title><indexterm><primary>DeviceRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceRemoved ('(ss)'device)</programlisting>
           <para>Emitted when a device has been dissociated from the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>device</parameter>:</term><listitem><simpara>Device structure</simpara></listitem></varlistentry></variablelist></refsect2>
   </refsect1>
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
index 59f3c17..8b578f7 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
@@ -8,33 +8,33 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Session.GetId">GetId</link>               (out 'o' ssid)
-<link linkend="Session.GetSeatId">GetSeatId</link>           (out 'o' sid)
-<link linkend="Session.GetSessionType">GetSessionType</link>      (out 's' type)
-<link linkend="Session.GetUser">GetUser</link>             (out 'u' uid)
-<link linkend="Session.GetUnixUser">GetUnixUser</link>         (out 'u' uid)
-<link linkend="Session.GetX11Display">GetX11Display</link>       (out 's' display)
-<link linkend="Session.GetX11DisplayDevice">GetX11DisplayDevice</link> (out 's' x11_display_device)
-<link linkend="Session.GetDisplayDevice">GetDisplayDevice</link>    (out 's' display_device)
-<link linkend="Session.GetRemoteHostName">GetRemoteHostName</link>   (out 's' remote_host_name)
-<link linkend="Session.GetLoginSessionId">GetLoginSessionId</link>   (out 's' login_session_id)
-<link linkend="Session.IsActive">IsActive</link>            (out 'b' active)
-<link linkend="Session.IsLocal">IsLocal</link>             (out 'b' local)
-<link linkend="Session.GetCreationTime">GetCreationTime</link>     (out 's' iso8601_datetime)
-<link linkend="Session.Activate">Activate</link>            ()
-<link linkend="Session.Lock">Lock</link>                ()
-<link linkend="Session.Unlock">Unlock</link>              ()
-<link linkend="Session.GetIdleHint">GetIdleHint</link>         (out 'b' idle_hint)
-<link linkend="Session.GetIdleSinceHint">GetIdleSinceHint</link>    (out 's' iso8601_datetime)
-<link linkend="Session.SetIdleHint">SetIdleHint</link>         (in  'b' idle_hint)
+    <synopsis><link linkend="Session.GetId">GetId</link>(out'o'ssid)
+<link linkend="Session.GetSeatId">GetSeatId</link>(out'o'sid)
+<link linkend="Session.GetSessionType">GetSessionType</link>(out's'type)
+<link linkend="Session.GetUser">GetUser</link>(out'u'uid)
+<link linkend="Session.GetUnixUser">GetUnixUser</link>(out'u'uid)
+<link linkend="Session.GetX11Display">GetX11Display</link>(out's'display)
+<link linkend="Session.GetX11DisplayDevice">GetX11DisplayDevice</link>(out's'x11_display_device)
+<link linkend="Session.GetDisplayDevice">GetDisplayDevice</link>(out's'display_device)
+<link linkend="Session.GetRemoteHostName">GetRemoteHostName</link>(out's'remote_host_name)
+<link linkend="Session.GetLoginSessionId">GetLoginSessionId</link>(out's'login_session_id)
+<link linkend="Session.IsActive">IsActive</link>(out'b'active)
+<link linkend="Session.IsLocal">IsLocal</link>(out'b'local)
+<link linkend="Session.GetCreationTime">GetCreationTime</link>(out's'iso8601_datetime)
+<link linkend="Session.Activate">Activate</link>()
+<link linkend="Session.Lock">Lock</link>()
+<link linkend="Session.Unlock">Unlock</link>()
+<link linkend="Session.GetIdleHint">GetIdleHint</link>(out'b'idle_hint)
+<link linkend="Session.GetIdleSinceHint">GetIdleSinceHint</link>(out's'iso8601_datetime)
+<link linkend="Session.SetIdleHint">SetIdleHint</link>(in'b'idle_hint)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Session::ActiveChanged">ActiveChanged</link>   ('b' is_active)
-<link linkend="Session::IdleHintChanged">IdleHintChanged</link> ('b' hint)
-<link linkend="Session::Lock">Lock</link>            ()
-<link linkend="Session::Unlock">Unlock</link>          ()
+    <synopsis><link linkend="Session::ActiveChanged">ActiveChanged</link>('b'is_active)
+<link linkend="Session::IdleHintChanged">IdleHintChanged</link>('b'hint)
+<link linkend="Session::Lock">Lock</link>()
+<link linkend="Session::Unlock">Unlock</link>()
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -47,16 +47,16 @@
   </refsect1>
   <refsect1 role="properties">
     <title role="properties.title">Properties</title>
-    <synopsis><link linkend="Session:unix-user">'unix-user'</link>          readwrite 'u'
-<link linkend="Session:user">'user'</link>               readwrite 'u'
-<link linkend="Session:session-type">'session-type'</link>       readwrite 's'
-<link linkend="Session:remote-host-name">'remote-host-name'</link>   readwrite 's'
-<link linkend="Session:display-device">'display-device'</link>     readwrite 's'
-<link linkend="Session:x11-display">'x11-display'</link>        readwrite 's'
-<link linkend="Session:x11-display-device">'x11-display-device'</link> readwrite 's'
-<link linkend="Session:active">'active'</link>             readwrite 'b'
-<link linkend="Session:is-local">'is-local'</link>           readwrite 'b'
-<link linkend="Session:idle-hint">'idle-hint'</link>          readwrite 'b'
+    <synopsis><link linkend="Session:unix-user">'unix-user'</link>readwrite'u'
+<link linkend="Session:user">'user'</link>readwrite'u'
+<link linkend="Session:session-type">'session-type'</link>readwrite's'
+<link linkend="Session:remote-host-name">'remote-host-name'</link>readwrite's'
+<link linkend="Session:display-device">'display-device'</link>readwrite's'
+<link linkend="Session:x11-display">'x11-display'</link>readwrite's'
+<link linkend="Session:x11-display-device">'x11-display-device'</link>readwrite's'
+<link linkend="Session:active">'active'</link>readwrite'b'
+<link linkend="Session:is-local">'is-local'</link>readwrite'b'
+<link linkend="Session:idle-hint">'idle-hint'</link>readwrite'b'
 </synopsis>
   </refsect1>
   <refsect1 role="desc"><title role="desc.title">Description</title>
@@ -71,14 +71,14 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Session.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Session</secondary></indexterm><programlisting>GetId (out 'o' ssid)</programlisting><para>Returns the ID for Session.</para>
+    <refsect2><title><anchor role="function" id="Session.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Session</secondary></indexterm><programlisting>GetId (out'o'ssid)</programlisting><para>Returns the ID for Session.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetSeatId"/>GetSeatId ()</title><indexterm><primary>GetSeatId</primary><secondary>Session</secondary></indexterm><programlisting>GetSeatId (out 'o' sid)</programlisting><para>Returns the ID for the Seat the Session is
+    <refsect2><title><anchor role="function" id="Session.GetSeatId"/>GetSeatId ()</title><indexterm><primary>GetSeatId</primary><secondary>Session</secondary></indexterm><programlisting>GetSeatId (out'o'sid)</programlisting><para>Returns the ID for the Seat the Session is
         attached to.</para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>Seat ID</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Seat">org.freedesktop.ConsoleKit.Seat</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetSessionType"/>GetSessionType ()</title><indexterm><primary>GetSessionType</primary><secondary>Session</secondary></indexterm><programlisting>GetSessionType (out 's' type)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetSessionType"/>GetSessionType ()</title><indexterm><primary>GetSessionType</primary><secondary>Session</secondary></indexterm><programlisting>GetSessionType (out's'type)</programlisting>
           <para>Returns the type of the session.</para>
           <para>Warning: we haven't yet defined the allowed values for this property.
           It is probably best to avoid this until we do.
@@ -86,50 +86,50 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>type</parameter>:</term><listitem><simpara>Session type</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:session-type"><literal>session-type</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetUser"/>GetUser ()</title><indexterm><primary>GetUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUser (out 'u' uid)</programlisting><para>Returns the user that the session belongs to.</para>
+    <refsect2><title><anchor role="function" id="Session.GetUser"/>GetUser ()</title><indexterm><primary>GetUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUser (out'u'uid)</programlisting><para>Returns the user that the session belongs to.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>User ID</simpara></listitem></varlistentry></variablelist><para role="deprecated"><warning><para><literal>GetUser</literal> is deprecated since version 0.1.3 and should not be used in newly-written code. Use
 
   <link linkend="Session.GetUnixUser"><function>GetUnixUser</function></link>
 instead.</para></warning></para><para>
 See also:
 <link linkend="Session:user"><literal>user</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetUnixUser"/>GetUnixUser ()</title><indexterm><primary>GetUnixUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUnixUser (out 'u' uid)</programlisting><para>Returns the POSIX user ID that the session belongs to.</para>
+    <refsect2><title><anchor role="function" id="Session.GetUnixUser"/>GetUnixUser ()</title><indexterm><primary>GetUnixUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUnixUser (out'u'uid)</programlisting><para>Returns the POSIX user ID that the session belongs to.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>POSIX User ID</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:unix-user"><literal>unix-user</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetX11Display"/>GetX11Display ()</title><indexterm><primary>GetX11Display</primary><secondary>Session</secondary></indexterm><programlisting>GetX11Display (out 's' display)</programlisting><para>Returns the value of the X11 DISPLAY for this session
+    <refsect2><title><anchor role="function" id="Session.GetX11Display"/>GetX11Display ()</title><indexterm><primary>GetX11Display</primary><secondary>Session</secondary></indexterm><programlisting>GetX11Display (out's'display)</programlisting><para>Returns the value of the X11 DISPLAY for this session
         if one is present.</para>
         <variablelist role="params"><varlistentry><term><parameter>display</parameter>:</term><listitem><simpara>The value of the X11 display</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:x11-display"><literal>x11-display</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetX11DisplayDevice"/>GetX11DisplayDevice ()</title><indexterm><primary>GetX11DisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetX11DisplayDevice (out 's' x11_display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
+    <refsect2><title><anchor role="function" id="Session.GetX11DisplayDevice"/>GetX11DisplayDevice ()</title><indexterm><primary>GetX11DisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetX11DisplayDevice (out's'x11_display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
         X11 display for the session is connected to.  If there is no x11-display set then this value
         is undefined.</para>
         <variablelist role="params"><varlistentry><term><parameter>x11_display_device</parameter>:</term><listitem><simpara>The value of the X11 display device</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:x11-display-device"><literal>x11-display-device</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetDisplayDevice"/>GetDisplayDevice ()</title><indexterm><primary>GetDisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetDisplayDevice (out 's' display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
+    <refsect2><title><anchor role="function" id="Session.GetDisplayDevice"/>GetDisplayDevice ()</title><indexterm><primary>GetDisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetDisplayDevice (out's'display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
         session is connected to.</para>
         <variablelist role="params"><varlistentry><term><parameter>display_device</parameter>:</term><listitem><simpara>The value of the display device</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:display-device"><literal>display-device</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetRemoteHostName"/>GetRemoteHostName ()</title><indexterm><primary>GetRemoteHostName</primary><secondary>Session</secondary></indexterm><programlisting>GetRemoteHostName (out 's' remote_host_name)</programlisting><para>Returns the value of the remote host name for the session.
+    <refsect2><title><anchor role="function" id="Session.GetRemoteHostName"/>GetRemoteHostName ()</title><indexterm><primary>GetRemoteHostName</primary><secondary>Session</secondary></indexterm><programlisting>GetRemoteHostName (out's'remote_host_name)</programlisting><para>Returns the value of the remote host name for the session.
         </para>
         <variablelist role="params"><varlistentry><term><parameter>remote_host_name</parameter>:</term><listitem><simpara>The remote host name</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:remote-host-name"><literal>remote-host-name</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetLoginSessionId"/>GetLoginSessionId ()</title><indexterm><primary>GetLoginSessionId</primary><secondary>Session</secondary></indexterm><programlisting>GetLoginSessionId (out 's' login_session_id)</programlisting><para>Returns the value of the login session ID that the
+    <refsect2><title><anchor role="function" id="Session.GetLoginSessionId"/>GetLoginSessionId ()</title><indexterm><primary>GetLoginSessionId</primary><secondary>Session</secondary></indexterm><programlisting>GetLoginSessionId (out's'login_session_id)</programlisting><para>Returns the value of the login session ID that the
         underlying system uses to enforce session boundaries.  If there is no login session ID
         set then this value is an empty string.</para>
         <variablelist role="params"><varlistentry><term><parameter>login_session_id</parameter>:</term><listitem><simpara>The value of the native system login session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.IsActive"/>IsActive ()</title><indexterm><primary>IsActive</primary><secondary>Session</secondary></indexterm><programlisting>IsActive (out 'b' active)</programlisting><para>Returns whether the session is active on the Seat that
+    <refsect2><title><anchor role="function" id="Session.IsActive"/>IsActive ()</title><indexterm><primary>IsActive</primary><secondary>Session</secondary></indexterm><programlisting>IsActive (out'b'active)</programlisting><para>Returns whether the session is active on the Seat that
         it is attached to.</para>
         <para>If the session is not attached to a seat this value is undefined.
         </para>
         <variablelist role="params"><varlistentry><term><parameter>active</parameter>:</term><listitem><simpara>TRUE if the session is active, otherwise FALSE</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:active"><literal>active</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.IsLocal"/>IsLocal ()</title><indexterm><primary>IsLocal</primary><secondary>Session</secondary></indexterm><programlisting>IsLocal (out 'b' local)</programlisting><para>Returns whether the session is local</para>
+    <refsect2><title><anchor role="function" id="Session.IsLocal"/>IsLocal ()</title><indexterm><primary>IsLocal</primary><secondary>Session</secondary></indexterm><programlisting>IsLocal (out'b'local)</programlisting><para>Returns whether the session is local</para>
         <para>FIXME: we need to come up with a concrete definition for this value.
         It was originally used as a way to identify XDMCP sessions that originate
         from a remote system.
@@ -137,7 +137,7 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>local</parameter>:</term><listitem><simpara>TRUE if the session is local, otherwise FALSE</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:is-local"><literal>is-local</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetCreationTime"/>GetCreationTime ()</title><indexterm><primary>GetCreationTime</primary><secondary>Session</secondary></indexterm><programlisting>GetCreationTime (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetCreationTime"/>GetCreationTime ()</title><indexterm><primary>GetCreationTime</primary><secondary>Session</secondary></indexterm><programlisting>GetCreationTime (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time that the session was opened.
           </para>
@@ -167,19 +167,19 @@ See also:
         <note><title>Permissions</title><para role="permission">This method is restricted to privileged users by D-Bus policy.</para></note><para>
 See also:
 <link linkend="Session::Unlock"><literal>Unlock signal</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetIdleHint"/>GetIdleHint ()</title><indexterm><primary>GetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleHint (out 'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetIdleHint"/>GetIdleHint ()</title><indexterm><primary>GetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleHint (out'b'idle_hint)</programlisting>
           <para>Gets the value of the <link linkend="Session:idle-hint"><literal>idle-hint</literal></link>
           property.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>idle_hint</parameter>:</term><listitem><simpara>The value of the idle-hint</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:idle-hint"><literal>idle-hint</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetIdleSinceHint"/>GetIdleSinceHint ()</title><indexterm><primary>GetIdleSinceHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleSinceHint (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetIdleSinceHint"/>GetIdleSinceHint ()</title><indexterm><primary>GetIdleSinceHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleSinceHint (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time of the last change of the idle-hint.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>iso8601_datetime</parameter>:</term><listitem><simpara>An ISO 8601 format date-type string</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.SetIdleHint"/>SetIdleHint ()</title><indexterm><primary>SetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>SetIdleHint (in  'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.SetIdleHint"/>SetIdleHint ()</title><indexterm><primary>SetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>SetIdleHint (in'b'idle_hint)</programlisting>
           <para>This may be used by the session to indicate that
           it is idle.
           </para>
@@ -189,10 +189,10 @@ See also:
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Session::ActiveChanged"/>The ActiveChanged signal</title><indexterm><primary>ActiveChanged</primary><secondary>Session</secondary></indexterm><programlisting>ActiveChanged ('b' is_active)</programlisting>
+    <refsect2><title><anchor role="function" id="Session::ActiveChanged"/>The ActiveChanged signal</title><indexterm><primary>ActiveChanged</primary><secondary>Session</secondary></indexterm><programlisting>ActiveChanged ('b'is_active)</programlisting>
           <para>Emitted when the active property has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>is_active</parameter>:</term><listitem><simpara>TRUE if the session is active, otherwise FALSE</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session::IdleHintChanged"/>The IdleHintChanged signal</title><indexterm><primary>IdleHintChanged</primary><secondary>Session</secondary></indexterm><programlisting>IdleHintChanged ('b' hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session::IdleHintChanged"/>The IdleHintChanged signal</title><indexterm><primary>IdleHintChanged</primary><secondary>Session</secondary></indexterm><programlisting>IdleHintChanged ('b'hint)</programlisting>
           <para>Emitted when the idle-hint property has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>hint</parameter>:</term><listitem><simpara>the new value of idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
     <refsect2><title><anchor role="function" id="Session::Lock"/>The Lock signal</title><indexterm><primary>Lock</primary><secondary>Session</secondary></indexterm><programlisting>Lock ()</programlisting>
@@ -206,25 +206,25 @@ See also:
   </refsect1>
   <refsect1 role="property_details">
     <title role="property_details.title">Property Details</title>
-    <refsect2><title><anchor role="function" id="Session:unix-user"/>The "unix-user" property</title><indexterm><primary>unix-user</primary><secondary>Session</secondary></indexterm><programlisting>'unix-user'  readwrite 'u'
+    <refsect2><title><anchor role="function" id="Session:unix-user"/>The "unix-user" property</title><indexterm><primary>unix-user</primary><secondary>Session</secondary></indexterm><programlisting>'unix-user'readwrite'u'
 </programlisting>
           <para>The user assigned to the session.</para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:user"/>The "user" property</title><indexterm><primary>user</primary><secondary>Session</secondary></indexterm><programlisting>'user'  readwrite 'u'
+    <refsect2><title><anchor role="function" id="Session:user"/>The "user" property</title><indexterm><primary>user</primary><secondary>Session</secondary></indexterm><programlisting>'user'readwrite'u'
 </programlisting>
           <para>The user assigned to the session.</para>
         <para role="deprecated"><warning><para><literal>user</literal> is deprecated since version 0.1.3 and should not be used in newly-written code. Use
 
   <link linkend="Session:unix-user"><literal>unix-user</literal></link>
 instead.</para></warning></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session:session-type"/>The "session-type" property</title><indexterm><primary>session-type</primary><secondary>Session</secondary></indexterm><programlisting>'session-type'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:session-type"/>The "session-type" property</title><indexterm><primary>session-type</primary><secondary>Session</secondary></indexterm><programlisting>'session-type'readwrite's'
 </programlisting>
           <para>The type of the session.</para>
           <para>Warning: we haven't yet defined the allowed values for this property.
           It is probably best to avoid this until we do.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:remote-host-name"/>The "remote-host-name" property</title><indexterm><primary>remote-host-name</primary><secondary>Session</secondary></indexterm><programlisting>'remote-host-name'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:remote-host-name"/>The "remote-host-name" property</title><indexterm><primary>remote-host-name</primary><secondary>Session</secondary></indexterm><programlisting>'remote-host-name'readwrite's'
 </programlisting>
           <para>The remote host name for the session.
           </para>
@@ -235,19 +235,19 @@ instead.</para></warning></para></refsect2>
           session is created from an SSH or XDMCP connection.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:display-device"/>The "display-device" property</title><indexterm><primary>display-device</primary><secondary>Session</secondary></indexterm><programlisting>'display-device'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:display-device"/>The "display-device" property</title><indexterm><primary>display-device</primary><secondary>Session</secondary></indexterm><programlisting>'display-device'readwrite's'
 </programlisting>
           <para>The display device (aka TTY) that the
           session is connected to.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:x11-display"/>The "x11-display" property</title><indexterm><primary>x11-display</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:x11-display"/>The "x11-display" property</title><indexterm><primary>x11-display</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display'readwrite's'
 </programlisting>
           <para>Value of the X11 DISPLAY for this session
           if one is present.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:x11-display-device"/>The "x11-display-device" property</title><indexterm><primary>x11-display-device</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display-device'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:x11-display-device"/>The "x11-display-device" property</title><indexterm><primary>x11-display-device</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display-device'readwrite's'
 </programlisting>
           <para>
           The display device (aka TTY) that the X11 display for the
@@ -255,7 +255,7 @@ instead.</para></warning></para></refsect2>
           this value is undefined.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:active"/>The "active" property</title><indexterm><primary>active</primary><secondary>Session</secondary></indexterm><programlisting>'active'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:active"/>The "active" property</title><indexterm><primary>active</primary><secondary>Session</secondary></indexterm><programlisting>'active'readwrite'b'
 </programlisting>
           <para>
           Whether the session is active on the Seat that
@@ -263,7 +263,7 @@ instead.</para></warning></para></refsect2>
           <para>If the session is not attached to a seat this value is undefined.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:is-local"/>The "is-local" property</title><indexterm><primary>is-local</primary><secondary>Session</secondary></indexterm><programlisting>'is-local'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:is-local"/>The "is-local" property</title><indexterm><primary>is-local</primary><secondary>Session</secondary></indexterm><programlisting>'is-local'readwrite'b'
 </programlisting>
           <para>
           Whether the session is local</para>
@@ -272,7 +272,7 @@ instead.</para></warning></para></refsect2>
           from a remote system.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:idle-hint"/>The "idle-hint" property</title><indexterm><primary>idle-hint</primary><secondary>Session</secondary></indexterm><programlisting>'idle-hint'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:idle-hint"/>The "idle-hint" property</title><indexterm><primary>idle-hint</primary><secondary>Session</secondary></indexterm><programlisting>'idle-hint'readwrite'b'
 </programlisting>
           <para>
           This is a hint used to indicate that the session may be idle.
diff --git a/install-sh b/install-sh
index 6781b98..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff --git a/libck-connector/Makefile.in b/libck-connector/Makefile.in
index 3b315fb..0af47c1 100644
--- a/libck-connector/Makefile.in
+++ b/libck-connector/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,6 +18,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,8 +83,9 @@ build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = test-connector$(EXEEXT) $(am__EXEEXT_1)
 subdir = libck-connector
-DIST_COMMON = $(libck_connectorinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/ck-connector.pc.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/ck-connector.pc.in $(top_srcdir)/depcomp \
+	$(libck_connectorinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -71,6 +116,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(libck_connectorincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -80,9 +131,10 @@ libck_connector_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am__objects_1 =
 am_libck_connector_la_OBJECTS = ck-connector.lo $(am__objects_1)
 libck_connector_la_OBJECTS = $(am_libck_connector_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libck_connector_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libck_connector_la_LDFLAGS) \
@@ -93,6 +145,18 @@ am_test_connector_OBJECTS = test-connector.$(OBJEXT) $(am__objects_1)
 test_connector_OBJECTS = $(am_test_connector_OBJECTS)
 test_connector_DEPENDENCIES = libck-connector.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -103,26 +167,44 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libck_connector_la_SOURCES) $(test_connector_SOURCES)
 DIST_SOURCES = $(libck_connector_la_SOURCES) $(test_connector_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(pkgconfig_DATA)
 HEADERS = $(libck_connectorinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +229,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -228,6 +309,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -377,9 +461,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 ck-connector.pc: $(top_builddir)/config.status $(srcdir)/ck-connector.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -387,6 +471,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -402,13 +488,16 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libck-connector.la: $(libck_connector_la_OBJECTS) $(libck_connector_la_DEPENDENCIES) 
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libck-connector.la: $(libck_connector_la_OBJECTS) $(libck_connector_la_DEPENDENCIES) $(EXTRA_libck_connector_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libck_connector_la_LINK) -rpath $(libdir) $(libck_connector_la_OBJECTS) $(libck_connector_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -419,7 +508,8 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test-connector$(EXEEXT): $(test_connector_OBJECTS) $(test_connector_DEPENDENCIES) 
+
+test-connector$(EXEEXT): $(test_connector_OBJECTS) $(test_connector_DEPENDENCIES) $(EXTRA_test_connector_DEPENDENCIES) 
 	@rm -f test-connector$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_connector_OBJECTS) $(test_connector_LDADD) $(LIBS)
 
@@ -435,26 +525,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -463,8 +550,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -478,13 +568,14 @@ uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-libck_connectorincludeHEADERS: $(libck_connectorinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libck_connectorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libck_connectorincludedir)"
 	@list='$(libck_connectorinclude_HEADERS)'; test -n "$(libck_connectorincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libck_connectorincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libck_connectorincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -498,30 +589,17 @@ uninstall-libck_connectorincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libck_connectorinclude_HEADERS)'; test -n "$(libck_connectorincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libck_connectorincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libck_connectorincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+	dir='$(DESTDIR)$(libck_connectorincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -533,15 +611,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -550,6 +624,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -601,10 +690,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -693,21 +787,21 @@ uninstall-am: uninstall-libLTLIBRARIES \
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-local \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-libck_connectorincludeHEADERS install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-libLTLIBRARIES \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-libck_connectorincludeHEADERS \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-libck_connectorincludeHEADERS \
 	uninstall-pkgconfigDATA
 
diff --git a/ltmain.sh b/ltmain.sh
index aa5624c..68c6d96 100755..100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.3
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION="2.4.2 Debian-2.4.2-1.3"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6111,7 +6124,10 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6147,7 +6163,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6430,19 +6447,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -6831,7 +6848,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7333,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7334,6 +7352,9 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -7432,7 +7453,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8041,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8076,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8084,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9174,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9285,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/missing b/missing
index 28055d2..cdea514 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,272 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/pam-ck-connector/Makefile.in b/pam-ck-connector/Makefile.in
index 2ec46e9..aae3b34 100644
--- a/pam-ck-connector/Makefile.in
+++ b/pam-ck-connector/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,7 +82,8 @@ host_triplet = @host@
 @CK_COMPILE_LINUX_TRUE@@ENABLE_PAM_MODULE_TRUE@noinst_PROGRAMS = test-pam$(EXEEXT) \
 @CK_COMPILE_LINUX_TRUE@@ENABLE_PAM_MODULE_TRUE@	$(am__EXEEXT_1)
 subdir = pam-ck-connector
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -69,6 +114,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pamlibdir)" "$(DESTDIR)$(man8dir)"
 LTLIBRARIES = $(pamlib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -81,9 +132,10 @@ am__pam_ck_connector_la_SOURCES_DIST = pam-ck-connector.c
 @ENABLE_PAM_MODULE_TRUE@am_pam_ck_connector_la_OBJECTS =  \
 @ENABLE_PAM_MODULE_TRUE@	pam-ck-connector.lo
 pam_ck_connector_la_OBJECTS = $(am_pam_ck_connector_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 pam_ck_connector_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(pam_ck_connector_la_LDFLAGS) \
@@ -99,6 +151,18 @@ am__objects_1 =
 test_pam_OBJECTS = $(am_test_pam_OBJECTS)
 @CK_COMPILE_LINUX_TRUE@@ENABLE_PAM_MODULE_TRUE@test_pam_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @CK_COMPILE_LINUX_TRUE@@ENABLE_PAM_MODULE_TRUE@	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -109,28 +173,46 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(pam_ck_connector_la_SOURCES) $(test_pam_SOURCES)
 DIST_SOURCES = $(am__pam_ck_connector_la_SOURCES_DIST) \
 	$(am__test_pam_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -155,7 +237,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -236,6 +317,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -369,9 +453,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pamlibLTLIBRARIES: $(pamlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pamlibdir)" || $(MKDIR_P) "$(DESTDIR)$(pamlibdir)"
 	@list='$(pamlib_LTLIBRARIES)'; test -n "$(pamlibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -379,6 +463,8 @@ install-pamlibLTLIBRARIES: $(pamlib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pamlibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pamlibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pamlibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pamlibdir)"; \
 	}
@@ -394,13 +480,16 @@ uninstall-pamlibLTLIBRARIES:
 
 clean-pamlibLTLIBRARIES:
 	-test -z "$(pamlib_LTLIBRARIES)" || rm -f $(pamlib_LTLIBRARIES)
-	@list='$(pamlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-pam_ck_connector.la: $(pam_ck_connector_la_OBJECTS) $(pam_ck_connector_la_DEPENDENCIES) 
+	@list='$(pamlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+pam_ck_connector.la: $(pam_ck_connector_la_OBJECTS) $(pam_ck_connector_la_DEPENDENCIES) $(EXTRA_pam_ck_connector_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(pam_ck_connector_la_LINK) $(am_pam_ck_connector_la_rpath) $(pam_ck_connector_la_OBJECTS) $(pam_ck_connector_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -411,7 +500,8 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test-pam$(EXEEXT): $(test_pam_OBJECTS) $(test_pam_DEPENDENCIES) 
+
+test-pam$(EXEEXT): $(test_pam_OBJECTS) $(test_pam_DEPENDENCIES) $(EXTRA_test_pam_DEPENDENCIES) 
 	@rm -f test-pam$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pam_OBJECTS) $(test_pam_LDADD) $(LIBS)
 
@@ -427,26 +517,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -455,11 +542,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man8: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -488,30 +582,17 @@ uninstall-man8:
 	  sed -n '/\.8[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +604,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,24 +617,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -604,10 +683,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -695,21 +779,21 @@ uninstall-man: uninstall-man8
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-local clean-noinstPROGRAMS \
-	clean-pamlibLTLIBRARIES ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man8 \
-	install-pamlibLTLIBRARIES install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	clean-pamlibLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man8 install-pamlibLTLIBRARIES install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-man uninstall-man8 \
-	uninstall-pamlibLTLIBRARIES
+	tags tags-am uninstall uninstall-am uninstall-man \
+	uninstall-man8 uninstall-pamlibLTLIBRARIES
 
 
 clean-local :
diff --git a/pam-ck-connector/pam-ck-connector.c b/pam-ck-connector/pam-ck-connector.c
index 9bdef51..949a9b0 100644
--- a/pam-ck-connector/pam-ck-connector.c
+++ b/pam-ck-connector/pam-ck-connector.c
@@ -244,12 +244,12 @@ pam_sm_open_session (pam_handle_t *pamh,
         const char *s;
         uid_t       uid;
         char        buf[256];
-        char        ttybuf[PATH_MAX];
+        char       *ttybuf;
         DBusError   error;
         dbus_bool_t is_local;
 
         ret = PAM_IGNORE;
-
+        ttybuf = NULL;
         is_local = TRUE;
 
         _parse_pam_args (pamh, flags, argc, argv);
@@ -295,7 +295,13 @@ pam_sm_open_session (pam_handle_t *pamh,
                 x11_display = display_device;
                 display_device = "";
         } else if (strncmp (_PATH_DEV, display_device, 5) != 0) {
-                snprintf (ttybuf, sizeof (ttybuf), _PATH_DEV "%s", display_device);
+                int len = strlen (_PATH_DEV) + strlen (display_device) + 1;
+                ttybuf = malloc (len);
+                if (ttybuf == NULL) {
+                        ck_pam_syslog (pamh, LOG_ERR, "oom allocating ttybuf");
+                        goto out;
+                }
+                snprintf (ttybuf, len, _PATH_DEV "%s", display_device);
                 display_device = ttybuf;
         }
 
@@ -411,6 +417,8 @@ pam_sm_open_session (pam_handle_t *pamh,
         ret = PAM_SUCCESS;
 
 out:
+        free (ttybuf);
+
         return ret;
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 869decd..217e531 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,11 +57,18 @@ libck_la_SOURCES +=		\
 	$(NULL)
 libck_la_LIBADD = $(KVM_LIBS)
 endif
+if CK_COMPILE_GNU
+libck_la_SOURCES +=		\
+	ck-sysdeps-gnu.c	\
+	$(NULL)
+libck_la_LIBADD = -lps
+endif
 
 EXTRA_libck_la_SOURCES =		\
 	ck-sysdeps-linux.c		\
 	ck-sysdeps-solaris.c		\
 	ck-sysdeps-freebsd.c		\
+	ck-sysdeps-gnu.c		\
 	$(NULL)
 
 sbin_PROGRAMS = 		\
diff --git a/src/Makefile.in b/src/Makefile.in
index 174a7e2..cde5062 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -48,12 +92,17 @@ host_triplet = @host@
 @CK_COMPILE_FREEBSD_TRUE@	ck-sysdeps-freebsd.c	\
 @CK_COMPILE_FREEBSD_TRUE@	$(NULL)
 
+@CK_COMPILE_GNU_TRUE@am__append_4 = \
+@CK_COMPILE_GNU_TRUE@	ck-sysdeps-gnu.c	\
+@CK_COMPILE_GNU_TRUE@	$(NULL)
+
 sbin_PROGRAMS = console-kit-daemon$(EXEEXT) $(am__EXEEXT_1)
 noinst_PROGRAMS = test-event-logger$(EXEEXT) \
 	test-tty-idle-monitor$(EXEEXT) test-vt-monitor$(EXEEXT) \
 	$(am__EXEEXT_1)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -68,22 +117,27 @@ libck_event_log_la_LIBADD =
 am__objects_1 =
 am_libck_event_log_la_OBJECTS = ck-log-event.lo $(am__objects_1)
 libck_event_log_la_OBJECTS = $(am_libck_event_log_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__DEPENDENCIES_1 =
 @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 \
-	ck-sysdeps-linux.c ck-sysdeps-solaris.c ck-sysdeps-freebsd.c
+	ck-sysdeps-linux.c ck-sysdeps-solaris.c ck-sysdeps-freebsd.c \
+	ck-sysdeps-gnu.c
 @CK_COMPILE_LINUX_TRUE@am__objects_2 = ck-sysdeps-linux.lo \
 @CK_COMPILE_LINUX_TRUE@	$(am__objects_1)
 @CK_COMPILE_SOLARIS_TRUE@am__objects_3 = ck-sysdeps-solaris.lo \
 @CK_COMPILE_SOLARIS_TRUE@	$(am__objects_1)
 @CK_COMPILE_FREEBSD_TRUE@am__objects_4 = ck-sysdeps-freebsd.lo \
 @CK_COMPILE_FREEBSD_TRUE@	$(am__objects_1)
+@CK_COMPILE_GNU_TRUE@am__objects_5 = ck-sysdeps-gnu.lo \
+@CK_COMPILE_GNU_TRUE@	$(am__objects_1)
 am_libck_la_OBJECTS = ck-sysdeps-unix.lo $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3) $(am__objects_4)
+	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
+	$(am__objects_5)
 libck_la_OBJECTS = $(am_libck_la_OBJECTS)
 am__EXEEXT_1 =
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(dbusifdir)"
@@ -97,16 +151,16 @@ am__console_kit_daemon_SOURCES_DIST = main.c ck-manager.h ck-manager.c \
 	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
-am__objects_5 = ck-marshal.$(OBJEXT) $(am__objects_1)
-@ENABLE_INOTIFY_FALSE@am__objects_6 = ck-file-monitor-dummy.$(OBJEXT)
-@ENABLE_INOTIFY_TRUE@am__objects_6 =  \
+am__objects_6 = ck-marshal.$(OBJEXT) $(am__objects_1)
+@ENABLE_INOTIFY_FALSE@am__objects_7 = ck-file-monitor-dummy.$(OBJEXT)
+@ENABLE_INOTIFY_TRUE@am__objects_7 =  \
 @ENABLE_INOTIFY_TRUE@	ck-file-monitor-inotify.$(OBJEXT)
 am_console_kit_daemon_OBJECTS = main.$(OBJEXT) ck-manager.$(OBJEXT) \
 	ck-vt-monitor.$(OBJEXT) ck-tty-idle-monitor.$(OBJEXT) \
 	ck-job.$(OBJEXT) ck-seat.$(OBJEXT) ck-session-leader.$(OBJEXT) \
 	ck-session.$(OBJEXT) ck-log.$(OBJEXT) \
 	ck-run-programs.$(OBJEXT) ck-event-logger.$(OBJEXT) \
-	$(am__objects_5) $(am__objects_1) $(am__objects_6)
+	$(am__objects_6) $(am__objects_1) $(am__objects_7)
 console_kit_daemon_OBJECTS = $(am_console_kit_daemon_OBJECTS)
 console_kit_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libck.la \
@@ -122,7 +176,7 @@ am__test_tty_idle_monitor_SOURCES_DIST = ck-tty-idle-monitor.h \
 	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) \
-	$(am__objects_6) test-tty-idle-monitor.$(OBJEXT) \
+	$(am__objects_7) test-tty-idle-monitor.$(OBJEXT) \
 	$(am__objects_1)
 test_tty_idle_monitor_OBJECTS = $(am_test_tty_idle_monitor_OBJECTS)
 test_tty_idle_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -132,6 +186,18 @@ am_test_vt_monitor_OBJECTS = ck-vt-monitor.$(OBJEXT) \
 test_vt_monitor_OBJECTS = $(am_test_vt_monitor_OBJECTS)
 test_vt_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libck.la $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -142,22 +208,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libck_event_log_la_SOURCES) $(libck_la_SOURCES) \
 	$(EXTRA_libck_la_SOURCES) $(console_kit_daemon_SOURCES) \
 	$(EXTRA_console_kit_daemon_SOURCES) \
@@ -170,13 +232,19 @@ DIST_SOURCES = $(libck_event_log_la_SOURCES) \
 	$(test_event_logger_SOURCES) \
 	$(am__test_tty_idle_monitor_SOURCES_DIST) \
 	$(test_vt_monitor_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -198,12 +266,38 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 DATA = $(dbusif_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -254,7 +348,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -335,6 +428,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -431,13 +527,16 @@ libck_event_log_la_SOURCES = \
 	$(NULL)
 
 libck_la_SOURCES = ck-sysdeps.h ck-sysdeps-unix.c $(NULL) \
-	$(am__append_1) $(am__append_2) $(am__append_3)
+	$(am__append_1) $(am__append_2) $(am__append_3) \
+	$(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		\
 	ck-sysdeps-freebsd.c		\
+	ck-sysdeps-gnu.c		\
 	$(NULL)
 
 BUILT_SOURCES = \
@@ -567,15 +666,19 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libck-event-log.la: $(libck_event_log_la_OBJECTS) $(libck_event_log_la_DEPENDENCIES) 
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libck-event-log.la: $(libck_event_log_la_OBJECTS) $(libck_event_log_la_DEPENDENCIES) $(EXTRA_libck_event_log_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libck_event_log_la_OBJECTS) $(libck_event_log_la_LIBADD) $(LIBS)
-libck.la: $(libck_la_OBJECTS) $(libck_la_DEPENDENCIES) 
+
+libck.la: $(libck_la_OBJECTS) $(libck_la_DEPENDENCIES) $(EXTRA_libck_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libck_la_OBJECTS) $(libck_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
@@ -588,14 +691,19 @@ clean-noinstPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -616,7 +724,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -629,16 +738,20 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-console-kit-daemon$(EXEEXT): $(console_kit_daemon_OBJECTS) $(console_kit_daemon_DEPENDENCIES) 
+
+console-kit-daemon$(EXEEXT): $(console_kit_daemon_OBJECTS) $(console_kit_daemon_DEPENDENCIES) $(EXTRA_console_kit_daemon_DEPENDENCIES) 
 	@rm -f console-kit-daemon$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(console_kit_daemon_OBJECTS) $(console_kit_daemon_LDADD) $(LIBS)
-test-event-logger$(EXEEXT): $(test_event_logger_OBJECTS) $(test_event_logger_DEPENDENCIES) 
+
+test-event-logger$(EXEEXT): $(test_event_logger_OBJECTS) $(test_event_logger_DEPENDENCIES) $(EXTRA_test_event_logger_DEPENDENCIES) 
 	@rm -f test-event-logger$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_event_logger_OBJECTS) $(test_event_logger_LDADD) $(LIBS)
-test-tty-idle-monitor$(EXEEXT): $(test_tty_idle_monitor_OBJECTS) $(test_tty_idle_monitor_DEPENDENCIES) 
+
+test-tty-idle-monitor$(EXEEXT): $(test_tty_idle_monitor_OBJECTS) $(test_tty_idle_monitor_DEPENDENCIES) $(EXTRA_test_tty_idle_monitor_DEPENDENCIES) 
 	@rm -f test-tty-idle-monitor$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_tty_idle_monitor_OBJECTS) $(test_tty_idle_monitor_LDADD) $(LIBS)
-test-vt-monitor$(EXEEXT): $(test_vt_monitor_OBJECTS) $(test_vt_monitor_DEPENDENCIES) 
+
+test-vt-monitor$(EXEEXT): $(test_vt_monitor_OBJECTS) $(test_vt_monitor_DEPENDENCIES) $(EXTRA_test_vt_monitor_DEPENDENCIES) 
 	@rm -f test-vt-monitor$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_vt_monitor_OBJECTS) $(test_vt_monitor_LDADD) $(LIBS)
 
@@ -661,6 +774,7 @@ distclean-compile:
 @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@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-gnu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-linux.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-solaris.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-unix.Plo@am__quote@
@@ -674,26 +788,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -702,8 +813,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dbusifDATA: $(dbusif_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dbusifdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusifdir)"
 	@list='$(dbusif_DATA)'; test -n "$(dbusifdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dbusifdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dbusifdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -717,27 +831,28 @@ uninstall-dbusifDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dbusif_DATA)'; test -n "$(dbusifdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(dbusifdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(dbusifdir)" && rm -f $$files
+	dir='$(DESTDIR)$(dbusifdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -752,57 +867,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -818,12 +888,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -835,15 +900,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -852,6 +913,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -888,13 +964,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -934,10 +1007,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1023,14 +1101,13 @@ ps-am:
 
 uninstall-am: uninstall-dbusifDATA uninstall-sbinPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	ctags-recursive install install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-	clean-sbinPROGRAMS ctags ctags-recursive distclean \
+	clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
@@ -1042,8 +1119,8 @@ uninstall-am: uninstall-dbusifDATA uninstall-sbinPROGRAMS
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-dbusifDATA uninstall-sbinPROGRAMS
+	tags tags-am uninstall uninstall-am uninstall-dbusifDATA \
+	uninstall-sbinPROGRAMS
 
 
 ck-manager-glue.h: org.freedesktop.ConsoleKit.Manager.xml Makefile.am
diff --git a/src/ck-manager-glue.h b/src/ck-manager-glue.h
index b3f37f8..ab9c217 100644
--- a/src/ck-manager-glue.h
+++ b/src/ck-manager-glue.h
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
@@ -55,6 +55,14 @@ G_BEGIN_DECLS
 #endif /* !G_ENABLE_DEBUG */
 
 
+/* NONE:POINTER */
+#define dbus_glib_marshal_ck_manager_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
+#define dbus_glib_marshal_ck_manager_NONE__POINTER	dbus_glib_marshal_ck_manager_VOID__POINTER
+
+/* NONE:UINT,POINTER */
+#define dbus_glib_marshal_ck_manager_VOID__UINT_POINTER	g_cclosure_marshal_VOID__UINT_POINTER
+#define dbus_glib_marshal_ck_manager_NONE__UINT_POINTER	dbus_glib_marshal_ck_manager_VOID__UINT_POINTER
+
 /* NONE:STRING,POINTER */
 extern void dbus_glib_marshal_ck_manager_VOID__STRING_POINTER (GClosure     *closure,
                                                                GValue       *return_value,
@@ -99,6 +107,50 @@ dbus_glib_marshal_ck_manager_VOID__STRING_POINTER (GClosure     *closure,
 }
 #define dbus_glib_marshal_ck_manager_NONE__STRING_POINTER	dbus_glib_marshal_ck_manager_VOID__STRING_POINTER
 
+/* NONE:BOXED,POINTER */
+extern void dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER (GClosure     *closure,
+                                                              GValue       *return_value,
+                                                              guint         n_param_values,
+                                                              const GValue *param_values,
+                                                              gpointer      invocation_hint,
+                                                              gpointer      marshal_data);
+void
+dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER (GClosure     *closure,
+                                                  GValue       *return_value G_GNUC_UNUSED,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__BOXED_POINTER) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__BOXED_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_boxed (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+#define dbus_glib_marshal_ck_manager_NONE__BOXED_POINTER	dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER
+
 /* BOOLEAN:POINTER,POINTER */
 extern void dbus_glib_marshal_ck_manager_BOOLEAN__POINTER_POINTER (GClosure     *closure,
                                                                    GValue       *return_value,
@@ -146,58 +198,6 @@ dbus_glib_marshal_ck_manager_BOOLEAN__POINTER_POINTER (GClosure     *closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-/* NONE:UINT,POINTER */
-#define dbus_glib_marshal_ck_manager_VOID__UINT_POINTER	g_cclosure_marshal_VOID__UINT_POINTER
-#define dbus_glib_marshal_ck_manager_NONE__UINT_POINTER	dbus_glib_marshal_ck_manager_VOID__UINT_POINTER
-
-/* NONE:POINTER */
-#define dbus_glib_marshal_ck_manager_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-#define dbus_glib_marshal_ck_manager_NONE__POINTER	dbus_glib_marshal_ck_manager_VOID__POINTER
-
-/* NONE:BOXED,POINTER */
-extern void dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER (GClosure     *closure,
-                                                              GValue       *return_value,
-                                                              guint         n_param_values,
-                                                              const GValue *param_values,
-                                                              gpointer      invocation_hint,
-                                                              gpointer      marshal_data);
-void
-dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER (GClosure     *closure,
-                                                  GValue       *return_value G_GNUC_UNUSED,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint G_GNUC_UNUSED,
-                                                  gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__BOXED_POINTER) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     arg_2,
-                                                    gpointer     data2);
-  register GMarshalFunc_VOID__BOXED_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_boxed (param_values + 1),
-            g_marshal_value_peek_pointer (param_values + 2),
-            data2);
-}
-#define dbus_glib_marshal_ck_manager_NONE__BOXED_POINTER	dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER
-
 G_END_DECLS
 
 #endif /* __dbus_glib_marshal_ck_manager_MARSHAL_H__ */
@@ -222,8 +222,7 @@ static const DBusGMethodInfo dbus_glib_ck_manager_methods[] = {
   { (GCallback) ck_manager_get_system_idle_since_hint, dbus_glib_marshal_ck_manager_BOOLEAN__POINTER_POINTER, 1070 },
 };
 
-const DBusGObjectInfo dbus_glib_ck_manager_object_info = {
-  0,
+const DBusGObjectInfo dbus_glib_ck_manager_object_info = {  1,
   dbus_glib_ck_manager_methods,
   16,
 "org.freedesktop.ConsoleKit.Manager\0Restart\0A\0\0org.freedesktop.ConsoleKit.Manager\0CanRestart\0A\0can_restart\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Manager\0Stop\0A\0\0org.freedesktop.ConsoleKit.Manager\0CanStop\0A\0can_stop\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Manager\0OpenSession\0A\0cookie\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Manager\0OpenSessionWithParameters\0A\0parameters\0I\0a(sv)\0cookie\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Manager\0CloseSession\0A\0cookie\0I\0s\0result\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Manager\0GetSeats\0S\0seats\0O\0F\0N\0ao\0\0org.freedesktop.ConsoleKit.Manager\0GetSessions\0S\0sessions\0O\0F\0N\0ao\0\0org.freedesktop.ConsoleKit.Manager\0GetSessionForCookie\0A\0cookie\0I\0s\0ssid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Manager\0GetSessionForUnixProcess\0A\0pid\0I\0u\0ssid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Manager\0GetCurrentSession\0A\0ssid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Manager\0GetSessionsForUnixUser\0A\0uid\0I\0u\0sessions\0O\0F\0N\0ao\0\0org.freedesktop.ConsoleKit.Manager\0GetSessionsForUser\0A\0uid\0I\0u\0sessions\0O\0F\0N\0ao\0\0org.freedesktop.ConsoleKit.Manager\0GetSystemIdleHint\0S\0idle_hint\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Manager\0GetSystemIdleSinceHint\0S\0iso8601_datetime\0O\0F\0N\0s\0\0\0",
diff --git a/src/ck-marshal.c b/src/ck-marshal.c
index c01cfbb..290f9bf 100644
--- a/src/ck-marshal.c
+++ b/src/ck-marshal.c
@@ -5,7 +5,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
diff --git a/src/ck-seat-glue.h b/src/ck-seat-glue.h
index 20e7240..7d4aef0 100644
--- a/src/ck-seat-glue.h
+++ b/src/ck-seat-glue.h
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
@@ -160,8 +160,7 @@ static const DBusGMethodInfo dbus_glib_ck_seat_methods[] = {
   { (GCallback) ck_seat_activate_session, dbus_glib_marshal_ck_seat_NONE__BOXED_POINTER, 325 },
 };
 
-const DBusGObjectInfo dbus_glib_ck_seat_object_info = {
-  0,
+const DBusGObjectInfo dbus_glib_ck_seat_object_info = {  1,
   dbus_glib_ck_seat_methods,
   6,
 "org.freedesktop.ConsoleKit.Seat\0GetId\0S\0sid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Seat\0GetSessions\0S\0sessions\0O\0F\0N\0ao\0\0org.freedesktop.ConsoleKit.Seat\0GetDevices\0S\0devices\0O\0F\0N\0a(ss)\0\0org.freedesktop.ConsoleKit.Seat\0GetActiveSession\0S\0ssid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Seat\0CanActivateSessions\0S\0can_activate\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Seat\0ActivateSession\0A\0ssid\0I\0o\0\0\0",
diff --git a/src/ck-session-glue.h b/src/ck-session-glue.h
index 38cd0bf..c081afc 100644
--- a/src/ck-session-glue.h
+++ b/src/ck-session-glue.h
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
@@ -55,49 +55,9 @@ G_BEGIN_DECLS
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* NONE:BOOLEAN,POINTER */
-extern void dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure     *closure,
-                                                                GValue       *return_value,
-                                                                guint         n_param_values,
-                                                                const GValue *param_values,
-                                                                gpointer      invocation_hint,
-                                                                gpointer      marshal_data);
-void
-dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure     *closure,
-                                                    GValue       *return_value G_GNUC_UNUSED,
-                                                    guint         n_param_values,
-                                                    const GValue *param_values,
-                                                    gpointer      invocation_hint G_GNUC_UNUSED,
-                                                    gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__BOOLEAN_POINTER) (gpointer     data1,
-                                                      gboolean     arg_1,
-                                                      gpointer     arg_2,
-                                                      gpointer     data2);
-  register GMarshalFunc_VOID__BOOLEAN_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_boolean (param_values + 1),
-            g_marshal_value_peek_pointer (param_values + 2),
-            data2);
-}
-#define dbus_glib_marshal_ck_session_NONE__BOOLEAN_POINTER	dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER
+/* NONE:POINTER */
+#define dbus_glib_marshal_ck_session_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
+#define dbus_glib_marshal_ck_session_NONE__POINTER	dbus_glib_marshal_ck_session_VOID__POINTER
 
 /* BOOLEAN:POINTER,POINTER */
 extern void dbus_glib_marshal_ck_session_BOOLEAN__POINTER_POINTER (GClosure     *closure,
@@ -146,9 +106,49 @@ dbus_glib_marshal_ck_session_BOOLEAN__POINTER_POINTER (GClosure     *closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-/* NONE:POINTER */
-#define dbus_glib_marshal_ck_session_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-#define dbus_glib_marshal_ck_session_NONE__POINTER	dbus_glib_marshal_ck_session_VOID__POINTER
+/* NONE:BOOLEAN,POINTER */
+extern void dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure     *closure,
+                                                                GValue       *return_value,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint,
+                                                                gpointer      marshal_data);
+void
+dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure     *closure,
+                                                    GValue       *return_value G_GNUC_UNUSED,
+                                                    guint         n_param_values,
+                                                    const GValue *param_values,
+                                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                                    gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__BOOLEAN_POINTER) (gpointer     data1,
+                                                      gboolean     arg_1,
+                                                      gpointer     arg_2,
+                                                      gpointer     data2);
+  register GMarshalFunc_VOID__BOOLEAN_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_boolean (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+#define dbus_glib_marshal_ck_session_NONE__BOOLEAN_POINTER	dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER
 
 G_END_DECLS
 
@@ -177,12 +177,11 @@ static const DBusGMethodInfo dbus_glib_ck_session_methods[] = {
   { (GCallback) ck_session_set_idle_hint, dbus_glib_marshal_ck_session_NONE__BOOLEAN_POINTER, 1180 },
 };
 
-const DBusGObjectInfo dbus_glib_ck_session_object_info = {
-  0,
+const DBusGObjectInfo dbus_glib_ck_session_object_info = {  1,
   dbus_glib_ck_session_methods,
   19,
 "org.freedesktop.ConsoleKit.Session\0GetId\0S\0ssid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Session\0GetSeatId\0S\0sid\0O\0F\0N\0o\0\0org.freedesktop.ConsoleKit.Session\0GetSessionType\0S\0type\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0GetUser\0S\0uid\0O\0F\0N\0u\0\0org.freedesktop.ConsoleKit.Session\0GetUnixUser\0S\0uid\0O\0F\0N\0u\0\0org.freedesktop.ConsoleKit.Session\0GetX11Display\0S\0display\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0GetX11DisplayDevice\0S\0x11_display_device\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0GetDisplayDevice\0S\0display_device\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0GetRemoteHostName\0S\0remote_host_name\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0GetLoginSessionId\0S\0login_session_id\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0IsActive\0S\0active\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Session\0IsLocal\0S\0local\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Session\0GetCreationTime\0S\0iso8601_datetime\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0Activate\0A\0\0org.freedesktop.ConsoleKit.Session\0Lock\0A\0\0org.freedesktop.ConsoleKit.Session\0Unlock\0A\0\0org.freedesktop.ConsoleKit.Session\0GetIdleHint\0S\0idle_hint\0O\0F\0N\0b\0\0org.freedesktop.ConsoleKit.Session\0GetIdleSinceHint\0S\0iso8601_datetime\0O\0F\0N\0s\0\0org.freedesktop.ConsoleKit.Session\0SetIdleHint\0A\0idle_hint\0I\0b\0\0\0",
 "org.freedesktop.ConsoleKit.Session\0ActiveChanged\0org.freedesktop.ConsoleKit.Session\0IdleHintChanged\0org.freedesktop.ConsoleKit.Session\0Lock\0org.freedesktop.ConsoleKit.Session\0Unlock\0\0",
-"org.freedesktop.ConsoleKit.Session\0unix-user\0org.freedesktop.ConsoleKit.Session\0user\0org.freedesktop.ConsoleKit.Session\0session-type\0org.freedesktop.ConsoleKit.Session\0remote-host-name\0org.freedesktop.ConsoleKit.Session\0display-device\0org.freedesktop.ConsoleKit.Session\0x11-display\0org.freedesktop.ConsoleKit.Session\0x11-display-device\0org.freedesktop.ConsoleKit.Session\0active\0org.freedesktop.ConsoleKit.Session\0is-local\0org.freedesktop.ConsoleKit.Session\0idle-hint\0\0"
+"org.freedesktop.ConsoleKit.Session\0unix-user\0unix-user\0readwrite\0org.freedesktop.ConsoleKit.Session\0user\0user\0readwrite\0org.freedesktop.ConsoleKit.Session\0session-type\0session-type\0readwrite\0org.freedesktop.ConsoleKit.Session\0remote-host-name\0remote-host-name\0readwrite\0org.freedesktop.ConsoleKit.Session\0display-device\0display-device\0readwrite\0org.freedesktop.ConsoleKit.Session\0x11-display\0x11-display\0readwrite\0org.freedesktop.ConsoleKit.Session\0x11-display-device\0x11-display-device\0readwrite\0org.freedesktop.ConsoleKit.Session\0active\0active\0readwrite\0org.freedesktop.ConsoleKit.Session\0is-local\0is-local\0readwrite\0org.freedesktop.ConsoleKit.Session\0idle-hint\0idle-hint\0readwrite\0\0"
 };
 
diff --git a/src/ck-sysdeps-gnu.c b/src/ck-sysdeps-gnu.c
new file mode 100644
index 0000000..254f7ef
--- /dev/null
+++ b/src/ck-sysdeps-gnu.c
@@ -0,0 +1,402 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Pino Toscano <pino@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <hurd.h>
+#include <dirent.h>
+#include <ps.h>
+#include <ttyent.h>
+
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif /* HAVE_PATHS_H */
+
+#include "ck-sysdeps.h"
+
+struct _CkProcessStat
+{
+        struct proc_stat *ps;           /* the statistics of a process */
+};
+
+static struct ps_context *pc = NULL;
+
+static gboolean
+get_proc_stat_from_pid (pid_t              pid,
+                        ps_flags_t         flags,
+                        struct proc_stat **res_ps)
+{
+        error_t           err;
+        struct proc_stat *ps;
+
+        g_assert (pid >= 0);
+        g_assert (res_ps != NULL);
+
+        if (pc == NULL) {
+                err = ps_context_create (getproc (), &pc);
+                if (err) {
+                    return FALSE;
+                }
+        }
+
+        err = _proc_stat_create (pid, pc, &ps);
+        if (err) {
+                return FALSE;
+        }
+
+        err = proc_stat_set_flags (ps, PSTAT_PID | flags);
+        if (err) {
+                return FALSE;
+        }
+
+        *res_ps = ps;
+        return TRUE;
+}
+
+
+pid_t
+ck_process_stat_get_ppid (CkProcessStat *stat)
+{
+        g_return_val_if_fail (stat != NULL, -1);
+
+        return proc_stat_pid (stat->ps);
+}
+
+char *
+ck_process_stat_get_cmd (CkProcessStat *stat)
+{
+        g_return_val_if_fail (stat != NULL, NULL);
+
+        return g_strdup (proc_stat_args (stat->ps));
+}
+
+char *
+ck_process_stat_get_tty (CkProcessStat *stat)
+{
+        struct ps_tty    *tty;
+
+        g_return_val_if_fail (stat != NULL, NULL);
+
+        tty = proc_stat_tty (stat->ps);
+
+        return tty ? g_strdup (ps_tty_name (tty)) : NULL;
+}
+
+gboolean
+ck_process_stat_new_for_unix_pid (pid_t           pid,
+                                  CkProcessStat **stat,
+                                  GError        **error)
+{
+        gboolean          res;
+        struct proc_stat *ps;
+        CkProcessStat    *proc;
+
+        g_return_val_if_fail (pid > 1, FALSE);
+
+        if (stat == NULL) {
+                return FALSE;
+        }
+
+        *stat = NULL;
+
+        res = get_proc_stat_from_pid (pid, PSTAT_ARGS | PSTAT_TTY, &ps);
+        if (!res) {
+                return FALSE;
+        }
+
+        proc = g_new0 (CkProcessStat, 1);
+        proc->ps = ps;
+        *stat = proc;
+
+        return TRUE;
+}
+
+void
+ck_process_stat_free (CkProcessStat *stat)
+{
+        _proc_stat_free (stat->ps);
+
+        g_free (stat);
+}
+
+GHashTable *
+ck_unix_pid_get_env_hash (pid_t pid)
+{
+        struct proc_stat *ps;
+        char             *env_p;
+        size_t            env_index;
+        size_t            env_l;
+        gboolean          res;
+        GHashTable       *hash;
+
+        g_return_val_if_fail (pid > 1, NULL);
+
+        res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps);
+        if (!res) {
+                return NULL;
+        }
+
+        hash = g_hash_table_new_full (g_str_hash,
+                                      g_str_equal,
+                                      g_free,
+                                      g_free);
+
+        env_index = 0;
+        env_l = 0;
+        env_p = proc_stat_env (ps);
+        while (env_index < proc_stat_env_len (ps)) {
+                env_l = strlen (env_p);
+                env_index += env_l + 1;
+                if (env_l) {
+                        char **vals;
+                        vals = g_strsplit (env_p, "=", 2);
+                        if (vals != NULL) {
+                                g_hash_table_insert (hash,
+                                                     g_strdup (vals[0]),
+                                                     g_strdup (vals[1]));
+                                g_strfreev (vals);
+                        }
+                }
+                env_p = env_p + env_l + 1;
+        }
+
+        _proc_stat_free (ps);
+
+        return hash;
+}
+
+char *
+ck_unix_pid_get_env (pid_t       pid,
+                     const char *var)
+{
+        struct proc_stat *ps;
+        char             *env_p;
+        size_t            env_index;
+        size_t            env_l;
+        char             *prefix;
+        int               prefix_len;
+        char             *val;
+        gboolean          res;
+
+        g_return_val_if_fail (pid > 1, NULL);
+
+        val = NULL;
+
+        res = get_proc_stat_from_pid (pid, PSTAT_ENV, &ps);
+        if (!res) {
+                return NULL;
+        }
+
+        prefix = g_strdup_printf ("%s=", var);
+        prefix_len = strlen (prefix);
+
+        env_index = 0;
+        env_l = 0;
+        env_p = proc_stat_env (ps);
+        while (env_index < proc_stat_env_len (ps)) {
+                env_l = strlen (env_p);
+                env_index += env_l + 1;
+                if (env_l && g_str_has_prefix (env_p, prefix)) {
+                        val = g_strdup (env_p + prefix_len);
+                        break;
+                }
+                env_p = env_p + env_l + 1;
+        }
+
+        g_free (prefix);
+
+        _proc_stat_free (ps);
+
+        return val;
+}
+
+uid_t
+ck_unix_pid_get_uid (pid_t pid)
+{
+        struct proc_stat *ps;
+        gboolean          res;
+        uid_t             uid;
+
+        g_return_val_if_fail (pid > 1, 0);
+
+        res = get_proc_stat_from_pid (pid, PSTAT_OWNER_UID, &ps);
+        if (!res) {
+                return 0;
+        }
+
+        uid = proc_stat_owner_uid (ps);
+
+        _proc_stat_free (ps);
+
+        return uid;
+}
+
+pid_t
+ck_unix_pid_get_ppid (pid_t pid)
+{
+        struct proc_stat *ps;
+        gboolean          res;
+        pid_t             ppid;
+
+        g_return_val_if_fail (pid > 1, 0);
+
+        res = get_proc_stat_from_pid (pid, PSTAT_PROC_INFO, &ps);
+        if (!res) {
+                return 0;
+        }
+
+        ppid = proc_stat_proc_info (ps)->ppid;
+
+        _proc_stat_free (ps);
+
+        return ppid;
+}
+
+gboolean
+ck_unix_pid_get_login_session_id (pid_t  pid,
+                                  char **idp)
+{
+        g_return_val_if_fail (pid > 1, FALSE);
+
+        return FALSE;
+}
+
+gboolean
+ck_get_max_num_consoles (guint *num)
+{
+        int      max_consoles;
+        int      res;
+        gboolean ret;
+        struct ttyent *t;
+
+        ret = FALSE;
+        max_consoles = 0;
+
+        res = setttyent ();
+        if (res == 0) {
+                goto done;
+        }
+
+        while ((t = getttyent ()) != NULL) {
+                if (t->ty_status & TTY_ON && strncmp (t->ty_name, "tty", 3) == 0)
+                        max_consoles++;
+        }
+
+        /* Increment one more so that all consoles are properly counted
+         * this is arguable a bug in vt_add_watches().
+         */
+        max_consoles++;
+
+        ret = TRUE;
+
+        endttyent ();
+
+done:
+        if (num != NULL) {
+                *num = max_consoles;
+        }
+
+        return ret;
+}
+
+gboolean
+ck_supports_activatable_consoles (void)
+{
+        return TRUE;
+}
+
+char *
+ck_get_console_device_for_num (guint num)
+{
+        char *device;
+
+        device = g_strdup_printf (_PATH_TTY "%u", num);
+
+        return device;
+}
+
+gboolean
+ck_get_console_num_from_device (const char *device,
+                                guint      *num)
+{
+        guint    n;
+        gboolean ret;
+
+        n = 0;
+        ret = FALSE;
+
+        if (device == NULL) {
+                return FALSE;
+        }
+
+        if (sscanf (device, _PATH_TTY "%u", &n) == 1) {
+                ret = TRUE;
+        }
+
+        if (num != NULL) {
+                *num = n;
+        }
+
+        return ret;
+}
+
+gboolean
+ck_get_active_console_num (int    console_fd,
+                           guint *num)
+{
+        gboolean       ret;
+        int            res;
+        long           cur_active;
+        char           buf[30];
+        guint          active;
+
+        g_assert (console_fd != -1);
+
+        active = 0;
+        ret = FALSE;
+
+        res = readlink ("/dev/cons/vcs", buf, sizeof (buf));
+        if (res > 0) {
+                /* the resolved path is like "/dev/vcs/$number", so skip
+                   the non-number part at the start */
+                const char *p = buf;
+                while ((*p) && ((*p < '0') || (*p > '9'))) {
+                        ++p;
+                }
+                if (*p) {
+                        cur_active = strtol (p, NULL, 10);
+                        g_debug ("Current VT: tty%ld", cur_active);
+                        active = cur_active;
+                        ret = TRUE;
+                }
+        }
+
+        if (num != NULL) {
+                *num = active;
+        }
+
+        return ret;
+}
diff --git a/tools/70-udev-acl.rules b/tools/70-udev-acl.rules
new file mode 100644
index 0000000..2dac283
--- /dev/null
+++ b/tools/70-udev-acl.rules
@@ -0,0 +1,76 @@
+# do not edit this file, it will be overwritten on update
+
+# Do not use TAG+="udev-acl" outside of this file. This variable is private to
+# udev-acl of this udev release and may be replaced at any time.
+
+ENV{MAJOR}=="", GOTO="acl_end"
+ACTION=="remove", GOTO="acl_apply"
+
+# systemd replaces udev-acl entirely, skip if active
+TEST=="/sys/fs/cgroup/systemd", TAG=="uaccess", GOTO="acl_end"
+
+# PTP/MTP protocol devices, cameras, portable media players
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl"
+
+# digicams with proprietary protocol
+ENV{ID_GPHOTO2}=="*?", TAG+="udev-acl"
+
+# SCSI and USB scanners
+ENV{libsane_matched}=="yes", TAG+="udev-acl"
+
+# HPLIP devices (necessary for ink level check and HP tool maintenance)
+ENV{ID_HPLIP}=="1", TAG+="udev-acl"
+
+# optical drives
+SUBSYSTEM=="block", ENV{ID_CDROM}=="1", TAG+="udev-acl"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", TAG+="udev-acl"
+
+# sound devices
+SUBSYSTEM=="sound", TAG+="udev-acl"
+
+# ffado is an userspace driver for firewire sound cards
+SUBSYSTEM=="firewire", ENV{ID_FFADO}=="1", TAG+="udev-acl"
+
+# webcams, frame grabber, TV cards
+SUBSYSTEM=="video4linux", TAG+="udev-acl"
+SUBSYSTEM=="dvb", TAG+="udev-acl"
+
+# IIDC devices: industrial cameras and some webcams
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*",  TAG+="udev-acl"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*",  TAG+="udev-acl"
+# AV/C devices: camcorders, set-top boxes, TV sets, audio devices, and more
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", TAG+="udev-acl"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", TAG+="udev-acl"
+
+# DRI video devices
+SUBSYSTEM=="drm", KERNEL=="card*", TAG+="udev-acl"
+
+# KVM
+SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="udev-acl"
+
+# smart-card readers
+ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl"
+
+# PDA devices
+ENV{ID_PDA}=="*?", TAG+="udev-acl"
+
+# Programmable remote control
+ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl"
+
+# joysticks
+SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl"
+
+# color measurement devices
+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="udev-acl"
+
+# DDC/CI device, usually high-end monitors such as the DreamColor
+ENV{DDC_DEVICE}=="*?", TAG+="udev-acl"
+
+# media player raw devices (for user-mode drivers, Android SDK, etc.)
+SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="udev-acl"
+
+# apply ACL for all locally logged in users
+LABEL="acl_apply", TAG=="udev-acl", TEST=="/var/run/ConsoleKit/database", \
+  RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"
+
+LABEL="acl_end"
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 13c191f..88f3c91 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -143,6 +143,21 @@ ck_get_x11_display_device_LDADD =	\
 	$(top_builddir)/src/libck.la	\
 	$(NULL)
 
+if ENABLE_UDEV_ACL
+udevdir = $(UDEVDIR)
+udevrulesdir = $(UDEVDIR)/rules.d
+
+dist_udevrules_DATA = 70-udev-acl.rules
+udev_PROGRAMS = udev-acl
+
+udev_acl_SOURCES = udev-acl.c
+udev_acl_LDADD = $(UDEV_ACL_LIBS)
+udev_acl_CFLAGS = $(UDEV_ACL_CFLAGS)
+
+install-exec-hook:
+	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+	ln -sf $(UDEVDIR)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+endif
 
 EXTRA_DIST =				\
 	$(NULL)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 9f18a7f..7d0e288 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,7 +14,53 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,8 +90,10 @@ sbin_PROGRAMS = ck-log-system-start$(EXEEXT) \
 libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
 	ck-get-x11-server-pid$(EXEEXT) \
 	ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
+@ENABLE_UDEV_ACL_TRUE@udev_PROGRAMS = udev-acl$(EXEEXT)
 subdir = tools
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(am__dist_udevrules_DATA_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -58,8 +105,10 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
-	"$(DESTDIR)$(sbindir)"
-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(sbin_PROGRAMS)
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(udevdir)" \
+	"$(DESTDIR)$(udevrulesdir)"
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(sbin_PROGRAMS) \
+	$(udev_PROGRAMS)
 am__objects_1 =
 am_ck_collect_session_info_OBJECTS =  \
 	ck-collect-session-info.$(OBJEXT) $(am__objects_1)
@@ -68,9 +117,10 @@ ck_collect_session_info_OBJECTS =  \
 am__DEPENDENCIES_1 =
 ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_ck_get_x11_display_device_OBJECTS =  \
 	ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
 ck_get_x11_display_device_OBJECTS =  \
@@ -111,6 +161,26 @@ am_ck_log_system_stop_OBJECTS = ck-log-system-stop.$(OBJEXT) \
 ck_log_system_stop_OBJECTS = $(am_ck_log_system_stop_OBJECTS)
 ck_log_system_stop_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/src/libck-event-log.la $(am__DEPENDENCIES_1)
+am__udev_acl_SOURCES_DIST = udev-acl.c
+@ENABLE_UDEV_ACL_TRUE@am_udev_acl_OBJECTS =  \
+@ENABLE_UDEV_ACL_TRUE@	udev_acl-udev-acl.$(OBJEXT)
+udev_acl_OBJECTS = $(am_udev_acl_OBJECTS)
+@ENABLE_UDEV_ACL_TRUE@udev_acl_DEPENDENCIES = $(am__DEPENDENCIES_1)
+udev_acl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(udev_acl_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -121,46 +191,99 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(ck_collect_session_info_SOURCES) \
 	$(ck_get_x11_display_device_SOURCES) \
 	$(ck_get_x11_server_pid_SOURCES) $(ck_history_SOURCES) \
 	$(ck_launch_session_SOURCES) $(ck_list_sessions_SOURCES) \
 	$(ck_log_system_restart_SOURCES) \
-	$(ck_log_system_start_SOURCES) $(ck_log_system_stop_SOURCES)
+	$(ck_log_system_start_SOURCES) $(ck_log_system_stop_SOURCES) \
+	$(udev_acl_SOURCES)
 DIST_SOURCES = $(ck_collect_session_info_SOURCES) \
 	$(ck_get_x11_display_device_SOURCES) \
 	$(ck_get_x11_server_pid_SOURCES) $(ck_history_SOURCES) \
 	$(ck_launch_session_SOURCES) $(ck_list_sessions_SOURCES) \
 	$(ck_log_system_restart_SOURCES) \
-	$(ck_log_system_start_SOURCES) $(ck_log_system_stop_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+	$(ck_log_system_start_SOURCES) $(ck_log_system_stop_SOURCES) \
+	$(am__udev_acl_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__dist_udevrules_DATA_DIST = 70-udev-acl.rules
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+DATA = $(dist_udevrules_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -210,7 +333,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -291,6 +413,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -462,6 +587,12 @@ ck_get_x11_display_device_LDADD = \
 	$(top_builddir)/src/libck.la	\
 	$(NULL)
 
+@ENABLE_UDEV_ACL_TRUE@udevdir = $(UDEVDIR)
+@ENABLE_UDEV_ACL_TRUE@udevrulesdir = $(UDEVDIR)/rules.d
+@ENABLE_UDEV_ACL_TRUE@dist_udevrules_DATA = 70-udev-acl.rules
+@ENABLE_UDEV_ACL_TRUE@udev_acl_SOURCES = udev-acl.c
+@ENABLE_UDEV_ACL_TRUE@udev_acl_LDADD = $(UDEV_ACL_LIBS)
+@ENABLE_UDEV_ACL_TRUE@udev_acl_CFLAGS = $(UDEV_ACL_CFLAGS)
 EXTRA_DIST = \
 	$(NULL)
 
@@ -505,14 +636,19 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -533,7 +669,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -548,14 +685,19 @@ clean-binPROGRAMS:
 	rm -f $$list
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -576,7 +718,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -591,14 +734,19 @@ clean-libexecPROGRAMS:
 	rm -f $$list
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -619,7 +767,8 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -632,34 +781,96 @@ clean-sbinPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) 
+install-udevPROGRAMS: $(udev_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(udev_PROGRAMS)'; test -n "$(udevdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(udevdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(udevdir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(udevdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(udevdir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-udevPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(udev_PROGRAMS)'; test -n "$(udevdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(udevdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(udevdir)" && rm -f $$files
+
+clean-udevPROGRAMS:
+	@list='$(udev_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) $(EXTRA_ck_collect_session_info_DEPENDENCIES) 
 	@rm -f ck-collect-session-info$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
-ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) 
+
+ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) $(EXTRA_ck_get_x11_display_device_DEPENDENCIES) 
 	@rm -f ck-get-x11-display-device$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
-ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) 
+
+ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) $(EXTRA_ck_get_x11_server_pid_DEPENDENCIES) 
 	@rm -f ck-get-x11-server-pid$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
-ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) 
+
+ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) $(EXTRA_ck_history_DEPENDENCIES) 
 	@rm -f ck-history$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-ck-launch-session$(EXEEXT): $(ck_launch_session_OBJECTS) $(ck_launch_session_DEPENDENCIES) 
+
+ck-launch-session$(EXEEXT): $(ck_launch_session_OBJECTS) $(ck_launch_session_DEPENDENCIES) $(EXTRA_ck_launch_session_DEPENDENCIES) 
 	@rm -f ck-launch-session$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_launch_session_OBJECTS) $(ck_launch_session_LDADD) $(LIBS)
-ck-list-sessions$(EXEEXT): $(ck_list_sessions_OBJECTS) $(ck_list_sessions_DEPENDENCIES) 
+
+ck-list-sessions$(EXEEXT): $(ck_list_sessions_OBJECTS) $(ck_list_sessions_DEPENDENCIES) $(EXTRA_ck_list_sessions_DEPENDENCIES) 
 	@rm -f ck-list-sessions$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_list_sessions_OBJECTS) $(ck_list_sessions_LDADD) $(LIBS)
-ck-log-system-restart$(EXEEXT): $(ck_log_system_restart_OBJECTS) $(ck_log_system_restart_DEPENDENCIES) 
+
+ck-log-system-restart$(EXEEXT): $(ck_log_system_restart_OBJECTS) $(ck_log_system_restart_DEPENDENCIES) $(EXTRA_ck_log_system_restart_DEPENDENCIES) 
 	@rm -f ck-log-system-restart$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_log_system_restart_OBJECTS) $(ck_log_system_restart_LDADD) $(LIBS)
-ck-log-system-start$(EXEEXT): $(ck_log_system_start_OBJECTS) $(ck_log_system_start_DEPENDENCIES) 
+
+ck-log-system-start$(EXEEXT): $(ck_log_system_start_OBJECTS) $(ck_log_system_start_DEPENDENCIES) $(EXTRA_ck_log_system_start_DEPENDENCIES) 
 	@rm -f ck-log-system-start$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_log_system_start_OBJECTS) $(ck_log_system_start_LDADD) $(LIBS)
-ck-log-system-stop$(EXEEXT): $(ck_log_system_stop_OBJECTS) $(ck_log_system_stop_DEPENDENCIES) 
+
+ck-log-system-stop$(EXEEXT): $(ck_log_system_stop_OBJECTS) $(ck_log_system_stop_DEPENDENCIES) $(EXTRA_ck_log_system_stop_DEPENDENCIES) 
 	@rm -f ck-log-system-stop$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ck_log_system_stop_OBJECTS) $(ck_log_system_stop_LDADD) $(LIBS)
 
+udev-acl$(EXEEXT): $(udev_acl_OBJECTS) $(udev_acl_DEPENDENCIES) $(EXTRA_udev_acl_DEPENDENCIES) 
+	@rm -f udev-acl$(EXEEXT)
+	$(AM_V_CCLD)$(udev_acl_LINK) $(udev_acl_OBJECTS) $(udev_acl_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -675,54 +886,90 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-stop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udev_acl-udev-acl.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+udev_acl-udev-acl.o: udev-acl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_acl_CFLAGS) $(CFLAGS) -MT udev_acl-udev-acl.o -MD -MP -MF $(DEPDIR)/udev_acl-udev-acl.Tpo -c -o udev_acl-udev-acl.o `test -f 'udev-acl.c' || echo '$(srcdir)/'`udev-acl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udev_acl-udev-acl.Tpo $(DEPDIR)/udev_acl-udev-acl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udev-acl.c' object='udev_acl-udev-acl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_acl_CFLAGS) $(CFLAGS) -c -o udev_acl-udev-acl.o `test -f 'udev-acl.c' || echo '$(srcdir)/'`udev-acl.c
+
+udev_acl-udev-acl.obj: udev-acl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_acl_CFLAGS) $(CFLAGS) -MT udev_acl-udev-acl.obj -MD -MP -MF $(DEPDIR)/udev_acl-udev-acl.Tpo -c -o udev_acl-udev-acl.obj `if test -f 'udev-acl.c'; then $(CYGPATH_W) 'udev-acl.c'; else $(CYGPATH_W) '$(srcdir)/udev-acl.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/udev_acl-udev-acl.Tpo $(DEPDIR)/udev_acl-udev-acl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udev-acl.c' object='udev_acl-udev-acl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_acl_CFLAGS) $(CFLAGS) -c -o udev_acl-udev-acl.obj `if test -f 'udev-acl.c'; then $(CYGPATH_W) 'udev-acl.c'; else $(CYGPATH_W) '$(srcdir)/udev-acl.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-dist_udevrulesDATA: $(dist_udevrules_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
+	done
+
+uninstall-dist_udevrulesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -737,57 +984,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -803,12 +1005,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -820,15 +1017,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -837,6 +1030,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -873,13 +1081,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -901,10 +1106,10 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(udevdir)" "$(DESTDIR)$(udevrulesdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -917,10 +1122,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -933,10 +1143,12 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@ENABLE_UDEV_ACL_FALSE@install-exec-hook:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
-	clean-libtool clean-sbinPROGRAMS mostlyclean-am
+	clean-libtool clean-sbinPROGRAMS clean-udevPROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
@@ -956,7 +1168,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_udevrulesDATA install-udevPROGRAMS
 
 install-dvi: install-dvi-recursive
 
@@ -964,7 +1176,8 @@ install-dvi-am:
 
 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
 	install-sbinPROGRAMS
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
 
 install-html-am:
@@ -1003,31 +1216,37 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
-	uninstall-sbinPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_udevrulesDATA \
+	uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS \
+	uninstall-udevPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-exec-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libexecPROGRAMS clean-libtool \
-	clean-sbinPROGRAMS ctags ctags-recursive distclean \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-binPROGRAMS clean-generic \
+	clean-libexecPROGRAMS clean-libtool clean-sbinPROGRAMS \
+	clean-udevPROGRAMS cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libexecPROGRAMS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-sbinPROGRAMS install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
-	uninstall-sbinPROGRAMS
-
+	install-data-am install-dist_udevrulesDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	install-udevPROGRAMS installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_udevrulesDATA uninstall-libexecPROGRAMS \
+	uninstall-sbinPROGRAMS uninstall-udevPROGRAMS
+
+
+@ENABLE_UDEV_ACL_TRUE@install-exec-hook:
+@ENABLE_UDEV_ACL_TRUE@	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+@ENABLE_UDEV_ACL_TRUE@	ln -sf $(UDEVDIR)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tools/ck-history.c b/tools/ck-history.c
index d02caaa..85d9e6f 100644
--- a/tools/ck-history.c
+++ b/tools/ck-history.c
@@ -804,7 +804,7 @@ generate_report_frequent (int         uid,
                 data = user_counts->data;
 
                 username = get_user_name_for_uid (data->uid);
-                g_print ("%-8.8s %u\n", username, data->count);
+                g_print ("%-8s %u\n", username, data->count);
                 g_free (data);
                 user_counts = g_list_delete_link (user_counts, user_counts);
                 g_free (username);
diff --git a/tools/freebsd/Makefile.in b/tools/freebsd/Makefile.in
index 49fc063..44e605d 100644
--- a/tools/freebsd/Makefile.in
+++ b/tools/freebsd/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tools/freebsd
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -66,28 +110,66 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(scriptdir)"
 SCRIPTS = $(script_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -138,7 +220,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -219,6 +300,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -334,8 +418,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-scriptSCRIPTS: $(script_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -363,9 +450,7 @@ uninstall-scriptSCRIPTS:
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -374,22 +459,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -404,57 +492,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -470,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -487,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -504,6 +538,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -540,13 +589,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -584,10 +630,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -666,23 +717,21 @@ ps-am:
 
 uninstall-am: uninstall-scriptSCRIPTS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-scriptSCRIPTS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-scriptSCRIPTS
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-scriptSCRIPTS install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-scriptSCRIPTS
 
 
 check:
diff --git a/tools/linux/Makefile.in b/tools/linux/Makefile.in
index 7209b18..7ac20b4 100644
--- a/tools/linux/Makefile.in
+++ b/tools/linux/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tools/linux
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -66,28 +110,66 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(scriptdir)"
 SCRIPTS = $(script_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -138,7 +220,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -219,6 +300,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -334,8 +418,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-scriptSCRIPTS: $(script_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -363,9 +450,7 @@ uninstall-scriptSCRIPTS:
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -374,22 +459,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -404,57 +492,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -470,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -487,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -504,6 +538,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -540,13 +589,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -584,10 +630,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -666,23 +717,21 @@ ps-am:
 
 uninstall-am: uninstall-scriptSCRIPTS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-scriptSCRIPTS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-scriptSCRIPTS
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-scriptSCRIPTS install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-scriptSCRIPTS
 
 
 check:
diff --git a/tools/solaris/Makefile.in b/tools/solaris/Makefile.in
index c76b0bb..52d4cc0 100644
--- a/tools/solaris/Makefile.in
+++ b/tools/solaris/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tools/solaris
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -66,28 +110,66 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(scriptdir)"
 SCRIPTS = $(script_SCRIPTS)
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -138,7 +220,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -219,6 +300,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -334,8 +418,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-scriptSCRIPTS: $(script_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scriptdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scriptdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -363,9 +450,7 @@ uninstall-scriptSCRIPTS:
 	@list='$(script_SCRIPTS)'; test -n "$(scriptdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(scriptdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(scriptdir)" && rm -f $$files
+	dir='$(DESTDIR)$(scriptdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -374,22 +459,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -404,57 +492,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -470,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -487,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -504,6 +538,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -540,13 +589,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -584,10 +630,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -666,23 +717,21 @@ ps-am:
 
 uninstall-am: uninstall-scriptSCRIPTS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-scriptSCRIPTS install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-scriptSCRIPTS
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-scriptSCRIPTS install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-scriptSCRIPTS
 
 
 check:
diff --git a/tools/udev-acl.c b/tools/udev-acl.c
new file mode 100644
index 0000000..628cfbe
--- /dev/null
+++ b/tools/udev-acl.c
@@ -0,0 +1,430 @@
+/*
+ * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details:
+ */
+
+#include <acl/libacl.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <getopt.h>
+#include <glib.h>
+#include <inttypes.h>
+#include <libudev.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static int debug;
+
+enum{
+        ACTION_NONE = 0,
+        ACTION_REMOVE,
+        ACTION_ADD,
+        ACTION_CHANGE
+};
+
+static int set_facl(const char* filename, uid_t uid, int add)
+{
+        int get;
+        acl_t acl;
+        acl_entry_t entry = NULL;
+        acl_entry_t e;
+        acl_permset_t permset;
+        int ret;
+
+        /* don't touch ACLs for root */
+        if (uid == 0)
+                return 0;
+
+        /* read current record */
+        acl = acl_get_file(filename, ACL_TYPE_ACCESS);
+        if (!acl)
+                return -1;
+
+        /* locate ACL_USER entry for uid */
+        get = acl_get_entry(acl, ACL_FIRST_ENTRY, &e);
+        while (get == 1) {
+                acl_tag_t t;
+
+                acl_get_tag_type(e, &t);
+                if (t == ACL_USER) {
+                        uid_t *u;
+
+                        u = (uid_t*)acl_get_qualifier(e);
+                        if (u == NULL) {
+                                ret = -1;
+                                goto out;
+                        }
+                        if (*u == uid) {
+                                entry = e;
+                                acl_free(u);
+                                break;
+                        }
+                        acl_free(u);
+                }
+
+                get = acl_get_entry(acl, ACL_NEXT_ENTRY, &e);
+        }
+
+        /* remove ACL_USER entry for uid */
+        if (!add) {
+                if (entry == NULL) {
+                        ret = 0;
+                        goto out;
+                }
+                acl_delete_entry(acl, entry);
+                goto update;
+        }
+
+        /* create ACL_USER entry for uid */
+        if (entry == NULL) {
+                ret = acl_create_entry(&acl, &entry);
+                if (ret != 0)
+                        goto out;
+                acl_set_tag_type(entry, ACL_USER);
+                acl_set_qualifier(entry, &uid);
+        }
+
+        /* add permissions for uid */
+        acl_get_permset(entry, &permset);
+        acl_add_perm(permset, ACL_READ|ACL_WRITE);
+update:
+        /* update record */
+        if (debug)
+                printf("%c%u %s\n", add ? '+' : '-', uid, filename);
+        acl_calc_mask(&acl);
+        ret = acl_set_file(filename, ACL_TYPE_ACCESS, acl);
+        if (ret != 0)
+                goto out;
+out:
+        acl_free(acl);
+        return ret;
+}
+
+/* check if a given uid is listed */
+static int uid_in_list(GSList *list, uid_t uid)
+{
+        GSList *l;
+
+        for (l = list; l != NULL; l = g_slist_next(l))
+                if (uid == GPOINTER_TO_UINT(l->data))
+                        return 1;
+        return 0;
+}
+
+/* return list of current uids of local active sessions */
+static GSList *uids_with_local_active_session(const char *own_id)
+{
+        GSList *list = NULL;
+        GKeyFile *keyfile;
+
+        keyfile = g_key_file_new();
+        if (g_key_file_load_from_file(keyfile, "/var/run/ConsoleKit/database", 0, NULL)) {
+                gchar **groups;
+
+                groups = g_key_file_get_groups(keyfile, NULL);
+                if (groups != NULL) {
+                        int i;
+
+                        for (i = 0; groups[i] != NULL; i++) {
+                                uid_t u;
+
+                                if (!g_str_has_prefix(groups[i], "Session "))
+                                        continue;
+                                if (own_id != NULL &&g_str_has_suffix(groups[i], own_id))
+                                        continue;
+                                if (!g_key_file_get_boolean(keyfile, groups[i], "is_local", NULL))
+                                        continue;
+                                if (!g_key_file_get_boolean(keyfile, groups[i], "is_active", NULL))
+                                        continue;
+                                u = g_key_file_get_integer(keyfile, groups[i], "uid", NULL);
+                                if (u > 0 && !uid_in_list(list, u))
+                                        list = g_slist_prepend(list, GUINT_TO_POINTER(u));
+                        }
+                        g_strfreev(groups);
+                }
+        }
+        g_key_file_free(keyfile);
+
+        return list;
+}
+
+/* ConsoleKit calls us with special variables */
+static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, const char **remove_session_id, int *action)
+{
+        int a = ACTION_NONE;
+        uid_t u = 0;
+        uid_t u2 = 0;
+        const char *s;
+        const char *s2;
+        const char *old_session = NULL;
+
+        if (ck_action == NULL || strcmp(ck_action, "seat_active_session_changed") != 0)
+                return -1;
+
+        /* We can have one of: remove, add, change, no-change */
+        s = getenv("CK_SEAT_OLD_SESSION_ID");
+        s2 = getenv("CK_SEAT_SESSION_ID");
+        if (s == NULL && s2 == NULL) {
+                return -1;
+        } else if (s2 == NULL) {
+                a = ACTION_REMOVE;
+        } else if (s == NULL) {
+                a = ACTION_ADD;
+        } else {
+                a = ACTION_CHANGE;
+        }
+
+        switch (a) {
+        case ACTION_ADD:
+                s = getenv("CK_SEAT_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_SESSION_IS_LOCAL");
+                if (s == NULL)
+                        return -1;
+                if (strcmp(s, "true") != 0)
+                        return 0;
+
+                break;
+        case ACTION_REMOVE:
+                s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+                if (s == NULL)
+                        return -1;
+                if (strcmp(s, "true") != 0)
+                        return 0;
+
+                old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                if (old_session == NULL)
+                        return -1;
+
+                break;
+        case ACTION_CHANGE:
+                s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+                s = getenv("CK_SEAT_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u2 = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+                s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
+                if (s == NULL || s2 == NULL)
+                        return -1;
+                /* don't process non-local session changes */
+                if (strcmp(s, "true") != 0 && strcmp(s2, "true") != 0)
+                        return 0;
+
+                if (strcmp(s, "true") == 0 && strcmp(s, "true") == 0) {
+                        /* process the change */
+                        if (u == u2) {
+                                /* special case: we noop if we are
+                                 * changing between local sessions for
+                                 * the same uid */
+                                a = ACTION_NONE;
+                        }
+                        old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                        if (old_session == NULL)
+                                return -1;
+                } else if (strcmp(s, "true") == 0) {
+                        /* only process the removal */
+                        a = ACTION_REMOVE;
+                        old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                        if (old_session == NULL)
+                                return -1;
+                } else if (strcmp(s2, "true") == 0) {
+                        /* only process the addition */
+                        a = ACTION_ADD;
+                        u = u2;
+                }
+                break;
+        }
+
+        *remove_session_id = old_session;
+        *uid = u;
+        *uid2 = u2;
+        *action = a;
+        return 0;
+}
+
+/* add or remove a ACL for a given uid from all matching devices */
+static void apply_acl_to_devices(uid_t uid, int add)
+{
+        struct udev *udev;
+        struct udev_enumerate *enumerate;
+        struct udev_list_entry *list_entry;
+
+        /* iterate over all devices tagged with ACL_SET */
+        udev = udev_new();
+        enumerate = udev_enumerate_new(udev);
+        udev_enumerate_add_match_tag(enumerate, "udev-acl");
+        udev_enumerate_scan_devices(enumerate);
+        udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+                struct udev_device *device;
+                const char *node;
+
+                device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
+                                                      udev_list_entry_get_name(list_entry));
+                if (device == NULL)
+                        continue;
+                node = udev_device_get_devnode(device);
+                if (node == NULL) {
+                        udev_device_unref(device);
+                        continue;
+                }
+                set_facl(node, uid, add);
+                udev_device_unref(device);
+        }
+        udev_enumerate_unref(enumerate);
+        udev_unref(udev);
+}
+
+static void
+remove_uid (uid_t uid, const char *remove_session_id)
+{
+        /*
+         * Remove ACL for given uid from all matching devices
+         * when there is currently no local active session.
+         */
+        GSList *list;
+
+        list = uids_with_local_active_session(remove_session_id);
+        if (!uid_in_list(list, uid))
+                apply_acl_to_devices(uid, 0);
+        g_slist_free(list);
+}
+
+int main (int argc, char* argv[])
+{
+        static const struct option options[] = {
+                { "action", required_argument, NULL, 'a' },
+                { "device", required_argument, NULL, 'D' },
+                { "user", required_argument, NULL, 'u' },
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+        int action = -1;
+        const char *device = NULL;
+        bool uid_given = false;
+        uid_t uid = 0;
+        uid_t uid2 = 0;
+        const char* remove_session_id = NULL;
+        int rc = 0;
+
+        /* valgrind is more important to us than a slice allocator */
+        g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "+a:D:u:dh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'a':
+                        if (strcmp(optarg, "remove") == 0)
+                                action = ACTION_REMOVE;
+                        else
+                                action = ACTION_ADD;
+                        break;
+                case 'D':
+                        device = optarg;
+                        break;
+                case 'u':
+                        uid_given = true;
+                        uid = strtoul(optarg, NULL, 10);
+                        break;
+                case 'd':
+                        debug = 1;
+                        break;
+                case 'h':
+                        printf("Usage: udev-acl --action=ACTION [--device=DEVICEFILE] [--user=UID]\n\n");
+                        goto out;
+                }
+        }
+
+        if (action < 0 && device == NULL && !uid_given)
+                if (!consolekit_called(argv[optind], &uid, &uid2, &remove_session_id, &action))
+                        uid_given = true;
+
+        if (action < 0) {
+                fprintf(stderr, "missing action\n\n");
+                rc = 2;
+                goto out;
+        }
+
+        if (device != NULL && uid_given) {
+                fprintf(stderr, "only one option, --device=DEVICEFILE or --user=UID expected\n\n");
+                rc = 3;
+                goto out;
+        }
+
+        if (uid_given) {
+                switch (action) {
+                case ACTION_ADD:
+                        /* Add ACL for given uid to all matching devices. */
+                        apply_acl_to_devices(uid, 1);
+                        break;
+                case ACTION_REMOVE:
+                        remove_uid(uid, remove_session_id);
+                        break;
+                case ACTION_CHANGE:
+                        remove_uid(uid, remove_session_id);
+                        apply_acl_to_devices(uid2, 1);
+                        break;
+                case ACTION_NONE:
+                        goto out;
+                        break;
+                default:
+                        g_assert_not_reached();
+                        break;
+                }
+        } else if (device != NULL) {
+                /*
+                 * Add ACLs for all current session uids to a given device.
+                 *
+                 * Or remove ACLs for uids which do not have any current local
+                 * active session. Remove is not really interesting, because in
+                 * most cases the device node is removed anyway.
+                 */
+                GSList *list;
+                GSList *l;
+
+                list = uids_with_local_active_session(NULL);
+                for (l = list; l != NULL; l = g_slist_next(l)) {
+                        uid_t u;
+
+                        u = GPOINTER_TO_UINT(l->data);
+                        if (action == ACTION_ADD || !uid_in_list(list, u))
+                                set_facl(device, u, action == ACTION_ADD);
+                }
+                g_slist_free(list);
+        } else {
+                fprintf(stderr, "--device=DEVICEFILE or --user=UID expected\n\n");
+                rc = 3;
+        }
+out:
+        return rc;
+}