r25141 - in /desktop/unstable/gnome-session/debian: changelog control control.in patches/03_devicekit_optional.patch patches/03_upower.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Sep 17 22:23:15 UTC 2010
Author: joss
Date: Fri Sep 17 22:23:14 2010
New Revision: 25141
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25141
Log:
* Temporarily disable gnome3-session in preparation of the squeeze
release. This way gnome-shell can be removed from squeeze too.
* 03_devicekit_optional.patch: dropped, upower builds everywhere.
* 03_upower.patch: stolen upstream. Closes: #595088.
* Update build-dependencies accordingly.
* 90_relibtoolize.patch: regenerated accordingly.
Added:
desktop/unstable/gnome-session/debian/patches/03_upower.patch
Removed:
desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch
Modified:
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/control
desktop/unstable/gnome-session/debian/control.in
desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch
desktop/unstable/gnome-session/debian/patches/series
Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=25141&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Fri Sep 17 22:23:14 2010
@@ -1,3 +1,14 @@
+gnome-session (2.30.2-2) unstable; urgency=low
+
+ * Temporarily disable gnome3-session in preparation of the squeeze
+ release. This way gnome-shell can be removed from squeeze too.
+ * 03_devicekit_optional.patch: dropped, upower builds everywhere.
+ * 03_upower.patch: stolen upstream. Closes: #595088.
+ * Update build-dependencies accordingly.
+ * 90_relibtoolize.patch: regenerated accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 18 Sep 2010 00:18:01 +0200
+
gnome-session (2.30.2-1) unstable; urgency=low
[ Michael Biebl ]
Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=25141&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Fri Sep 17 22:23:14 2010
@@ -15,7 +15,7 @@
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.16.0),
libgtk2.0-dev (>= 2.14.0),
- libdevkit-power-gobject-dev (>= 008),
+ libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
libstartup-notification0-dev,
@@ -60,41 +60,41 @@
This version is configured to start the GNOME 2 desktop, based on the
GNOME panel.
-Package: gnome3-session
-Architecture: all
-Depends: ${misc:Depends},
- gnome-settings-daemon (>= 2.26),
- gnome-shell,
- nautilus (>= 2.26),
- policykit-1-gnome,
- gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
-Recommends: gnome-power-manager (>= 2.28)
-Breaks: bug-buddy (<< 2.20),
- xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Provides: x-session-manager
-Suggests: gnome-user-guide,
- desktop-base,
- gnome-keyring
-Description: The GNOME Session Manager - GNOME 3 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
- .
- The session manager also features the ability to save a running session
- an restore it later.
- .
- This version is configured to start the GNOME 3 desktop, based on the
- GNOME shell.
+# Package: gnome3-session
+# Architecture: all
+# Depends: ${misc:Depends},
+# gnome-settings-daemon (>= 2.26),
+# gnome-shell,
+# nautilus (>= 2.26),
+# policykit-1-gnome,
+# gnome-session-bin (>= ${binary:Version}),
+# gnome-session-bin (<< ${gnome:NextVersion}),
+# gnome-session-common (= ${binary:Version})
+# Recommends: gnome-power-manager (>= 2.28)
+# Breaks: bug-buddy (<< 2.20),
+# xserver-xorg (<< 1:7.4),
+# gnome-power-manager (<< 2.28)
+# Provides: x-session-manager
+# Suggests: gnome-user-guide,
+# desktop-base,
+# gnome-keyring
+# Description: The GNOME Session Manager - GNOME 3 session
+# This package contains a session that can be started from a display
+# manager such as GDM. It will load all necessary applications for a
+# full-featured user session.
+# .
+# The session manager also features the ability to save a running session
+# an restore it later.
+# .
+# This version is configured to start the GNOME 3 desktop, based on the
+# GNOME shell.
Package: gnome-session-bin
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
dbus-x11,
- upower
+ upower (>= 0.9.0)
Conflicts: gnome-session (<< 2.26.1-5)
Description: The GNOME Session Manager - Minimal runtime
This package contains the binaries for the GNOME Session Manager, but
Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=25141&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Fri Sep 17 22:23:14 2010
@@ -10,7 +10,7 @@
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.16.0),
libgtk2.0-dev (>= 2.14.0),
- libdevkit-power-gobject-dev (>= 008),
+ libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
libstartup-notification0-dev,
@@ -55,41 +55,41 @@
This version is configured to start the GNOME 2 desktop, based on the
GNOME panel.
-Package: gnome3-session
-Architecture: all
-Depends: ${misc:Depends},
- gnome-settings-daemon (>= 2.26),
- gnome-shell,
- nautilus (>= 2.26),
- policykit-1-gnome,
- gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
-Recommends: gnome-power-manager (>= 2.28)
-Breaks: bug-buddy (<< 2.20),
- xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Provides: x-session-manager
-Suggests: gnome-user-guide,
- desktop-base,
- gnome-keyring
-Description: The GNOME Session Manager - GNOME 3 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
- .
- The session manager also features the ability to save a running session
- an restore it later.
- .
- This version is configured to start the GNOME 3 desktop, based on the
- GNOME shell.
+# Package: gnome3-session
+# Architecture: all
+# Depends: ${misc:Depends},
+# gnome-settings-daemon (>= 2.26),
+# gnome-shell,
+# nautilus (>= 2.26),
+# policykit-1-gnome,
+# gnome-session-bin (>= ${binary:Version}),
+# gnome-session-bin (<< ${gnome:NextVersion}),
+# gnome-session-common (= ${binary:Version})
+# Recommends: gnome-power-manager (>= 2.28)
+# Breaks: bug-buddy (<< 2.20),
+# xserver-xorg (<< 1:7.4),
+# gnome-power-manager (<< 2.28)
+# Provides: x-session-manager
+# Suggests: gnome-user-guide,
+# desktop-base,
+# gnome-keyring
+# Description: The GNOME Session Manager - GNOME 3 session
+# This package contains a session that can be started from a display
+# manager such as GDM. It will load all necessary applications for a
+# full-featured user session.
+# .
+# The session manager also features the ability to save a running session
+# an restore it later.
+# .
+# This version is configured to start the GNOME 3 desktop, based on the
+# GNOME shell.
Package: gnome-session-bin
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
dbus-x11,
- upower
+ upower (>= 0.9.0)
Conflicts: gnome-session (<< 2.26.1-5)
Description: The GNOME Session Manager - Minimal runtime
This package contains the binaries for the GNOME Session Manager, but
Added: desktop/unstable/gnome-session/debian/patches/03_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/03_upower.patch?rev=25141&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/03_upower.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/03_upower.patch [utf-8] Fri Sep 17 22:23:14 2010
@@ -1,0 +1,191 @@
+From 75935773a6c5b0f7d93ca4fb9a032baa9f7dfa40 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 12 Jul 2010 13:07:02 +0000
+Subject: Port gnome-session to upower
+
+devkit-power-gobject is deprecated and will be removed in future versions.
+UPower 0.9.0 has been required by gnome-power-manager for many months now.
+---
+Index: gnome-session-2.30.2/configure.in
+===================================================================
+--- gnome-session-2.30.2.orig/configure.in 2010-09-18 00:14:16.303869008 +0200
++++ gnome-session-2.30.2/configure.in 2010-09-18 00:16:35.863873839 +0200
+@@ -40,7 +40,7 @@ fi
+ GLIB_REQUIRED=2.16.0
+ GTK_REQUIRED=2.14.0
+ DBUS_GLIB_REQUIRED=0.76
+-DEVKIT_POWER_REQUIRED=008
++UPOWER_REQUIRED=0.9.0
+
+ dnl ====================================================================
+ dnl Dependency Checks
+@@ -52,7 +52,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
+ )
+
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+Index: gnome-session-2.30.2/gnome-session/gsm-logout-dialog.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-logout-dialog.c 2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-2.30.2/gnome-session/gsm-logout-dialog.c 2010-09-18 00:16:35.863873839 +0200
+@@ -27,7 +27,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+
+-#include <devkit-power-gobject/devicekit-power.h>
++#include <upower.h>
+
+ #include "gsm-logout-dialog.h"
+ #include "gsm-consolekit.h"
+@@ -50,7 +50,7 @@ struct _GsmLogoutDialogPrivate
+ {
+ GsmDialogLogoutType type;
+
+- DkpClient *dkp_client;
++ UpClient *up_client;
+ GsmConsolekit *consolekit;
+
+ int timeout;
+@@ -142,7 +142,7 @@ gsm_logout_dialog_init (GsmLogoutDialog
+ gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+ gtk_window_stick (GTK_WINDOW (logout_dialog));
+
+- logout_dialog->priv->dkp_client = dkp_client_new ();
++ logout_dialog->priv->up_client = up_client_new ();
+
+ logout_dialog->priv->consolekit = gsm_get_consolekit ();
+
+@@ -166,9 +166,9 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ logout_dialog->priv->timeout_id = 0;
+ }
+
+- if (logout_dialog->priv->dkp_client) {
+- g_object_unref (logout_dialog->priv->dkp_client);
+- logout_dialog->priv->dkp_client = NULL;
++ if (logout_dialog->priv->up_client) {
++ g_object_unref (logout_dialog->priv->up_client);
++ logout_dialog->priv->up_client = NULL;
+ }
+
+ if (logout_dialog->priv->consolekit) {
+@@ -182,21 +182,13 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
+- gboolean ret;
+- g_object_get (logout_dialog->priv->dkp_client,
+- "can-suspend", &ret,
+- NULL);
+- return ret;
++ return up_client_get_can_suspend (logout_dialog->priv->up_client);
+ }
+
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
+- gboolean ret;
+- g_object_get (logout_dialog->priv->dkp_client,
+- "can-hibernate", &ret,
+- NULL);
+- return ret;
++ return up_client_get_can_hibernate (logout_dialog->priv->up_client);
+ }
+
+ static gboolean
+Index: gnome-session-2.30.2/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.30.2.orig/gnome-session/gsm-manager.c 2010-09-18 00:14:16.443872139 +0200
++++ gnome-session-2.30.2/gnome-session/gsm-manager.c 2010-09-18 00:16:35.867874417 +0200
+@@ -38,7 +38,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+-#include <devkit-power-gobject/devicekit-power.h>
++#include <upower.h>
+
+ #include <gtk/gtk.h> /* for logout dialog */
+ #include <gconf/gconf-client.h>
+@@ -135,7 +135,7 @@ struct GsmManagerPrivate
+ DBusGConnection *connection;
+
+ /* Interface with other parts of the system */
+- DkpClient *dkp_client;
++ UpClient *up_client;
+ };
+
+ enum {
+@@ -987,17 +987,14 @@ manager_attempt_hibernate (GsmManager *m
+ GError *error;
+ gboolean ret;
+
+- g_object_get (manager->priv->dkp_client,
+- "can-hibernate", &can_hibernate,
+- NULL);
+-
++ can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
+ if (can_hibernate) {
+
+ /* lock the screen before we suspend */
+ manager_perhaps_lock (manager);
+
+ error = NULL;
+- ret = dkp_client_hibernate (manager->priv->dkp_client, &error);
++ ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error);
+ if (!ret) {
+ g_warning ("Unexpected hibernate failure: %s",
+ error->message);
+@@ -1013,17 +1010,14 @@ manager_attempt_suspend (GsmManager *man
+ GError *error;
+ gboolean ret;
+
+- g_object_get (manager->priv->dkp_client,
+- "can-suspend", &can_suspend,
+- NULL);
+-
++ can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+ if (can_suspend) {
+
+ /* lock the screen before we suspend */
+ manager_perhaps_lock (manager);
+
+ error = NULL;
+- ret = dkp_client_suspend (manager->priv->dkp_client, &error);
++ ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error);
+ if (!ret) {
+ g_warning ("Unexpected suspend failure: %s",
+ error->message);
+@@ -2202,9 +2196,9 @@ gsm_manager_dispose (GObject *object)
+ manager->priv->gconf_client = NULL;
+ }
+
+- if (manager->priv->dkp_client != NULL) {
+- g_object_unref (manager->priv->dkp_client);
+- manager->priv->dkp_client = NULL;
++ if (manager->priv->up_client != NULL) {
++ g_object_unref (manager->priv->up_client);
++ manager->priv->up_client = NULL;
+ }
+
+ G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
+@@ -2435,7 +2429,7 @@ gsm_manager_init (GsmManager *manager)
+ G_CALLBACK (on_presence_status_changed),
+ manager);
+
+- manager->priv->dkp_client = dkp_client_new ();
++ manager->priv->up_client = up_client_new ();
+
+ /* GConf setup */
+ gconf_client_add_dir (manager->priv->gconf_client,
+@@ -2959,7 +2953,7 @@ gsm_manager_can_shutdown (GsmManager *ma
+ gboolean can_suspend;
+ gboolean can_hibernate;
+
+- g_object_get (manager->priv->dkp_client,
++ g_object_get (manager->priv->up_client,
+ "can-suspend", &can_suspend,
+ "can-hibernate", &can_hibernate,
+ NULL);
Modified: desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch?rev=25141&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch [utf-8] Fri Sep 17 22:23:14 2010
@@ -7,9 +7,9 @@
Index: gnome-session-2.30.2/INSTALL
===================================================================
---- gnome-session-2.30.2.orig/INSTALL 2010-07-22 17:18:24.738608554 +0200
-+++ gnome-session-2.30.2/INSTALL 2010-07-22 17:18:05.922608270 +0200
-@@ -4,8 +4,10 @@
+--- gnome-session-2.30.2.orig/INSTALL 2010-02-09 18:44:27.000000000 +0100
++++ gnome-session-2.30.2/INSTALL 2010-09-18 00:16:59.771369277 +0200
+@@ -4,8 +4,10 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -22,7 +22,7 @@
Basic Installation
==================
-@@ -13,7 +15,11 @@
+@@ -13,7 +15,11 @@ Basic Installation
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
@@ -35,7 +35,7 @@
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-@@ -42,7 +48,7 @@
+@@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
@@ -44,7 +44,7 @@
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@
+@@ -53,12 +59,22 @@ The simplest way to compile this package
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
@@ -70,7 +70,7 @@
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
-@@ -67,8 +83,15 @@
+@@ -67,8 +83,15 @@ The simplest way to compile this package
all sorts of other programs in order to regenerate files that came
with the distribution.
@@ -88,7 +88,7 @@
Compilers and Options
=====================
-@@ -93,7 +116,8 @@
+@@ -93,7 +116,8 @@ same time, by placing the object files f
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
@@ -98,7 +98,7 @@
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
-@@ -120,7 +144,8 @@
+@@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
@@ -108,7 +108,7 @@
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-@@ -131,15 +156,46 @@
+@@ -131,15 +156,46 @@ Documentation and other data files still
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
@@ -159,7 +159,7 @@
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-@@ -152,6 +208,13 @@
+@@ -152,6 +208,13 @@ find the X include and library files aut
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
@@ -173,7 +173,7 @@
Particular systems
==================
-@@ -288,7 +351,7 @@
+@@ -288,7 +351,7 @@ operates.
`configure' can determine that directory automatically.
`--prefix=DIR'
@@ -184,26 +184,9 @@
Index: gnome-session-2.30.2/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/Makefile.in 2010-07-22 17:18:23.582609301 +0200
-+++ gnome-session-2.30.2/Makefile.in 2010-07-22 17:18:06.054606089 +0200
-@@ -139,6 +139,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -165,6 +167,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -211,6 +214,8 @@
+--- gnome-session-2.30.2.orig/Makefile.in 2010-06-22 04:06:49.000000000 +0200
++++ gnome-session-2.30.2/Makefile.in 2010-09-18 00:17:25.307366040 +0200
+@@ -211,6 +211,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -214,9 +197,17 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/aclocal.m4
===================================================================
---- gnome-session-2.30.2.orig/aclocal.m4 2010-07-22 17:18:23.634607269 +0200
-+++ gnome-session-2.30.2/aclocal.m4 2010-07-22 17:17:59.946609652 +0200
-@@ -19,1861 +19,1864 @@
+--- gnome-session-2.30.2.orig/aclocal.m4 2010-06-22 04:06:45.000000000 +0200
++++ gnome-session-2.30.2/aclocal.m4 2010-09-18 00:17:22.203871610 +0200
+@@ -13,1867 +13,1870 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+-[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -3733,26 +3724,9 @@
m4_include([m4/libtool.m4])
Index: gnome-session-2.30.2/capplet/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/capplet/Makefile.in 2010-07-22 17:18:25.322607250 +0200
-+++ gnome-session-2.30.2/capplet/Makefile.in 2010-07-22 17:18:04.134608450 +0200
-@@ -122,6 +122,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -148,6 +150,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -194,6 +197,8 @@
+--- gnome-session-2.30.2.orig/capplet/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/capplet/Makefile.in 2010-09-18 00:17:23.739367670 +0200
+@@ -194,6 +194,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -3763,26 +3737,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/compat/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/compat/Makefile.in 2010-07-22 17:18:24.166609147 +0200
-+++ gnome-session-2.30.2/compat/Makefile.in 2010-07-22 17:18:04.310606280 +0200
-@@ -143,6 +143,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -169,6 +171,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -215,6 +218,8 @@
+--- gnome-session-2.30.2.orig/compat/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/compat/Makefile.in 2010-09-18 00:17:23.863367986 +0200
+@@ -215,6 +215,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -3793,8 +3750,8 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/config.guess
===================================================================
---- gnome-session-2.30.2.orig/config.guess 2010-07-22 17:18:24.330608249 +0200
-+++ gnome-session-2.30.2/config.guess 2010-07-22 17:18:03.718606295 +0200
+--- gnome-session-2.30.2.orig/config.guess 2010-06-22 04:06:47.000000000 +0200
++++ gnome-session-2.30.2/config.guess 2010-09-18 00:16:59.783371990 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3808,7 +3765,7 @@
# 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
-@@ -56,8 +56,9 @@
+@@ -56,8 +56,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
@@ -3820,24 +3777,10 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-Index: gnome-session-2.30.2/config.h.in
-===================================================================
---- gnome-session-2.30.2.orig/config.h.in 2010-07-22 17:18:23.682603329 +0200
-+++ gnome-session-2.30.2/config.h.in 2010-07-22 17:18:07.958609458 +0200
-@@ -18,6 +18,9 @@
- /* Define to 1 if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
-
-+/* Have the DeviceKit-Power library */
-+#undef HAVE_DEVKIT_POWER
-+
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
Index: gnome-session-2.30.2/config.sub
===================================================================
---- gnome-session-2.30.2.orig/config.sub 2010-07-22 17:18:24.382608175 +0200
-+++ gnome-session-2.30.2/config.sub 2010-07-22 17:18:03.722607363 +0200
+--- gnome-session-2.30.2.orig/config.sub 2010-06-22 04:06:47.000000000 +0200
++++ gnome-session-2.30.2/config.sub 2010-09-18 00:16:59.783371990 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -3851,7 +3794,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -75,8 +75,9 @@
+@@ -75,8 +75,9 @@ Report bugs and patches to <config-patch
version="\
GNU config.sub ($timestamp)
@@ -3863,7 +3806,7 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -380,7 +381,8 @@
+@@ -380,7 +381,8 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
@@ -3873,7 +3816,7 @@
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
-@@ -1085,6 +1087,11 @@
+@@ -1085,6 +1087,11 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
@@ -3885,7 +3828,7 @@
tile*)
basic_machine=tile-unknown
os=-linux-gnu
-@@ -1435,6 +1442,8 @@
+@@ -1435,6 +1442,8 @@ case $os in
-dicos*)
os=-dicos
;;
@@ -3896,19 +3839,72 @@
*)
Index: gnome-session-2.30.2/configure
===================================================================
---- gnome-session-2.30.2.orig/configure 2010-07-22 17:18:25.514609931 +0200
-+++ gnome-session-2.30.2/configure 2010-07-22 17:18:11.390602493 +0200
-@@ -791,6 +791,9 @@
- USE_GNOME_WM_FALSE
- USE_GNOME_WM_TRUE
- DEFAULT_WM
-+HAVE_DEVKIT_POWER
-+DEVKIT_POWER_LIBS
-+DEVKIT_POWER_CFLAGS
- EGG_SMCLIENT_LIBS
- EGG_SMCLIENT_CFLAGS
- GCONF_LIBS
-@@ -811,6 +814,8 @@
+--- gnome-session-2.30.2.orig/configure 2010-06-22 04:06:47.000000000 +0200
++++ gnome-session-2.30.2/configure 2010-09-18 00:17:26.415865999 +0200
+@@ -1,13 +1,13 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65 for gnome-session 2.30.2.
++# Generated by GNU Autoconf 2.67 for gnome-session 2.30.2.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session>.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -320,7 +320,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -360,19 +360,19 @@ else
+ fi # as_fn_arith
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -683,7 +683,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -811,6 +811,8 @@ SESSION_PROPERTIES_LIBS
SESSION_PROPERTIES_CFLAGS
GNOME_SESSION_LIBS
GNOME_SESSION_CFLAGS
@@ -3917,7 +3913,7 @@
PKG_CONFIG
DISABLE_DEPRECATED_CFLAGS
WARN_CFLAGS
-@@ -994,6 +999,8 @@
+@@ -994,6 +996,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
@@ -3926,16 +3922,146 @@
GNOME_SESSION_CFLAGS
GNOME_SESSION_LIBS
SESSION_PROPERTIES_CFLAGS
-@@ -1014,6 +1021,8 @@
- GCONF_LIBS
- EGG_SMCLIENT_CFLAGS
- EGG_SMCLIENT_LIBS
-+DEVKIT_POWER_CFLAGS
-+DEVKIT_POWER_LIBS
- XMKMF
- XTEST_CFLAGS
- XTEST_LIBS
-@@ -1690,6 +1699,10 @@
+@@ -1081,8 +1085,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1127,7 +1132,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1153,7 +1158,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1357,7 +1362,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1373,7 +1378,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1403,8 +1408,8 @@ do
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+@@ -1412,7 +1417,7 @@ Try \`$0 --help' for more information."
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -1430,13 +1435,13 @@ done
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -1459,7 +1464,7 @@ do
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1473,8 +1478,8 @@ 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
++ $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
+@@ -1489,9 +1494,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -1530,11 +1535,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1574,7 +1579,7 @@ Configuration:
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1690,6 +1695,10 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
@@ -3946,18 +4072,489 @@
GNOME_SESSION_CFLAGS
C compiler flags for GNOME_SESSION, overriding pkg-config
GNOME_SESSION_LIBS
-@@ -1721,6 +1734,10 @@
- C compiler flags for EGG_SMCLIENT, overriding pkg-config
- EGG_SMCLIENT_LIBS
- linker flags for EGG_SMCLIENT, overriding pkg-config
-+ DEVKIT_POWER_CFLAGS
-+ C compiler flags for DEVKIT_POWER, overriding pkg-config
-+ DEVKIT_POWER_LIBS
-+ linker flags for DEVKIT_POWER, overriding pkg-config
- XMKMF Path to xmkmf, Makefile generator for X Window System
- XTEST_CFLAGS
- C compiler flags for XTEST, overriding pkg-config
-@@ -5734,8 +5751,8 @@
+@@ -1797,9 +1806,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gnome-session configure 2.30.2
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.67
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1902,7 +1911,7 @@ ac_fn_c_check_func ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1982,7 +1991,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2049,7 +2058,7 @@ ac_fn_c_check_header_compile ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2079,10 +2088,10 @@ $as_echo "$ac_res" >&6; }
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2118,7 +2127,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2141,17 +2150,15 @@ $as_echo "$as_me: WARNING: $2: see the A
+ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-( cat <<\_ASBOX
+-## ---------------------------------------------------------------------------- ##
++( $as_echo "## ---------------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session ##
+-## ---------------------------------------------------------------------------- ##
+-_ASBOX
++## ---------------------------------------------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2168,7 +2175,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by gnome-session $as_me 2.30.2, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
+@@ -2278,11 +2285,9 @@ trap 'exit_status=$?
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2316,11 +2321,9 @@ $as_echo "$as_me: WARNING: cache variabl
+ )
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2333,11 +2336,9 @@ _ASBOX
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
++ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2351,11 +2352,9 @@ _ASBOX
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -2410,7 +2409,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2425,7 +2429,11 @@ do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2501,7 +2509,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2522,16 +2530,22 @@ am__api_version='1.11'
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
++ if test -f "$ac_dir/install-sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f "$ac_dir/install.sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ elif test -f "$ac_dir/shtool"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/shtool install -c"
++ break
++ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+
+ # These three variables are undocumented and unsupported,
+@@ -2647,11 +2661,11 @@ am_lf='
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2673,7 +2687,7 @@ if (
+ # 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
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -2683,7 +2697,7 @@ then
+ # Ok.
+ :
+ else
+- as_fn_error "newly created file is older than distributed files!
++ as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -2921,7 +2935,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -2929,7 +2943,7 @@ SHELL = /bin/sh
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2963,7 +2977,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+ fi
+
+@@ -3459,8 +3473,8 @@ fi
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3574,9 +3588,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3618,8 +3631,8 @@ done
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3676,9 +3689,9 @@ $as_echo "$ac_try_echo"; } >&5
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -3729,8 +3742,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4082,7 +4095,7 @@ fi
+
+ case "$am__api_version" in
+ 1.01234)
+- as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
++ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+@@ -4099,7 +4112,7 @@ $as_echo_n "checking for intltool >= 0.4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
++ as_fn_error $? "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+@@ -4223,7 +4236,7 @@ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
++ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -4505,13 +4518,13 @@ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+@@ -4555,13 +4568,13 @@ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- as_fn_error "perl not found" "$LINENO" 5
++ as_fn_error $? "perl not found" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
++ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+@@ -4574,7 +4587,7 @@ $as_echo_n "checking for XML::Parser...
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
++ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -4979,8 +4992,8 @@ fi
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -5388,7 +5401,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5404,11 +5417,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -5447,7 +5460,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5463,18 +5476,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -5535,7 +5548,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -5601,7 +5614,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -5734,8 +5747,8 @@ esac
@@ -3968,24 +4565,98 @@
-@@ -6276,13 +6293,13 @@
+@@ -5753,7 +5766,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -5764,16 +5777,16 @@ else
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5798,7 +5811,7 @@ else
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -5806,7 +5819,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5879,7 +5892,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_SED=$SED
+@@ -5958,7 +5971,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_FGREP=$FGREP
+@@ -6074,7 +6087,7 @@ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -6276,13 +6289,13 @@ if test "${lt_cv_nm_interface+set}" = se
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6279: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6296: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6292: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6282: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6295: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6285: output\"" >&5)
-+ (eval echo "\"\$as_me:6302: output\"" >&5)
++ (eval echo "\"\$as_me:6298: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6748,11 +6765,11 @@
+@@ -6748,11 +6761,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -3999,30 +4670,40 @@
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
-@@ -7487,7 +7504,7 @@
+@@ -7487,7 +7500,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7490 "configure"' > conftest.$ac_ext
-+ echo '#line 7507 "configure"' > conftest.$ac_ext
++ echo '#line 7503 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -8767,11 +8784,11 @@
+@@ -8241,8 +8254,7 @@ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -8767,11 +8779,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8770: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8787: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8782: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8774: \$? = $ac_status" >&5
-+ echo "$as_me:8791: \$? = $ac_status" >&5
++ echo "$as_me:8786: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8936,7 +8953,7 @@
+@@ -8936,7 +8948,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -4031,49 +4712,49 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9106,11 +9123,11 @@
+@@ -9106,11 +9118,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9109: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9126: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9113: \$? = $ac_status" >&5
-+ echo "$as_me:9130: \$? = $ac_status" >&5
++ echo "$as_me:9125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9211,11 +9228,11 @@
+@@ -9211,11 +9223,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9214: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9231: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9218: \$? = $ac_status" >&5
-+ echo "$as_me:9235: \$? = $ac_status" >&5
++ echo "$as_me:9230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9266,11 +9283,11 @@
+@@ -9266,11 +9278,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9269: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9286: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9281: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9273: \$? = $ac_status" >&5
-+ echo "$as_me:9290: \$? = $ac_status" >&5
++ echo "$as_me:9285: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9385,6 +9402,9 @@
+@@ -9385,6 +9397,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -4083,7 +4764,7 @@
esac
ld_shlibs=yes
-@@ -9406,6 +9426,7 @@
+@@ -9406,6 +9421,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -4091,7 +4772,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9497,7 +9518,7 @@
+@@ -9497,7 +9513,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -4100,7 +4781,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -9567,7 +9588,7 @@
+@@ -9567,7 +9583,7 @@ _LT_EOF
fi
;;
@@ -4109,7 +4790,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9742,6 +9763,7 @@
+@@ -9742,6 +9758,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -4117,7 +4798,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10068,7 +10090,7 @@
+@@ -10068,7 +10085,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -4126,7 +4807,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10958,7 +10980,7 @@
+@@ -10958,7 +10975,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -4135,7 +4816,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11013,6 +11035,18 @@
+@@ -11013,6 +11030,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4154,36 +4835,47 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11633,7 +11667,7 @@
+@@ -11633,7 +11662,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11636 "configure"
-+#line 11670 "configure"
++#line 11665 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11729,7 +11763,7 @@
+@@ -11729,7 +11758,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11732 "configure"
-+#line 11766 "configure"
++#line 11761 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12141,6 +12175,10 @@
-
-
-
+@@ -12082,7 +12111,7 @@ $as_echo "$has_option" >&6; }
+ fi
+ ;;
+ *)
+- as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
++ as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+@@ -12137,7 +12166,11 @@ fi
+ GLIB_REQUIRED=2.16.0
+ GTK_REQUIRED=2.14.0
+ DBUS_GLIB_REQUIRED=0.76
+-DEVKIT_POWER_REQUIRED=008
++UPOWER_REQUIRED=0.9.0
+
+
+
+
- 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.
-@@ -12253,7 +12291,6 @@
+
+
+
+@@ -12253,7 +12286,6 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -4191,51 +4883,57 @@
fi
-@@ -12269,13 +12306,11 @@
+@@ -12269,13 +12301,13 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
++ upower-glib >= \$UPOWER_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -12284,7 +12319,6 @@
+@@ -12284,7 +12316,7 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
-@@ -12300,13 +12334,11 @@
+@@ -12300,13 +12332,13 @@ if test -n "$GNOME_SESSION_LIBS"; then
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
++ upower-glib >= \$UPOWER_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -12315,7 +12347,6 @@
+@@ -12315,7 +12347,7 @@ if test -n "$GNOME_SESSION_LIBS"; then
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
-@@ -12327,6 +12358,8 @@
+@@ -12327,6 +12359,8 @@ fi
if test $pkg_failed = yes; then
@@ -4244,11 +4942,12 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12338,14 +12371,12 @@
+@@ -12338,24 +12372,24 @@ fi
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
" 2>&1`
else
GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED
@@ -4256,18 +4955,23 @@
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -12355,7 +12386,6 @@
+ echo "$GNOME_SESSION_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED
++ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
++ upower-glib >= $UPOWER_REQUIRED
) were not met:
$GNOME_SESSION_PKG_ERRORS
-@@ -12365,9 +12395,10 @@
+@@ -12365,12 +12399,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
@@ -4279,8 +4983,19 @@
+$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
-@@ -12385,7 +12416,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12379,13 +12414,13 @@ and GNOME_SESSION_LIBS to avoid the need
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ GNOME_SESSION_CFLAGS=$pkg_cv_GNOME_SESSION_CFLAGS
GNOME_SESSION_LIBS=$pkg_cv_GNOME_SESSION_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4289,7 +5004,7 @@
fi
-@@ -12399,15 +12430,18 @@
+@@ -12399,15 +12434,18 @@ if test -n "$SESSION_PROPERTIES_CFLAGS";
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
@@ -4308,7 +5023,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -12421,15 +12455,18 @@
+@@ -12421,15 +12459,18 @@ if test -n "$SESSION_PROPERTIES_LIBS"; t
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
@@ -4327,7 +5042,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -12441,6 +12478,8 @@
+@@ -12441,6 +12482,8 @@ fi
if test $pkg_failed = yes; then
@@ -4336,7 +5051,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12450,10 +12489,12 @@
+@@ -12450,17 +12493,20 @@ fi
if test $_pkg_short_errors_supported = yes; then
SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
@@ -4349,15 +5064,16 @@
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -12461,6 +12502,7 @@
-
- as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ echo "$SESSION_PROPERTIES_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED
++ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
) were not met:
$SESSION_PROPERTIES_PKG_ERRORS
-@@ -12470,9 +12512,10 @@
+@@ -12470,12 +12516,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
@@ -4369,8 +5085,19 @@
+$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
-@@ -12490,7 +12533,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12484,13 +12531,13 @@ and SESSION_PROPERTIES_LIBS to avoid the
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ SESSION_PROPERTIES_CFLAGS=$pkg_cv_SESSION_PROPERTIES_CFLAGS
SESSION_PROPERTIES_LIBS=$pkg_cv_SESSION_PROPERTIES_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4379,7 +5106,7 @@
fi
-@@ -12558,6 +12601,8 @@
+@@ -12558,6 +12605,8 @@ fi
if test $pkg_failed = yes; then
@@ -4388,7 +5115,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12593,9 +12638,10 @@
+@@ -12580,7 +12629,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SPLASH_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED
++ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+ libstartup-notification-1.0
+@@ -12593,12 +12642,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SPLASH_CFLAGS
and SPLASH_LIBS to avoid the need to call pkg-config.
@@ -4400,8 +5136,19 @@
+$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
-@@ -12613,7 +12659,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12607,13 +12657,13 @@ and SPLASH_LIBS to avoid the need to cal
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ SPLASH_CFLAGS=$pkg_cv_SPLASH_CFLAGS
SPLASH_LIBS=$pkg_cv_SPLASH_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4410,7 +5157,7 @@
fi
-@@ -12663,6 +12709,8 @@
+@@ -12663,6 +12713,8 @@ fi
if test $pkg_failed = yes; then
@@ -4419,7 +5166,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12689,9 +12737,10 @@
+@@ -12679,7 +12731,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$COMPAT_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED
++ as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+ $COMPAT_PKG_ERRORS
+@@ -12689,12 +12741,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables COMPAT_CFLAGS
and COMPAT_LIBS to avoid the need to call pkg-config.
@@ -4431,8 +5187,19 @@
+$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
-@@ -12709,7 +12758,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12703,13 +12756,13 @@ and COMPAT_LIBS to avoid the need to cal
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ COMPAT_CFLAGS=$pkg_cv_COMPAT_CFLAGS
COMPAT_LIBS=$pkg_cv_COMPAT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4441,7 +5208,7 @@
fi
-@@ -12753,6 +12802,8 @@
+@@ -12753,6 +12806,8 @@ fi
if test $pkg_failed = yes; then
@@ -4450,7 +5217,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12776,9 +12827,10 @@
+@@ -12767,7 +12822,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SM_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (sm) were not met:
++ as_fn_error $? "Package requirements (sm) were not met:
+
+ $SM_PKG_ERRORS
+
+@@ -12776,12 +12831,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SM_CFLAGS
and SM_LIBS to avoid the need to call pkg-config.
@@ -4462,8 +5238,19 @@
+$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
-@@ -12796,7 +12848,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12790,13 +12846,13 @@ and SM_LIBS to avoid the need to call pk
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ SM_CFLAGS=$pkg_cv_SM_CFLAGS
SM_LIBS=$pkg_cv_SM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4472,7 +5259,7 @@
fi
pkg_failed=no
-@@ -12839,6 +12891,8 @@
+@@ -12839,6 +12895,8 @@ fi
if test $pkg_failed = yes; then
@@ -4481,7 +5268,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12862,9 +12916,10 @@
+@@ -12853,7 +12911,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ICE_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (ice) were not met:
++ as_fn_error $? "Package requirements (ice) were not met:
+
+ $ICE_PKG_ERRORS
+
+@@ -12862,12 +12920,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables ICE_CFLAGS
and ICE_LIBS to avoid the need to call pkg-config.
@@ -4493,8 +5289,19 @@
+$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
-@@ -12882,7 +12937,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12876,13 +12935,13 @@ and ICE_LIBS to avoid the need to call p
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ICE_CFLAGS=$pkg_cv_ICE_CFLAGS
ICE_LIBS=$pkg_cv_ICE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4503,7 +5310,7 @@
fi
pkg_failed=no
-@@ -12925,6 +12980,8 @@
+@@ -12925,6 +12984,8 @@ fi
if test $pkg_failed = yes; then
@@ -4512,7 +5319,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -12948,9 +13005,10 @@
+@@ -12939,7 +13000,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XEXT_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (xext xau) were not met:
++ as_fn_error $? "Package requirements (xext xau) were not met:
+
+ $XEXT_PKG_ERRORS
+
+@@ -12948,12 +13009,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables XEXT_CFLAGS
and XEXT_LIBS to avoid the need to call pkg-config.
@@ -4524,8 +5340,19 @@
+$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
-@@ -12968,7 +13026,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -12962,13 +13024,13 @@ and XEXT_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
XEXT_LIBS=$pkg_cv_XEXT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4534,7 +5361,7 @@
fi
-@@ -13012,6 +13070,8 @@
+@@ -13012,6 +13074,8 @@ fi
if test $pkg_failed = yes; then
@@ -4543,7 +5370,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -13035,9 +13095,10 @@
+@@ -13026,7 +13090,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_GLIB_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++ as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+ $DBUS_GLIB_PKG_ERRORS
+
+@@ -13035,12 +13099,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
@@ -4555,8 +5391,19 @@
+$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
-@@ -13055,7 +13116,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -13049,13 +13114,13 @@ and DBUS_GLIB_LIBS to avoid the need to
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4565,7 +5412,7 @@
fi
pkg_failed=no
-@@ -13098,6 +13159,8 @@
+@@ -13098,6 +13163,8 @@ fi
if test $pkg_failed = yes; then
@@ -4574,7 +5421,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -13121,9 +13184,10 @@
+@@ -13112,7 +13179,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GCONF_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (gconf-2.0) were not met:
++ as_fn_error $? "Package requirements (gconf-2.0) were not met:
+
+ $GCONF_PKG_ERRORS
+
+@@ -13121,12 +13188,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GCONF_CFLAGS
and GCONF_LIBS to avoid the need to call pkg-config.
@@ -4586,8 +5442,19 @@
+$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
-@@ -13141,7 +13205,7 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -13135,13 +13203,13 @@ and GCONF_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
GCONF_LIBS=$pkg_cv_GCONF_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4596,7 +5463,7 @@
fi
-@@ -13185,6 +13249,8 @@
+@@ -13185,6 +13253,8 @@ fi
if test $pkg_failed = yes; then
@@ -4605,7 +5472,16 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -13208,9 +13274,10 @@
+@@ -13199,7 +13269,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (gtk+-2.0) were not met:
++ as_fn_error $? "Package requirements (gtk+-2.0) were not met:
+
+ $EGG_SMCLIENT_PKG_ERRORS
+
+@@ -13208,12 +13278,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
@@ -4617,99 +5493,100 @@
+$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
-@@ -13228,8 +13295,89 @@
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -13222,13 +13293,13 @@ and EGG_SMCLIENT_LIBS to avoid the need
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS
EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
-+fi
-+
-+
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT_POWER" >&5
-+$as_echo_n "checking for DEVKIT_POWER... " >&6; }
-+
-+if test -n "$DEVKIT_POWER_CFLAGS"; then
-+ pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$DEVKIT_POWER_LIBS"; then
-+ pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_DEVKIT_POWER_LIBS=`$PKG_CONFIG --libs "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
-+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
-+ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1`
-+ else
-+ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$DEVKIT_POWER_PKG_ERRORS" >&5
-+
-+ have_devkit_power=no
-+
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ have_devkit_power=no
-+
-+else
-+ DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
-+ DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ have_devkit_power=yes
-+fi
-+if test "$have_devkit_power" = yes; then
-+
-+$as_echo "#define HAVE_DEVKIT_POWER 1" >>confdefs.h
-+
-+fi
-+
-+
-
-
-
-@@ -14233,6 +14381,8 @@
+
+
+@@ -13311,7 +13382,7 @@ fi
+
+
+ if test x"$GCONFTOOL" = xno; then
+- as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
++ as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
+ fi
+
+
+@@ -13351,7 +13422,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a
+ if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -13413,7 +13484,7 @@ fi
+
+
+ if test x"$GCONF_SANITY_CHECK" = xno; then
+- as_fn_error "gconf-sanity-check-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
++ as_fn_error $? "gconf-sanity-check-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
+ fi
+
+
+@@ -13453,7 +13524,7 @@ if test "x$with_x" = xno; then
+ have_x=disabled
+ else
+ case $x_includes,$x_libraries in #(
+- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -13471,7 +13542,7 @@ libdir:
+ @echo libdir='${LIBDIR}'
+ _ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+@@ -13557,7 +13628,7 @@ else
+ fi
+ done
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ fi # $ac_x_includes = no
+
+ if test "$ac_x_libraries" = no; then
+@@ -14123,7 +14194,7 @@ fi
+
+
+ if test x$no_x = xyes ; then
+- as_fn_error "X development libraries not found" "$LINENO" 5
++ as_fn_error $? "X development libraries not found" "$LINENO" 5
+ else
+ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+ fi
+@@ -14168,7 +14239,7 @@ $as_echo "$ac_cv_lib_Xau_XauFileName" >&
+ if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then :
+ X_LIBS="$X_LIBS -lXau"
+ else
+- as_fn_error "
++ as_fn_error $? "
+ *** Can't find the Xauth library. It is needed to compile gnome-session." "$LINENO" 5
+ fi
+
+@@ -14233,6 +14304,8 @@ fi
if test $pkg_failed = yes; then
@@ -4718,7 +5595,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -14247,10 +14397,10 @@
+@@ -14247,10 +14320,10 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XTEST_PKG_ERRORS" >&5
@@ -4732,7 +5609,7 @@
have_xtest=no
else
XTEST_CFLAGS=$pkg_cv_XTEST_CFLAGS
-@@ -14310,6 +14460,8 @@
+@@ -14310,6 +14383,8 @@ fi
if test $pkg_failed = yes; then
@@ -4741,7 +5618,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -14324,10 +14476,10 @@
+@@ -14324,10 +14399,10 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XRENDER_PKG_ERRORS" >&5
@@ -4755,36 +5632,422 @@
have_xrender=no
else
XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
-@@ -18025,6 +18177,7 @@
- Maintainer mode: ${USE_MAINTAINER_MODE}
- Warn about deprecations: ${enable_deprecations}
-
-+ DeviceKit-Power support: ${have_devkit_power}
- Default WM: ${with_default_wm}
- IPv6 support: ${have_full_ipv6}
- Backtrace support: ${have_backtrace}
+@@ -14418,7 +14493,7 @@ if test x$enable_docbook_docs = xauto ;
+ fi
+ if test x$enable_docbook_docs = xyes; then
+ if test x$have_docbook = xno; then
+- as_fn_error "Building DocBook docs explicitly required, but DocBook not found" "$LINENO" 5
++ as_fn_error $? "Building DocBook docs explicitly required, but DocBook not found" "$LINENO" 5
+ fi
+ fi
+ if test x$enable_docbook_docs = xyes; then
+@@ -15302,8 +15377,7 @@ for ac_header in syslog.h tcpd.h sys/par
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15440,7 +15514,7 @@ fi
+ as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -l$lib" >&5
+ $as_echo_n "checking for getaddrinfo in -l$lib... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15475,8 +15549,7 @@ fi
+ eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Lib
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break
+ fi
+
+@@ -15686,6 +15759,7 @@ DEFS=-DHAVE_CONFIG_H
+
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -15709,15 +15783,15 @@ else
+ fi
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- as_fn_error "conditional \"AMDEP\" was never defined.
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -15725,27 +15799,27 @@ fi
+
+
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_GNOME_WM_TRUE}" && test -z "${USE_GNOME_WM_FALSE}"; then
+- as_fn_error "conditional \"USE_GNOME_WM\" was never defined.
++ as_fn_error $? "conditional \"USE_GNOME_WM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_SPLASH_TRUE}" && test -z "${ENABLE_SPLASH_FALSE}"; then
+- as_fn_error "conditional \"ENABLE_SPLASH\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_SPLASH\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+- as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++ as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_XRENDER_TRUE}" && test -z "${HAVE_XRENDER_FALSE}"; then
+- as_fn_error "conditional \"HAVE_XRENDER\" was never defined.
++ as_fn_error $? "conditional \"HAVE_XRENDER\" 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.
++ as_fn_error $? "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -15895,19 +15969,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -16103,7 +16177,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -16157,7 +16231,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by gnome-session $as_me 2.30.2, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -16223,10 +16297,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ gnome-session config.status 2.30.2
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -16244,11 +16318,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -16270,6 +16349,7 @@ do
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -16282,7 +16362,7 @@ do
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -16291,7 +16371,7 @@ Try \`$0 --help' for more information.";
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -16631,7 +16711,7 @@ do
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -16669,7 +16749,7 @@ $debug ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -16686,7 +16766,7 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\r'
++ ac_cs_awk_cr='\\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+@@ -16700,18 +16780,18 @@ _ACEOF
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -16800,20 +16880,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+ else
+ cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -16841,7 +16929,7 @@ for ac_last_try in false false :; do
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -16926,7 +17014,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -16939,7 +17027,7 @@ do
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -16967,7 +17055,7 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -16994,7 +17082,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -17131,22 +17219,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -17157,19 +17245,19 @@ which seems to be undefined. Please mak
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error "could not create -" "$LINENO" 5
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -17949,7 +18037,7 @@ _LT_EOF
+ esac ;;
+ "po/stamp-it":C)
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+- as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
++ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+ fi
+ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+ >"po/stamp-it.tmp"
+@@ -17977,7 +18065,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -17998,7 +18086,7 @@ if test "$no_create" != yes; then
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
Index: gnome-session-2.30.2/data/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/Makefile.in 2010-07-22 17:18:23.730608327 +0200
-+++ gnome-session-2.30.2/data/Makefile.in 2010-07-22 17:18:04.430601183 +0200
-@@ -153,6 +153,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -179,6 +181,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -225,6 +228,8 @@
+--- gnome-session-2.30.2.orig/data/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/Makefile.in 2010-09-18 00:17:23.975367070 +0200
+@@ -225,6 +225,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4795,26 +6058,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/16x16/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/16x16/Makefile.in 2010-07-22 17:18:24.054607169 +0200
-+++ gnome-session-2.30.2/data/icons/16x16/Makefile.in 2010-07-22 17:18:04.526603080 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/16x16/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/16x16/Makefile.in 2010-09-18 00:17:24.063366107 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4825,26 +6071,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/22x22/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/22x22/Makefile.in 2010-07-22 17:18:23.838607847 +0200
-+++ gnome-session-2.30.2/data/icons/22x22/Makefile.in 2010-07-22 17:18:04.622601898 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/22x22/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/22x22/Makefile.in 2010-09-18 00:17:24.139367323 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4855,26 +6084,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/24x24/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/24x24/Makefile.in 2010-07-22 17:18:24.110605644 +0200
-+++ gnome-session-2.30.2/data/icons/24x24/Makefile.in 2010-07-22 17:18:04.714602997 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/24x24/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/24x24/Makefile.in 2010-09-18 00:17:24.215367554 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4885,26 +6097,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/32x32/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/32x32/Makefile.in 2010-07-22 17:18:23.890608332 +0200
-+++ gnome-session-2.30.2/data/icons/32x32/Makefile.in 2010-07-22 17:18:04.802602190 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/32x32/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/32x32/Makefile.in 2010-09-18 00:17:24.295369335 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4915,26 +6110,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/48x48/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/48x48/Makefile.in 2010-07-22 17:18:23.946609047 +0200
-+++ gnome-session-2.30.2/data/icons/48x48/Makefile.in 2010-07-22 17:18:04.894601348 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/48x48/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/48x48/Makefile.in 2010-09-18 00:17:24.371368094 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4945,26 +6123,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/Makefile.in 2010-07-22 17:18:23.790608987 +0200
-+++ gnome-session-2.30.2/data/icons/Makefile.in 2010-07-22 17:18:04.986603294 +0200
-@@ -121,6 +121,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -147,6 +149,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -193,6 +196,8 @@
+--- gnome-session-2.30.2.orig/data/icons/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/Makefile.in 2010-09-18 00:17:24.447367840 +0200
+@@ -193,6 +193,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -4975,26 +6136,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/data/icons/scalable/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/data/icons/scalable/Makefile.in 2010-07-22 17:18:23.998604781 +0200
-+++ gnome-session-2.30.2/data/icons/scalable/Makefile.in 2010-07-22 17:18:05.082603232 +0200
-@@ -105,6 +105,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -131,6 +133,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -177,6 +180,8 @@
+--- gnome-session-2.30.2.orig/data/icons/scalable/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/data/icons/scalable/Makefile.in 2010-09-18 00:17:24.523368073 +0200
+@@ -177,6 +177,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5005,26 +6149,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/doc/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/doc/Makefile.in 2010-07-22 17:18:25.106609352 +0200
-+++ gnome-session-2.30.2/doc/Makefile.in 2010-07-22 17:18:05.174604053 +0200
-@@ -121,6 +121,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -147,6 +149,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -193,6 +196,8 @@
+--- gnome-session-2.30.2.orig/doc/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/doc/Makefile.in 2010-09-18 00:17:24.603367424 +0200
+@@ -193,6 +193,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5035,26 +6162,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/doc/dbus/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/doc/dbus/Makefile.in 2010-07-22 17:18:25.158609270 +0200
-+++ gnome-session-2.30.2/doc/dbus/Makefile.in 2010-07-22 17:18:05.274602256 +0200
-@@ -106,6 +106,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -132,6 +134,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -178,6 +181,8 @@
+--- gnome-session-2.30.2.orig/doc/dbus/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/doc/dbus/Makefile.in 2010-09-18 00:17:24.683367259 +0200
+@@ -178,6 +178,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5065,26 +6175,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/doc/man/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/doc/man/Makefile.in 2010-07-22 17:18:25.214610254 +0200
-+++ gnome-session-2.30.2/doc/man/Makefile.in 2010-07-22 17:18:05.374602432 +0200
-@@ -106,6 +106,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -132,6 +134,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -178,6 +181,8 @@
+--- gnome-session-2.30.2.orig/doc/man/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/doc/man/Makefile.in 2010-09-18 00:17:24.763367576 +0200
+@@ -178,6 +178,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5095,26 +6188,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/egg/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/egg/Makefile.in 2010-07-22 17:18:24.270608423 +0200
-+++ gnome-session-2.30.2/egg/Makefile.in 2010-07-22 17:18:05.506601653 +0200
-@@ -130,6 +130,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -156,6 +158,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -202,6 +205,8 @@
+--- gnome-session-2.30.2.orig/egg/Makefile.in 2010-06-22 04:06:48.000000000 +0200
++++ gnome-session-2.30.2/egg/Makefile.in 2010-09-18 00:17:24.871368024 +0200
+@@ -202,6 +202,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5125,36 +6201,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/gnome-session/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/gnome-session/Makefile.in 2010-07-22 17:18:25.390605303 +0200
-+++ gnome-session-2.30.2/gnome-session/Makefile.in 2010-07-22 17:18:05.654607094 +0200
-@@ -80,7 +80,8 @@
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1)
- am_test_client_dbus_OBJECTS = test-client-dbus.$(OBJEXT) \
- $(am__objects_1)
- test_client_dbus_OBJECTS = $(am_test_client_dbus_OBJECTS)
-@@ -149,6 +150,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -175,6 +178,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -221,6 +225,8 @@
+--- gnome-session-2.30.2.orig/gnome-session/Makefile.in 2010-06-22 04:06:49.000000000 +0200
++++ gnome-session-2.30.2/gnome-session/Makefile.in 2010-09-18 00:17:24.999367467 +0200
+@@ -221,6 +221,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5163,26 +6212,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -315,6 +321,7 @@
- $(ICE_CFLAGS) \
- $(XEXT_CFLAGS) \
- $(GNOME_SESSION_CFLAGS) \
-+ $(DEVKIT_POWER_CFLAGS) \
- $(GCONF_CFLAGS) \
- -I$(top_srcdir)/egg \
- -DLOCALE_DIR=\""$(datadir)/locale"\" \
-@@ -348,6 +355,7 @@
- $(SM_LIBS) \
- $(ICE_LIBS) \
- $(GNOME_SESSION_LIBS) \
-+ $(DEVKIT_POWER_LIBS) \
- $(GCONF_LIBS) \
- $(XRENDER_LIBS) \
- $(XTEST_LIBS) \
Index: gnome-session-2.30.2/ltmain.sh
===================================================================
---- gnome-session-2.30.2.orig/ltmain.sh 2010-07-22 17:18:24.222609854 +0200
-+++ gnome-session-2.30.2/ltmain.sh 2010-07-22 17:17:40.710607186 +0200
+--- gnome-session-2.30.2.orig/ltmain.sh 2010-06-22 04:06:40.000000000 +0200
++++ gnome-session-2.30.2/ltmain.sh 2010-09-18 00:16:59.815373191 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -5212,7 +6245,7 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -116,15 +116,15 @@
+@@ -116,15 +116,15 @@ $lt_unset CDPATH
: ${CP="cp -f"}
: ${ECHO="echo"}
@@ -5232,7 +6265,7 @@
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5244,7 +6277,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5344,19 +5347,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -5274,7 +6307,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@ func_mode_link ()
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -5282,7 +6315,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@
+@@ -6206,6 +6210,9 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
@@ -5294,9 +6327,9 @@
no)
Index: gnome-session-2.30.2/m4/libtool.m4
===================================================================
---- gnome-session-2.30.2.orig/m4/libtool.m4 2010-07-22 17:18:25.054607198 +0200
-+++ gnome-session-2.30.2/m4/libtool.m4 2010-07-22 17:17:40.786610441 +0200
-@@ -2445,7 +2445,7 @@
+--- gnome-session-2.30.2.orig/m4/libtool.m4 2010-06-22 04:06:40.000000000 +0200
++++ gnome-session-2.30.2/m4/libtool.m4 2010-09-18 00:16:59.819376213 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -5305,7 +6338,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2485,6 +2485,18 @@
+@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5324,7 +6357,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3072,11 +3084,11 @@
+@@ -3072,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -5338,7 +6371,7 @@
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
-@@ -3693,7 +3705,7 @@
+@@ -3693,7 +3705,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -5347,7 +6380,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -3757,7 +3769,7 @@
+@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -5356,7 +6389,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3977,7 +3989,7 @@
+@@ -3977,7 +3989,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -5365,7 +6398,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -4182,6 +4194,9 @@
+@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5375,7 +6408,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4246,6 +4261,9 @@
+@@ -4246,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -5385,7 +6418,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4267,6 +4285,7 @@
+@@ -4267,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -5393,7 +6426,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4358,7 +4377,7 @@
+@@ -4358,7 +4377,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5402,7 +6435,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -4428,7 +4447,7 @@
+@@ -4428,7 +4447,7 @@ _LT_EOF
fi
;;
@@ -5411,7 +6444,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4603,6 +4622,7 @@
+@@ -4603,6 +4622,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -5419,7 +6452,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4841,7 +4861,7 @@
+@@ -4841,7 +4861,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -5428,7 +6461,7 @@
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
-@@ -5841,7 +5861,7 @@
+@@ -5841,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -5439,8 +6472,8 @@
# Kuck and Associates, Inc. (KAI) C++ Compiler
Index: gnome-session-2.30.2/m4/ltversion.m4
===================================================================
---- gnome-session-2.30.2.orig/m4/ltversion.m4 2010-07-22 17:18:24.998607886 +0200
-+++ gnome-session-2.30.2/m4/ltversion.m4 2010-07-22 17:17:40.934608922 +0200
+--- gnome-session-2.30.2.orig/m4/ltversion.m4 2010-06-22 04:06:41.000000000 +0200
++++ gnome-session-2.30.2/m4/ltversion.m4 2010-09-18 00:16:59.819376213 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -5464,26 +6497,9 @@
])
Index: gnome-session-2.30.2/splash/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/splash/Makefile.in 2010-07-22 17:18:24.930608997 +0200
-+++ gnome-session-2.30.2/splash/Makefile.in 2010-07-22 17:18:05.778603882 +0200
-@@ -143,6 +143,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -169,6 +171,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -215,6 +218,8 @@
+--- gnome-session-2.30.2.orig/splash/Makefile.in 2010-06-22 04:06:49.000000000 +0200
++++ gnome-session-2.30.2/splash/Makefile.in 2010-09-18 00:17:25.107367444 +0200
+@@ -215,6 +215,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -5494,26 +6510,9 @@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Index: gnome-session-2.30.2/tools/Makefile.in
===================================================================
---- gnome-session-2.30.2.orig/tools/Makefile.in 2010-07-22 17:18:25.270608443 +0200
-+++ gnome-session-2.30.2/tools/Makefile.in 2010-07-22 17:18:05.890601957 +0200
-@@ -116,6 +116,8 @@
- DEFAULT_WM = @DEFAULT_WM@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
- DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
- DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
- DSYMUTIL = @DSYMUTIL@
-@@ -142,6 +144,7 @@
- GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
- GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
- GREP = @GREP@
-+HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
- HAVE_XRENDER = @HAVE_XRENDER@
- HAVE_XTEST = @HAVE_XTEST@
- ICE_CFLAGS = @ICE_CFLAGS@
-@@ -188,6 +191,8 @@
+--- gnome-session-2.30.2.orig/tools/Makefile.in 2010-06-22 04:06:49.000000000 +0200
++++ gnome-session-2.30.2/tools/Makefile.in 2010-09-18 00:17:25.207368703 +0200
+@@ -188,6 +188,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=25141&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Fri Sep 17 22:23:14 2010
@@ -1,5 +1,5 @@
01_gnome-wm.patch
-03_devicekit_optional.patch
+03_upower.patch
10_session_save.patch
11_saved_session_name.patch
12_no_gdm_fallback.patch
More information about the pkg-gnome-commits
mailing list