r18023 - in /desktop/experimental/gnome-panel/debian: changelog control control.in patches/02_panel_logout.patch patches/03_switch-user_lock.patch patches/04_gnome-panel-logout.patch patches/70_relibtoolize.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Dec 28 01:54:07 UTC 2008


Author: joss
Date: Sun Dec 28 01:54:06 2008
New Revision: 18023

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18023
Log:
* 02_panel_logout.patch: revert the logout code to the version 
  without the gnome-session 2.24 requirement.
* 03_switch-user_lock.patch, 04_gnome-panel-logout.patch: re-add the 
  two patches that we applied on top of this old code. Update the 
  latter to other code changes.
* 70_relibtoolize.patch: regenerated.

Added:
    desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch
    desktop/experimental/gnome-panel/debian/patches/03_switch-user_lock.patch
    desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/control
    desktop/experimental/gnome-panel/debian/control.in
    desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch
    desktop/experimental/gnome-panel/debian/patches/series

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=18023&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Sun Dec 28 01:54:06 2008
@@ -2,10 +2,14 @@
 
   * Recommend gnome-icon-theme 2.24.
   * Bump gnome-menus dependency to match the build-dependency.
-  * Break gnome-session < 2.24 since logout doesn’t work if gnome-panel 
-    is upgraded alone.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 27 Dec 2008 00:33:08 +0100
+  * 02_panel_logout.patch: revert the logout code to the version 
+    without the gnome-session 2.24 requirement.
+  * 03_switch-user_lock.patch, 04_gnome-panel-logout.patch: re-add the 
+    two patches that we applied on top of this old code. Update the 
+    latter to other code changes.
+  * 70_relibtoolize.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 27 Dec 2008 18:32:32 +0100
 
 gnome-panel (2.24.2-2) experimental; urgency=low
 

Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=18023&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control (original)
+++ desktop/experimental/gnome-panel/debian/control Sun Dec 28 01:54:06 2008
@@ -63,7 +63,6 @@
           gnome-terminal | x-terminal-emulator,
           gnome-system-tools,
           nautilus
-Breaks: gnome-session (<< 2.24)
 Description: launcher and docking facility for GNOME
  The GNOME Panel is an essential part of the GNOME Desktop, providing
  toolbar-like “panels” which can be attached to the sides of your desktop.

Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=18023&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in (original)
+++ desktop/experimental/gnome-panel/debian/control.in Sun Dec 28 01:54:06 2008
@@ -63,7 +63,6 @@
           gnome-terminal | x-terminal-emulator,
           gnome-system-tools,
           nautilus
-Breaks: gnome-session (<< 2.24)
 Description: launcher and docking facility for GNOME
  The GNOME Panel is an essential part of the GNOME Desktop, providing
  toolbar-like “panels” which can be attached to the sides of your desktop.

Added: desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch?rev=18023&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/02_panel_logout.patch Sun Dec 28 01:54:06 2008
@@ -1,0 +1,1161 @@
+Revert large parts of upstream commit r11134 to get back the logout 
+window without gnome-session 2.24.
+
+Index: gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.am
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/libpanel-util/Makefile.am	2008-11-25 14:02:14.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.am	2008-12-27 18:25:43.843539891 +0100
+@@ -32,8 +32,6 @@ libpanel_util_la_SOURCES=	\
+ 	panel-keyfile.h			\
+ 	panel-power-manager.c		\
+ 	panel-power-manager.h		\
+-	panel-session-manager.c		\
+-	panel-session-manager.h		\
+ 	panel-show.c			\
+ 	panel-show.h			\
+ 	$(NULL)
+Index: gnome-panel-2.24.2/gnome-panel/panel-gdm.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-panel-2.24.2/gnome-panel/panel-gdm.c	2008-12-27 18:24:39.127983584 +0100
+@@ -0,0 +1,417 @@
++/*
++ * gdm-protocol.c: GDM logout action protocol implementation
++ *
++ * Copyright (C) 2005 Raffaele Sandrini
++ * Copyright (C) 2005 Red Hat, Inc.
++ * Copyright (C) 2002, 2003 George Lebl
++ * Copyright (C) 2001 Queen of England, 
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ *      Raffaele Sandrini <rasa at gmx.ch>
++ *      George Lebl <jirka at 5z.com>
++ *      Mark McLoughlin <mark at skynet.ie>
++ */
++
++#include <config.h>
++
++#include "panel-gdm.h"
++
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <time.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++
++#include <X11/Xauth.h>
++#include <gdk/gdk.h>
++
++#define GDM_PROTOCOL_UPDATE_INTERVAL 1 /* seconds */
++
++#define GDM_PROTOCOL_SOCKET_PATH "/var/run/gdm_socket"
++
++#define GDM_PROTOCOL_MSG_CLOSE         "CLOSE"
++#define GDM_PROTOCOL_MSG_VERSION       "VERSION"
++#define GDM_PROTOCOL_MSG_AUTHENTICATE  "AUTH_LOCAL"
++#define GDM_PROTOCOL_MSG_QUERY_ACTION  "QUERY_LOGOUT_ACTION"
++#define GDM_PROTOCOL_MSG_SET_ACTION    "SET_SAFE_LOGOUT_ACTION"
++#define GDM_PROTOCOL_MSG_FLEXI_XSERVER "FLEXI_XSERVER"
++
++#define GDM_ACTION_STR_NONE     "NONE"
++#define GDM_ACTION_STR_SHUTDOWN "HALT"
++#define GDM_ACTION_STR_REBOOT   "REBOOT"
++#define GDM_ACTION_STR_SUSPEND  "SUSPEND"
++
++typedef struct {
++        int fd;
++	char *auth_cookie;
++
++        GdmLogoutAction available_actions;
++        GdmLogoutAction current_actions;
++
++        time_t last_update;
++} GdmProtocolData;
++
++static GdmProtocolData gdm_protocol_data = {
++        0,
++        NULL,
++        GDM_LOGOUT_ACTION_NONE,
++        GDM_LOGOUT_ACTION_NONE,
++        0
++};
++
++static char *
++gdm_send_protocol_msg (GdmProtocolData *data,
++                       const char      *msg)
++{
++        GString *retval;
++        char     buf[256];
++        char    *p;
++        int      len;
++
++        p = g_strconcat (msg, "\n", NULL);
++        if (write (data->fd, p, strlen (p)) < 0) {
++                g_free (p);
++
++                g_warning ("Failed to send message to GDM: %s",
++                           g_strerror (errno));
++                return NULL;
++        }
++        g_free (p);             
++
++        p = NULL;
++        retval = NULL;
++        while ((len = read (data->fd, buf, sizeof (buf) - 1)) > 0) {
++                buf[len] = '\0';
++
++                if (!retval)
++                        retval = g_string_new (buf);
++                else
++                        retval = g_string_append (retval, buf);
++
++                if ((p = strchr (retval->str, '\n')))
++                        break;
++        }
++
++        if (p) *p = '\0';
++        
++        return retval ? g_string_free (retval, FALSE) : NULL;
++}
++
++static char *
++get_display_number (void)
++{
++        const char *display_name;
++        char       *retval;
++        char       *p;
++                
++        display_name = gdk_display_get_name (gdk_display_get_default ());
++
++        p = strchr (display_name, ':');
++        if (!p)
++                return g_strdup ("0");
++
++        while (*p == ':') p++;
++
++        retval = g_strdup (p);
++
++        p = strchr (retval, '.');
++        if (p != NULL)
++                *p = '\0';
++
++        return retval;
++}
++
++static gboolean
++gdm_authenticate_connection (GdmProtocolData *data)
++{
++#define GDM_MIT_MAGIC_COOKIE_LEN 16
++
++        const char *xau_path;
++        FILE       *f;
++        Xauth      *xau;
++        char       *display_number;
++        gboolean    retval;
++
++        if (data->auth_cookie) {
++                char *msg;
++                char *response;
++
++                msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s",
++                                       data->auth_cookie);
++                response = gdm_send_protocol_msg (data, msg);
++                g_free (msg);
++ 
++                if (response && !strcmp (response, "OK")) {
++                        g_free (response);
++                        return TRUE;
++                } else {
++                        g_free (response);
++                        g_free (data->auth_cookie);
++                        data->auth_cookie = NULL;
++                }
++        }
++
++        if (!(xau_path = XauFileName ()))
++                return FALSE;
++
++        if (!(f = fopen (xau_path, "r")))
++                return FALSE;
++
++        retval = FALSE;
++        display_number = get_display_number ();
++
++        while ((xau = XauReadAuth (f))) {
++                char  buffer[40]; /* 2*16 == 32, so 40 is enough */
++                char *msg;
++                char *response;
++                int   i;
++
++                if (xau->family != FamilyLocal ||
++                    strncmp (xau->number, display_number, xau->number_length) ||
++                    strncmp (xau->name, "MIT-MAGIC-COOKIE-1", xau->name_length) ||
++                    xau->data_length != GDM_MIT_MAGIC_COOKIE_LEN) {
++                        XauDisposeAuth (xau);
++                        continue;
++                }
++                
++                for (i = 0; i < GDM_MIT_MAGIC_COOKIE_LEN; i++)
++                        g_snprintf (buffer + 2*i, 3, "%02x", (guint)(guchar)xau->data[i]);
++                
++                XauDisposeAuth (xau);
++                
++                msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer);
++                response = gdm_send_protocol_msg (data, msg);
++                g_free (msg);
++ 
++                if (response && !strcmp (response, "OK")) {
++			data->auth_cookie = g_strdup (buffer);
++                        g_free (response);
++                        retval = TRUE;
++                        break;
++                }
++
++                g_free (response);
++        }
++
++        g_free (display_number);
++        
++        fclose (f);
++
++        return retval;
++
++#undef GDM_MIT_MAGIC_COOKIE_LEN
++}
++
++static void
++gdm_shutdown_protocol_connection (GdmProtocolData *data)
++{
++        if (data->fd)
++                close (data->fd);
++        data->fd = 0;
++}
++
++static gboolean
++gdm_init_protocol_connection (GdmProtocolData *data)
++{
++        struct sockaddr_un  addr;
++        char               *response;
++
++        g_assert (data->fd <= 0);
++
++        data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
++        if (data->fd < 0) {
++                g_warning ("Failed to create GDM socket: %s",
++                           g_strerror (errno));
++		gdm_shutdown_protocol_connection (data);
++                return FALSE;
++        }
++	
++	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
++	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
++	else
++	  strcpy (addr.sun_path, "/tmp/.gdm_socket");
++        
++	addr.sun_family = AF_UNIX;
++
++        if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
++                g_warning ("Failed to establish a connection with GDM: %s",
++                           g_strerror (errno));
++		gdm_shutdown_protocol_connection (data);
++                return FALSE;
++        }
++
++        response = gdm_send_protocol_msg (data, GDM_PROTOCOL_MSG_VERSION);
++        if (!response || strncmp (response, "GDM ", strlen ("GDM ") != 0)) {
++                g_free (response);
++
++                g_warning ("Failed to get protocol version from GDM");
++		gdm_shutdown_protocol_connection (data);
++
++                return FALSE;
++        }
++	g_free (response);
++
++        if (!gdm_authenticate_connection (data)) {
++                g_warning ("Failed to authenticate with GDM");
++		gdm_shutdown_protocol_connection (data);
++                return FALSE;
++        }
++
++        return TRUE;
++}
++
++static void
++gdm_parse_query_response (GdmProtocolData *data,
++                          const char      *response)
++{
++        char **actions;
++        int    i;
++
++        data->available_actions = GDM_LOGOUT_ACTION_NONE;
++        data->current_actions   = GDM_LOGOUT_ACTION_NONE;
++          
++        if (strncmp (response, "OK ", 3) != 0)
++                return;
++
++        response += 3;
++
++        actions = g_strsplit (response, ";", -1);
++        for (i = 0; actions[i]; i++) {
++                GdmLogoutAction  action = GDM_LOGOUT_ACTION_NONE;
++                gboolean         selected = FALSE;
++                char            *str = actions [i];
++                int              len;
++
++                len = strlen (str);
++                if (!len)
++                        continue;
++
++                if (str[len - 1] == '!') {
++                        selected = TRUE;
++                        str[len - 1] = '\0';
++                }
++
++                if (!strcmp (str, GDM_ACTION_STR_SHUTDOWN))
++                        action = GDM_LOGOUT_ACTION_SHUTDOWN;
++                else if (!strcmp (str, GDM_ACTION_STR_REBOOT))
++                        action = GDM_LOGOUT_ACTION_REBOOT;
++                else if (!strcmp (str, GDM_ACTION_STR_SUSPEND))
++                        action = GDM_LOGOUT_ACTION_SUSPEND;
++
++                data->available_actions |= action;
++                if (selected)
++                        data->current_actions |= action;
++        }
++
++        g_strfreev (actions);
++}
++
++static void
++gdm_update_logout_actions (GdmProtocolData *data)
++{
++        time_t  current_time;
++        char   *response;
++        
++        current_time = time (NULL);
++        if (current_time <= (data->last_update + GDM_PROTOCOL_UPDATE_INTERVAL))
++                return;
++        
++        data->last_update = current_time;
++                
++        if (!gdm_init_protocol_connection (data))
++                return;
++        
++        if ((response = gdm_send_protocol_msg (data, GDM_PROTOCOL_MSG_QUERY_ACTION))) {
++                gdm_parse_query_response (data, response);
++                g_free (response);
++        }
++
++        gdm_shutdown_protocol_connection (data);
++}
++
++gboolean
++gdm_supports_logout_action (GdmLogoutAction action)
++{
++        gdm_update_logout_actions (&gdm_protocol_data);
++
++        return (gdm_protocol_data.available_actions & action) != 0;
++}
++
++GdmLogoutAction
++gdm_get_logout_action (void)
++{
++        gdm_update_logout_actions (&gdm_protocol_data);
++        
++        return gdm_protocol_data.current_actions;
++}
++
++void
++gdm_set_logout_action (GdmLogoutAction action)
++{
++	char *action_str = NULL;
++        char *msg;
++        char *response;
++
++        if (!gdm_init_protocol_connection (&gdm_protocol_data))
++                return;
++
++        switch (action) {
++        case GDM_LOGOUT_ACTION_NONE:
++                action_str = GDM_ACTION_STR_NONE;
++                break;
++        case GDM_LOGOUT_ACTION_SHUTDOWN:
++                action_str = GDM_ACTION_STR_SHUTDOWN;
++                break;
++        case GDM_LOGOUT_ACTION_REBOOT:
++                action_str = GDM_ACTION_STR_REBOOT;
++                break;
++        case GDM_LOGOUT_ACTION_SUSPEND:
++                action_str = GDM_ACTION_STR_SUSPEND;
++                break;
++        }
++
++        msg = g_strdup_printf (GDM_PROTOCOL_MSG_SET_ACTION " %s", action_str);
++
++        response = gdm_send_protocol_msg (&gdm_protocol_data, msg);
++        
++        g_free (msg);
++        g_free (response);
++
++	gdm_protocol_data.last_update = 0;
++
++        gdm_shutdown_protocol_connection (&gdm_protocol_data);
++}
++
++void
++gdm_new_login (void)
++{
++        char *response;
++
++        if (!gdm_init_protocol_connection (&gdm_protocol_data))
++                return;
++
++        response = gdm_send_protocol_msg (&gdm_protocol_data,
++					  GDM_PROTOCOL_MSG_FLEXI_XSERVER);
++
++        g_free (response);
++
++	gdm_protocol_data.last_update = 0;
++
++        gdm_shutdown_protocol_connection (&gdm_protocol_data);
++}
+Index: gnome-panel-2.24.2/gnome-panel/panel-logout.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-panel-2.24.2/gnome-panel/panel-logout.c	2008-12-27 18:24:39.135986207 +0100
+@@ -0,0 +1,402 @@
++/*
++ * panel-logout.c:
++ *
++ * Copyright (C) 2006 Vincent Untz
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ *	Vincent Untz <vuntz at gnome.org>
++ */
++
++
++#include <config.h>
++
++#include <string.h>
++
++#include <glib/gi18n.h>
++#include <gtk/gtkimage.h>
++#include <gtk/gtklabel.h>
++#include <gtk/gtkstock.h>
++
++#include <libpanel-util/panel-power-manager.h>
++
++#include "panel-logout.h"
++#include "panel-gdm.h"
++#include "panel-session.h"
++#include "panel-icon-names.h"
++
++#define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
++
++#define AUTOMATIC_ACTION_TIMEOUT 60
++
++enum {
++	PANEL_LOGOUT_RESPONSE_LOGOUT,
++	PANEL_LOGOUT_RESPONSE_SWITCH_USER,
++	PANEL_LOGOUT_RESPONSE_SHUTDOWN,
++	PANEL_LOGOUT_RESPONSE_REBOOT,
++	PANEL_LOGOUT_RESPONSE_STD,
++	PANEL_LOGOUT_RESPONSE_STR
++};
++
++struct _PanelLogoutDialogPrivate {
++	PanelLogoutDialogType type;
++
++	PanelPowerManager    *power_manager;
++
++	int                   timeout;
++	unsigned int          timeout_id;
++
++	unsigned int          default_response;
++};
++
++static PanelLogoutDialog *current_dialog = NULL;
++
++static void panel_logout_destroy (PanelLogoutDialog *logout_dialog,
++				  gpointer           data);
++static void panel_logout_response (PanelLogoutDialog *logout_dialog,
++				   guint              response_id,
++				   gpointer           data);
++
++enum {
++  PROP_0,
++  PROP_MESSAGE_TYPE
++};
++G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
++
++static void 
++panel_logout_set_property (GObject      *object,
++			   guint         prop_id,
++			   const GValue *value,
++			   GParamSpec   *pspec)
++{
++	switch (prop_id) {
++	case PROP_MESSAGE_TYPE:
++		break;
++	default:
++		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++		break;
++	}
++}
++
++static void 
++panel_logout_get_property (GObject     *object,
++			   guint        prop_id,
++			   GValue      *value,
++			   GParamSpec  *pspec)
++{
++	switch (prop_id) {
++	case PROP_MESSAGE_TYPE:
++		g_value_set_enum (value, GTK_MESSAGE_WARNING);
++		break;
++	default:
++		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++		break;
++	}
++}
++
++static void
++panel_logout_class_init (PanelLogoutDialogClass *klass)
++{
++	GObjectClass *gobject_class;
++
++	gobject_class = G_OBJECT_CLASS (klass);
++
++	/* This is a workaround to avoid a stupid crash: libgnomeui
++	 * listens for the "show" signal on all GtkMessageDialog and
++	 * gets the "message-type" of the dialogs. We will crash when
++	 * it accesses this property if we don't override it since we
++	 * didn't define it. */
++	gobject_class->set_property = panel_logout_set_property;
++	gobject_class->get_property = panel_logout_get_property;
++
++	g_object_class_override_property (gobject_class,
++					  PROP_MESSAGE_TYPE,
++					  "message-type");
++
++	g_type_class_add_private (klass, sizeof (PanelLogoutDialogPrivate));
++}
++
++static void
++panel_logout_init (PanelLogoutDialog *logout_dialog)
++{
++	logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
++
++	logout_dialog->priv->timeout_id = 0;
++	logout_dialog->priv->timeout    = 0;
++	logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
++
++	/* FIXME: we should most probably use gtk_window_set_transient_for(PANEL) */
++	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
++	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
++	gtk_window_stick (GTK_WINDOW (logout_dialog));
++	gtk_window_set_position (GTK_WINDOW (logout_dialog),
++				 GTK_WIN_POS_CENTER_ALWAYS);
++
++	logout_dialog->priv->power_manager = panel_power_manager_get ();
++
++	g_signal_connect (logout_dialog, "destroy",
++			  G_CALLBACK (panel_logout_destroy), NULL);
++	g_signal_connect (logout_dialog, "response",
++			  G_CALLBACK (panel_logout_response), NULL);
++}
++
++static void
++panel_logout_destroy (PanelLogoutDialog *logout_dialog,
++		      gpointer           data)
++{
++	if (logout_dialog->priv->timeout_id != 0)
++		g_source_remove (logout_dialog->priv->timeout_id);
++	logout_dialog->priv->timeout_id = 0;
++
++	g_object_unref (logout_dialog->priv->power_manager);
++	logout_dialog->priv->power_manager = NULL;
++
++	current_dialog = NULL;
++}
++
++static void
++panel_logout_response (PanelLogoutDialog *logout_dialog,
++		       guint      response_id,
++		       gpointer   data)
++{
++	PanelPowerManager *power_manager;
++
++	power_manager = g_object_ref (logout_dialog->priv->power_manager);
++	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
++
++	switch (response_id) {
++	case GTK_RESPONSE_CANCEL:
++		break;
++	case PANEL_LOGOUT_RESPONSE_LOGOUT:
++		gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++		panel_session_request_logout ();
++		break;
++	case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
++		gdm_new_login ();
++		break;
++	case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
++		gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++		panel_session_request_logout ();
++		break;
++	case PANEL_LOGOUT_RESPONSE_REBOOT:
++		gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++		panel_session_request_logout ();
++		break;
++	case PANEL_LOGOUT_RESPONSE_STD:
++		if (panel_power_manager_can_hibernate (power_manager))
++			panel_power_manager_attempt_hibernate (power_manager);
++		break;
++	case PANEL_LOGOUT_RESPONSE_STR:
++		if (panel_power_manager_can_suspend (power_manager))
++			panel_power_manager_attempt_suspend (power_manager);
++		break;
++	case GTK_RESPONSE_NONE:
++	case GTK_RESPONSE_DELETE_EVENT:
++		break;
++	default:
++		g_assert_not_reached ();
++	}
++	g_object_unref (power_manager);
++}
++
++static gboolean
++panel_logout_timeout (gpointer data)
++{
++	PanelLogoutDialog *logout_dialog;
++	char              *secondary_text;
++	char              *name;
++	int                seconds_to_show;
++
++	logout_dialog = (PanelLogoutDialog *) data;
++
++	if (!logout_dialog->priv->timeout) {
++		gtk_dialog_response (GTK_DIALOG (logout_dialog),
++				     logout_dialog->priv->default_response);
++
++		return FALSE;
++	}
++
++	if (logout_dialog->priv->timeout <= 30)
++		seconds_to_show = logout_dialog->priv->timeout;
++	else {
++		seconds_to_show = (logout_dialog->priv->timeout/10) * 10;
++		if (logout_dialog->priv->timeout % 10)
++			seconds_to_show += 10;
++	}
++
++	switch (logout_dialog->priv->type) {
++	case PANEL_LOGOUT_DIALOG_LOGOUT:
++		secondary_text = ngettext ("You are currently logged in as "
++					   "\"%s\".\n"
++					   "You will be automatically logged "
++					   "out in %d second.",
++					   "You are currently logged in as "
++					   "\"%s\".\n"
++					   "You will be automatically logged "
++					   "out in %d seconds.",
++					   seconds_to_show);
++		break;
++	case PANEL_LOGOUT_DIALOG_SHUTDOWN:
++		secondary_text = ngettext ("You are currently logged in as "
++					   "\"%s\".\n"
++					   "This system will be automatically "
++					   "shut down in %d second.",
++					   "You are currently logged in as "
++					   "\"%s\".\n"
++					   "This system will be automatically "
++					   "shut down in %d seconds.",
++					   seconds_to_show);
++		break;
++	default:
++		g_assert_not_reached ();
++	}
++
++	name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
++	if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0)
++		name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL);
++
++	if (!name)
++		name = g_strdup (g_get_user_name ());
++
++	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog),
++						  secondary_text,
++						  name,
++						  seconds_to_show,
++						  NULL);
++
++	logout_dialog->priv->timeout--;
++
++	g_free (name);
++
++	return TRUE;
++}
++
++static void
++panel_logout_set_timeout (PanelLogoutDialog *logout_dialog)
++{
++	logout_dialog->priv->timeout = AUTOMATIC_ACTION_TIMEOUT;
++
++	/* Sets the secondary text */
++	panel_logout_timeout (logout_dialog);
++
++	if (logout_dialog->priv->timeout_id != 0)
++		g_source_remove (logout_dialog->priv->timeout_id);
++
++	logout_dialog->priv->timeout_id = g_timeout_add (1000,
++							 panel_logout_timeout,
++							 logout_dialog);
++}
++
++void
++panel_logout_new (PanelLogoutDialogType  type,
++		  GdkScreen             *screen,
++		  guint32                activate_time)
++{
++	PanelLogoutDialog *logout_dialog;
++	char              *icon_name;
++	char              *primary_text;
++
++	if (current_dialog != NULL) {
++		if (current_dialog->priv->type == type) {
++			gtk_window_set_screen (GTK_WINDOW (current_dialog),
++					       screen);
++			gtk_window_present_with_time (GTK_WINDOW (current_dialog),
++						      activate_time);
++			panel_logout_set_timeout (current_dialog);
++			//FIXME center the dialog on screen, and reset sticky and above_all?
++			return;
++		} else {
++			gtk_widget_destroy (GTK_WIDGET (current_dialog));
++		}
++	}
++
++	logout_dialog = g_object_new (PANEL_TYPE_LOGOUT_DIALOG, NULL);
++	current_dialog = logout_dialog;
++
++	gtk_window_set_title (GTK_WINDOW (logout_dialog), "");
++
++	logout_dialog->priv->type = type;
++
++	icon_name    = NULL;
++	primary_text = NULL;
++
++	switch (type) {
++	case PANEL_LOGOUT_DIALOG_LOGOUT:
++		icon_name      = PANEL_ICON_LOGOUT;
++		primary_text   = _("Log out of this system now?");
++		// FIXME need to verify that this response can be used
++		logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
++
++		//FIXME is gdm running?
++		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++				       _("_Switch User"),
++				       PANEL_LOGOUT_RESPONSE_SWITCH_USER);
++		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++				       GTK_STOCK_CANCEL,
++				       GTK_RESPONSE_CANCEL);
++		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++				       _("_Log Out"),
++				       PANEL_LOGOUT_RESPONSE_LOGOUT);
++		break;
++	case PANEL_LOGOUT_DIALOG_SHUTDOWN:
++		icon_name      = PANEL_ICON_SHUTDOWN;
++		primary_text   = _("Shut down this system now?");
++
++		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
++		if (panel_power_manager_can_suspend (logout_dialog->priv->power_manager))
++			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++					       _("S_uspend"),
++					       PANEL_LOGOUT_RESPONSE_STR);
++
++		if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager))
++			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++					       _("_Hibernate"),
++					       PANEL_LOGOUT_RESPONSE_STD);
++
++		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
++			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++					       _("_Restart"),
++					       PANEL_LOGOUT_RESPONSE_REBOOT);
++
++		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++				       GTK_STOCK_CANCEL,
++				       GTK_RESPONSE_CANCEL);
++
++		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
++			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++					       _("_Shut Down"),
++					       PANEL_LOGOUT_RESPONSE_SHUTDOWN);
++		break;
++	default:
++		g_assert_not_reached ();
++	}
++
++	gtk_image_set_from_icon_name (GTK_IMAGE (GTK_MESSAGE_DIALOG (logout_dialog)->image),
++				      icon_name, GTK_ICON_SIZE_DIALOG);
++
++	gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label),
++			    primary_text);
++
++	gtk_dialog_set_default_response (GTK_DIALOG (logout_dialog),
++					 logout_dialog->priv->default_response);
++
++	panel_logout_set_timeout (logout_dialog);
++
++	gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
++	gtk_widget_show (GTK_WIDGET (logout_dialog));
++	gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
++}
+Index: gnome-panel-2.24.2/gnome-panel/ChangeLog
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/ChangeLog	2008-11-25 14:02:15.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/ChangeLog	2008-12-27 18:24:39.147985986 +0100
+@@ -269,30 +269,6 @@
+ 
+ 2008-06-06  Vincent Untz  <vuntz at gnome.org>
+ 
+-	Use the gnome-session DBus API to log out/shut down. The dialog is also
+-	displayed by gnome-session.
+-	Fix bug #507391
+-
+-	* Makefile.am: remove files
+-	* panel-gdm.[ch]: killed, not used anymore
+-	* panel-logout.[ch]: killed, not used anymore
+-	* panel-session.[ch]: remove panel_session_request_logout()
+-	* libpanel-util/Makefile.am: add new files
+-	* libpanel-util/panel-session-manager.[ch]: new, object to interact
+-	with the session manager
+-	* panel-action-button.c: (panel_action_logout): use PanelSessionManager
+-	API
+-	(panel_action_shutdown): ditto
+-	(panel_action_shutdown_reboot_is_disabled): updated, with a comment
+-	about a regression
+-	* libpanel-util/panel-power-manager.c: remove useless includes
+-	(panel_power_manager_can_suspend): add g_return_val_if_fail
+-	(panel_power_manager_can_hibernate): add g_return_val_if_fail
+-	(panel_power_manager_attempt_suspend): add g_return_if_fail
+-	(panel_power_manager_attempt_hibernate): add g_return_if_fail
+-
+-2008-06-06  Vincent Untz  <vuntz at gnome.org>
+-
+ 	* Makefile.am:
+ 	* libpanel-util/Makefile.am:
+ 	* panel-power-manager.[ch]: move PanelPowerManager to libpanel-util
+Index: gnome-panel-2.24.2/gnome-panel/panel-gdm.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-panel-2.24.2/gnome-panel/panel-gdm.h	2008-12-27 18:24:39.171984078 +0100
+@@ -0,0 +1,52 @@
++/*
++ * gdm-logout-action.h: GDM logout action protocol implementation
++ *
++ * Copyright (C) 2005 Raffaele Sandrini
++ * Copyright (C) 2005 Red Hat, Inc.
++ * Copyright (C) 2002, 2003 George Lebl
++ * Copyright (C) 2001 Queen of England, 
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ *      Raffaele Sandrini <rasa at gmx.ch>
++ *      George Lebl <jirka at 5z.com>
++ *      Mark McLoughlin <mark at skynet.ie>
++ */
++
++#ifndef __GDM_LOGOUT_ACTION_H__
++#define __GDM_LOGOUT_ACTION_H__
++
++#include <glib.h>
++
++G_BEGIN_DECLS
++
++typedef enum {
++        GDM_LOGOUT_ACTION_NONE     = 0,
++        GDM_LOGOUT_ACTION_SHUTDOWN = 1 << 0,
++        GDM_LOGOUT_ACTION_REBOOT   = 1 << 1,
++        GDM_LOGOUT_ACTION_SUSPEND  = 1 << 2
++} GdmLogoutAction;
++
++gboolean gdm_supports_logout_action (GdmLogoutAction action);
++
++void            gdm_set_logout_action (GdmLogoutAction action);
++GdmLogoutAction gdm_get_logout_action (void);
++void            gdm_new_login         (void);
++
++G_END_DECLS
++
++#endif /* __GDM_LOGOUT_ACTION_H__ */
+Index: gnome-panel-2.24.2/gnome-panel/panel-logout.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-panel-2.24.2/gnome-panel/panel-logout.h	2008-12-27 18:24:39.171984078 +0100
+@@ -0,0 +1,66 @@
++/*
++ * panel-logout.h:
++ *
++ * Copyright (C) 2006 Vincent Untz
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ *	Vincent Untz <vuntz at gnome.org>
++ */
++
++#ifndef PANEL_LOGOUT_H
++#define PANEL_LOGOUT_H
++
++#include "gtk/gtkmessagedialog.h"
++
++G_BEGIN_DECLS
++
++typedef enum {
++	PANEL_LOGOUT_DIALOG_LOGOUT,
++	PANEL_LOGOUT_DIALOG_SHUTDOWN
++} PanelLogoutDialogType;
++
++#define PANEL_TYPE_LOGOUT_DIALOG         (panel_logout_get_type ())
++#define PANEL_LOGOUT_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialog))
++#define PANEL_LOGOUT_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogClass))
++#define PANEL_IS_LOGOUT_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_TYPE_LOGOUT_DIALOG))
++#define PANEL_IS_LOGOUT_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), PANEL_TYPE_LOGOUT_DIALOG))
++#define PANEL_LOGOUT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogClass))
++
++typedef struct _PanelLogoutDialog        PanelLogoutDialog;
++typedef struct _PanelLogoutDialogClass   PanelLogoutDialogClass;
++typedef struct _PanelLogoutDialogPrivate PanelLogoutDialogPrivate;
++
++struct _PanelLogoutDialog {
++	GtkMessageDialog          parent;
++
++	PanelLogoutDialogPrivate *priv;
++};
++
++struct _PanelLogoutDialogClass {
++	GtkMessageDialogClass   parent_class;
++};
++
++GType  panel_logout_get_type          (void) G_GNUC_CONST;	
++
++void panel_logout_new (PanelLogoutDialogType  type,
++		       GdkScreen             *screen,
++		       guint32                activate_time);
++
++G_END_DECLS
++
++#endif /* PANEL_LOGOUT_H */
+Index: gnome-panel-2.24.2/gnome-panel/panel-session.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-session.c	2008-11-25 14:02:15.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-session.c	2008-12-27 18:24:39.175995412 +0100
+@@ -32,6 +32,34 @@
+ #include "panel-profile.h"
+ #include "panel-shell.h"
+ 
++void
++panel_session_request_logout (void)
++{
++	GnomeClient *client;
++	static int   recursion_guard = 0;
++
++	if (recursion_guard)
++		return;
++
++	recursion_guard++;
++
++	if (!(client = gnome_master_client ()))
++		return;
++
++	/* Only request a Global save. We only want a Local
++	 * save if the user selects 'Save current setup'
++	 * from the dialog.
++	 */
++	gnome_client_request_save (client,
++				   GNOME_SAVE_GLOBAL,
++				   TRUE,
++				   GNOME_INTERACT_ANY,
++				   TRUE, /* do not use the gnome-session gui */
++				   TRUE);
++
++	recursion_guard--;
++}
++
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
+Index: gnome-panel-2.24.2/gnome-panel/panel-action-button.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-action-button.c	2008-11-25 14:02:15.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-action-button.c	2008-12-27 18:25:14.815984294 +0100
+@@ -33,7 +33,6 @@
+ #include <glib/gi18n.h>
+ 
+ #include <libpanel-util/panel-error.h>
+-#include <libpanel-util/panel-session-manager.h>
+ 
+ #include "applet.h"
+ #include "panel-config-global.h"
+@@ -47,7 +46,9 @@
+ #include "panel-run-dialog.h"
+ #include "panel-a11y.h"
+ #include "panel-lockdown.h"
++#include "panel-logout.h"
+ #include "panel-compatibility.h"
++#include "panel-gdm.h"
+ #include "panel-icon-names.h"
+ 
+ G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET)
+@@ -156,8 +157,7 @@ panel_action_lock_invoke_menu (PanelActi
+ static void
+ panel_action_logout (GtkWidget *widget)
+ {
+-	PanelSessionManager *manager;
+-	gboolean             not_prompt;
++	gboolean not_prompt;
+ 
+ 	not_prompt = gconf_client_get_bool (panel_gconf_get_client (),
+ 					    LOGOUT_PROMPT_KEY, NULL);
+@@ -165,40 +165,28 @@ panel_action_logout (GtkWidget *widget)
+ 	 * safer */
+ 	not_prompt = !not_prompt;
+ 
+-	manager = panel_session_manager_get ();
+-
+ 	if (not_prompt)
+-		panel_session_manager_request_logout (manager,
+-						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NO_CONFIRMATION);
++		panel_session_request_logout ();
+ 	else
+-		/* FIXME: we need to use widget to get the screen for the
+-		 * confirmation dialog, see
+-		 * http://bugzilla.gnome.org/show_bug.cgi?id=536914 */
+-		panel_session_manager_request_logout (manager,
+-						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
++		panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT,
++				  gtk_widget_get_screen (widget),
++				  gtk_get_current_event_time ());
+ }
+ 
+ static void
+ panel_action_shutdown (GtkWidget *widget)
+ {
+-	PanelSessionManager *manager;
+-
+-	manager = panel_session_manager_get ();
+-	panel_session_manager_request_shutdown (manager);
++	panel_logout_new (PANEL_LOGOUT_DIALOG_SHUTDOWN,
++			  gtk_widget_get_screen (widget),
++			  gtk_get_current_event_time ());
+ }
+ 
+ static gboolean
+ panel_action_shutdown_reboot_is_disabled (void)
+ {
+-	return panel_lockdown_get_disable_log_out();
+-#if 0
+-	/* FIXME: waiting for a gnome-session dbus api to know if
+-	 * shutdown/reboot is possible:
+-	 * http://bugzilla.gnome.org/show_bug.cgi?id=536915 */
+ 	return (panel_lockdown_get_disable_log_out() ||
+ 	(!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
+ 	 !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
+-#endif
+ }
+ 
+ /* Run Application
+Index: gnome-panel-2.24.2/gnome-panel/panel-session.h
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-session.h	2008-11-25 14:02:15.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-session.h	2008-12-27 18:24:39.183983368 +0100
+@@ -29,6 +29,7 @@ G_BEGIN_DECLS
+ 
+ void panel_session_init           (void);
+ void panel_session_do_not_restart (void);
++void panel_session_request_logout (void);
+ 
+ G_END_DECLS
+ 
+Index: gnome-panel-2.24.2/gnome-panel/Makefile.am
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/Makefile.am	2008-11-25 14:02:15.000000000 +0100
++++ gnome-panel-2.24.2/gnome-panel/Makefile.am	2008-12-27 18:24:39.183983368 +0100
+@@ -97,6 +97,8 @@ panel_sources =			\
+ 	panel-force-quit.c	\
+ 	panel-lockdown.c	\
+ 	panel-addto.c		\
++	panel-logout.c		\
++	panel-gdm.c		\
+ 	panel-ditem-editor.c	\
+ 	$(NULL)
+ 
+@@ -143,6 +145,8 @@ panel_headers =			\
+ 	panel-force-quit.h	\
+ 	panel-lockdown.h	\
+ 	panel-addto.h		\
++	panel-logout.h		\
++	panel-gdm.h		\
+ 	panel-ditem-editor.h	\
+ 	panel-icon-names.h	\
+ 	$(NULL)

Added: desktop/experimental/gnome-panel/debian/patches/03_switch-user_lock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/03_switch-user_lock.patch?rev=18023&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/03_switch-user_lock.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/03_switch-user_lock.patch Sun Dec 28 01:54:06 2008
@@ -1,0 +1,39 @@
+Index: gnome-panel-2.24.2/gnome-panel/panel-logout.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-logout.c	2008-12-27 18:24:39.135986207 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-logout.c	2008-12-27 18:30:00.279486499 +0100
+@@ -38,6 +38,7 @@
+ #include "panel-gdm.h"
+ #include "panel-session.h"
+ #include "panel-icon-names.h"
++#include "panel-util.h"
+ 
+ #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
+ 
+@@ -174,8 +175,10 @@ panel_logout_response (PanelLogoutDialog
+ 		       gpointer   data)
+ {
+ 	PanelPowerManager *power_manager;
++	GdkScreen *screen;
+ 
+ 	power_manager = g_object_ref (logout_dialog->priv->power_manager);
++	screen = g_object_ref (gtk_window_get_screen (GTK_WINDOW (logout_dialog)));
+ 	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+ 
+ 	switch (response_id) {
+@@ -186,6 +189,7 @@ panel_logout_response (PanelLogoutDialog
+ 		panel_session_request_logout ();
+ 		break;
+ 	case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
++		panel_lock_screen (screen);
+ 		gdm_new_login ();
+ 		break;
+ 	case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
+@@ -211,6 +215,7 @@ panel_logout_response (PanelLogoutDialog
+ 		g_assert_not_reached ();
+ 	}
+ 	g_object_unref (power_manager);
++	g_object_unref (screen);
+ }
+ 
+ static gboolean

Added: desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch?rev=18023&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch Sun Dec 28 01:54:06 2008
@@ -1,0 +1,338 @@
+Index: gnome-panel-2.24.2/configure.in
+===================================================================
+--- gnome-panel-2.24.2.orig/configure.in	2008-12-27 18:35:14.175484313 +0100
++++ gnome-panel-2.24.2/configure.in	2008-12-27 18:36:04.859990795 +0100
+@@ -74,6 +74,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+ 
++PKG_CHECK_MODULES(LOGOUT, gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
++AC_SUBST(LOGOUT_CFLAGS)
++AC_SUBST(LOGOUT_LIBS)
++
+ PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
+ AC_SUBST(LIBPANEL_APPLET_CFLAGS)
+ AC_SUBST(LIBPANEL_APPLET_LIBS)
+Index: gnome-panel-2.24.2/gnome-panel/Makefile.am
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/Makefile.am	2008-12-27 18:35:14.131490175 +0100
++++ gnome-panel-2.24.2/gnome-panel/Makefile.am	2008-12-28 02:30:59.471568803 +0100
+@@ -31,6 +31,7 @@ STANDARD_PROPERTIES_CFLAGS = 					\
+ 
+ bin_PROGRAMS = \
+ 	gnome-panel 			\
++	gnome-panel-logout		\
+ 	gnome-desktop-item-edit
+ 
+ $(gnome_panel_OBJECTS): $(BUILT_SOURCES)
+@@ -164,6 +165,23 @@ gnome_panel_LDADD =		\
+ 
+ gnome_panel_LDFLAGS = -export-dynamic
+ 
++gnome_panel_logout_SOURCES =  \
++	gnome-panel-logout.c  \
++	panel-logout.c        \
++	panel-lockdown.c      \
++	panel-gdm.c	      \
++	panel-session.c       \
++	panel-util.c
++
++gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
++
++gnome_panel_logout_LDADD = \
++	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
++	$(LOGOUT_LIBS)	   \
++	$(X_LIBS)
++
++gnome_panel_logout_LDFLAGS = -export-dynamic
++
+ gnome_desktop_item_edit_SOURCES = \
+ 	gnome-desktop-item-edit.c \
+ 	panel-ditem-editor.c	  \
+Index: gnome-panel-2.24.2/gnome-panel/gnome-panel-logout.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-panel-2.24.2/gnome-panel/gnome-panel-logout.c	2008-12-27 18:36:04.859990795 +0100
+@@ -0,0 +1,49 @@
++/* GNOME panel : logout/shutdown request standalone binary
++ *
++ * (C) 2007 Josselin Mouette
++ */
++
++#include <config.h>
++
++#include <glib/gi18n.h>
++#include <libgnomeui/libgnomeui.h>
++
++#include "panel-logout.h"
++
++static gboolean shutdown_requested;
++
++static const GOptionEntry options[] = {
++  { "shutdown", 0, 0, G_OPTION_ARG_NONE, &shutdown_requested, "Request a shutdown or reboot", NULL },
++  { NULL }
++};
++
++int
++main (int argc, char **argv)
++{
++	GOptionContext *context;
++	GnomeProgram   *program;
++
++	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++	textdomain (GETTEXT_PACKAGE);
++
++	context = g_option_context_new ("");
++
++	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
++
++	program = gnome_program_init ("gnome-panel-logout", VERSION,
++				      LIBGNOMEUI_MODULE,
++				      argc, argv,
++				      GNOME_PARAM_GOPTION_CONTEXT, context,
++				      GNOME_PROGRAM_STANDARD_PROPERTIES,
++				      NULL);
++	gnome_client_set_restart_style (gnome_master_client (), GNOME_RESTART_NEVER);
++
++	panel_logout_new (shutdown_requested?PANEL_LOGOUT_DIALOG_SHUTDOWN:PANEL_LOGOUT_DIALOG_LOGOUT,
++			  NULL,
++			  GDK_CURRENT_TIME);
++
++	gtk_main ();
++	g_object_unref (program);
++	return 0;
++}
+Index: gnome-panel-2.24.2/gnome-panel/panel-logout.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-logout.c	2008-12-27 18:36:04.163483906 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-logout.c	2008-12-27 18:36:04.859990795 +0100
+@@ -182,8 +182,6 @@ panel_logout_response (PanelLogoutDialog
+ 	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+ 
+ 	switch (response_id) {
+-	case GTK_RESPONSE_CANCEL:
+-		break;
+ 	case PANEL_LOGOUT_RESPONSE_LOGOUT:
+ 		gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
+ 		panel_session_request_logout ();
+@@ -208,6 +206,7 @@ panel_logout_response (PanelLogoutDialog
+ 		if (panel_power_manager_can_suspend (power_manager))
+ 			panel_power_manager_attempt_suspend (power_manager);
+ 		break;
++	case GTK_RESPONSE_CANCEL:
+ 	case GTK_RESPONSE_NONE:
+ 	case GTK_RESPONSE_DELETE_EVENT:
+ 		break;
+@@ -216,6 +215,9 @@ panel_logout_response (PanelLogoutDialog
+ 	}
+ 	g_object_unref (power_manager);
+ 	g_object_unref (screen);
++#ifdef BUILDING_STANDALONE_LOGOUT
++	gtk_main_quit ();
++#endif
+ }
+ 
+ static gboolean
+@@ -317,8 +319,10 @@ panel_logout_new (PanelLogoutDialogType 
+ 
+ 	if (current_dialog != NULL) {
+ 		if (current_dialog->priv->type == type) {
+-			gtk_window_set_screen (GTK_WINDOW (current_dialog),
+-					       screen);
++			if (screen) {
++				gtk_window_set_screen (GTK_WINDOW (current_dialog),
++						       screen);
++			}
+ 			gtk_window_present_with_time (GTK_WINDOW (current_dialog),
+ 						      activate_time);
+ 			panel_logout_set_timeout (current_dialog);
+@@ -401,7 +405,9 @@ panel_logout_new (PanelLogoutDialogType 
+ 
+ 	panel_logout_set_timeout (logout_dialog);
+ 
+-	gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
++	if (screen) {
++		gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
++	}
+ 	gtk_widget_show (GTK_WIDGET (logout_dialog));
+ 	gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
+ }
+Index: gnome-panel-2.24.2/gnome-panel/panel-session.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-session.c	2008-12-27 18:35:14.027484917 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-session.c	2008-12-27 18:36:04.859990795 +0100
+@@ -29,8 +29,10 @@
+ 
+ #include <stdlib.h>
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ #include "panel-profile.h"
+ #include "panel-shell.h"
++#endif // BUILDING_STANDALONE_LOGOUT
+ 
+ void
+ panel_session_request_logout (void)
+@@ -60,6 +62,7 @@ panel_session_request_logout (void)
+ 	recursion_guard--;
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
+@@ -107,3 +110,4 @@ panel_session_init (void)
+ 	g_signal_connect (client, "die",
+ 			  G_CALLBACK (panel_session_handle_die_request), NULL);
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+Index: gnome-panel-2.24.2/gnome-panel/panel-util.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-util.c	2008-12-27 18:35:13.983482956 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-util.c	2008-12-28 02:36:48.327991058 +0100
+@@ -35,6 +35,7 @@
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-keyfile.h>
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ #include "applet.h"
+ #include "nothing.h"
+ #include "xstuff.h"
+@@ -43,8 +44,11 @@
+ #include "panel-globals.h"
+ #include "launcher.h"
+ #include "panel-icon-names.h"
++#endif /* BUILDING_STANDALONE_LOGOUT */
++
+ #include "panel-lockdown.h"
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ static int
+ panel_ditem_launch (GnomeDesktopItem  *item,
+ 		    GList             *file_list,
+@@ -417,6 +421,7 @@ panel_pop_window_busy (GtkWidget *window
+ 				   GINT_TO_POINTER (busy));
+ 	}
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+ 
+ gboolean
+ panel_is_program_in_path (const char *program)
+@@ -430,6 +435,7 @@ panel_is_program_in_path (const char *pr
+ 	}
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ static gboolean
+ panel_ensure_dir (const char *dirname)
+ {
+@@ -626,6 +632,7 @@ panel_load_icon (GtkIconTheme  *icon_the
+ 
+ 	return retval;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+ 
+ static char *
+ panel_lock_screen_action_get_command (const char *action)
+@@ -665,6 +672,7 @@ panel_lock_screen_action_get_command (co
+ 	return command;
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ gboolean
+ panel_lock_screen_action_available (const char *action)
+ {
+@@ -685,6 +693,7 @@ panel_lock_screen_action_available (cons
+ 
+ 	return enabled;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+ 
+ void
+ panel_lock_screen_action (GdkScreen  *screen,
+@@ -706,6 +715,7 @@ panel_lock_screen_action (GdkScreen  *sc
+ 		return;
+ 
+ 	if (!gdk_spawn_command_line_on_screen (screen, command, &error)) {
++#ifndef BUILDING_STANDALONE_LOGOUT
+ 		char *primary;
+ 
+ 		primary = g_strdup_printf (_("Could not execute '%s'"),
+@@ -714,6 +724,7 @@ panel_lock_screen_action (GdkScreen  *sc
+ 				    "cannot_exec_screensaver", TRUE,
+ 				    primary, error->message);
+ 		g_free (primary);
++#endif // BUILDING_STANDALONE_LOGOUT
+ 		g_error_free (error);
+ 	}
+ 
+@@ -727,6 +738,7 @@ panel_lock_screen (GdkScreen *screen)
+ }
+ 
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ char *
+ panel_make_full_path (const char *dir,
+ 		      const char *filename)
+@@ -1401,3 +1413,4 @@ panel_util_get_file_optional_homedir (co
+ 
+ 	return file;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+Index: gnome-panel-2.24.2/gnome-panel/panel-lockdown.c
+===================================================================
+--- gnome-panel-2.24.2.orig/gnome-panel/panel-lockdown.c	2008-12-28 01:55:34.923986218 +0100
++++ gnome-panel-2.24.2/gnome-panel/panel-lockdown.c	2008-12-28 02:46:53.635982367 +0100
+@@ -26,10 +26,14 @@
+ 
+ #include "panel-lockdown.h"
+ 
++#ifdef BUILDING_STANDALONE_LOGOUT
++#include <gconf/gconf-client.h>
++#else /* BUILDING_STANDALONE_LOGOUT */
+ #include <string.h>
+ #include "panel-gconf.h"
+ 
+ #define N_LISTENERS 6
++#endif /* BUILDING_STANDALONE_LOGOUT */
+ 
+ #define PANEL_GLOBAL_LOCKDOWN_DIR    "/apps/panel/global"
+ #define DESKTOP_GNOME_LOCKDOWN_DIR   "/desktop/gnome/lockdown"
+@@ -40,6 +44,7 @@
+ #define DISABLE_FORCE_QUIT_KEY       PANEL_GLOBAL_LOCKDOWN_DIR  "/disable_force_quit"
+ #define DISABLED_APPLETS_KEY         PANEL_GLOBAL_LOCKDOWN_DIR  "/disabled_applets"
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ typedef struct {
+         guint   initialized : 1;
+ 
+@@ -332,15 +337,24 @@ panel_lockdown_get_disable_command_line 
+ 
+         return panel_lockdown.disable_command_line;
+ }
++#endif /* BUILDING_STANDALONE_LOGOUT */
+ 
+ gboolean
+ panel_lockdown_get_disable_lock_screen (void)
+ {
++#ifdef BUILDING_STANDALONE_LOGOUT
++        GConfClient *client = gconf_client_get_default ();
++        gboolean ret = gconf_client_get_bool (client, DISABLE_LOCK_SCREEN_KEY, NULL);
++        g_object_unref (client);
++        return ret;
++#else /* BUILDING_STANDALONE_LOGOUT */
+         g_assert (panel_lockdown.initialized != FALSE);
+ 
+         return panel_lockdown.disable_lock_screen;
++#endif /* BUILDING_STANDALONE_LOGOUT */
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ gboolean
+ panel_lockdown_get_disable_log_out (void)
+ {
+@@ -440,3 +454,4 @@ panel_lockdown_notify_remove (GCallback 
+ 
+         g_closure_unref (closure);
+ }
++#endif /* BUILDING_STANDALONE_LOGOUT */

Modified: desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch?rev=18023&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch Sun Dec 28 01:54:06 2008
@@ -1,7 +1,14 @@
+libtoolize --force --copy
+aclocal -I m4
+automake -acf
+autoheader
+autoconf
+rm -rf autom4te.cache
+
 Index: gnome-panel-2.24.2/aclocal.m4
 ===================================================================
---- gnome-panel-2.24.2.orig/aclocal.m4	2008-11-25 14:23:51.000000000 +0100
-+++ gnome-panel-2.24.2/aclocal.m4	2008-12-26 18:40:49.523587634 +0100
+--- gnome-panel-2.24.2.orig/aclocal.m4	2008-12-27 18:41:52.911987836 +0100
++++ gnome-panel-2.24.2/aclocal.m4	2008-12-28 02:39:20.123481756 +0100
 @@ -13,4163 +13,3250 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -10961,9 +10968,18 @@
  m4_include([m4/gnome-doc-utils.m4])
 Index: gnome-panel-2.24.2/applets/clock/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/clock/Makefile.in	2008-11-25 14:23:55.000000000 +0100
-+++ gnome-panel-2.24.2/applets/clock/Makefile.in	2008-12-26 18:42:05.959586762 +0100
-@@ -395,7 +395,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/clock/Makefile.in	2008-12-27 18:41:52.859989118 +0100
++++ gnome-panel-2.24.2/applets/clock/Makefile.in	2008-12-28 02:39:35.551481403 +0100
+@@ -293,6 +293,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -395,7 +397,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -10973,9 +10989,18 @@
  SUBDIRS = pixmaps
 Index: gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/clock/pixmaps/Makefile.in	2008-11-25 14:23:55.000000000 +0100
-+++ gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in	2008-12-26 18:42:06.051585396 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/clock/pixmaps/Makefile.in	2008-12-27 18:41:52.815989601 +0100
++++ gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in	2008-12-28 02:39:35.639481414 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -10985,9 +11010,18 @@
  icondir = $(datadir)/gnome-panel/pixmaps
 Index: gnome-panel-2.24.2/applets/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/fish/Makefile.in	2008-11-25 14:23:55.000000000 +0100
-+++ gnome-panel-2.24.2/applets/fish/Makefile.in	2008-12-26 18:42:06.207586438 +0100
-@@ -311,7 +311,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/fish/Makefile.in	2008-12-27 18:41:52.787987020 +0100
++++ gnome-panel-2.24.2/applets/fish/Makefile.in	2008-12-28 02:39:35.791481390 +0100
+@@ -209,6 +209,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -311,7 +313,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -10997,9 +11031,18 @@
  INCLUDES = \
 Index: gnome-panel-2.24.2/applets/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/Makefile.in	2008-11-25 14:23:55.000000000 +0100
-+++ gnome-panel-2.24.2/applets/Makefile.in	2008-12-26 18:42:05.615585918 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/Makefile.in	2008-12-27 18:41:52.763990395 +0100
++++ gnome-panel-2.24.2/applets/Makefile.in	2008-12-28 02:39:35.203480958 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -11009,9 +11052,18 @@
  SUBDIRS = \
 Index: gnome-panel-2.24.2/applets/notification_area/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/notification_area/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/applets/notification_area/Makefile.in	2008-12-26 18:42:06.423586377 +0100
-@@ -333,7 +333,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/notification_area/Makefile.in	2008-12-27 18:41:52.715987855 +0100
++++ gnome-panel-2.24.2/applets/notification_area/Makefile.in	2008-12-28 02:39:35.999481150 +0100
+@@ -231,6 +231,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -333,7 +335,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -11021,9 +11073,18 @@
  INCLUDES = \
 Index: gnome-panel-2.24.2/applets/wncklet/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/applets/wncklet/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/applets/wncklet/Makefile.in	2008-12-26 18:42:06.627586048 +0100
-@@ -321,7 +321,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/applets/wncklet/Makefile.in	2008-12-27 18:41:52.687989185 +0100
++++ gnome-panel-2.24.2/applets/wncklet/Makefile.in	2008-12-28 02:39:36.191482019 +0100
+@@ -219,6 +219,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -321,7 +323,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -11033,8 +11094,8 @@
  INCLUDES = \
 Index: gnome-panel-2.24.2/configure
 ===================================================================
---- gnome-panel-2.24.2.orig/configure	2008-11-25 14:23:54.000000000 +0100
-+++ gnome-panel-2.24.2/configure	2008-12-26 18:40:49.591586709 +0100
+--- gnome-panel-2.24.2.orig/configure	2008-12-27 18:41:52.643985757 +0100
++++ gnome-panel-2.24.2/configure	2008-12-28 02:39:42.123483083 +0100
 @@ -1,11 +1,11 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -11290,7 +11351,16 @@
  mkdir_p
  AWK
  SET_MAKE
-@@ -1016,38 +993,6 @@ REBUILD
+@@ -941,6 +918,8 @@ DISABLE_DEPRECATED_CFLAGS
+ PKG_CONFIG
+ PANEL_CFLAGS
+ PANEL_LIBS
++LOGOUT_CFLAGS
++LOGOUT_LIBS
+ LIBPANEL_APPLET_CFLAGS
+ LIBPANEL_APPLET_LIBS
+ WNCKLET_CFLAGS
+@@ -1016,38 +995,6 @@ REBUILD
  LIBOBJS
  LTLIBOBJS'
  ac_subst_files=''
@@ -11329,7 +11399,16 @@
        ac_precious_vars='build_alias
  host_alias
  target_alias
-@@ -1090,8 +1035,6 @@ XMKMF'
+@@ -1066,6 +1013,8 @@ FFLAGS
+ PKG_CONFIG
+ PANEL_CFLAGS
+ PANEL_LIBS
++LOGOUT_CFLAGS
++LOGOUT_LIBS
+ LIBPANEL_APPLET_CFLAGS
+ LIBPANEL_APPLET_LIBS
+ WNCKLET_CFLAGS
+@@ -1090,8 +1039,6 @@ XMKMF'
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
@@ -11338,7 +11417,7 @@
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -1190,21 +1133,13 @@ do
+@@ -1190,21 +1137,13 @@ do
      datarootdir=$ac_optarg ;;
  
    -disable-* | --disable-*)
@@ -11365,7 +11444,7 @@
  
    -docdir | --docdir | --docdi | --doc | --do)
      ac_prev=docdir ;;
-@@ -1217,21 +1152,13 @@ do
+@@ -1217,21 +1156,13 @@ do
      dvidir=$ac_optarg ;;
  
    -enable-* | --enable-*)
@@ -11392,7 +11471,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1422,38 +1349,22 @@ do
+@@ -1422,38 +1353,22 @@ do
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -11441,7 +11520,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -1473,7 +1384,7 @@ do
+@@ -1473,7 +1388,7 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -11450,7 +11529,7 @@
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
-@@ -1482,16 +1393,16 @@ Try \`$0 --help' for more information." 
+@@ -1482,16 +1397,16 @@ Try \`$0 --help' for more information." 
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -11470,7 +11549,7 @@
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
  
-@@ -1500,38 +1411,22 @@ done
+@@ -1500,38 +1415,22 @@ done
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -11512,7 +11591,7 @@
     { (exit 1); exit 1; }; }
  done
  
-@@ -1546,7 +1441,7 @@ target=$target_alias
+@@ -1546,7 +1445,7 @@ target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
@@ -11521,7 +11600,7 @@
      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
-@@ -1562,10 +1457,10 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1562,10 +1461,10 @@ 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 .` ||
@@ -11534,7 +11613,7 @@
     { (exit 1); exit 1; }; }
  
  
-@@ -1573,12 +1468,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+@@ -1573,12 +1472,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then the parent directory.
@@ -11553,7 +11632,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -1605,12 +1500,12 @@ else
+@@ -1605,12 +1504,12 @@ else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -11568,7 +11647,7 @@
     { (exit 1); exit 1; }; }
  	pwd)`
  # When building in place, set srcdir=.
-@@ -1659,9 +1554,9 @@ Configuration:
+@@ -1659,9 +1558,9 @@ Configuration:
  
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -11580,7 +11659,7 @@
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1671,25 +1566,25 @@ for instance \`--prefix=\$HOME'.
+@@ -1671,25 +1570,25 @@ for instance \`--prefix=\$HOME'.
  For better control, use the options below.
  
  Fine tuning of the installation directories:
@@ -11625,7 +11704,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1716,7 +1611,6 @@ if test -n "$ac_init_help"; then
+@@ -1716,7 +1615,6 @@ if test -n "$ac_init_help"; then
    cat <<\_ACEOF
  
  Optional Features:
@@ -11633,7 +11712,17 @@
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-maintainer-mode  enable make rules and dependencies not useful
-@@ -1830,17 +1724,15 @@ fi
+@@ -1786,6 +1684,9 @@ Some influential environment variables:
+   PANEL_CFLAGS
+               C compiler flags for PANEL, overriding pkg-config
+   PANEL_LIBS  linker flags for PANEL, overriding pkg-config
++  LOGOUT_CFLAGS
++              C compiler flags for LOGOUT, overriding pkg-config
++  LOGOUT_LIBS linker flags for LOGOUT, overriding pkg-config
+   LIBPANEL_APPLET_CFLAGS
+               C compiler flags for LIBPANEL_APPLET, overriding pkg-config
+   LIBPANEL_APPLET_LIBS
+@@ -1830,17 +1731,15 @@ fi
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
@@ -11654,7 +11743,7 @@
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1876,7 +1768,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -1876,7 +1775,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
        echo &&
        $SHELL "$ac_srcdir/configure" --help=recursive
      else
@@ -11663,7 +11752,7 @@
      fi || ac_status=$?
      cd "$ac_pwd" || { ac_status=$?; break; }
    done
-@@ -1886,10 +1778,10 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1886,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat
  if $ac_init_version; then
    cat <<\_ACEOF
  gnome-panel configure 2.24.2
@@ -11676,7 +11765,7 @@
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
-@@ -1900,7 +1792,7 @@ This file contains any messages produced
+@@ -1900,7 +1799,7 @@ This file contains any messages produced
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by gnome-panel $as_me 2.24.2, which was
@@ -11685,7 +11774,7 @@
  
    $ $0 $@
  
-@@ -1936,7 +1828,7 @@ for as_dir in $PATH
+@@ -1936,7 +1835,7 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11694,7 +11783,7 @@
  done
  IFS=$as_save_IFS
  
-@@ -1971,7 +1863,7 @@ do
+@@ -1971,7 +1870,7 @@ do
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
      *\'*)
@@ -11703,7 +11792,7 @@
      esac
      case $ac_pass in
      1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2023,12 +1915,11 @@ _ASBOX
+@@ -2023,12 +1922,11 @@ _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -11718,7 +11807,7 @@
        *) $as_unset $ac_var ;;
        esac ;;
      esac
-@@ -2058,9 +1949,9 @@ _ASBOX
+@@ -2058,9 +1956,9 @@ _ASBOX
      do
        eval ac_val=\$$ac_var
        case $ac_val in
@@ -11730,7 +11819,7 @@
      done | sort
      echo
  
-@@ -2075,9 +1966,9 @@ _ASBOX
+@@ -2075,9 +1973,9 @@ _ASBOX
        do
  	eval ac_val=\$$ac_var
  	case $ac_val in
@@ -11742,7 +11831,7 @@
        done | sort
        echo
      fi
-@@ -2093,8 +1984,8 @@ _ASBOX
+@@ -2093,8 +1991,8 @@ _ASBOX
        echo
      fi
      test "$ac_signal" != 0 &&
@@ -11753,7 +11842,7 @@
    } >&5
    rm -f core *.core core.conftest.* &&
      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2136,24 +2027,21 @@ _ACEOF
+@@ -2136,24 +2034,21 @@ _ACEOF
  
  
  # Let the site file select an alternate cache file if it wants to.
@@ -11787,7 +11876,7 @@
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
-@@ -2163,16 +2051,16 @@ if test -r "$cache_file"; then
+@@ -2163,16 +2058,16 @@ if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
@@ -11808,7 +11897,7 @@
    >$cache_file
  fi
  
-@@ -2186,38 +2074,29 @@ for ac_var in $ac_precious_vars; do
+@@ -2186,38 +2081,29 @@ for ac_var in $ac_precious_vars; do
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -11859,7 +11948,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -2227,10 +2106,10 @@ $as_echo "$as_me:   current value: \`$ac
+@@ -2227,10 +2113,10 @@ $as_echo "$as_me:   current value: \`$ac
    fi
  done
  if $ac_cache_corrupted; then
@@ -11874,7 +11963,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -2286,8 +2165,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
+@@ -2286,8 +2172,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
    fi
  done
  if test -z "$ac_aux_dir"; then
@@ -11885,7 +11974,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -2313,12 +2192,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2313,12 +2199,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -11901,7 +11990,7 @@
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -2347,29 +2225,17 @@ case $as_dir/ in
+@@ -2347,29 +2232,17 @@ case $as_dir/ in
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
@@ -11933,7 +12022,7 @@
  
  fi
    if test "${ac_cv_path_install+set}" = set; then
-@@ -2382,8 +2248,8 @@ fi
+@@ -2382,8 +2255,8 @@ fi
      INSTALL=$ac_install_sh
    fi
  fi
@@ -11944,7 +12033,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2393,8 +2259,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2393,8 +2266,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -11955,7 +12044,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2417,9 +2283,9 @@ if (
+@@ -2417,9 +2290,9 @@ 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".
@@ -11967,7 +12056,7 @@
  alias in your environment" >&2;}
     { (exit 1); exit 1; }; }
     fi
-@@ -2430,23 +2296,26 @@ then
+@@ -2430,23 +2303,26 @@ then
     # Ok.
     :
  else
@@ -12001,7 +12090,7 @@
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2457,15 +2326,15 @@ if eval "$MISSING --run true"; then
+@@ -2457,15 +2333,15 @@ if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -12022,7 +12111,7 @@
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2500,8 +2369,8 @@ fi
+@@ -2500,8 +2376,8 @@ fi
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -12033,7 +12122,7 @@
  
  mkdir_p="$MKDIR_P"
  case $mkdir_p in
-@@ -2513,10 +2382,10 @@ for ac_prog in gawk mawk nawk awk
+@@ -2513,10 +2389,10 @@ for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12047,7 +12136,7 @@
  else
    if test -n "$AWK"; then
    ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2529,7 +2398,7 @@ do
+@@ -2529,7 +2405,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
@@ -12056,7 +12145,7 @@
      break 2
    fi
  done
-@@ -2540,23 +2409,22 @@ fi
+@@ -2540,23 +2416,22 @@ fi
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
@@ -12088,7 +12177,7 @@
  else
    cat >conftest.make <<\_ACEOF
  SHELL = /bin/sh
-@@ -2573,12 +2441,12 @@ esac
+@@ -2573,12 +2448,12 @@ esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -12105,7 +12194,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2597,8 +2465,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2597,8 +2472,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -12116,7 +12205,7 @@
     { (exit 1); exit 1; }; }
    fi
  fi
-@@ -2653,10 +2521,10 @@ if test "$cross_compiling" != no; then
+@@ -2653,10 +2528,10 @@ if test "$cross_compiling" != no; then
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -12130,7 +12219,7 @@
  else
    if test -n "$STRIP"; then
    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2669,7 +2537,7 @@ do
+@@ -2669,7 +2544,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -12139,7 +12228,7 @@
      break 2
    fi
  done
-@@ -2680,11 +2548,11 @@ fi
+@@ -2680,11 +2555,11 @@ fi
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
@@ -12155,7 +12244,7 @@
  fi
  
  
-@@ -2693,10 +2561,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2693,10 +2568,10 @@ if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -12169,7 +12258,7 @@
  else
    if test -n "$ac_ct_STRIP"; then
    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2709,7 +2577,7 @@ do
+@@ -2709,7 +2584,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
@@ -12178,7 +12267,7 @@
      break 2
    fi
  done
-@@ -2720,11 +2588,11 @@ fi
+@@ -2720,11 +2595,11 @@ fi
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
@@ -12194,7 +12283,7 @@
  fi
  
    if test "x$ac_ct_STRIP" = x; then
-@@ -2732,10 +2600,10 @@ fi
+@@ -2732,10 +2607,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -12207,7 +12296,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -2785,8 +2653,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2785,8 +2660,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
  LIB_PANEL_APPLET_LT_VERSION=2:47:2
  
  
@@ -12218,7 +12307,7 @@
      # Check whether --enable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
    enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -2794,8 +2662,8 @@ else
+@@ -2794,8 +2669,8 @@ else
    USE_MAINTAINER_MODE=no
  fi
  
@@ -12229,7 +12318,7 @@
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
    MAINTAINER_MODE_FALSE='#'
-@@ -2819,8 +2687,8 @@ fi
+@@ -2819,8 +2694,8 @@ fi
  
  
  
@@ -12240,7 +12329,7 @@
      # Check whether --enable-nls was given.
  if test "${enable_nls+set}" = set; then
    enableval=$enable_nls; USE_NLS=$enableval
-@@ -2828,8 +2696,8 @@ else
+@@ -2828,8 +2703,8 @@ else
    USE_NLS=yes
  fi
  
@@ -12251,7 +12340,7 @@
  
  
  DEPDIR="${am__leading_dot}deps"
-@@ -2844,8 +2712,8 @@ am__doit:
+@@ -2844,8 +2719,8 @@ am__doit:
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -12262,7 +12351,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2872,8 +2740,8 @@ if test "$am__include" = "#"; then
+@@ -2872,8 +2747,8 @@ if test "$am__include" = "#"; then
  fi
  
  
@@ -12273,7 +12362,7 @@
  rm -f confinc confmf
  
  # Check whether --enable-dependency-tracking was given.
-@@ -2902,10 +2770,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2902,10 +2777,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -12287,7 +12376,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2918,7 +2786,7 @@ do
+@@ -2918,7 +2793,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -12296,7 +12385,7 @@
      break 2
    fi
  done
-@@ -2929,11 +2797,11 @@ fi
+@@ -2929,11 +2804,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -12312,7 +12401,7 @@
  fi
  
  
-@@ -2942,10 +2810,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2942,10 +2817,10 @@ if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -12326,7 +12415,7 @@
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2958,7 +2826,7 @@ do
+@@ -2958,7 +2833,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
@@ -12335,7 +12424,7 @@
      break 2
    fi
  done
-@@ -2969,11 +2837,11 @@ fi
+@@ -2969,11 +2844,11 @@ fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -12351,7 +12440,7 @@
  fi
  
    if test "x$ac_ct_CC" = x; then
-@@ -2981,10 +2849,10 @@ fi
+@@ -2981,10 +2856,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -12364,7 +12453,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -2999,10 +2867,10 @@ if test -z "$CC"; then
+@@ -2999,10 +2874,10 @@ if test -z "$CC"; then
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -12378,7 +12467,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3015,7 +2883,7 @@ do
+@@ -3015,7 +2890,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -12387,7 +12476,7 @@
      break 2
    fi
  done
-@@ -3026,11 +2894,11 @@ fi
+@@ -3026,11 +2901,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -12403,7 +12492,7 @@
  fi
  
  
-@@ -3039,10 +2907,10 @@ fi
+@@ -3039,10 +2914,10 @@ fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -12417,7 +12506,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3060,7 +2928,7 @@ do
+@@ -3060,7 +2935,7 @@ do
         continue
       fi
      ac_cv_prog_CC="cc"
@@ -12426,7 +12515,7 @@
      break 2
    fi
  done
-@@ -3083,11 +2951,11 @@ fi
+@@ -3083,11 +2958,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -12442,7 +12531,7 @@
  fi
  
  
-@@ -3098,10 +2966,10 @@ if test -z "$CC"; then
+@@ -3098,10 +2973,10 @@ if test -z "$CC"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -12456,7 +12545,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3114,7 +2982,7 @@ do
+@@ -3114,7 +2989,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -12465,7 +12554,7 @@
      break 2
    fi
  done
-@@ -3125,11 +2993,11 @@ fi
+@@ -3125,11 +3000,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -12481,7 +12570,7 @@
  fi
  
  
-@@ -3142,10 +3010,10 @@ if test -z "$CC"; then
+@@ -3142,10 +3017,10 @@ if test -z "$CC"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12495,7 +12584,7 @@
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3158,7 +3026,7 @@ do
+@@ -3158,7 +3033,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -12504,7 +12593,7 @@
      break 2
    fi
  done
-@@ -3169,11 +3037,11 @@ fi
+@@ -3169,11 +3044,11 @@ fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -12520,7 +12609,7 @@
  fi
  
  
-@@ -3185,10 +3053,10 @@ done
+@@ -3185,10 +3060,10 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -12533,7 +12622,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -3200,48 +3068,44 @@ fi
+@@ -3200,48 +3075,44 @@ fi
  fi
  
  
@@ -12592,7 +12681,7 @@
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3260,22 +3124,27 @@ main ()
+@@ -3260,22 +3131,27 @@ main ()
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -12629,7 +12718,7 @@
      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
    esac
  done
-@@ -3286,11 +3155,10 @@ case "(($ac_try" in
+@@ -3286,11 +3162,10 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12643,7 +12732,7 @@
    (exit $ac_status); }; then
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3301,7 +3169,7 @@ for ac_file in $ac_files ''
+@@ -3301,7 +3176,7 @@ for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -12652,7 +12741,7 @@
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
-@@ -3328,15 +3196,15 @@ else
+@@ -3328,15 +3203,15 @@ else
    ac_file=''
  fi
  
@@ -12673,7 +12762,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 77); exit 77; }; }
  fi
-@@ -3345,8 +3213,8 @@ ac_exeext=$ac_cv_exeext
+@@ -3345,8 +3220,8 @@ ac_exeext=$ac_cv_exeext
  
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
@@ -12684,7 +12773,7 @@
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
-@@ -3355,51 +3223,49 @@ if test "$cross_compiling" != yes; then
+@@ -3355,51 +3230,49 @@ if test "$cross_compiling" != yes; then
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12751,7 +12840,7 @@
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -3408,31 +3274,31 @@ $as_echo "$ac_try_echo") >&5
+@@ -3408,31 +3281,31 @@ $as_echo "$ac_try_echo") >&5
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -12791,7 +12880,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3455,41 +3321,40 @@ case "(($ac_try" in
+@@ -3455,41 +3328,40 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12844,7 +12933,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3515,21 +3380,20 @@ case "(($ac_try" in
+@@ -3515,21 +3387,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12869,7 +12958,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
-@@ -3539,19 +3403,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -3539,19 +3410,15 @@ rm -f core conftest.err conftest.$ac_obj
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -12895,7 +12984,7 @@
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-@@ -3578,21 +3438,20 @@ case "(($ac_try" in
+@@ -3578,21 +3445,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12920,7 +13009,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CFLAGS=""
-@@ -3617,21 +3476,20 @@ case "(($ac_try" in
+@@ -3617,21 +3483,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12945,7 +13034,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3657,21 +3515,20 @@ case "(($ac_try" in
+@@ -3657,21 +3522,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12970,7 +13059,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -3686,8 +3543,8 @@ fi
+@@ -3686,8 +3550,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
@@ -12981,7 +13070,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3703,10 +3560,10 @@ else
+@@ -3703,10 +3567,10 @@ else
      CFLAGS=
    fi
  fi
@@ -12995,7 +13084,7 @@
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
-@@ -3777,21 +3634,20 @@ case "(($ac_try" in
+@@ -3777,21 +3641,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13020,7 +13109,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -3807,15 +3663,15 @@ fi
+@@ -3807,15 +3670,15 @@ fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -13042,7 +13131,7 @@
  esac
  
  
-@@ -3827,10 +3683,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3827,10 +3690,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -13056,7 +13145,7 @@
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -3918,8 +3774,8 @@ else
+@@ -3918,8 +3781,8 @@ else
  fi
  
  fi
@@ -13067,7 +13156,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
   if
-@@ -3938,8 +3794,8 @@ fi
+@@ -3938,8 +3801,8 @@ fi
  
  case "$am__api_version" in
      1.01234)
@@ -13078,7 +13167,7 @@
     { (exit 1); exit 1; }; }
      ;;
      *)
-@@ -3947,27 +3803,27 @@ $as_echo "$as_me: error: Automake 1.5 or
+@@ -3947,27 +3810,27 @@ $as_echo "$as_me: error: Automake 1.5 or
  esac
  
  if test -n "0.40.0"; then
@@ -13115,7 +13204,7 @@
  else
    case $INTLTOOL_UPDATE in
    [\\/]* | ?:[\\/]*)
-@@ -3982,7 +3838,7 @@ do
+@@ -3982,7 +3845,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
@@ -13124,7 +13213,7 @@
      break 2
    fi
  done
-@@ -3994,20 +3850,20 @@ esac
+@@ -3994,20 +3857,20 @@ esac
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -13152,7 +13241,7 @@
  else
    case $INTLTOOL_MERGE in
    [\\/]* | ?:[\\/]*)
-@@ -4022,7 +3878,7 @@ do
+@@ -4022,7 +3885,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -13161,7 +13250,7 @@
      break 2
    fi
  done
-@@ -4034,20 +3890,20 @@ esac
+@@ -4034,20 +3897,20 @@ esac
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -13189,7 +13278,7 @@
  else
    case $INTLTOOL_EXTRACT in
    [\\/]* | ?:[\\/]*)
-@@ -4062,7 +3918,7 @@ do
+@@ -4062,7 +3925,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
@@ -13198,7 +13287,7 @@
      break 2
    fi
  done
-@@ -4074,17 +3930,17 @@ esac
+@@ -4074,17 +3937,17 @@ esac
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -13222,7 +13311,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -4131,10 +3987,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -4131,10 +3994,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
  # Check the gettext tools to make sure they are GNU
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -13236,7 +13325,7 @@
  else
    case $XGETTEXT in
    [\\/]* | ?:[\\/]*)
-@@ -4149,7 +4005,7 @@ do
+@@ -4149,7 +4012,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -13245,7 +13334,7 @@
      break 2
    fi
  done
-@@ -4161,20 +4017,20 @@ esac
+@@ -4161,20 +4024,20 @@ esac
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -13273,7 +13362,7 @@
  else
    case $MSGMERGE in
    [\\/]* | ?:[\\/]*)
-@@ -4189,7 +4045,7 @@ do
+@@ -4189,7 +4052,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -13282,7 +13371,7 @@
      break 2
    fi
  done
-@@ -4201,20 +4057,20 @@ esac
+@@ -4201,20 +4064,20 @@ esac
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -13310,7 +13399,7 @@
  else
    case $MSGFMT in
    [\\/]* | ?:[\\/]*)
-@@ -4229,7 +4085,7 @@ do
+@@ -4229,7 +4092,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -13319,7 +13408,7 @@
      break 2
    fi
  done
-@@ -4241,20 +4097,20 @@ esac
+@@ -4241,20 +4104,20 @@ esac
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -13347,7 +13436,7 @@
  else
    case $GMSGFMT in
    [\\/]* | ?:[\\/]*)
-@@ -4269,7 +4125,7 @@ do
+@@ -4269,7 +4132,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -13356,7 +13445,7 @@
      break 2
    fi
  done
-@@ -4282,34 +4138,34 @@ esac
+@@ -4282,34 +4145,34 @@ esac
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -13402,7 +13491,7 @@
  else
    case $INTLTOOL_PERL in
    [\\/]* | ?:[\\/]*)
-@@ -4324,7 +4180,7 @@ do
+@@ -4324,7 +4187,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -13411,7 +13500,7 @@
      break 2
    fi
  done
-@@ -4336,33 +4192,33 @@ esac
+@@ -4336,33 +4199,33 @@ esac
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -13459,7 +13548,7 @@
     { (exit 1); exit 1; }; }
     fi
  fi
-@@ -4395,32 +4251,29 @@ case "(($ac_try" in
+@@ -4395,32 +4258,29 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13500,7 +13589,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4473,35 +4326,31 @@ case "(($ac_try" in
+@@ -4473,35 +4333,31 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13543,7 +13632,7 @@
  if test $ac_cv_func_bind_textdomain_codeset = yes; then
    DATADIRNAME=share
  else
-@@ -4515,7 +4364,6 @@ fi
+@@ -4515,7 +4371,6 @@ fi
      esac
  fi
  
@@ -13551,7 +13640,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
-@@ -4525,10 +4373,10 @@ fi
+@@ -4525,10 +4380,10 @@ fi
  
  
  
@@ -13565,7 +13654,7 @@
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -4566,30 +4414,26 @@ case "(($ac_try" in
+@@ -4566,30 +4421,26 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13601,7 +13690,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_strerror+set}" = set; then
-@@ -4604,8 +4448,8 @@ fi
+@@ -4604,8 +4455,8 @@ fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -13612,7 +13701,7 @@
  ac_res=$ac_cv_search_strerror
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -4620,10 +4464,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4620,10 +4471,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -13626,7 +13715,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4636,7 +4480,7 @@ do
+@@ -4636,7 +4487,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -13635,7 +13724,7 @@
      break 2
    fi
  done
-@@ -4647,11 +4491,11 @@ fi
+@@ -4647,11 +4498,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -13651,7 +13740,7 @@
  fi
  
  
-@@ -4660,10 +4504,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -4660,10 +4511,10 @@ if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -13665,7 +13754,7 @@
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4676,7 +4520,7 @@ do
+@@ -4676,7 +4527,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
@@ -13674,7 +13763,7 @@
      break 2
    fi
  done
-@@ -4687,11 +4531,11 @@ fi
+@@ -4687,11 +4538,11 @@ fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -13690,7 +13779,7 @@
  fi
  
    if test "x$ac_ct_CC" = x; then
-@@ -4699,10 +4543,10 @@ fi
+@@ -4699,10 +4550,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -13703,7 +13792,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -4717,10 +4561,10 @@ if test -z "$CC"; then
+@@ -4717,10 +4568,10 @@ if test -z "$CC"; then
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -13717,7 +13806,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4733,7 +4577,7 @@ do
+@@ -4733,7 +4584,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -13726,7 +13815,7 @@
      break 2
    fi
  done
-@@ -4744,11 +4588,11 @@ fi
+@@ -4744,11 +4595,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -13742,7 +13831,7 @@
  fi
  
  
-@@ -4757,10 +4601,10 @@ fi
+@@ -4757,10 +4608,10 @@ fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -13756,7 +13845,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4778,7 +4622,7 @@ do
+@@ -4778,7 +4629,7 @@ do
         continue
       fi
      ac_cv_prog_CC="cc"
@@ -13765,7 +13854,7 @@
      break 2
    fi
  done
-@@ -4801,11 +4645,11 @@ fi
+@@ -4801,11 +4652,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -13781,7 +13870,7 @@
  fi
  
  
-@@ -4816,10 +4660,10 @@ if test -z "$CC"; then
+@@ -4816,10 +4667,10 @@ if test -z "$CC"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -13795,7 +13884,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4832,7 +4676,7 @@ do
+@@ -4832,7 +4683,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -13804,7 +13893,7 @@
      break 2
    fi
  done
-@@ -4843,11 +4687,11 @@ fi
+@@ -4843,11 +4694,11 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -13820,7 +13909,7 @@
  fi
  
  
-@@ -4860,10 +4704,10 @@ if test -z "$CC"; then
+@@ -4860,10 +4711,10 @@ if test -z "$CC"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -13834,7 +13923,7 @@
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4876,7 +4720,7 @@ do
+@@ -4876,7 +4727,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -13843,7 +13932,7 @@
      break 2
    fi
  done
-@@ -4887,11 +4731,11 @@ fi
+@@ -4887,11 +4738,11 @@ fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -13859,7 +13948,7 @@
  fi
  
  
-@@ -4903,10 +4747,10 @@ done
+@@ -4903,10 +4754,10 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -13872,7 +13961,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -4918,54 +4762,50 @@ fi
+@@ -4918,54 +4769,50 @@ fi
  fi
  
  
@@ -13940,7 +14029,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4991,21 +4831,20 @@ case "(($ac_try" in
+@@ -4991,21 +4838,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13965,7 +14054,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
-@@ -5015,19 +4854,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5015,19 +4861,15 @@ rm -f core conftest.err conftest.$ac_obj
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -13991,7 +14080,7 @@
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-@@ -5054,21 +4889,20 @@ case "(($ac_try" in
+@@ -5054,21 +4896,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14016,7 +14105,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CFLAGS=""
-@@ -5093,21 +4927,20 @@ case "(($ac_try" in
+@@ -5093,21 +4934,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14041,7 +14130,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -5133,21 +4966,20 @@ case "(($ac_try" in
+@@ -5133,21 +4973,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14066,7 +14155,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -5162,8 +4994,8 @@ fi
+@@ -5162,8 +5001,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
@@ -14077,7 +14166,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -5179,10 +5011,10 @@ else
+@@ -5179,10 +5018,10 @@ else
      CFLAGS=
    fi
  fi
@@ -14091,7 +14180,7 @@
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
-@@ -5253,21 +5085,20 @@ case "(($ac_try" in
+@@ -5253,21 +5092,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14116,7 +14205,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -5283,15 +5114,15 @@ fi
+@@ -5283,15 +5121,15 @@ fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -14138,7 +14227,7 @@
  esac
  
  
-@@ -5303,10 +5134,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5303,10 +5141,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -14152,7 +14241,7 @@
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -5394,8 +5225,8 @@ else
+@@ -5394,8 +5232,8 @@ else
  fi
  
  fi
@@ -14163,7 +14252,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
   if
-@@ -5414,15 +5245,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5414,15 +5252,15 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -14182,7 +14271,7 @@
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5454,21 +5285,20 @@ case "(($ac_try" in
+@@ -5454,21 +5292,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14207,7 +14296,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -5492,14 +5322,13 @@ case "(($ac_try" in
+@@ -5492,14 +5329,13 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14224,7 +14313,7 @@
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -5507,7 +5336,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -5507,7 +5343,7 @@ $as_echo "$ac_try_echo") >&5
    # Broken: success on invalid input.
  continue
  else
@@ -14233,7 +14322,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -5532,8 +5361,8 @@ fi
+@@ -5532,8 +5368,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -14244,7 +14333,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -5561,21 +5390,20 @@ case "(($ac_try" in
+@@ -5561,21 +5397,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14269,7 +14358,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -5599,14 +5427,13 @@ case "(($ac_try" in
+@@ -5599,14 +5434,13 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14286,7 +14375,7 @@
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -5614,7 +5441,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -5614,7 +5448,7 @@ $as_echo "$ac_try_echo") >&5
    # Broken: success on invalid input.
  continue
  else
@@ -14295,7 +14384,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -5630,9 +5457,9 @@ rm -f conftest.err conftest.$ac_ext
+@@ -5630,9 +5464,9 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
@@ -14307,7 +14396,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5644,37 +5471,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5644,37 +5478,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -14362,7 +14451,7 @@
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
-@@ -5689,60 +5521,74 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5689,60 +5528,74 @@ case `"$ac_path_GREP" --version 2>&1` in
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
@@ -14457,7 +14546,7 @@
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
-@@ -5757,31 +5603,40 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5757,31 +5610,40 @@ case `"$ac_path_EGREP" --version 2>&1` i
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
@@ -14509,7 +14598,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5808,21 +5663,20 @@ case "(($ac_try" in
+@@ -5808,21 +5670,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14534,7 +14623,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stdc=no
-@@ -5914,40 +5768,37 @@ case "(($ac_try" in
+@@ -5914,40 +5775,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14583,7 +14672,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6032,34 +5883,34 @@ fi
+@@ -6032,34 +5890,34 @@ fi
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -14631,7 +14720,7 @@
     { (exit 1); exit 1; }; };;
  esac
  build=$ac_cv_build
-@@ -6076,27 +5927,27 @@ IFS=$ac_save_IFS
+@@ -6076,27 +5934,27 @@ IFS=$ac_save_IFS
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -14668,7 +14757,7 @@
     { (exit 1); exit 1; }; };;
  esac
  host=$ac_cv_host
-@@ -6113,10 +5964,10 @@ IFS=$ac_save_IFS
+@@ -6113,10 +5971,10 @@ IFS=$ac_save_IFS
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
@@ -14682,7 +14771,7 @@
  else
    # Loop through the user's path and test for sed and gsed.
  # Then use that list of sed's as ones to test for truncation.
-@@ -6169,8 +6020,8 @@ fi
+@@ -6169,8 +6027,8 @@ fi
  
  SED=$lt_cv_path_SED
  
@@ -14693,7 +14782,7 @@
  
  
  # Check whether --with-gnu-ld was given.
-@@ -6183,8 +6034,8 @@ fi
+@@ -6183,8 +6041,8 @@ fi
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -14704,7 +14793,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -6213,14 +6064,14 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6213,14 +6071,14 @@ $as_echo_n "checking for ld used by $CC.
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -14724,7 +14813,7 @@
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -6250,19 +6101,19 @@ fi
+@@ -6250,19 +6108,19 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -14753,7 +14842,7 @@
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
  case `$LD -v 2>&1 </dev/null` in
-@@ -6274,20 +6125,20 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6274,20 +6132,20 @@ case `$LD -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -14781,7 +14870,7 @@
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
  "" | " "*) ;;
-@@ -6304,10 +6155,10 @@ case $host_os in
+@@ -6304,10 +6162,10 @@ case $host_os in
      ;;
  esac
  
@@ -14795,7 +14884,7 @@
  else
    if test -n "$NM"; then
    # Let the user override the test.
-@@ -6353,25 +6204,25 @@ else
+@@ -6353,25 +6211,25 @@ else
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
@@ -14832,7 +14921,7 @@
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
  lt_cv_file_magic_test_file=
-@@ -6483,7 +6334,7 @@ linux* | k*bsd*-gnu)
+@@ -6483,7 +6341,7 @@ linux* | k*bsd*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -14841,7 +14930,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
-@@ -6554,8 +6405,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
+@@ -6554,8 +6412,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
  esac
  
  fi
@@ -14852,7 +14941,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6588,7 +6439,7 @@ ia64-*-hpux*)
+@@ -6588,7 +6446,7 @@ ia64-*-hpux*)
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -14861,12 +14950,12 @@
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.$ac_objext` in
      *ELF-32*)
-@@ -6603,11 +6454,11 @@ ia64-*-hpux*)
+@@ -6603,11 +6461,11 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 6606 "configure"' > conftest.$ac_ext
-+  echo '#line 6457 "configure"' > conftest.$ac_ext
++  echo '#line 6464 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -14875,7 +14964,7 @@
    (exit $ac_status); }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
      case `/usr/bin/file conftest.$ac_objext` in
-@@ -6645,7 +6496,7 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6645,7 +6503,7 @@ s390*-*linux*|sparc*-*linux*)
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -14884,7 +14973,7 @@
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.o` in
      *32-bit*)
-@@ -6668,7 +6519,6 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6668,7 +6526,6 @@ s390*-*linux*|sparc*-*linux*)
        esac
        ;;
      *64-bit*)
@@ -14892,7 +14981,7 @@
        case $host in
          x86_64-*kfreebsd*-gnu)
            LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -6696,10 +6546,10 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6696,10 +6553,10 @@ s390*-*linux*|sparc*-*linux*)
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -14906,7 +14995,7 @@
  else
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -6728,30 +6578,26 @@ case "(($ac_try" in
+@@ -6728,30 +6585,26 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14942,7 +15031,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
-@@ -6761,8 +6607,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6761,8 +6614,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -14953,7 +15042,7 @@
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -6774,7 +6620,7 @@ sparc*-*solaris*)
+@@ -6774,7 +6627,7 @@ sparc*-*solaris*)
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -14962,7 +15051,7 @@
    (exit $ac_status); }; then
      case `/usr/bin/file conftest.o` in
      *64-bit*)
-@@ -6796,10 +6642,10 @@ sparc*-*solaris*)
+@@ -6796,10 +6649,10 @@ sparc*-*solaris*)
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -14976,7 +15065,7 @@
  else
    if test -n "$DLLTOOL"; then
    ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-@@ -6812,7 +6658,7 @@ do
+@@ -6812,7 +6665,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
@@ -14985,7 +15074,7 @@
      break 2
    fi
  done
-@@ -6823,11 +6669,11 @@ fi
+@@ -6823,11 +6676,11 @@ fi
  fi
  DLLTOOL=$ac_cv_prog_DLLTOOL
  if test -n "$DLLTOOL"; then
@@ -15001,7 +15090,7 @@
  fi
  
  
-@@ -6836,10 +6682,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6836,10 +6689,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
    ac_ct_DLLTOOL=$DLLTOOL
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
@@ -15015,7 +15104,7 @@
  else
    if test -n "$ac_ct_DLLTOOL"; then
    ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-@@ -6852,7 +6698,7 @@ do
+@@ -6852,7 +6705,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DLLTOOL="dlltool"
@@ -15024,7 +15113,7 @@
      break 2
    fi
  done
-@@ -6863,11 +6709,11 @@ fi
+@@ -6863,11 +6716,11 @@ fi
  fi
  ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  if test -n "$ac_ct_DLLTOOL"; then
@@ -15040,7 +15129,7 @@
  fi
  
    if test "x$ac_ct_DLLTOOL" = x; then
-@@ -6875,10 +6721,10 @@ fi
+@@ -6875,10 +6728,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -15053,7 +15142,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -6892,10 +6738,10 @@ fi
+@@ -6892,10 +6745,10 @@ fi
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -15067,7 +15156,7 @@
  else
    if test -n "$AS"; then
    ac_cv_prog_AS="$AS" # Let the user override the test.
-@@ -6908,7 +6754,7 @@ do
+@@ -6908,7 +6761,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AS="${ac_tool_prefix}as"
@@ -15076,7 +15165,7 @@
      break 2
    fi
  done
-@@ -6919,11 +6765,11 @@ fi
+@@ -6919,11 +6772,11 @@ fi
  fi
  AS=$ac_cv_prog_AS
  if test -n "$AS"; then
@@ -15092,7 +15181,7 @@
  fi
  
  
-@@ -6932,10 +6778,10 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6932,10 +6785,10 @@ if test -z "$ac_cv_prog_AS"; then
    ac_ct_AS=$AS
    # Extract the first word of "as", so it can be a program name with args.
  set dummy as; ac_word=$2
@@ -15106,7 +15195,7 @@
  else
    if test -n "$ac_ct_AS"; then
    ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-@@ -6948,7 +6794,7 @@ do
+@@ -6948,7 +6801,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AS="as"
@@ -15115,7 +15204,7 @@
      break 2
    fi
  done
-@@ -6959,11 +6805,11 @@ fi
+@@ -6959,11 +6812,11 @@ fi
  fi
  ac_ct_AS=$ac_cv_prog_ac_ct_AS
  if test -n "$ac_ct_AS"; then
@@ -15131,7 +15220,7 @@
  fi
  
    if test "x$ac_ct_AS" = x; then
-@@ -6971,10 +6817,10 @@ fi
+@@ -6971,10 +6824,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -15144,7 +15233,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -6988,10 +6834,10 @@ fi
+@@ -6988,10 +6841,10 @@ fi
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -15158,7 +15247,7 @@
  else
    if test -n "$OBJDUMP"; then
    ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -7004,7 +6850,7 @@ do
+@@ -7004,7 +6857,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
@@ -15167,7 +15256,7 @@
      break 2
    fi
  done
-@@ -7015,11 +6861,11 @@ fi
+@@ -7015,11 +6868,11 @@ fi
  fi
  OBJDUMP=$ac_cv_prog_OBJDUMP
  if test -n "$OBJDUMP"; then
@@ -15183,7 +15272,7 @@
  fi
  
  
-@@ -7028,10 +6874,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7028,10 +6881,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -15197,7 +15286,7 @@
  else
    if test -n "$ac_ct_OBJDUMP"; then
    ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-@@ -7044,7 +6890,7 @@ do
+@@ -7044,7 +6897,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_OBJDUMP="objdump"
@@ -15206,7 +15295,7 @@
      break 2
    fi
  done
-@@ -7055,11 +6901,11 @@ fi
+@@ -7055,11 +6908,11 @@ fi
  fi
  ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
  if test -n "$ac_ct_OBJDUMP"; then
@@ -15222,7 +15311,7 @@
  fi
  
    if test "x$ac_ct_OBJDUMP" = x; then
-@@ -7067,10 +6913,10 @@ fi
+@@ -7067,10 +6920,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -15235,7 +15324,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -7101,11 +6947,11 @@ need_locks="$enable_libtool_lock"
+@@ -7101,11 +6954,11 @@ need_locks="$enable_libtool_lock"
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  		  inttypes.h stdint.h unistd.h
  do
@@ -15251,7 +15340,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -7123,21 +6969,20 @@ case "(($ac_try" in
+@@ -7123,21 +6976,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15276,7 +15365,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
-@@ -7145,14 +6990,12 @@ fi
+@@ -7145,14 +6997,12 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -15296,7 +15385,7 @@
  _ACEOF
  
  fi
-@@ -7163,21 +7006,20 @@ done
+@@ -7163,21 +7013,20 @@ done
  
  for ac_header in dlfcn.h
  do
@@ -15327,7 +15416,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7193,33 +7035,32 @@ case "(($ac_try" in
+@@ -7193,33 +7042,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15368,7 +15457,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7233,52 +7074,51 @@ case "(($ac_try" in
+@@ -7233,52 +7081,51 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15442,7 +15531,7 @@
      ( cat <<\_ASBOX
  ## -------------------------------------------------------------------------- ##
  ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -7287,23 +7127,21 @@ _ASBOX
+@@ -7287,23 +7134,21 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -15474,7 +15563,7 @@
  _ACEOF
  
  fi
-@@ -7324,10 +7162,10 @@ if test -z "$CXX"; then
+@@ -7324,10 +7169,10 @@ if test -z "$CXX"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -15488,7 +15577,7 @@
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -7340,7 +7178,7 @@ do
+@@ -7340,7 +7185,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -15497,7 +15586,7 @@
      break 2
    fi
  done
-@@ -7351,11 +7189,11 @@ fi
+@@ -7351,11 +7196,11 @@ fi
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
@@ -15513,7 +15602,7 @@
  fi
  
  
-@@ -7368,10 +7206,10 @@ if test -z "$CXX"; then
+@@ -7368,10 +7213,10 @@ if test -z "$CXX"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -15527,7 +15616,7 @@
  else
    if test -n "$ac_ct_CXX"; then
    ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -7384,7 +7222,7 @@ do
+@@ -7384,7 +7229,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -15536,7 +15625,7 @@
      break 2
    fi
  done
-@@ -7395,11 +7233,11 @@ fi
+@@ -7395,11 +7240,11 @@ fi
  fi
  ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  if test -n "$ac_ct_CXX"; then
@@ -15552,7 +15641,7 @@
  fi
  
  
-@@ -7411,10 +7249,10 @@ done
+@@ -7411,10 +7256,10 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -15565,7 +15654,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -7426,47 +7264,43 @@ fi
+@@ -7426,47 +7271,43 @@ fi
    fi
  fi
  # Provide some information about the compiler.
@@ -15624,7 +15713,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -7492,21 +7326,20 @@ case "(($ac_try" in
+@@ -7492,21 +7333,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15649,7 +15738,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
-@@ -7516,19 +7349,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -7516,19 +7356,15 @@ rm -f core conftest.err conftest.$ac_obj
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -15675,7 +15764,7 @@
  else
    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
     ac_cxx_werror_flag=yes
-@@ -7555,21 +7384,20 @@ case "(($ac_try" in
+@@ -7555,21 +7391,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15700,7 +15789,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CXXFLAGS=""
-@@ -7594,21 +7422,20 @@ case "(($ac_try" in
+@@ -7594,21 +7429,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15725,7 +15814,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -7634,21 +7461,20 @@ case "(($ac_try" in
+@@ -7634,21 +7468,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15750,7 +15839,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -7663,8 +7489,8 @@ fi
+@@ -7663,8 +7496,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_cxx_werror_flag=$ac_save_cxx_werror_flag
  fi
@@ -15761,7 +15850,7 @@
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7688,10 +7514,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -7688,10 +7521,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
  depcc="$CXX"  am_compiler_list=
  
@@ -15775,7 +15864,7 @@
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -7779,8 +7605,8 @@ else
+@@ -7779,8 +7612,8 @@ else
  fi
  
  fi
@@ -15786,7 +15875,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
   if
-@@ -7804,11 +7630,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -7804,11 +7637,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -15801,7 +15890,7 @@
  else
        # Double quotes because CXXCPP needs to be expanded
      for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7840,21 +7666,20 @@ case "(($ac_try" in
+@@ -7840,21 +7673,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15826,7 +15915,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -7878,14 +7703,13 @@ case "(($ac_try" in
+@@ -7878,14 +7710,13 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15843,7 +15932,7 @@
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7893,7 +7717,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -7893,7 +7724,7 @@ $as_echo "$ac_try_echo") >&5
    # Broken: success on invalid input.
  continue
  else
@@ -15852,7 +15941,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -7918,8 +7742,8 @@ fi
+@@ -7918,8 +7749,8 @@ fi
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -15863,7 +15952,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -7947,21 +7771,20 @@ case "(($ac_try" in
+@@ -7947,21 +7778,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15888,7 +15977,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -7985,14 +7808,13 @@ case "(($ac_try" in
+@@ -7985,14 +7815,13 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15905,7 +15994,7 @@
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8000,7 +7822,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -8000,7 +7829,7 @@ $as_echo "$ac_try_echo") >&5
    # Broken: success on invalid input.
  continue
  else
@@ -15914,7 +16003,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -8016,9 +7838,9 @@ rm -f conftest.err conftest.$ac_ext
+@@ -8016,9 +7845,9 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
@@ -15926,7 +16015,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -8041,10 +7863,10 @@ if test -n "$ac_tool_prefix"; then
+@@ -8041,10 +7870,10 @@ if test -n "$ac_tool_prefix"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -15940,7 +16029,7 @@
  else
    if test -n "$F77"; then
    ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -8057,7 +7879,7 @@ do
+@@ -8057,7 +7886,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
@@ -15949,7 +16038,7 @@
      break 2
    fi
  done
-@@ -8068,11 +7890,11 @@ fi
+@@ -8068,11 +7897,11 @@ fi
  fi
  F77=$ac_cv_prog_F77
  if test -n "$F77"; then
@@ -15965,7 +16054,7 @@
  fi
  
  
-@@ -8085,10 +7907,10 @@ if test -z "$F77"; then
+@@ -8085,10 +7914,10 @@ if test -z "$F77"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -15979,7 +16068,7 @@
  else
    if test -n "$ac_ct_F77"; then
    ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -8101,7 +7923,7 @@ do
+@@ -8101,7 +7930,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_F77="$ac_prog"
@@ -15988,7 +16077,7 @@
      break 2
    fi
  done
-@@ -8112,11 +7934,11 @@ fi
+@@ -8112,11 +7941,11 @@ fi
  fi
  ac_ct_F77=$ac_cv_prog_ac_ct_F77
  if test -n "$ac_ct_F77"; then
@@ -16004,7 +16093,7 @@
  fi
  
  
-@@ -8128,10 +7950,10 @@ done
+@@ -8128,10 +7957,10 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16017,7 +16106,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -8142,41 +7964,37 @@ fi
+@@ -8142,41 +7971,37 @@ fi
  
  
  # Provide some information about the compiler.
@@ -16067,7 +16156,7 @@
    (exit $ac_status); }
  rm -f a.out
  
-@@ -8184,10 +8002,10 @@ rm -f a.out
+@@ -8184,10 +8009,10 @@ rm -f a.out
  # input file.  (Note that this only needs to work for GNU compilers.)
  ac_save_ext=$ac_ext
  ac_ext=F
@@ -16081,7 +16170,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
        program main
-@@ -8203,21 +8021,20 @@ case "(($ac_try" in
+@@ -8203,21 +8028,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16106,7 +16195,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
-@@ -8227,16 +8044,16 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -8227,16 +8051,16 @@ rm -f core conftest.err conftest.$ac_obj
  ac_cv_f77_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -16128,7 +16217,7 @@
  else
    FFLAGS=-g
  cat >conftest.$ac_ext <<_ACEOF
-@@ -8250,21 +8067,20 @@ case "(($ac_try" in
+@@ -8250,21 +8074,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16153,7 +16242,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_prog_f77_g=no
-@@ -8273,8 +8089,8 @@ fi
+@@ -8273,8 +8096,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
@@ -16164,7 +16253,7 @@
  if test "$ac_test_FFLAGS" = set; then
    FFLAGS=$ac_save_FFLAGS
  elif test $ac_cv_prog_f77_g = yes; then
-@@ -8291,11 +8107,7 @@ else
+@@ -8291,11 +8114,7 @@ else
    fi
  fi
  
@@ -16177,7 +16266,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8306,10 +8118,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -8306,10 +8125,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  # find the maximum length of command line arguments
@@ -16191,7 +16280,7 @@
  else
      i=0
    teststring="ABCD"
-@@ -8418,11 +8230,11 @@ else
+@@ -8418,11 +8237,11 @@ else
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -16207,7 +16296,7 @@
  fi
  
  
-@@ -8430,10 +8242,10 @@ fi
+@@ -8430,10 +8249,10 @@ fi
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -16221,7 +16310,7 @@
  else
  
  # These are sane defaults that work on at least a few old systems.
-@@ -8538,14 +8350,14 @@ EOF
+@@ -8538,14 +8357,14 @@ EOF
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -16238,7 +16327,7 @@
    (exit $ac_status); } && test -s "$nlist"; then
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
-@@ -8600,7 +8412,7 @@ EOF
+@@ -8600,7 +8419,7 @@ EOF
  	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
@@ -16247,7 +16336,7 @@
    (exit $ac_status); } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
-@@ -8635,17 +8447,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8635,17 +8454,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -16272,7 +16361,7 @@
  else
    rm -f .libs 2>/dev/null
  mkdir .libs 2>/dev/null
-@@ -8657,8 +8469,8 @@ else
+@@ -8657,8 +8476,8 @@ else
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -16283,7 +16372,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8709,10 +8521,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
+@@ -8709,10 +8528,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -16297,7 +16386,7 @@
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8725,7 +8537,7 @@ do
+@@ -8725,7 +8544,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -16306,7 +16395,7 @@
      break 2
    fi
  done
-@@ -8736,11 +8548,11 @@ fi
+@@ -8736,11 +8555,11 @@ fi
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
@@ -16322,7 +16411,7 @@
  fi
  
  
-@@ -8749,10 +8561,10 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -8749,10 +8568,10 @@ if test -z "$ac_cv_prog_AR"; then
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -16336,7 +16425,7 @@
  else
    if test -n "$ac_ct_AR"; then
    ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -8765,7 +8577,7 @@ do
+@@ -8765,7 +8584,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AR="ar"
@@ -16345,7 +16434,7 @@
      break 2
    fi
  done
-@@ -8776,11 +8588,11 @@ fi
+@@ -8776,11 +8595,11 @@ fi
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
@@ -16361,7 +16450,7 @@
  fi
  
    if test "x$ac_ct_AR" = x; then
-@@ -8788,10 +8600,10 @@ fi
+@@ -8788,10 +8607,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16374,7 +16463,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -8805,10 +8617,10 @@ fi
+@@ -8805,10 +8624,10 @@ fi
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -16388,7 +16477,7 @@
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8821,7 +8633,7 @@ do
+@@ -8821,7 +8640,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -16397,7 +16486,7 @@
      break 2
    fi
  done
-@@ -8832,11 +8644,11 @@ fi
+@@ -8832,11 +8651,11 @@ fi
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
@@ -16413,7 +16502,7 @@
  fi
  
  
-@@ -8845,10 +8657,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -8845,10 +8664,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -16427,7 +16516,7 @@
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -8861,7 +8673,7 @@ do
+@@ -8861,7 +8680,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -16436,7 +16525,7 @@
      break 2
    fi
  done
-@@ -8872,11 +8684,11 @@ fi
+@@ -8872,11 +8691,11 @@ fi
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
@@ -16452,7 +16541,7 @@
  fi
  
    if test "x$ac_ct_RANLIB" = x; then
-@@ -8884,10 +8696,10 @@ fi
+@@ -8884,10 +8703,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16465,7 +16554,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -8901,10 +8713,10 @@ fi
+@@ -8901,10 +8720,10 @@ fi
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -16479,7 +16568,7 @@
  else
    if test -n "$STRIP"; then
    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8917,7 +8729,7 @@ do
+@@ -8917,7 +8736,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -16488,7 +16577,7 @@
      break 2
    fi
  done
-@@ -8928,11 +8740,11 @@ fi
+@@ -8928,11 +8747,11 @@ fi
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
@@ -16504,7 +16593,7 @@
  fi
  
  
-@@ -8941,10 +8753,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -8941,10 +8760,10 @@ if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -16518,7 +16607,7 @@
  else
    if test -n "$ac_ct_STRIP"; then
    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -8957,7 +8769,7 @@ do
+@@ -8957,7 +8776,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
@@ -16527,7 +16616,7 @@
      break 2
    fi
  done
-@@ -8968,11 +8780,11 @@ fi
+@@ -8968,11 +8787,11 @@ fi
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
@@ -16543,7 +16632,7 @@
  fi
  
    if test "x$ac_ct_STRIP" = x; then
-@@ -8980,10 +8792,10 @@ fi
+@@ -8980,10 +8799,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16556,7 +16645,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -9048,10 +8860,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+@@ -9048,10 +8867,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -16570,7 +16659,7 @@
  else
    case $MAGIC_CMD in
  [\\/*] |  ?:[\\/]*)
-@@ -9101,19 +8913,19 @@ fi
+@@ -9101,19 +8920,19 @@ fi
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -16597,7 +16686,7 @@
  else
    case $MAGIC_CMD in
  [\\/*] |  ?:[\\/]*)
-@@ -9163,11 +8975,11 @@ fi
+@@ -9163,11 +8982,11 @@ fi
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -16613,7 +16702,7 @@
  fi
  
    else
-@@ -9185,10 +8997,10 @@ esac
+@@ -9185,10 +9004,10 @@ esac
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -16627,7 +16716,7 @@
  else
    if test -n "$DSYMUTIL"; then
    ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -9201,7 +9013,7 @@ do
+@@ -9201,7 +9020,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
@@ -16636,7 +16725,7 @@
      break 2
    fi
  done
-@@ -9212,11 +9024,11 @@ fi
+@@ -9212,11 +9031,11 @@ fi
  fi
  DSYMUTIL=$ac_cv_prog_DSYMUTIL
  if test -n "$DSYMUTIL"; then
@@ -16652,7 +16741,7 @@
  fi
  
  
-@@ -9225,10 +9037,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -9225,10 +9044,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
@@ -16666,7 +16755,7 @@
  else
    if test -n "$ac_ct_DSYMUTIL"; then
    ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -9241,7 +9053,7 @@ do
+@@ -9241,7 +9060,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
@@ -16675,7 +16764,7 @@
      break 2
    fi
  done
-@@ -9252,11 +9064,11 @@ fi
+@@ -9252,11 +9071,11 @@ fi
  fi
  ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
  if test -n "$ac_ct_DSYMUTIL"; then
@@ -16691,7 +16780,7 @@
  fi
  
    if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -9264,10 +9076,10 @@ fi
+@@ -9264,10 +9083,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16704,7 +16793,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -9281,10 +9093,10 @@ fi
+@@ -9281,10 +9100,10 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -16718,7 +16807,7 @@
  else
    if test -n "$NMEDIT"; then
    ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -9297,7 +9109,7 @@ do
+@@ -9297,7 +9116,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
@@ -16727,7 +16816,7 @@
      break 2
    fi
  done
-@@ -9308,11 +9120,11 @@ fi
+@@ -9308,11 +9127,11 @@ fi
  fi
  NMEDIT=$ac_cv_prog_NMEDIT
  if test -n "$NMEDIT"; then
@@ -16743,7 +16832,7 @@
  fi
  
  
-@@ -9321,10 +9133,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -9321,10 +9140,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
@@ -16757,7 +16846,7 @@
  else
    if test -n "$ac_ct_NMEDIT"; then
    ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -9337,7 +9149,7 @@ do
+@@ -9337,7 +9156,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_NMEDIT="nmedit"
@@ -16766,7 +16855,7 @@
      break 2
    fi
  done
-@@ -9348,11 +9160,11 @@ fi
+@@ -9348,11 +9167,11 @@ fi
  fi
  ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  if test -n "$ac_ct_NMEDIT"; then
@@ -16782,7 +16871,7 @@
  fi
  
    if test "x$ac_ct_NMEDIT" = x; then
-@@ -9360,10 +9172,10 @@ fi
+@@ -9360,10 +9179,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16795,7 +16884,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -9375,10 +9187,10 @@ else
+@@ -9375,10 +9194,10 @@ else
  fi
  
  
@@ -16809,7 +16898,7 @@
  else
    lt_cv_apple_cc_single_mod=no
        if test -z "${LT_MULTI_MODULE}"; then
-@@ -9396,12 +9208,12 @@ else
+@@ -9396,12 +9215,12 @@ else
     rm conftest.c
        fi
  fi
@@ -16827,7 +16916,7 @@
  else
    lt_cv_ld_exported_symbols_list=no
        save_LDFLAGS=$LDFLAGS
-@@ -9428,37 +9240,33 @@ case "(($ac_try" in
+@@ -9428,37 +9247,33 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16872,7 +16961,7 @@
      case $host_os in
      rhapsody* | darwin1.[0123])
        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -9570,10 +9378,10 @@ if test "$GCC" = yes; then
+@@ -9570,10 +9385,10 @@ if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -16886,21 +16975,21 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
-@@ -9588,11 +9396,11 @@ else
+@@ -9588,11 +9403,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:9591: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9399: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9406: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9595: \$? = $ac_status" >&5
-+   echo "$as_me:9403: \$? = $ac_status" >&5
++   echo "$as_me:9410: \$? = $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.
-@@ -9605,8 +9413,8 @@ else
+@@ -9605,8 +9420,8 @@ else
     $rm conftest*
  
  fi
@@ -16911,7 +17000,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9620,8 +9428,8 @@ lt_prog_compiler_wl=
+@@ -9620,8 +9435,8 @@ lt_prog_compiler_wl=
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -16922,7 +17011,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9852,18 +9660,18 @@ $as_echo_n "checking for $compiler optio
+@@ -9852,18 +9667,18 @@ $as_echo_n "checking for $compiler optio
      esac
    fi
  
@@ -16946,21 +17035,21 @@
  else
    lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
-@@ -9878,11 +9686,11 @@ else
+@@ -9878,11 +9693,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:9881: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9689: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9696: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9885: \$? = $ac_status" >&5
-+   echo "$as_me:9693: \$? = $ac_status" >&5
++   echo "$as_me:9700: \$? = $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.
-@@ -9895,8 +9703,8 @@ else
+@@ -9895,8 +9710,8 @@ else
     $rm conftest*
  
  fi
@@ -16971,7 +17060,7 @@
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9923,10 +9731,10 @@ esac
+@@ -9923,10 +9738,10 @@ esac
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -16985,7 +17074,7 @@
  else
    lt_cv_prog_compiler_static_works=no
     save_LDFLAGS="$LDFLAGS"
-@@ -9951,8 +9759,8 @@ else
+@@ -9951,8 +9766,8 @@ else
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -16996,7 +17085,7 @@
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
      :
-@@ -9961,10 +9769,10 @@ else
+@@ -9961,10 +9776,10 @@ else
  fi
  
  
@@ -17010,21 +17099,21 @@
  else
    lt_cv_prog_compiler_c_o=no
     $rm -r conftest 2>/dev/null
-@@ -9982,11 +9790,11 @@ else
+@@ -9982,11 +9797,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:9985: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9793: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9800: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9989: \$? = $ac_status" >&5
-+   echo "$as_me:9797: \$? = $ac_status" >&5
++   echo "$as_me:9804: \$? = $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
-@@ -10008,34 +9816,34 @@ else
+@@ -10008,34 +9823,34 @@ else
     $rm conftest*
  
  fi
@@ -17069,7 +17158,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -10247,12 +10055,13 @@ EOF
+@@ -10247,12 +10062,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -17084,7 +17173,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -10465,21 +10274,18 @@ case "(($ac_try" in
+@@ -10465,21 +10281,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17110,7 +17199,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10494,13 +10300,12 @@ if test -z "$aix_libpath"; then
+@@ -10494,13 +10307,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -17125,7 +17214,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10535,21 +10340,18 @@ case "(($ac_try" in
+@@ -10535,21 +10347,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17151,7 +17240,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10564,13 +10366,12 @@ if test -z "$aix_libpath"; then
+@@ -10564,13 +10373,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -17166,7 +17255,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10803,7 +10604,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10803,7 +10611,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs=yes
        ;;
  
@@ -17175,7 +17264,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11022,8 +10823,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11022,8 +10830,8 @@ if test -z "$aix_libpath"; then aix_libp
      esac
    fi
  
@@ -17186,7 +17275,7 @@
  test "$ld_shlibs" = no && can_build_shared=no
  
  #
-@@ -11043,15 +10844,15 @@ x|xyes)
+@@ -11043,15 +10851,15 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -17205,7 +17294,7 @@
    (exit $ac_status); } 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11069,7 +10870,7 @@ $as_echo_n "checking whether -lc should 
+@@ -11069,7 +10877,7 @@ $as_echo_n "checking whether -lc should 
          if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
    (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
    ac_status=$?
@@ -17214,7 +17303,7 @@
    (exit $ac_status); }
          then
  	  archive_cmds_need_lc=no
-@@ -11081,16 +10882,16 @@ $as_echo_n "checking whether -lc should 
+@@ -11081,16 +10889,16 @@ $as_echo_n "checking whether -lc should 
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -17235,7 +17324,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -11498,13 +11299,11 @@ linux* | k*bsd*-gnu)
+@@ -11498,13 +11306,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -17250,7 +17339,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11516,6 +11315,18 @@ linux* | k*bsd*-gnu)
+@@ -11516,6 +11322,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -17269,7 +17358,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -11693,19 +11504,19 @@ uts4*)
+@@ -11693,19 +11511,19 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -17293,7 +17382,7 @@
  else
    lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
  fi
-@@ -11717,8 +11528,8 @@ if test "$GCC" = yes; then
+@@ -11717,8 +11535,8 @@ if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -17304,7 +17393,7 @@
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -11742,8 +11553,8 @@ else
+@@ -11742,8 +11560,8 @@ else
    # directories.
    hardcode_action=unsupported
  fi
@@ -17315,7 +17404,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11756,13 +11567,13 @@ fi
+@@ -11756,13 +11574,13 @@ fi
  
  striplib=
  old_striplib=
@@ -17333,7 +17422,7 @@
  else
  # FIXME - insert some real tests, host_os isn't really good enough
    case $host_os in
-@@ -11770,16 +11581,16 @@ else
+@@ -11770,16 +11588,16 @@ else
         if test -n "$STRIP" ; then
           striplib="$STRIP -x"
           old_striplib="$STRIP -S"
@@ -17356,7 +17445,7 @@
      ;;
    esac
  fi
-@@ -11811,10 +11622,10 @@ else
+@@ -11811,10 +11629,10 @@ else
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -17370,7 +17459,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
-@@ -11846,36 +11657,32 @@ case "(($ac_try" in
+@@ -11846,36 +11664,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17414,7 +17503,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11889,10 +11696,10 @@ fi
+@@ -11889,10 +11703,10 @@ fi
     ;;
  
    *)
@@ -17428,7 +17517,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -11945,42 +11752,38 @@ case "(($ac_try" in
+@@ -11945,42 +11759,38 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17481,7 +17570,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
-@@ -12012,43 +11815,39 @@ case "(($ac_try" in
+@@ -12012,43 +11822,39 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17535,7 +17624,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -12101,42 +11900,38 @@ case "(($ac_try" in
+@@ -12101,42 +11907,38 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17588,7 +17677,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
-@@ -12168,43 +11963,39 @@ case "(($ac_try" in
+@@ -12168,43 +11970,39 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17642,7 +17731,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsvld  $LIBS"
-@@ -12236,43 +12027,39 @@ case "(($ac_try" in
+@@ -12236,43 +12034,39 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17696,7 +17785,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
-@@ -12304,36 +12091,32 @@ case "(($ac_try" in
+@@ -12304,36 +12098,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17740,7 +17829,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
-@@ -12373,10 +12156,10 @@ fi
+@@ -12373,10 +12163,10 @@ fi
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -17754,16 +17843,16 @@
  else
    	  if test "$cross_compiling" = yes; then :
    lt_cv_dlopen_self=cross
-@@ -12384,7 +12167,7 @@ else
+@@ -12384,7 +12174,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 12387 "configure"
-+#line 12170 "configure"
++#line 12177 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12450,7 +12233,7 @@ EOF
+@@ -12450,7 +12240,7 @@ EOF
    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
@@ -17772,7 +17861,7 @@
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
-@@ -12468,15 +12251,15 @@ rm -fr conftest*
+@@ -12468,15 +12258,15 @@ rm -fr conftest*
  
  
  fi
@@ -17793,16 +17882,16 @@
  else
    	  if test "$cross_compiling" = yes; then :
    lt_cv_dlopen_self_static=cross
-@@ -12484,7 +12267,7 @@ else
+@@ -12484,7 +12274,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 12487 "configure"
-+#line 12270 "configure"
++#line 12277 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12550,7 +12333,7 @@ EOF
+@@ -12550,7 +12340,7 @@ EOF
    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
@@ -17811,7 +17900,7 @@
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
-@@ -12568,8 +12351,8 @@ rm -fr conftest*
+@@ -12568,8 +12358,8 @@ rm -fr conftest*
  
  
  fi
@@ -17822,7 +17911,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -12591,13 +12374,13 @@ fi
+@@ -12591,13 +12381,13 @@ fi
  
  
  # Report which library types will actually be built
@@ -17842,7 +17931,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12617,15 +12400,15 @@ aix[4-9]*)
+@@ -12617,15 +12407,15 @@ aix[4-9]*)
    fi
      ;;
  esac
@@ -17864,7 +17953,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12718,8 +12501,8 @@ if test -f "$ltmain"; then
+@@ -12718,8 +12508,8 @@ if test -f "$ltmain"; then
  cfgfile="${ofile}T"
    trap "$rm \"$cfgfile\"; exit 1" 1 2 15
    $rm -f "$cfgfile"
@@ -17875,7 +17964,7 @@
  
    cat <<__EOF__ >> "$cfgfile"
  #! $SHELL
-@@ -13131,18 +12914,18 @@ fi
+@@ -13131,18 +12921,18 @@ fi
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
@@ -17900,7 +17989,7 @@
      fi
    fi
    if test -z "$LTCFLAGS"; then
-@@ -13159,16 +12942,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
+@@ -13159,16 +12949,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
      # Check whether tagname contains only valid characters
      case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
      "") ;;
@@ -17921,7 +18010,7 @@
     { (exit 1); exit 1; }; }
      fi
  
-@@ -13311,8 +13094,8 @@ fi
+@@ -13311,8 +13101,8 @@ fi
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -17932,7 +18021,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -13341,14 +13124,14 @@ $as_echo_n "checking for ld used by $CC.
+@@ -13341,14 +13131,14 @@ $as_echo_n "checking for ld used by $CC.
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -17952,7 +18041,7 @@
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -13378,19 +13161,19 @@ fi
+@@ -13378,19 +13168,19 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17981,7 +18070,7 @@
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
  case `$LD -v 2>&1 </dev/null` in
-@@ -13402,8 +13185,8 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -13402,8 +13192,8 @@ case `$LD -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -17992,7 +18081,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -13453,8 +13236,8 @@ else
+@@ -13453,8 +13243,8 @@ else
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -18003,7 +18092,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -13571,21 +13354,18 @@ case "(($ac_try" in
+@@ -13571,21 +13361,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18029,7 +18118,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -13600,13 +13380,12 @@ if test -z "$aix_libpath"; then
+@@ -13600,13 +13387,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -18044,7 +18133,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13642,21 +13421,18 @@ case "(($ac_try" in
+@@ -13642,21 +13428,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18070,7 +18159,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -13671,13 +13447,12 @@ if test -z "$aix_libpath"; then
+@@ -13671,13 +13454,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -18085,7 +18174,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14080,7 +13855,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14080,7 +13862,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -18094,7 +18183,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -14407,8 +14182,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14407,8 +14189,8 @@ if test -z "$aix_libpath"; then aix_libp
      ld_shlibs_CXX=no
      ;;
  esac
@@ -18105,7 +18194,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -14427,7 +14202,7 @@ EOF
+@@ -14427,7 +14209,7 @@ EOF
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -18114,7 +18203,7 @@
    (exit $ac_status); }; then
    # Parse the compiler output and extract the necessary
    # objects, libraries and library flags.
-@@ -14583,8 +14358,8 @@ lt_prog_compiler_wl_CXX=
+@@ -14583,8 +14365,8 @@ lt_prog_compiler_wl_CXX=
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18125,7 +18214,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -14784,7 +14559,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14784,7 +14566,7 @@ $as_echo_n "checking for $compiler optio
  	    ;;
  	esac
  	;;
@@ -18134,7 +18223,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -14867,18 +14642,18 @@ $as_echo_n "checking for $compiler optio
+@@ -14867,18 +14649,18 @@ $as_echo_n "checking for $compiler optio
      esac
    fi
  
@@ -18158,21 +18247,21 @@
  else
    lt_cv_prog_compiler_pic_works_CXX=no
    ac_outfile=conftest.$ac_objext
-@@ -14893,11 +14668,11 @@ else
+@@ -14893,11 +14675,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:14896: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14671: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14678: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14900: \$? = $ac_status" >&5
-+   echo "$as_me:14675: \$? = $ac_status" >&5
++   echo "$as_me:14682: \$? = $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.
-@@ -14910,8 +14685,8 @@ else
+@@ -14910,8 +14692,8 @@ else
     $rm conftest*
  
  fi
@@ -18183,7 +18272,7 @@
  
  if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14938,10 +14713,10 @@ esac
+@@ -14938,10 +14720,10 @@ esac
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -18197,7 +18286,7 @@
  else
    lt_cv_prog_compiler_static_works_CXX=no
     save_LDFLAGS="$LDFLAGS"
-@@ -14966,8 +14741,8 @@ else
+@@ -14966,8 +14748,8 @@ else
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -18208,7 +18297,7 @@
  
  if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
      :
-@@ -14976,10 +14751,10 @@ else
+@@ -14976,10 +14758,10 @@ else
  fi
  
  
@@ -18222,21 +18311,21 @@
  else
    lt_cv_prog_compiler_c_o_CXX=no
     $rm -r conftest 2>/dev/null
-@@ -14997,11 +14772,11 @@ else
+@@ -14997,11 +14779,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:15000: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14775: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14782: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:15004: \$? = $ac_status" >&5
-+   echo "$as_me:14779: \$? = $ac_status" >&5
++   echo "$as_me:14786: \$? = $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
-@@ -15023,34 +14798,34 @@ else
+@@ -15023,34 +14805,34 @@ else
     $rm conftest*
  
  fi
@@ -18281,7 +18370,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -15069,14 +14844,17 @@ $as_echo_n "checking whether the $compil
+@@ -15069,14 +14851,17 @@ $as_echo_n "checking whether the $compil
    cygwin* | mingw*)
      export_symbols_cmds_CXX='$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'
    ;;
@@ -18301,7 +18390,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  #
-@@ -15096,15 +14874,15 @@ x|xyes)
+@@ -15096,15 +14881,15 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -18320,7 +18409,7 @@
    (exit $ac_status); } 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -15122,7 +14900,7 @@ $as_echo_n "checking whether -lc should 
+@@ -15122,7 +14907,7 @@ $as_echo_n "checking whether -lc should 
          if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
    (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
    ac_status=$?
@@ -18329,7 +18418,7 @@
    (exit $ac_status); }
          then
  	  archive_cmds_need_lc_CXX=no
-@@ -15134,16 +14912,16 @@ $as_echo_n "checking whether -lc should 
+@@ -15134,16 +14919,16 @@ $as_echo_n "checking whether -lc should 
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18350,7 +18439,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -15499,13 +15277,11 @@ linux* | k*bsd*-gnu)
+@@ -15499,13 +15284,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -18365,7 +18454,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15517,6 +15293,18 @@ linux* | k*bsd*-gnu)
+@@ -15517,6 +15300,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18384,7 +18473,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -15694,19 +15482,19 @@ uts4*)
+@@ -15694,19 +15489,19 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -18408,7 +18497,7 @@
  else
    lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
  fi
-@@ -15718,8 +15506,8 @@ if test "$GCC" = yes; then
+@@ -15718,8 +15513,8 @@ if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -18419,7 +18508,7 @@
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
     test -n "$runpath_var_CXX" || \
-@@ -15743,8 +15531,8 @@ else
+@@ -15743,8 +15538,8 @@ else
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -18430,7 +18519,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -16282,13 +16070,13 @@ done
+@@ -16282,13 +16077,13 @@ done
  cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
  
@@ -18450,7 +18539,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -16307,15 +16095,15 @@ aix[4-9]*)
+@@ -16307,15 +16102,15 @@ aix[4-9]*)
    fi
    ;;
  esac
@@ -18472,7 +18561,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16324,8 +16112,8 @@ lt_prog_compiler_wl_F77=
+@@ -16324,8 +16119,8 @@ lt_prog_compiler_wl_F77=
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -18483,7 +18572,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16556,18 +16344,18 @@ $as_echo_n "checking for $compiler optio
+@@ -16556,18 +16351,18 @@ $as_echo_n "checking for $compiler optio
      esac
    fi
  
@@ -18507,21 +18596,21 @@
  else
    lt_cv_prog_compiler_pic_works_F77=no
    ac_outfile=conftest.$ac_objext
-@@ -16582,11 +16370,11 @@ else
+@@ -16582,11 +16377,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:16585: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16373: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16589: \$? = $ac_status" >&5
-+   echo "$as_me:16377: \$? = $ac_status" >&5
++   echo "$as_me:16384: \$? = $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.
-@@ -16599,8 +16387,8 @@ else
+@@ -16599,8 +16394,8 @@ else
     $rm conftest*
  
  fi
@@ -18532,7 +18621,7 @@
  
  if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16627,10 +16415,10 @@ esac
+@@ -16627,10 +16422,10 @@ esac
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -18546,7 +18635,7 @@
  else
    lt_cv_prog_compiler_static_works_F77=no
     save_LDFLAGS="$LDFLAGS"
-@@ -16655,8 +16443,8 @@ else
+@@ -16655,8 +16450,8 @@ else
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -18557,7 +18646,7 @@
  
  if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
      :
-@@ -16665,10 +16453,10 @@ else
+@@ -16665,10 +16460,10 @@ else
  fi
  
  
@@ -18571,21 +18660,21 @@
  else
    lt_cv_prog_compiler_c_o_F77=no
     $rm -r conftest 2>/dev/null
-@@ -16686,11 +16474,11 @@ else
+@@ -16686,11 +16481,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:16689: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16477: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16693: \$? = $ac_status" >&5
-+   echo "$as_me:16481: \$? = $ac_status" >&5
++   echo "$as_me:16488: \$? = $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
-@@ -16712,34 +16500,34 @@ else
+@@ -16712,34 +16507,34 @@ else
     $rm conftest*
  
  fi
@@ -18630,7 +18719,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16951,12 +16739,13 @@ EOF
+@@ -16951,12 +16746,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -18645,7 +18734,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -17159,21 +16948,18 @@ case "(($ac_try" in
+@@ -17159,21 +16955,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18671,7 +18760,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -17188,13 +16974,12 @@ if test -z "$aix_libpath"; then
+@@ -17188,13 +16981,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -18686,7 +18775,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17219,21 +17004,18 @@ case "(($ac_try" in
+@@ -17219,21 +17011,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18712,7 +18801,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -17248,13 +17030,12 @@ if test -z "$aix_libpath"; then
+@@ -17248,13 +17037,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -18727,7 +18816,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17487,7 +17268,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17487,7 +17275,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs_F77=yes
        ;;
  
@@ -18736,7 +18825,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17706,8 +17487,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17706,8 +17494,8 @@ if test -z "$aix_libpath"; then aix_libp
      esac
    fi
  
@@ -18747,7 +18836,7 @@
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
  #
-@@ -17727,15 +17508,15 @@ x|xyes)
+@@ -17727,15 +17515,15 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -18766,7 +18855,7 @@
    (exit $ac_status); } 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -17753,7 +17534,7 @@ $as_echo_n "checking whether -lc should 
+@@ -17753,7 +17541,7 @@ $as_echo_n "checking whether -lc should 
          if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
    (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
    ac_status=$?
@@ -18775,7 +18864,7 @@
    (exit $ac_status); }
          then
  	  archive_cmds_need_lc_F77=no
-@@ -17765,16 +17546,16 @@ $as_echo_n "checking whether -lc should 
+@@ -17765,16 +17553,16 @@ $as_echo_n "checking whether -lc should 
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18796,7 +18885,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -18130,13 +17911,11 @@ linux* | k*bsd*-gnu)
+@@ -18130,13 +17918,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -18811,7 +18900,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18148,6 +17927,18 @@ linux* | k*bsd*-gnu)
+@@ -18148,6 +17934,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18830,7 +18919,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -18325,19 +18116,19 @@ uts4*)
+@@ -18325,19 +18123,19 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -18854,7 +18943,7 @@
  else
    lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
  fi
-@@ -18349,8 +18140,8 @@ if test "$GCC" = yes; then
+@@ -18349,8 +18147,8 @@ if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -18865,7 +18954,7 @@
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
     test -n "$runpath_var_F77" || \
-@@ -18374,8 +18165,8 @@ else
+@@ -18374,8 +18172,8 @@ else
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -18876,7 +18965,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -18885,10 +18676,10 @@ if test "$GCC" = yes; then
+@@ -18885,10 +18683,10 @@ if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -18890,21 +18979,21 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
-@@ -18903,11 +18694,11 @@ else
+@@ -18903,11 +18701,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:18906: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18697: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18704: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18910: \$? = $ac_status" >&5
-+   echo "$as_me:18701: \$? = $ac_status" >&5
++   echo "$as_me:18708: \$? = $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.
-@@ -18920,8 +18711,8 @@ else
+@@ -18920,8 +18718,8 @@ else
     $rm conftest*
  
  fi
@@ -18915,7 +19004,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18935,8 +18726,8 @@ lt_prog_compiler_wl_GCJ=
+@@ -18935,8 +18733,8 @@ lt_prog_compiler_wl_GCJ=
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -18926,7 +19015,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -19167,18 +18958,18 @@ $as_echo_n "checking for $compiler optio
+@@ -19167,18 +18965,18 @@ $as_echo_n "checking for $compiler optio
      esac
    fi
  
@@ -18950,21 +19039,21 @@
  else
    lt_cv_prog_compiler_pic_works_GCJ=no
    ac_outfile=conftest.$ac_objext
-@@ -19193,11 +18984,11 @@ else
+@@ -19193,11 +18991,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:19196: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18987: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18994: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:19200: \$? = $ac_status" >&5
-+   echo "$as_me:18991: \$? = $ac_status" >&5
++   echo "$as_me:18998: \$? = $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.
-@@ -19210,8 +19001,8 @@ else
+@@ -19210,8 +19008,8 @@ else
     $rm conftest*
  
  fi
@@ -18975,7 +19064,7 @@
  
  if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -19238,10 +19029,10 @@ esac
+@@ -19238,10 +19036,10 @@ esac
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -18989,7 +19078,7 @@
  else
    lt_cv_prog_compiler_static_works_GCJ=no
     save_LDFLAGS="$LDFLAGS"
-@@ -19266,8 +19057,8 @@ else
+@@ -19266,8 +19064,8 @@ else
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -19000,7 +19089,7 @@
  
  if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
      :
-@@ -19276,10 +19067,10 @@ else
+@@ -19276,10 +19074,10 @@ else
  fi
  
  
@@ -19014,21 +19103,21 @@
  else
    lt_cv_prog_compiler_c_o_GCJ=no
     $rm -r conftest 2>/dev/null
-@@ -19297,11 +19088,11 @@ else
+@@ -19297,11 +19095,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:19300: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19091: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19098: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:19304: \$? = $ac_status" >&5
-+   echo "$as_me:19095: \$? = $ac_status" >&5
++   echo "$as_me:19102: \$? = $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
-@@ -19323,34 +19114,34 @@ else
+@@ -19323,34 +19121,34 @@ else
     $rm conftest*
  
  fi
@@ -19073,7 +19162,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -19562,12 +19353,13 @@ EOF
+@@ -19562,12 +19360,13 @@ EOF
    $echo "local: *; };" >> $output_objdir/$libname.ver~
  	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
  	fi
@@ -19088,7 +19177,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -19780,21 +19572,18 @@ case "(($ac_try" in
+@@ -19780,21 +19579,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19114,7 +19203,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -19809,13 +19598,12 @@ if test -z "$aix_libpath"; then
+@@ -19809,13 +19605,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -19129,7 +19218,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19850,21 +19638,18 @@ case "(($ac_try" in
+@@ -19850,21 +19645,18 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19155,7 +19244,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -19879,13 +19664,12 @@ if test -z "$aix_libpath"; then
+@@ -19879,13 +19671,12 @@ if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
  else
@@ -19170,7 +19259,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20118,7 +19902,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20118,7 +19909,7 @@ if test -z "$aix_libpath"; then aix_libp
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -19179,7 +19268,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -20337,8 +20121,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20337,8 +20128,8 @@ if test -z "$aix_libpath"; then aix_libp
      esac
    fi
  
@@ -19190,7 +19279,7 @@
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
  #
-@@ -20358,15 +20142,15 @@ x|xyes)
+@@ -20358,15 +20149,15 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -19209,7 +19298,7 @@
    (exit $ac_status); } 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -20384,7 +20168,7 @@ $as_echo_n "checking whether -lc should 
+@@ -20384,7 +20175,7 @@ $as_echo_n "checking whether -lc should 
          if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
    (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
    ac_status=$?
@@ -19218,7 +19307,7 @@
    (exit $ac_status); }
          then
  	  archive_cmds_need_lc_GCJ=no
-@@ -20396,16 +20180,16 @@ $as_echo_n "checking whether -lc should 
+@@ -20396,16 +20187,16 @@ $as_echo_n "checking whether -lc should 
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -19239,7 +19328,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -20761,13 +20545,11 @@ linux* | k*bsd*-gnu)
+@@ -20761,13 +20552,11 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
@@ -19254,7 +19343,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20779,6 +20561,18 @@ linux* | k*bsd*-gnu)
+@@ -20779,6 +20568,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19273,7 +19362,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -20956,19 +20750,19 @@ uts4*)
+@@ -20956,19 +20757,19 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -19297,7 +19386,7 @@
  else
    lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
  fi
-@@ -20980,8 +20774,8 @@ if test "$GCC" = yes; then
+@@ -20980,8 +20781,8 @@ if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -19308,7 +19397,7 @@
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
     test -n "$runpath_var_GCJ" || \
-@@ -21005,8 +20799,8 @@ else
+@@ -21005,8 +20806,8 @@ else
    # directories.
    hardcode_action_GCJ=unsupported
  fi
@@ -19319,7 +19408,7 @@
  
  if test "$hardcode_action_GCJ" = relink; then
    # Fast installation is not supported
-@@ -21929,8 +21723,8 @@ CC="$lt_save_CC"
+@@ -21929,8 +21730,8 @@ CC="$lt_save_CC"
  	;;
  
        *)
@@ -19330,7 +19419,7 @@
     { (exit 1); exit 1; }; }
  	;;
        esac
-@@ -21949,8 +21743,8 @@ $as_echo "$as_me: error: Unsupported tag
+@@ -21949,8 +21750,8 @@ $as_echo "$as_me: error: Unsupported tag
      chmod +x "$ofile"
    else
      rm -f "${ofile}T"
@@ -19341,7 +19430,7 @@
     { (exit 1); exit 1; }; }
    fi
  fi
-@@ -21986,16 +21780,16 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21986,16 +21787,16 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  #AC_PROG_SED available in 2.59b
  if test "x$CC" != xcc; then
@@ -19364,7 +19453,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22021,21 +21815,19 @@ if { (case "(($ac_try" in
+@@ -22021,21 +21822,19 @@ if { (case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19390,7 +19479,7 @@
    (exit $ac_status); };
  then
    eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-@@ -22046,11 +21838,10 @@ then
+@@ -22046,11 +21845,10 @@ then
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19404,7 +19493,7 @@
    (exit $ac_status); }; }; then
        ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
        rm -f conftest2.*
-@@ -22058,21 +21849,19 @@ $as_echo "$ac_try_echo") >&5
+@@ -22058,21 +21856,19 @@ $as_echo "$ac_try_echo") >&5
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19430,7 +19519,7 @@
    (exit $ac_status); };
        then
  	# cc works too.
-@@ -22090,11 +21879,11 @@ rm -f core conftest*
+@@ -22090,11 +21886,11 @@ rm -f core conftest*
  
  fi
  if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -19446,7 +19535,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define NO_MINUS_C_MINUS_O 1
-@@ -22119,10 +21908,10 @@ fi
+@@ -22119,10 +21915,10 @@ fi
  
  # Extract the first word of "glib-genmarshal", so it can be a program name with args.
  set dummy glib-genmarshal; ac_word=$2
@@ -19460,7 +19549,7 @@
  else
    case $GLIB_GENMARSHAL in
    [\\/]* | ?:[\\/]*)
-@@ -22137,7 +21926,7 @@ do
+@@ -22137,7 +21933,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
@@ -19469,7 +19558,7 @@
      break 2
    fi
  done
-@@ -22149,20 +21938,20 @@ esac
+@@ -22149,20 +21945,20 @@ esac
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -19497,7 +19586,7 @@
  else
    case $GCONFTOOL in
    [\\/]* | ?:[\\/]*)
-@@ -22177,7 +21966,7 @@ do
+@@ -22177,7 +21973,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -19506,7 +19595,7 @@
      break 2
    fi
  done
-@@ -22189,11 +21978,11 @@ esac
+@@ -22189,11 +21985,11 @@ esac
  fi
  GCONFTOOL=$ac_cv_path_GCONFTOOL
  if test -n "$GCONFTOOL"; then
@@ -19522,7 +19611,7 @@
  fi
  
  
-@@ -22232,8 +22021,8 @@ fi
+@@ -22232,8 +22028,8 @@ fi
  	for option in -Wno-sign-compare; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -19533,7 +19622,7 @@
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22255,21 +22044,20 @@ case "(($ac_try" in
+@@ -22255,21 +22051,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19558,7 +19647,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	has_option=no
-@@ -22277,8 +22065,8 @@ fi
+@@ -22277,8 +22072,8 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  		CFLAGS="$SAVE_CFLAGS"
@@ -19569,7 +19658,7 @@
  		if test $has_option = yes; then
  		  warning_flags="$warning_flags $option"
  		fi
-@@ -22291,16 +22079,16 @@ $as_echo "$has_option" >&6; }
+@@ -22291,16 +22086,16 @@ $as_echo "$has_option" >&6; }
  	fi
  	;;
      *)
@@ -19592,7 +19681,7 @@
  
      # Check whether --enable-iso-c was given.
  if test "${enable_iso_c+set}" = set; then
-@@ -22310,8 +22098,8 @@ else
+@@ -22310,8 +22105,8 @@ else
  fi
  
  
@@ -19603,7 +19692,7 @@
      complCFLAGS=
      if test "x$enable_iso_c" != "xno"; then
  	if test "x$GCC" = "xyes"; then
-@@ -22325,8 +22113,8 @@ $as_echo_n "checking what language compl
+@@ -22325,8 +22120,8 @@ $as_echo_n "checking what language compl
  	esac
  	fi
      fi
@@ -19614,7 +19703,7 @@
  
      WARN_CFLAGS="$warning_flags $complCFLAGS"
  
-@@ -22348,21 +22136,20 @@ fi
+@@ -22348,21 +22143,20 @@ fi
  
  for ac_header in crt_externs.h
  do
@@ -19645,7 +19734,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22378,33 +22165,32 @@ case "(($ac_try" in
+@@ -22378,33 +22172,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19686,7 +19775,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22418,52 +22204,51 @@ case "(($ac_try" in
+@@ -22418,52 +22211,51 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19760,7 +19849,7 @@
      ( cat <<\_ASBOX
  ## -------------------------------------------------------------------------- ##
  ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -22472,23 +22257,21 @@ _ASBOX
+@@ -22472,23 +22264,21 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -19792,7 +19881,7 @@
  _ACEOF
  
  fi
-@@ -22498,11 +22281,11 @@ done
+@@ -22498,11 +22288,11 @@ done
  
  for ac_func in _NSGetEnviron
  do
@@ -19808,7 +19897,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22555,41 +22338,35 @@ case "(($ac_try" in
+@@ -22555,41 +22345,35 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19860,7 +19949,7 @@
  _ACEOF
  
  fi
-@@ -22623,10 +22400,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != 
+@@ -22623,10 +22407,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != 
  	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.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -19874,7 +19963,7 @@
  else
    case $PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-@@ -22641,7 +22418,7 @@ do
+@@ -22641,7 +22425,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -19883,7 +19972,7 @@
      break 2
    fi
  done
-@@ -22653,11 +22430,11 @@ esac
+@@ -22653,11 +22437,11 @@ esac
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -19899,7 +19988,7 @@
  fi
  
  
-@@ -22666,10 +22443,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -22666,10 +22450,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -19913,7 +20002,7 @@
  else
    case $ac_pt_PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-@@ -22684,7 +22461,7 @@ do
+@@ -22684,7 +22468,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -19922,7 +20011,7 @@
      break 2
    fi
  done
-@@ -22696,11 +22473,11 @@ esac
+@@ -22696,11 +22480,11 @@ esac
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -19938,7 +20027,7 @@
  fi
  
    if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -22708,10 +22485,10 @@ fi
+@@ -22708,10 +22492,10 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -19951,7 +20040,7 @@
  whose name does not start with the host triplet.  If you think this
  configuration is useful to you, please write to autoconf at gnu.org." >&2;}
  ac_tool_warned=yes ;;
-@@ -22725,54 +22502,58 @@ fi
+@@ -22725,54 +22509,58 @@ fi
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -20034,7 +20123,7 @@
  fi
  
  
-@@ -22785,14 +22566,14 @@ else
+@@ -22785,14 +22573,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20052,7 +20141,7 @@
  
  $PANEL_PKG_ERRORS
  
-@@ -22803,7 +22584,7 @@ Alternatively, you may set the environme
+@@ -22803,7 +22591,7 @@ Alternatively, you may set the environme
  and PANEL_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -20061,7 +20150,7 @@
  
  $PANEL_PKG_ERRORS
  
-@@ -22816,7 +22597,7 @@ See the pkg-config man page for more det
+@@ -22816,7 +22604,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -20070,7 +20159,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -22826,7 +22607,7 @@ See the pkg-config man page for more det
+@@ -22826,7 +22614,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -20079,7 +20168,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -22840,8 +22621,8 @@ See \`config.log' for more details." >&2
+@@ -22840,8 +22628,8 @@ See \`config.log' for more details." >&2
  else
  	PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
  	PANEL_LIBS=$pkg_cv_PANEL_LIBS
@@ -20090,20 +20179,134 @@
  	:
  fi
  
-@@ -22849,40 +22630,44 @@ fi
+@@ -22849,40 +22637,158 @@ fi
  
  
  pkg_failed=no
 -{ $as_echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
 -$as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
-+{ echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
-+echo $ECHO_N "checking for LIBPANEL_APPLET... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for LOGOUT" >&5
++echo $ECHO_N "checking for LOGOUT... $ECHO_C" >&6; }
  
 -if test -n "$LIBPANEL_APPLET_CFLAGS"; then
 -    pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++    if test -n "$LOGOUT_CFLAGS"; then
++        pkg_cv_LOGOUT_CFLAGS="$LOGOUT_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_LOGOUT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$LOGOUT_LIBS"; then
++        pkg_cv_LOGOUT_LIBS="$LOGOUT_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_LOGOUT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++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
++	        LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++        else
++	        LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$LOGOUT_PKG_ERRORS" >&5
++
++	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++
++$LOGOUT_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++
++$LOGOUT_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++   { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++	LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
++	LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	:
++fi
++
++
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
++echo $ECHO_N "checking for LIBPANEL_APPLET... $ECHO_C" >&6; }
++
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$LIBPANEL_APPLET_CFLAGS"; then
 +        pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
@@ -20153,7 +20356,7 @@
  fi
  
  
-@@ -22895,14 +22680,14 @@ else
+@@ -22895,14 +22801,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20171,7 +20374,7 @@
  
  $LIBPANEL_APPLET_PKG_ERRORS
  
-@@ -22913,7 +22698,7 @@ Alternatively, you may set the environme
+@@ -22913,7 +22819,7 @@ Alternatively, you may set the environme
  and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -20180,7 +20383,7 @@
  
  $LIBPANEL_APPLET_PKG_ERRORS
  
-@@ -22926,7 +22711,7 @@ See the pkg-config man page for more det
+@@ -22926,7 +22832,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -20189,7 +20392,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -22936,7 +22721,7 @@ See the pkg-config man page for more det
+@@ -22936,7 +22842,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -20198,7 +20401,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -22950,8 +22735,8 @@ See \`config.log' for more details." >&2
+@@ -22950,8 +22856,8 @@ See \`config.log' for more details." >&2
  else
  	LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
  	LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
@@ -20209,7 +20412,7 @@
  	:
  fi
  
-@@ -22959,40 +22744,44 @@ fi
+@@ -22959,40 +22865,44 @@ fi
  
  
  pkg_failed=no
@@ -20272,7 +20475,7 @@
  fi
  
  
-@@ -23005,14 +22794,14 @@ else
+@@ -23005,14 +22915,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20290,7 +20493,7 @@
  
  $WNCKLET_PKG_ERRORS
  
-@@ -23023,7 +22812,7 @@ Alternatively, you may set the environme
+@@ -23023,7 +22933,7 @@ Alternatively, you may set the environme
  and WNCKLET_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -20299,7 +20502,7 @@
  
  $WNCKLET_PKG_ERRORS
  
-@@ -23036,7 +22825,7 @@ See the pkg-config man page for more det
+@@ -23036,7 +22946,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -20308,7 +20511,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23046,7 +22835,7 @@ See the pkg-config man page for more det
+@@ -23046,7 +22956,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -20317,7 +20520,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23060,8 +22849,8 @@ See \`config.log' for more details." >&2
+@@ -23060,8 +22970,8 @@ See \`config.log' for more details." >&2
  else
  	WNCKLET_CFLAGS=$pkg_cv_WNCKLET_CFLAGS
  	WNCKLET_LIBS=$pkg_cv_WNCKLET_LIBS
@@ -20328,7 +20531,7 @@
  	:
  fi
  
-@@ -23070,21 +22859,20 @@ fi
+@@ -23070,21 +22980,20 @@ fi
  
  for ac_header in langinfo.h
  do
@@ -20359,7 +20562,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23100,33 +22888,32 @@ case "(($ac_try" in
+@@ -23100,33 +23009,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20400,7 +20603,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23140,52 +22927,51 @@ case "(($ac_try" in
+@@ -23140,52 +23048,51 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20474,7 +20677,7 @@
      ( cat <<\_ASBOX
  ## -------------------------------------------------------------------------- ##
  ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -23194,23 +22980,21 @@ _ASBOX
+@@ -23194,23 +23101,21 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -20506,7 +20709,7 @@
  _ACEOF
  
  fi
-@@ -23220,11 +23004,11 @@ done
+@@ -23220,11 +23125,11 @@ done
  
  for ac_func in nl_langinfo
  do
@@ -20522,7 +20725,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23277,41 +23061,35 @@ case "(($ac_try" in
+@@ -23277,41 +23182,35 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20574,7 +20777,7 @@
  _ACEOF
  
  fi
-@@ -23331,16 +23109,16 @@ if test "x$enable_eds" = "xyes"; then
+@@ -23331,16 +23230,16 @@ if test "x$enable_eds" = "xyes"; then
    CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
  else
    if test "x$enable_eds" != "xno"; then
@@ -20597,7 +20800,7 @@
      fi
    fi
  fi
-@@ -23363,40 +23141,44 @@ fi
+@@ -23363,40 +23262,44 @@ fi
  
  
  pkg_failed=no
@@ -20660,7 +20863,7 @@
  fi
  
  
-@@ -23409,14 +23191,14 @@ else
+@@ -23409,14 +23312,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20678,7 +20881,7 @@
  
  $CLOCK_PKG_ERRORS
  
-@@ -23427,7 +23209,7 @@ Alternatively, you may set the environme
+@@ -23427,7 +23330,7 @@ Alternatively, you may set the environme
  and CLOCK_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -20687,7 +20890,7 @@
  
  $CLOCK_PKG_ERRORS
  
-@@ -23440,7 +23222,7 @@ See the pkg-config man page for more det
+@@ -23440,7 +23343,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -20696,7 +20899,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23450,7 +23232,7 @@ See the pkg-config man page for more det
+@@ -23450,7 +23353,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -20705,7 +20908,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23464,8 +23246,8 @@ See \`config.log' for more details." >&2
+@@ -23464,8 +23367,8 @@ See \`config.log' for more details." >&2
  else
  	CLOCK_CFLAGS=$pkg_cv_CLOCK_CFLAGS
  	CLOCK_LIBS=$pkg_cv_CLOCK_LIBS
@@ -20716,7 +20919,7 @@
  	:
  fi
  
-@@ -23473,40 +23255,44 @@ fi
+@@ -23473,40 +23376,44 @@ fi
  
  
  pkg_failed=no
@@ -20779,7 +20982,7 @@
  fi
  
  
-@@ -23519,14 +23305,14 @@ else
+@@ -23519,14 +23426,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20797,7 +21000,7 @@
  
  $CLOCK_MECHANISM_PKG_ERRORS
  
-@@ -23537,7 +23323,7 @@ Alternatively, you may set the environme
+@@ -23537,7 +23444,7 @@ Alternatively, you may set the environme
  and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -20806,7 +21009,7 @@
  
  $CLOCK_MECHANISM_PKG_ERRORS
  
-@@ -23550,7 +23336,7 @@ See the pkg-config man page for more det
+@@ -23550,7 +23457,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -20815,7 +21018,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23560,7 +23346,7 @@ See the pkg-config man page for more det
+@@ -23560,7 +23467,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -20824,7 +21027,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23574,8 +23360,8 @@ See \`config.log' for more details." >&2
+@@ -23574,8 +23481,8 @@ See \`config.log' for more details." >&2
  else
  	CLOCK_MECHANISM_CFLAGS=$pkg_cv_CLOCK_MECHANISM_CFLAGS
  	CLOCK_MECHANISM_LIBS=$pkg_cv_CLOCK_MECHANISM_LIBS
@@ -20835,7 +21038,7 @@
  	:
  fi
  
-@@ -23606,40 +23392,44 @@ else
+@@ -23606,40 +23513,44 @@ else
    HAVE_POLKIT=no
  
  pkg_failed=no
@@ -20898,7 +21101,7 @@
  fi
  
  
-@@ -23652,29 +23442,29 @@ else
+@@ -23652,29 +23563,29 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -20936,7 +21139,7 @@
     { (exit 1); exit 1; }; }
    fi
  
-@@ -23686,40 +23476,44 @@ _ACEOF
+@@ -23686,40 +23597,44 @@ _ACEOF
  
  
  pkg_failed=no
@@ -20999,7 +21202,7 @@
  fi
  
  
-@@ -23732,14 +23526,14 @@ else
+@@ -23732,14 +23647,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -21017,7 +21220,7 @@
  
  $POLKIT_DBUS_PKG_ERRORS
  
-@@ -23750,7 +23544,7 @@ Alternatively, you may set the environme
+@@ -23750,7 +23665,7 @@ Alternatively, you may set the environme
  and POLKIT_DBUS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -21026,7 +21229,7 @@
  
  $POLKIT_DBUS_PKG_ERRORS
  
-@@ -23763,7 +23557,7 @@ See the pkg-config man page for more det
+@@ -23763,7 +23678,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -21035,7 +21238,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23773,7 +23567,7 @@ See the pkg-config man page for more det
+@@ -23773,7 +23688,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -21044,7 +21247,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -23787,16 +23581,16 @@ See \`config.log' for more details." >&2
+@@ -23787,16 +23702,16 @@ See \`config.log' for more details." >&2
  else
  	POLKIT_DBUS_CFLAGS=$pkg_cv_POLKIT_DBUS_CFLAGS
  	POLKIT_DBUS_LIBS=$pkg_cv_POLKIT_DBUS_LIBS
@@ -21066,7 +21269,7 @@
  else
    if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
    ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE="$POLKIT_POLICY_FILE_VALIDATE" # Let the user override the test.
-@@ -23809,7 +23603,7 @@ do
+@@ -23809,7 +23724,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE="polkit-policy-file-validate"
@@ -21075,7 +21278,7 @@
      break 2
    fi
  done
-@@ -23820,11 +23614,11 @@ fi
+@@ -23820,11 +23735,11 @@ fi
  fi
  POLKIT_POLICY_FILE_VALIDATE=$ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE
  if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
@@ -21091,7 +21294,7 @@
  fi
  
  
-@@ -23855,40 +23649,44 @@ if test "x$enable_network_manager" = "xn
+@@ -23855,40 +23770,44 @@ if test "x$enable_network_manager" = "xn
  else
  
  pkg_failed=no
@@ -21154,7 +21357,7 @@
  fi
  
  
-@@ -23901,23 +23699,23 @@ else
+@@ -23901,23 +23820,23 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -21184,7 +21387,7 @@
  	HAVE_NETWORK_MANAGER=yes
  fi
  fi
-@@ -23931,40 +23729,44 @@ fi
+@@ -23931,40 +23850,44 @@ fi
  
  
  pkg_failed=no
@@ -21247,7 +21450,7 @@
  fi
  
  
-@@ -23977,14 +23779,14 @@ else
+@@ -23977,14 +23900,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -21265,7 +21468,7 @@
  
  $FISH_PKG_ERRORS
  
-@@ -23995,7 +23797,7 @@ Alternatively, you may set the environme
+@@ -23995,7 +23918,7 @@ Alternatively, you may set the environme
  and FISH_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -21274,7 +21477,7 @@
  
  $FISH_PKG_ERRORS
  
-@@ -24008,7 +23810,7 @@ See the pkg-config man page for more det
+@@ -24008,7 +23931,7 @@ See the pkg-config man page for more det
  " >&2;}
     { (exit 1); exit 1; }; }
  elif test $pkg_failed = untried; then
@@ -21283,7 +21486,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -24018,7 +23820,7 @@ See the pkg-config man page for more det
+@@ -24018,7 +23941,7 @@ See the pkg-config man page for more det
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  See \`config.log' for more details." >&5
@@ -21292,7 +21495,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -24032,8 +23834,8 @@ See \`config.log' for more details." >&2
+@@ -24032,8 +23955,8 @@ See \`config.log' for more details." >&2
  else
  	FISH_CFLAGS=$pkg_cv_FISH_CFLAGS
  	FISH_LIBS=$pkg_cv_FISH_LIBS
@@ -21303,7 +21506,7 @@
  	:
  fi
  
-@@ -24159,11 +23961,11 @@ fi
+@@ -24159,11 +24082,11 @@ fi
  
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -21319,7 +21522,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24189,21 +23991,20 @@ case "(($ac_try" in
+@@ -24189,21 +24112,20 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21344,7 +21547,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
-@@ -24211,14 +24012,12 @@ fi
+@@ -24211,14 +24133,12 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -21364,7 +21567,7 @@
  _ACEOF
  
  ac_header_dirent=$ac_hdr; break
-@@ -24227,10 +24026,10 @@ fi
+@@ -24227,10 +24147,10 @@ fi
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -21378,7 +21581,7 @@
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -24268,30 +24067,26 @@ case "(($ac_try" in
+@@ -24268,30 +24188,26 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21414,7 +21617,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24306,8 +24101,8 @@ fi
+@@ -24306,8 +24222,8 @@ fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -21425,7 +21628,7 @@
  ac_res=$ac_cv_search_opendir
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24315,10 +24110,10 @@ if test "$ac_res" != no; then
+@@ -24315,10 +24231,10 @@ if test "$ac_res" != no; then
  fi
  
  else
@@ -21439,7 +21642,7 @@
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -24356,30 +24151,26 @@ case "(($ac_try" in
+@@ -24356,30 +24272,26 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21475,7 +21678,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24394,8 +24185,8 @@ fi
+@@ -24394,8 +24306,8 @@ fi
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -21486,7 +21689,7 @@
  ac_res=$ac_cv_search_opendir
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24404,10 +24195,10 @@ fi
+@@ -24404,10 +24316,10 @@ fi
  
  fi
  
@@ -21500,7 +21703,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24446,37 +24237,33 @@ case "(($ac_try" in
+@@ -24446,37 +24358,33 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21545,7 +21748,7 @@
     if test $jm_cv_struct_dirent_d_type = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -24488,8 +24275,8 @@ _ACEOF
+@@ -24488,8 +24396,8 @@ _ACEOF
  
  
  
@@ -21556,7 +21759,7 @@
  
  
  # Check whether --with-x was given.
-@@ -24503,11 +24290,11 @@ if test "x$with_x" = xno; then
+@@ -24503,11 +24411,11 @@ if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -21571,7 +21774,7 @@
  else
    # One or both of the vars are not set, and there is no cached value.
  ac_x_includes=no ac_x_libraries=no
-@@ -24528,7 +24315,7 @@ _ACEOF
+@@ -24528,7 +24436,7 @@ _ACEOF
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
      # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
@@ -21580,7 +21783,7 @@
        if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
  	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
  	ac_im_usrlibdir=$ac_im_libdir; break
-@@ -24603,14 +24390,13 @@ case "(($ac_try" in
+@@ -24603,14 +24511,13 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21597,7 +21800,7 @@
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -24618,7 +24404,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -24618,7 +24525,7 @@ $as_echo "$ac_try_echo") >&5
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
@@ -21606,7 +21809,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    for ac_dir in $ac_x_header_dirs; do
-@@ -24659,33 +24445,30 @@ case "(($ac_try" in
+@@ -24659,33 +24566,30 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21647,7 +21850,7 @@
      if test -r "$ac_dir/libX11.$ac_extension"; then
        ac_x_libraries=$ac_dir
        break 2
-@@ -24694,7 +24477,6 @@ do
+@@ -24694,7 +24598,6 @@ do
  done
  fi
  
@@ -21655,7 +21858,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = no
-@@ -24717,8 +24499,8 @@ fi
+@@ -24717,8 +24620,8 @@ fi
  fi # $with_x != no
  
  if test "$have_x" != yes; then
@@ -21666,7 +21869,7 @@
    no_x=yes
  else
    # If each of the values was on the command line, it overrides each guess.
-@@ -24728,46 +24510,50 @@ else
+@@ -24728,46 +24631,50 @@ else
    ac_cv_have_x="have_x=yes\
  	ac_x_includes='$x_includes'\
  	ac_x_libraries='$x_libraries'"
@@ -21737,7 +21940,7 @@
  fi
  
  
-@@ -24780,15 +24566,15 @@ else
+@@ -24780,15 +24687,15 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -21757,7 +21960,7 @@
  
    # pkg-config modules not found (only present since X11R7 aka Xorg); use
    # old-style detection
-@@ -24810,8 +24596,8 @@ else
+@@ -24810,8 +24717,8 @@ else
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -21768,7 +21971,7 @@
      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
      ac_xsave_c_werror_flag=$ac_c_werror_flag
      ac_c_werror_flag=yes
-@@ -24836,26 +24622,23 @@ case "(($ac_try" in
+@@ -24836,26 +24743,23 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21802,7 +22005,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -24880,38 +24663,33 @@ case "(($ac_try" in
+@@ -24880,38 +24784,33 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21850,7 +22053,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -24957,30 +24735,27 @@ case "(($ac_try" in
+@@ -24957,30 +24856,27 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21889,7 +22092,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
-@@ -25012,45 +24787,41 @@ case "(($ac_try" in
+@@ -25012,45 +24908,41 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21945,7 +22148,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
-@@ -25082,36 +24853,32 @@ case "(($ac_try" in
+@@ -25082,36 +24974,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -21989,7 +22192,7 @@
  if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
-@@ -25119,7 +24886,6 @@ fi
+@@ -25119,7 +25007,6 @@ fi
      fi
  fi
  
@@ -21997,7 +22200,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
-@@ -25132,10 +24898,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25132,10 +25019,10 @@ rm -f core conftest.err conftest.$ac_obj
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -22011,7 +22214,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -25188,41 +24954,37 @@ case "(($ac_try" in
+@@ -25188,41 +25075,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22063,7 +22266,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
-@@ -25254,45 +25016,41 @@ case "(($ac_try" in
+@@ -25254,45 +25137,41 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22119,7 +22322,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
-@@ -25324,36 +25082,32 @@ case "(($ac_try" in
+@@ -25324,36 +25203,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22163,7 +22366,7 @@
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-@@ -25368,10 +25122,10 @@ fi
+@@ -25368,10 +25243,10 @@ fi
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -22177,7 +22380,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -25424,41 +25178,37 @@ case "(($ac_try" in
+@@ -25424,41 +25299,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22229,7 +22432,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -25490,36 +25240,32 @@ case "(($ac_try" in
+@@ -25490,36 +25361,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22273,7 +22476,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
-@@ -25527,10 +25273,10 @@ fi
+@@ -25527,10 +25394,10 @@ fi
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -22287,7 +22490,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -25583,41 +25329,37 @@ case "(($ac_try" in
+@@ -25583,41 +25450,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22339,7 +22542,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
-@@ -25649,36 +25391,32 @@ case "(($ac_try" in
+@@ -25649,36 +25512,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22383,7 +22586,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -25686,10 +25424,10 @@ fi
+@@ -25686,10 +25545,10 @@ fi
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -22397,7 +22600,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -25742,41 +25480,37 @@ case "(($ac_try" in
+@@ -25742,41 +25601,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22449,7 +22652,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
-@@ -25808,36 +25542,32 @@ case "(($ac_try" in
+@@ -25808,36 +25663,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22493,7 +22696,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -25854,10 +25584,10 @@ fi
+@@ -25854,10 +25705,10 @@ fi
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -22507,7 +22710,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -25889,36 +25619,32 @@ case "(($ac_try" in
+@@ -25889,36 +25740,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22551,7 +22754,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-@@ -25929,8 +25655,8 @@ fi
+@@ -25929,8 +25776,8 @@ fi
  
    # X not found
    if test x$no_x = xyes ; then
@@ -22562,7 +22765,7 @@
     { (exit 1); exit 1; }; }
    fi
  
-@@ -25939,10 +25665,10 @@ $as_echo "$as_me: error: X development l
+@@ -25939,10 +25786,10 @@ $as_echo "$as_me: error: X development l
    CFLAGS="$X_CFLAGS"
    LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
  
@@ -22576,7 +22779,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11  $LIBS"
-@@ -25974,36 +25700,32 @@ case "(($ac_try" in
+@@ -25974,36 +25821,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22620,7 +22823,7 @@
  if test $ac_cv_lib_X11_XFree = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBX11 1
-@@ -26012,16 +25734,16 @@ _ACEOF
+@@ -26012,16 +25855,16 @@ _ACEOF
    LIBS="-lX11 $LIBS"
  
  else
@@ -22642,7 +22845,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXau  $LIBS"
-@@ -26053,36 +25775,32 @@ case "(($ac_try" in
+@@ -26053,36 +25896,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22686,7 +22889,7 @@
  if test $ac_cv_lib_Xau_XauFileName = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBXAU 1
-@@ -26091,8 +25809,8 @@ _ACEOF
+@@ -26091,8 +25930,8 @@ _ACEOF
    LIBS="-lXau $LIBS"
  
  else
@@ -22697,7 +22900,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -26123,8 +25841,8 @@ else
+@@ -26123,8 +25962,8 @@ else
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -22708,7 +22911,7 @@
      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
      ac_xsave_c_werror_flag=$ac_c_werror_flag
      ac_c_werror_flag=yes
-@@ -26149,26 +25867,23 @@ case "(($ac_try" in
+@@ -26149,26 +25988,23 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22742,7 +22945,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -26193,38 +25908,33 @@ case "(($ac_try" in
+@@ -26193,38 +26029,33 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22790,7 +22993,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -26270,30 +25980,27 @@ case "(($ac_try" in
+@@ -26270,30 +26101,27 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22829,7 +23032,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
-@@ -26325,45 +26032,41 @@ case "(($ac_try" in
+@@ -26325,45 +26153,41 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22885,7 +23088,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
-@@ -26395,36 +26098,32 @@ case "(($ac_try" in
+@@ -26395,36 +26219,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -22929,7 +23132,7 @@
  if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
-@@ -26432,7 +26131,6 @@ fi
+@@ -26432,7 +26252,6 @@ fi
      fi
  fi
  
@@ -22937,7 +23140,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
-@@ -26445,10 +26143,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -26445,10 +26264,10 @@ rm -f core conftest.err conftest.$ac_obj
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -22951,7 +23154,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -26501,41 +26199,37 @@ case "(($ac_try" in
+@@ -26501,41 +26320,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23003,7 +23206,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
-@@ -26567,45 +26261,41 @@ case "(($ac_try" in
+@@ -26567,45 +26382,41 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23059,7 +23262,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
-@@ -26637,36 +26327,32 @@ case "(($ac_try" in
+@@ -26637,36 +26448,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23103,7 +23306,7 @@
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-@@ -26681,10 +26367,10 @@ fi
+@@ -26681,10 +26488,10 @@ fi
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -23117,7 +23320,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -26737,41 +26423,37 @@ case "(($ac_try" in
+@@ -26737,41 +26544,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23169,7 +23372,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -26803,36 +26485,32 @@ case "(($ac_try" in
+@@ -26803,36 +26606,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23213,7 +23416,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
-@@ -26840,10 +26518,10 @@ fi
+@@ -26840,10 +26639,10 @@ fi
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -23227,7 +23430,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -26896,41 +26574,37 @@ case "(($ac_try" in
+@@ -26896,41 +26695,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23279,7 +23482,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
-@@ -26962,36 +26636,32 @@ case "(($ac_try" in
+@@ -26962,36 +26757,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23323,7 +23526,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -26999,10 +26669,10 @@ fi
+@@ -26999,10 +26790,10 @@ fi
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -23337,7 +23540,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -27055,41 +26725,37 @@ case "(($ac_try" in
+@@ -27055,41 +26846,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23389,7 +23592,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
-@@ -27121,36 +26787,32 @@ case "(($ac_try" in
+@@ -27121,36 +26908,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23433,7 +23636,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -27167,10 +26829,10 @@ fi
+@@ -27167,10 +26950,10 @@ fi
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -23447,7 +23650,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -27202,36 +26864,32 @@ case "(($ac_try" in
+@@ -27202,36 +26985,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23491,7 +23694,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-@@ -27242,8 +26900,8 @@ fi
+@@ -27242,8 +27021,8 @@ fi
  
    # X not found
    if test x$no_x = xyes ; then
@@ -23502,7 +23705,7 @@
     { (exit 1); exit 1; }; }
    fi
  
-@@ -27252,10 +26910,10 @@ $as_echo "$as_me: error: X development l
+@@ -27252,10 +27031,10 @@ $as_echo "$as_me: error: X development l
    CFLAGS="$X_CFLAGS"
    LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
  
@@ -23516,7 +23719,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lX11  $LIBS"
-@@ -27287,36 +26945,32 @@ case "(($ac_try" in
+@@ -27287,36 +27066,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23560,7 +23763,7 @@
  if test $ac_cv_lib_X11_XFree = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBX11 1
-@@ -27325,16 +26979,16 @@ _ACEOF
+@@ -27325,16 +27100,16 @@ _ACEOF
    LIBS="-lX11 $LIBS"
  
  else
@@ -23582,7 +23785,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lXau  $LIBS"
-@@ -27366,36 +27020,32 @@ case "(($ac_try" in
+@@ -27366,36 +27141,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23626,7 +23829,7 @@
  if test $ac_cv_lib_Xau_XauFileName = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBXAU 1
-@@ -27404,8 +27054,8 @@ _ACEOF
+@@ -27404,8 +27175,8 @@ _ACEOF
    LIBS="-lXau $LIBS"
  
  else
@@ -23637,7 +23840,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -27417,8 +27067,8 @@ fi
+@@ -27417,8 +27188,8 @@ fi
  else
  	X_CFLAGS=$pkg_cv_X_CFLAGS
  	X_LIBS=$pkg_cv_X_LIBS
@@ -23648,7 +23851,7 @@
  	:
  fi
  
-@@ -27447,21 +27097,20 @@ _ACEOF
+@@ -27447,21 +27218,20 @@ _ACEOF
  
  for ac_header in locale.h
  do
@@ -23679,7 +23882,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27477,33 +27126,32 @@ case "(($ac_try" in
+@@ -27477,33 +27247,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23720,7 +23923,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27517,52 +27165,51 @@ case "(($ac_try" in
+@@ -27517,52 +27286,51 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23794,7 +23997,7 @@
      ( cat <<\_ASBOX
  ## -------------------------------------------------------------------------- ##
  ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -27571,23 +27218,21 @@ _ASBOX
+@@ -27571,23 +27339,21 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -23826,7 +24029,7 @@
  _ACEOF
  
  fi
-@@ -27595,10 +27240,10 @@ fi
+@@ -27595,10 +27361,10 @@ fi
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -23840,7 +24043,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -27621,35 +27266,31 @@ case "(($ac_try" in
+@@ -27621,35 +27387,31 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23883,7 +24086,7 @@
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -27668,17 +27309,17 @@ _ACEOF
+@@ -27668,17 +27430,17 @@ _ACEOF
      INTLLIBS=
  
      if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -23908,7 +24111,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27694,33 +27335,32 @@ case "(($ac_try" in
+@@ -27694,33 +27456,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -23949,7 +24152,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27734,52 +27374,51 @@ case "(($ac_try" in
+@@ -27734,52 +27495,51 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24023,7 +24226,7 @@
      ( cat <<\_ASBOX
  ## -------------------------------------------------------------------------- ##
  ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -27788,15 +27427,15 @@ _ASBOX
+@@ -27788,15 +27548,15 @@ _ASBOX
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -24044,7 +24247,7 @@
  
  fi
  if test $ac_cv_header_libintl_h = yes; then
-@@ -27806,10 +27445,10 @@ if test $ac_cv_header_libintl_h = yes; t
+@@ -27806,10 +27566,10 @@ if test $ac_cv_header_libintl_h = yes; t
        #
        # First check in libc
        #
@@ -24058,7 +24261,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -27834,42 +27473,38 @@ case "(($ac_try" in
+@@ -27834,42 +27594,38 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24111,7 +24314,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -27894,47 +27529,43 @@ case "(($ac_try" in
+@@ -27894,47 +27650,43 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24170,7 +24373,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -27987,41 +27618,35 @@ case "(($ac_try" in
+@@ -27987,41 +27739,35 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24222,7 +24425,7 @@
  _ACEOF
  
  fi
-@@ -28036,10 +27661,10 @@ done
+@@ -28036,10 +27782,10 @@ done
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -24236,7 +24439,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl  $LIBS"
-@@ -28071,41 +27696,37 @@ case "(($ac_try" in
+@@ -28071,41 +27817,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24288,7 +24491,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl  $LIBS"
-@@ -28137,41 +27758,37 @@ case "(($ac_try" in
+@@ -28137,41 +27879,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24340,7 +24543,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl  $LIBS"
-@@ -28203,36 +27820,32 @@ case "(($ac_try" in
+@@ -28203,36 +27941,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24384,7 +24587,7 @@
  if test $ac_cv_lib_intl_dgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  fi
-@@ -28243,14 +27856,14 @@ fi
+@@ -28243,14 +27977,14 @@ fi
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -24406,7 +24609,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl -liconv $LIBS"
-@@ -28282,41 +27895,37 @@ case "(($ac_try" in
+@@ -28282,41 +28016,37 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24458,7 +24661,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl -liconv $LIBS"
-@@ -28348,36 +27957,32 @@ case "(($ac_try" in
+@@ -28348,36 +28078,32 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24502,7 +24705,7 @@
  if test $ac_cv_lib_intl_dcgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
-@@ -28403,11 +28008,11 @@ fi
+@@ -28403,11 +28129,11 @@ fi
  
  for ac_func in bind_textdomain_codeset
  do
@@ -24518,7 +24721,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -28460,41 +28065,35 @@ case "(($ac_try" in
+@@ -28460,41 +28186,35 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24570,7 +24773,7 @@
  _ACEOF
  
  fi
-@@ -28530,10 +28129,10 @@ _ACEOF
+@@ -28530,10 +28250,10 @@ _ACEOF
  
  	# Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -24584,7 +24787,7 @@
  else
    case "$MSGFMT" in
    /*)
-@@ -28557,11 +28156,11 @@ esac
+@@ -28557,11 +28277,11 @@ esac
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -24600,7 +24803,7 @@
  fi
  	if test "$MSGFMT" != "no"; then
            glib_save_LIBS="$LIBS"
-@@ -28569,11 +28168,11 @@ fi
+@@ -28569,11 +28289,11 @@ fi
  
  for ac_func in dcgettext
  do
@@ -24616,7 +24819,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -28626,49 +28225,43 @@ case "(($ac_try" in
+@@ -28626,49 +28346,43 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24678,7 +24881,7 @@
  	  cat >conftest.foo <<_ACEOF
  
  msgid ""
-@@ -28682,25 +28275,25 @@ msgstr ""
+@@ -28682,25 +28396,25 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -24713,7 +24916,7 @@
  else
    case $GMSGFMT in
    [\\/]* | ?:[\\/]*)
-@@ -28715,7 +28308,7 @@ do
+@@ -28715,7 +28429,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -24722,7 +24925,7 @@
      break 2
    fi
  done
-@@ -28728,20 +28321,20 @@ esac
+@@ -28728,20 +28442,20 @@ esac
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -24750,7 +24953,7 @@
  else
    case "$XGETTEXT" in
    /*)
-@@ -28765,11 +28358,11 @@ esac
+@@ -28765,11 +28479,11 @@ esac
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -24766,7 +24969,7 @@
  fi
  
  	  cat >conftest.$ac_ext <<_ACEOF
-@@ -28794,33 +28387,30 @@ case "(($ac_try" in
+@@ -28794,33 +28508,30 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24808,7 +25011,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -28873,35 +28463,31 @@ case "(($ac_try" in
+@@ -28873,35 +28584,31 @@ case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -24851,7 +25054,7 @@
  if test $ac_cv_func_bind_textdomain_codeset = yes; then
    CATOBJEXT=.gmo
                 DATADIRNAME=share
-@@ -28918,7 +28504,6 @@ fi
+@@ -28918,7 +28625,6 @@ fi
  	    esac
  fi
  
@@ -24859,7 +25062,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
            LIBS="$glib_save_LIBS"
-@@ -28944,8 +28529,8 @@ _ACEOF
+@@ -28944,8 +28650,8 @@ _ACEOF
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -24870,7 +25073,7 @@
          XGETTEXT=":"
        fi
      fi
-@@ -28977,8 +28562,8 @@ $as_echo "found xgettext program is not 
+@@ -28977,8 +28683,8 @@ $as_echo "found xgettext program is not 
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -24881,7 +25084,7 @@
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
           useit=no
-@@ -29002,8 +28587,8 @@ $as_echo_n "checking for catalogs to be 
+@@ -29002,8 +28708,8 @@ $as_echo_n "checking for catalogs to be 
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -24892,7 +25095,7 @@
       fi
  
            if test -n "$LINGUAS"; then
-@@ -29058,32 +28643,32 @@ fi
+@@ -29058,32 +28764,32 @@ fi
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -24936,7 +25139,7 @@
  else
    case $GTKDOC_CHECK in
    [\\/]* | ?:[\\/]*)
-@@ -29098,7 +28683,7 @@ do
+@@ -29098,7 +28804,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
@@ -24945,7 +25148,7 @@
      break 2
    fi
  done
-@@ -29110,11 +28695,11 @@ esac
+@@ -29110,11 +28816,11 @@ esac
  fi
  GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
  if test -n "$GTKDOC_CHECK"; then
@@ -24961,7 +25164,7 @@
  fi
  
  
-@@ -29145,10 +28730,10 @@ fi
+@@ -29145,10 +28851,10 @@ fi
  gdu_cv_version_required=0.3.2
  
  if test -n "$PKG_CONFIG" && \
@@ -24974,7 +25177,7 @@
    (exit $ac_status); }; then
    gdu_cv_have_gdu=yes
  else
-@@ -29158,8 +28743,8 @@ fi
+@@ -29158,8 +28864,8 @@ fi
  if test "$gdu_cv_have_gdu" = "yes"; then
  	:
  else
@@ -24985,7 +25188,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -29230,10 +28815,10 @@ fi
+@@ -29230,10 +28936,10 @@ fi
  
  # Extract the first word of "scrollkeeper-config", so it can be a program name with args.
  set dummy scrollkeeper-config; ac_word=$2
@@ -24999,7 +25202,7 @@
  else
    case $SCROLLKEEPER_CONFIG in
    [\\/]* | ?:[\\/]*)
-@@ -29248,7 +28833,7 @@ do
+@@ -29248,7 +28954,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -25008,7 +25211,7 @@
      break 2
    fi
  done
-@@ -29261,17 +28846,17 @@ esac
+@@ -29261,17 +28967,17 @@ esac
  fi
  SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
  if test -n "$SCROLLKEEPER_CONFIG"; then
@@ -25032,7 +25235,7 @@
     { (exit 1); exit 1; }; }
  fi
  
-@@ -29290,8 +28875,8 @@ fi
+@@ -29290,8 +28996,8 @@ fi
  
  
  
@@ -25043,7 +25246,7 @@
  
    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
      GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -29305,15 +28890,15 @@ fi
+@@ -29305,15 +29011,15 @@ fi
  
  
  
@@ -25063,7 +25266,7 @@
     { (exit 1); exit 1; }; } ;;
        esac
  fi
-@@ -29343,10 +28928,10 @@ for ac_prog in mawk gawk nawk awk
+@@ -29343,10 +29049,10 @@ for ac_prog in mawk gawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -25077,7 +25280,7 @@
  else
    case $AWK in
    [\\/]* | ?:[\\/]*)
-@@ -29361,7 +28946,7 @@ do
+@@ -29361,7 +29067,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
@@ -25086,7 +25289,7 @@
      break 2
    fi
  done
-@@ -29373,11 +28958,11 @@ esac
+@@ -29373,11 +29079,11 @@ esac
  fi
  AWK=$ac_cv_path_AWK
  if test -n "$AWK"; then
@@ -25102,7 +25305,7 @@
  fi
  
  
-@@ -29388,10 +28973,10 @@ for ac_prog in perl5 perl
+@@ -29388,10 +29094,10 @@ for ac_prog in perl5 perl
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -25116,7 +25319,7 @@
  else
    case $PERL in
    [\\/]* | ?:[\\/]*)
-@@ -29406,7 +28991,7 @@ do
+@@ -29406,7 +29112,7 @@ do
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -25125,7 +25328,7 @@
      break 2
    fi
  done
-@@ -29418,11 +29003,11 @@ esac
+@@ -29418,11 +29124,11 @@ esac
  fi
  PERL=$ac_cv_path_PERL
  if test -n "$PERL"; then
@@ -25141,7 +25344,7 @@
  fi
  
  
-@@ -29475,12 +29060,11 @@ _ACEOF
+@@ -29475,12 +29181,11 @@ _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -25156,7 +25359,7 @@
        *) $as_unset $ac_var ;;
        esac ;;
      esac
-@@ -29513,12 +29097,12 @@ $as_echo "$as_me: WARNING: Cache variabl
+@@ -29513,12 +29218,12 @@ $as_echo "$as_me: WARNING: Cache variabl
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -25173,7 +25376,7 @@
    fi
  fi
  rm -f confcache
-@@ -29534,7 +29118,7 @@ ac_ltlibobjs=
+@@ -29534,7 +29239,7 @@ ac_ltlibobjs=
  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$//'
@@ -25182,7 +25385,7 @@
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
    ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -29546,23 +29130,23 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -29546,23 +29251,23 @@ LTLIBOBJS=$ac_ltlibobjs
  
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -25212,7 +25415,7 @@
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -29571,104 +29155,103 @@ fi
+@@ -29571,104 +29276,103 @@ fi
  
  
  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -25346,7 +25549,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -29681,7 +29264,7 @@ ac_cs_silent=false
+@@ -29681,7 +29385,7 @@ ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
@@ -25355,7 +25558,7 @@
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
-@@ -29691,7 +29274,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+@@ -29691,7 +29395,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
@@ -25364,7 +25567,7 @@
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
-@@ -29713,45 +29296,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -29713,45 +29417,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -25419,7 +25622,7 @@
  fi
  
  # Support unset when possible.
-@@ -29767,6 +29322,8 @@ fi
+@@ -29767,6 +29443,8 @@ fi
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
@@ -25428,7 +25631,7 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
-@@ -29789,7 +29346,7 @@ if test "x$as_myself" = x; then
+@@ -29789,7 +29467,7 @@ if test "x$as_myself" = x; then
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
@@ -25437,7 +25640,7 @@
    { (exit 1); exit 1; }
  fi
  
-@@ -29802,10 +29359,17 @@ PS2='> '
+@@ -29802,10 +29480,17 @@ PS2='> '
  PS4='+ '
  
  # NLS nuisances.
@@ -25459,7 +25662,7 @@
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -29827,7 +29391,7 @@ as_me=`$as_basename -- "$0" ||
+@@ -29827,7 +29512,7 @@ as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -25468,7 +25671,7 @@
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
-@@ -29878,7 +29442,7 @@ $as_unset CDPATH
+@@ -29878,7 +29563,7 @@ $as_unset CDPATH
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -25477,7 +25680,7 @@
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -29906,6 +29470,7 @@ case `echo -n x` in
+@@ -29906,6 +29591,7 @@ case `echo -n x` in
  *)
    ECHO_N='-n';;
  esac
@@ -25485,7 +25688,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -29918,22 +29483,19 @@ if test -d conf$$.dir; then
+@@ -29918,22 +29604,19 @@ if test -d conf$$.dir; then
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
@@ -25519,7 +25722,7 @@
  else
    as_ln_s='cp -p'
  fi
-@@ -29958,10 +29520,10 @@ else
+@@ -29958,10 +29641,10 @@ else
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
@@ -25532,7 +25735,7 @@
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
-@@ -29984,7 +29546,7 @@ exec 6>&1
+@@ -29984,7 +29667,7 @@ exec 6>&1
  # values after options handling.
  ac_log="
  This file was extended by gnome-panel $as_me 2.24.2, which was
@@ -25541,7 +25744,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -29997,7 +29559,7 @@ on `(hostname || uname -n) 2>/dev/null |
+@@ -29997,7 +29680,7 @@ on `(hostname || uname -n) 2>/dev/null |
  
  _ACEOF
  
@@ -25550,7 +25753,7 @@
  # Files that config.status was made for.
  config_files="$ac_config_files"
  config_headers="$ac_config_headers"
-@@ -30005,7 +29567,7 @@ config_commands="$ac_config_commands"
+@@ -30005,7 +29688,7 @@ config_commands="$ac_config_commands"
  
  _ACEOF
  
@@ -25559,7 +25762,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -30018,9 +29580,9 @@ Usage: $0 [OPTIONS] [FILE]...
+@@ -30018,9 +29701,9 @@ Usage: $0 [OPTIONS] [FILE]...
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
    --file=FILE[:TEMPLATE]
@@ -25571,7 +25774,7 @@
  
  Configuration files:
  $config_files
-@@ -30034,13 +29596,13 @@ $config_commands
+@@ -30034,13 +29717,13 @@ $config_commands
  Report bugs to <bug-autoconf at gnu.org>."
  
  _ACEOF
@@ -25589,7 +25792,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -30048,12 +29610,11 @@ ac_pwd='$ac_pwd'
+@@ -30048,12 +29731,11 @@ ac_pwd='$ac_pwd'
  srcdir='$srcdir'
  INSTALL='$INSTALL'
  MKDIR_P='$MKDIR_P'
@@ -25605,7 +25808,7 @@
  ac_need_defaults=:
  while test $# != 0
  do
-@@ -30075,36 +29636,30 @@ do
+@@ -30075,36 +29757,30 @@ do
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -25648,7 +25851,7 @@
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
  
-@@ -30123,29 +29678,27 @@ if $ac_cs_silent; then
+@@ -30123,29 +29799,27 @@ if $ac_cs_silent; then
  fi
  
  _ACEOF
@@ -25685,7 +25888,7 @@
  #
  # INIT-COMMANDS
  #
-@@ -30154,7 +29707,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
+@@ -30154,7 +29828,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
  
  _ACEOF
  
@@ -25694,7 +25897,7 @@
  
  # Handling of arguments.
  for ac_config_target in $ac_config_targets
-@@ -30211,8 +29764,8 @@ do
+@@ -30211,8 +29885,8 @@ do
      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -25705,7 +25908,7 @@
     { (exit 1); exit 1; }; };;
    esac
  done
-@@ -30253,143 +29806,371 @@ $debug ||
+@@ -30253,143 +29927,373 @@ $debug ||
    (umask 077 && mkdir "$tmp")
  } ||
  {
@@ -25943,6 +26146,8 @@
 +PKG_CONFIG!$PKG_CONFIG$ac_delim
 +PANEL_CFLAGS!$PANEL_CFLAGS$ac_delim
 +PANEL_LIBS!$PANEL_LIBS$ac_delim
++LOGOUT_CFLAGS!$LOGOUT_CFLAGS$ac_delim
++LOGOUT_LIBS!$LOGOUT_LIBS$ac_delim
 +LIBPANEL_APPLET_CFLAGS!$LIBPANEL_APPLET_CFLAGS$ac_delim
 +LIBPANEL_APPLET_LIBS!$LIBPANEL_APPLET_LIBS$ac_delim
 +WNCKLET_CFLAGS!$WNCKLET_CFLAGS$ac_delim
@@ -25985,8 +26190,6 @@
 +GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
 +MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
 +CATALOGS!$CATALOGS$ac_delim
-+CATOBJEXT!$CATOBJEXT$ac_delim
-+GMOFILES!$GMOFILES$ac_delim
 +_ACEOF
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
@@ -26104,6 +26307,8 @@
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
++CATOBJEXT!$CATOBJEXT$ac_delim
++GMOFILES!$GMOFILES$ac_delim
 +INSTOBJEXT!$INSTOBJEXT$ac_delim
 +INTLLIBS!$INTLLIBS$ac_delim
 +PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
@@ -26144,7 +26349,7 @@
 -  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
 -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
 +
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -26185,7 +26390,7 @@
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -30405,133 +30186,19 @@ s/^[^=]*=[	 ]*$//
+@@ -30405,133 +30309,19 @@ s/^[^=]*=[	 ]*$//
  }'
  fi
  
@@ -26323,7 +26528,7 @@
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -30560,38 +30227,26 @@ $as_echo "$as_me: error: Invalid tag $ac
+@@ -30560,38 +30350,26 @@ $as_echo "$as_me: error: Invalid tag $ac
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -26370,7 +26575,7 @@
      esac
      ;;
    esac
-@@ -30601,7 +30256,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+@@ -30601,7 +30379,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  	 X"$ac_file" : 'X\(//\)$' \| \
  	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26379,7 +26584,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30627,7 +30282,7 @@ $as_echo X"$ac_file" |
+@@ -30627,7 +30405,7 @@ $as_echo X"$ac_file" |
      as_dirs=
      while :; do
        case $as_dir in #(
@@ -26388,7 +26593,7 @@
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
-@@ -30636,7 +30291,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -30636,7 +30414,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26397,7 +26602,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30657,17 +30312,17 @@ $as_echo X"$as_dir" |
+@@ -30657,17 +30435,17 @@ $as_echo X"$as_dir" |
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -26419,7 +26624,7 @@
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -30712,13 +30367,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -30712,13 +30490,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
    esac
  _ACEOF
  
@@ -26435,7 +26640,7 @@
    p
    q
  }
-@@ -30727,14 +30381,13 @@ ac_sed_dataroot='
+@@ -30727,14 +30504,13 @@ ac_sed_dataroot='
  /@infodir@/p
  /@localedir@/p
  /@mandir@/p
@@ -26454,7 +26659,7 @@
    ac_datarootdir_hack='
    s&@datadir@&$datadir&g
    s&@docdir@&$docdir&g
-@@ -30748,16 +30401,15 @@ _ACEOF
+@@ -30748,16 +30524,15 @@ _ACEOF
  # Neutralize VPATH when `$srcdir' = `.'.
  # Shell code in configure.ac might set extrasub.
  # FIXME: do we really want to maintain this feature?
@@ -26475,7 +26680,7 @@
  s&@srcdir@&$ac_srcdir&;t t
  s&@abs_srcdir@&$ac_abs_srcdir&;t t
  s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -30768,60 +30420,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
+@@ -30768,60 +30543,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
  s&@INSTALL@&$ac_INSTALL&;t t
  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  $ac_datarootdir_hack
@@ -26632,7 +26837,7 @@
  _am_stamp_count=1
  for _am_header in $config_headers :; do
    case $_am_header in
-@@ -30836,7 +30549,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
+@@ -30836,7 +30672,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
  	 X"$_am_arg" : 'X\(//\)[^/]' \| \
  	 X"$_am_arg" : 'X\(//\)$' \| \
  	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26641,7 +26846,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30856,8 +30569,8 @@ $as_echo X"$_am_arg" |
+@@ -30856,8 +30692,8 @@ $as_echo X"$_am_arg" |
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -26652,7 +26857,7 @@
   ;;
    esac
  
-@@ -30879,7 +30592,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
+@@ -30879,7 +30715,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
  	 X"$mf" : 'X\(//\)[^/]' \| \
  	 X"$mf" : 'X\(//\)$' \| \
  	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26661,7 +26866,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30923,7 +30636,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
+@@ -30923,7 +30759,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
  	 X"$file" : 'X\(//\)[^/]' \| \
  	 X"$file" : 'X\(//\)$' \| \
  	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26670,7 +26875,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30949,7 +30662,7 @@ $as_echo X"$file" |
+@@ -30949,7 +30785,7 @@ $as_echo X"$file" |
      as_dirs=
      while :; do
        case $as_dir in #(
@@ -26679,7 +26884,7 @@
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
-@@ -30958,7 +30671,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -30958,7 +30794,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26688,7 +26893,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -30979,8 +30692,8 @@ $as_echo X"$as_dir" |
+@@ -30979,8 +30815,8 @@ $as_echo X"$as_dir" |
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -26699,7 +26904,7 @@
     { (exit 1); exit 1; }; }; }
      # echo "creating $dirpart/$file"
      echo '# dummy' > "$dirpart/$file"
-@@ -31017,11 +30730,6 @@ _ACEOF
+@@ -31017,11 +30853,6 @@ _ACEOF
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  
@@ -26711,7 +26916,7 @@
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -31043,10 +30751,6 @@ if test "$no_create" != yes; then
+@@ -31043,10 +30874,6 @@ if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
@@ -26724,9 +26929,18 @@
  if echo foo | xgettext --from-code=UTF-8 -LC -o - - 2>/dev/null ; then
 Index: gnome-panel-2.24.2/doc/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/doc/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/doc/Makefile.in	2008-12-26 18:42:06.723587704 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/doc/Makefile.in	2008-12-27 18:41:52.611986509 +0100
++++ gnome-panel-2.24.2/doc/Makefile.in	2008-12-28 02:39:36.279481540 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26736,9 +26950,18 @@
  SUBDIRS = reference
 Index: gnome-panel-2.24.2/doc/reference/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/doc/reference/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/doc/reference/Makefile.in	2008-12-26 18:42:06.815585849 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/doc/reference/Makefile.in	2008-12-27 18:41:52.571986593 +0100
++++ gnome-panel-2.24.2/doc/reference/Makefile.in	2008-12-28 02:39:36.367481551 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26748,9 +26971,18 @@
  SUBDIRS = panel-applet
 Index: gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/doc/reference/panel-applet/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in	2008-12-26 18:42:06.919586217 +0100
-@@ -253,7 +253,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/doc/reference/panel-applet/Makefile.in	2008-12-27 18:41:52.523989431 +0100
++++ gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in	2008-12-28 02:39:36.471481431 +0100
+@@ -151,6 +151,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -253,7 +255,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26760,9 +26992,73 @@
  AUTOMAKE_OPTIONS = 1.6
 Index: gnome-panel-2.24.2/gnome-panel/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/gnome-panel/Makefile.in	2008-11-25 14:23:56.000000000 +0100
-+++ gnome-panel-2.24.2/gnome-panel/Makefile.in	2008-12-26 18:42:07.099585351 +0100
-@@ -343,7 +343,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/gnome-panel/Makefile.in	2008-12-27 18:41:52.499989872 +0100
++++ gnome-panel-2.24.2/gnome-panel/Makefile.in	2008-12-28 02:39:36.679481190 +0100
+@@ -33,7 +33,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
++bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-logout$(EXEEXT) \
++	gnome-desktop-item-edit$(EXEEXT)
+ subdir = gnome-panel
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/gnome-panel.desktop.in.in ChangeLog
+@@ -88,7 +89,8 @@ am__objects_3 = panel-typebuiltins.$(OBJ
+ 	panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \
+ 	panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \
+ 	panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \
+-	panel-addto.$(OBJEXT) panel-ditem-editor.$(OBJEXT) \
++	panel-addto.$(OBJEXT) panel-logout.$(OBJEXT) \
++	panel-gdm.$(OBJEXT) panel-ditem-editor.$(OBJEXT) \
+ 	$(am__objects_1)
+ am__objects_4 = $(am__objects_1)
+ am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \
+@@ -100,6 +102,21 @@ gnome_panel_DEPENDENCIES =  \
+ gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
++am_gnome_panel_logout_OBJECTS =  \
++	gnome_panel_logout-gnome-panel-logout.$(OBJEXT) \
++	gnome_panel_logout-panel-logout.$(OBJEXT) \
++	gnome_panel_logout-panel-lockdown.$(OBJEXT) \
++	gnome_panel_logout-panel-gdm.$(OBJEXT) \
++	gnome_panel_logout-panel-session.$(OBJEXT) \
++	gnome_panel_logout-panel-util.$(OBJEXT)
++gnome_panel_logout_OBJECTS = $(am_gnome_panel_logout_OBJECTS)
++gnome_panel_logout_DEPENDENCIES =  \
++	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++gnome_panel_logout_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
++	$(gnome_panel_logout_CFLAGS) $(CFLAGS) \
++	$(gnome_panel_logout_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -112,9 +129,10 @@ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES)
++SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) \
++	$(gnome_panel_logout_SOURCES)
+ DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \
+-	$(gnome_panel_SOURCES)
++	$(gnome_panel_SOURCES) $(gnome_panel_logout_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+ 	install-dvi-recursive install-exec-recursive \
+@@ -241,6 +259,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -343,7 +363,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26770,11 +27066,184 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.3
+@@ -434,6 +453,8 @@ panel_sources = \
+ 	panel-force-quit.c	\
+ 	panel-lockdown.c	\
+ 	panel-addto.c		\
++	panel-logout.c		\
++	panel-gdm.c		\
+ 	panel-ditem-editor.c	\
+ 	$(NULL)
+ 
+@@ -480,6 +501,8 @@ panel_headers = \
+ 	panel-force-quit.h	\
+ 	panel-lockdown.h	\
+ 	panel-addto.h		\
++	panel-logout.h		\
++	panel-gdm.h		\
+ 	panel-ditem-editor.h	\
+ 	panel-icon-names.h	\
+ 	$(NULL)
+@@ -496,6 +519,21 @@ gnome_panel_LDADD = \
+ 	$(X_LIBS)
+ 
+ gnome_panel_LDFLAGS = -export-dynamic
++gnome_panel_logout_SOURCES = \
++	gnome-panel-logout.c  \
++	panel-logout.c        \
++	panel-lockdown.c      \
++	panel-gdm.c	      \
++	panel-session.c       \
++	panel-util.c
++
++gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
++gnome_panel_logout_LDADD = \
++	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
++	$(LOGOUT_LIBS)	   \
++	$(X_LIBS)
++
++gnome_panel_logout_LDFLAGS = -export-dynamic
+ gnome_desktop_item_edit_SOURCES = \
+ 	gnome-desktop-item-edit.c \
+ 	panel-ditem-editor.c	  \
+@@ -630,6 +668,9 @@ gnome-desktop-item-edit$(EXEEXT): $(gnom
+ gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES) 
+ 	@rm -f gnome-panel$(EXEEXT)
+ 	$(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
++gnome-panel-logout$(EXEEXT): $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_DEPENDENCIES) 
++	@rm -f gnome-panel-logout$(EXEEXT)
++	$(gnome_panel_logout_LINK) $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -644,6 +685,12 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/button-widget.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawer.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-desktop-item-edit.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-gdm.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-lockdown.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-logout.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-session.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-util.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/launcher.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu.Po at am__quote@
+@@ -662,7 +709,9 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-force-quit.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-frame.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gconf.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gdm.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-lockdown.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-logout.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-marshal.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-bar.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-button.Po at am__quote@
+@@ -706,6 +755,90 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
++gnome_panel_logout-gnome-panel-logout.o: gnome-panel-logout.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
++
++gnome_panel_logout-gnome-panel-logout.obj: gnome-panel-logout.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
++
++gnome_panel_logout-panel-logout.o: panel-logout.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-logout.c' object='gnome_panel_logout-panel-logout.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
++
++gnome_panel_logout-panel-logout.obj: panel-logout.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-logout.c' object='gnome_panel_logout-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
++
++gnome_panel_logout-panel-lockdown.o: panel-lockdown.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
++
++gnome_panel_logout-panel-lockdown.obj: panel-lockdown.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
++
++gnome_panel_logout-panel-gdm.o: panel-gdm.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
++
++gnome_panel_logout-panel-gdm.obj: panel-gdm.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
++
++gnome_panel_logout-panel-session.o: panel-session.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-session.c' object='gnome_panel_logout-panel-session.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
++
++gnome_panel_logout-panel-session.obj: panel-session.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-session.c' object='gnome_panel_logout-panel-session.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
++
++gnome_panel_logout-panel-util.o: panel-util.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-util.c' object='gnome_panel_logout-panel-util.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
++
++gnome_panel_logout-panel-util.obj: panel-util.c
++ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
++ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-util.c' object='gnome_panel_logout-panel-util.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
++
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
 Index: gnome-panel-2.24.2/help/clock/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/clock/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/clock/Makefile.in	2008-12-26 18:42:07.440085750 +0100
-@@ -271,7 +271,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/clock/Makefile.in	2008-12-27 18:41:52.419990040 +0100
++++ gnome-panel-2.24.2/help/clock/Makefile.in	2008-12-28 02:39:37.015981989 +0100
+@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26784,9 +27253,18 @@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
 Index: gnome-panel-2.24.2/help/de/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/de/fish/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/de/fish/Makefile.in	2008-12-26 18:42:07.624086440 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/de/fish/Makefile.in	2008-12-27 18:41:52.387986392 +0100
++++ gnome-panel-2.24.2/help/de/fish/Makefile.in	2008-12-28 02:39:37.203981791 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26796,9 +27274,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/de/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/de/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/de/Makefile.in	2008-12-26 18:42:07.532088784 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/de/Makefile.in	2008-12-27 18:41:52.359989188 +0100
++++ gnome-panel-2.24.2/help/de/Makefile.in	2008-12-28 02:39:37.115984713 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26808,9 +27295,18 @@
  SUBDIRS = fish window-list workspace-switcher
 Index: gnome-panel-2.24.2/help/de/window-list/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/de/window-list/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/de/window-list/Makefile.in	2008-12-26 18:42:07.732086899 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/de/window-list/Makefile.in	2008-12-27 18:41:52.319988294 +0100
++++ gnome-panel-2.24.2/help/de/window-list/Makefile.in	2008-12-28 02:39:37.295982381 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26820,9 +27316,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/de/workspace-switcher/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in	2008-12-26 18:42:07.828086111 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/de/workspace-switcher/Makefile.in	2008-12-27 18:41:52.295988736 +0100
++++ gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in	2008-12-28 02:39:37.391981593 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26832,9 +27337,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/fish/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/fish/Makefile.in	2008-12-26 18:42:07.976087952 +0100
-@@ -271,7 +271,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/fish/Makefile.in	2008-12-27 18:41:52.267986644 +0100
++++ gnome-panel-2.24.2/help/fish/Makefile.in	2008-12-28 02:39:37.527481566 +0100
+@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26844,9 +27358,18 @@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
 Index: gnome-panel-2.24.2/help/ja/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/ja/fish/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/ja/fish/Makefile.in	2008-12-26 18:42:08.168085888 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/ja/fish/Makefile.in	2008-12-27 18:41:52.223985172 +0100
++++ gnome-panel-2.24.2/help/ja/fish/Makefile.in	2008-12-28 02:39:37.707484611 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26856,9 +27379,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/ja/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/ja/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/ja/Makefile.in	2008-12-26 18:42:08.072088631 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/ja/Makefile.in	2008-12-27 18:41:52.179982722 +0100
++++ gnome-panel-2.24.2/help/ja/Makefile.in	2008-12-28 02:39:37.615481088 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26868,9 +27400,18 @@
  SUBDIRS = fish window-list workspace-switcher
 Index: gnome-panel-2.24.2/help/ja/window-list/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/ja/window-list/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/ja/window-list/Makefile.in	2008-12-26 18:42:08.264087055 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/ja/window-list/Makefile.in	2008-12-27 18:41:52.127990360 +0100
++++ gnome-panel-2.24.2/help/ja/window-list/Makefile.in	2008-12-28 02:39:37.807481468 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26880,9 +27421,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/ja/workspace-switcher/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in	2008-12-26 18:42:08.360085778 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/ja/workspace-switcher/Makefile.in	2008-12-27 18:41:52.099990712 +0100
++++ gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in	2008-12-28 02:39:37.911481836 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26892,9 +27442,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/Makefile.in	2008-11-25 14:23:57.000000000 +0100
-+++ gnome-panel-2.24.2/help/Makefile.in	2008-12-26 18:42:07.307586577 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/Makefile.in	2008-12-27 18:41:52.071988130 +0100
++++ gnome-panel-2.24.2/help/Makefile.in	2008-12-28 02:39:36.879485171 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26904,9 +27463,18 @@
  SUBDIRS = clock fish window-list workspace-switcher ja de zh_CN zh_TW
 Index: gnome-panel-2.24.2/help/window-list/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/window-list/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/window-list/Makefile.in	2008-12-26 18:42:08.500087440 +0100
-@@ -271,7 +271,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/window-list/Makefile.in	2008-12-27 18:41:52.031982836 +0100
++++ gnome-panel-2.24.2/help/window-list/Makefile.in	2008-12-28 02:39:38.059481721 +0100
+@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26916,9 +27484,18 @@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
 Index: gnome-panel-2.24.2/help/workspace-switcher/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/workspace-switcher/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/workspace-switcher/Makefile.in	2008-12-26 18:42:08.639585546 +0100
-@@ -271,7 +271,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/workspace-switcher/Makefile.in	2008-12-27 18:41:52.003983188 +0100
++++ gnome-panel-2.24.2/help/workspace-switcher/Makefile.in	2008-12-28 02:39:38.211482185 +0100
+@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26928,9 +27505,18 @@
  _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
 Index: gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/fish/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in	2008-12-26 18:42:08.835586505 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_CN/fish/Makefile.in	2008-12-27 18:41:51.963983272 +0100
++++ gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in	2008-12-28 02:39:38.415481366 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26940,9 +27526,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/zh_CN/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/Makefile.in	2008-12-26 18:42:08.739585826 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_CN/Makefile.in	2008-12-27 18:41:51.923987756 +0100
++++ gnome-panel-2.24.2/help/zh_CN/Makefile.in	2008-12-28 02:39:38.311481486 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26952,9 +27547,18 @@
  SUBDIRS = fish workspace-switcher
 Index: gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/workspace-switcher/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in	2008-12-26 18:42:08.931586206 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_CN/workspace-switcher/Makefile.in	2008-12-27 18:41:51.903987798 +0100
++++ gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in	2008-12-28 02:39:38.519482224 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26964,9 +27568,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/fish/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in	2008-12-26 18:42:09.111585340 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_TW/fish/Makefile.in	2008-12-27 18:41:51.871987571 +0100
++++ gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in	2008-12-28 02:39:38.723481895 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26976,9 +27589,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/zh_TW/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/Makefile.in	2008-11-25 14:23:58.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/Makefile.in	2008-12-26 18:42:09.019585728 +0100
-@@ -258,7 +258,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_TW/Makefile.in	2008-12-27 18:41:51.835987256 +0100
++++ gnome-panel-2.24.2/help/zh_TW/Makefile.in	2008-12-28 02:39:38.619482015 +0100
+@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -26988,9 +27610,18 @@
  SUBDIRS = fish window-list workspace-switcher
 Index: gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/window-list/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in	2008-12-26 18:42:09.207586508 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_TW/window-list/Makefile.in	2008-12-27 18:41:51.807987608 +0100
++++ gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in	2008-12-28 02:39:38.851481334 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27000,9 +27631,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/workspace-switcher/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in	2008-12-26 18:42:09.303585721 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/help/zh_TW/workspace-switcher/Makefile.in	2008-12-27 18:41:51.763982713 +0100
++++ gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in	2008-12-28 02:39:38.967481482 +0100
+@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27012,9 +27652,18 @@
  figdir = figures
 Index: gnome-panel-2.24.2/icons/16x16/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/16x16/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/16x16/Makefile.in	2008-12-26 18:42:09.395586310 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/16x16/Makefile.in	2008-12-27 18:41:51.735986487 +0100
++++ gnome-panel-2.24.2/icons/16x16/Makefile.in	2008-12-28 02:39:39.083483586 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27024,9 +27673,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/icons/22x22/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/22x22/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/22x22/Makefile.in	2008-12-26 18:42:09.491587478 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/22x22/Makefile.in	2008-12-27 18:41:51.671989456 +0100
++++ gnome-panel-2.24.2/icons/22x22/Makefile.in	2008-12-28 02:39:39.195481689 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27036,9 +27694,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/icons/24x24/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/24x24/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/24x24/Makefile.in	2008-12-26 18:42:09.579586023 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/24x24/Makefile.in	2008-12-27 18:41:51.643987853 +0100
++++ gnome-panel-2.24.2/icons/24x24/Makefile.in	2008-12-28 02:39:39.311481836 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27048,9 +27715,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/icons/32x32/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/32x32/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/32x32/Makefile.in	2008-12-26 18:42:09.671587101 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/32x32/Makefile.in	2008-12-27 18:41:51.619987805 +0100
++++ gnome-panel-2.24.2/icons/32x32/Makefile.in	2008-12-28 02:39:39.423481895 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27060,9 +27736,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/icons/48x48/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/48x48/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/48x48/Makefile.in	2008-12-26 18:42:09.779586092 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/48x48/Makefile.in	2008-12-27 18:41:51.571988688 +0100
++++ gnome-panel-2.24.2/icons/48x48/Makefile.in	2008-12-28 02:39:39.539482042 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27072,9 +27757,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/icons/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/Makefile.in	2008-11-25 14:23:59.000000000 +0100
-+++ gnome-panel-2.24.2/icons/Makefile.in	2008-12-26 18:42:09.875585793 +0100
-@@ -268,7 +268,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/Makefile.in	2008-12-27 18:41:51.547988640 +0100
++++ gnome-panel-2.24.2/icons/Makefile.in	2008-12-28 02:39:39.659481302 +0100
+@@ -166,6 +166,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -268,7 +270,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27084,9 +27778,18 @@
  SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
 Index: gnome-panel-2.24.2/icons/scalable/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/icons/scalable/Makefile.in	2008-11-25 14:24:00.000000000 +0100
-+++ gnome-panel-2.24.2/icons/scalable/Makefile.in	2008-12-26 18:42:09.967585893 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/icons/scalable/Makefile.in	2008-12-27 18:41:51.519983615 +0100
++++ gnome-panel-2.24.2/icons/scalable/Makefile.in	2008-12-28 02:39:39.771481361 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27096,9 +27799,18 @@
  NULL = 
 Index: gnome-panel-2.24.2/idl/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/idl/Makefile.in	2008-11-25 14:24:00.000000000 +0100
-+++ gnome-panel-2.24.2/idl/Makefile.in	2008-12-26 18:42:10.055586393 +0100
-@@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/idl/Makefile.in	2008-12-27 18:41:51.495987967 +0100
++++ gnome-panel-2.24.2/idl/Makefile.in	2008-12-28 02:39:39.879481330 +0100
+@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27108,9 +27820,18 @@
  idldir = $(datadir)/idl/gnome-panel-2.0
 Index: gnome-panel-2.24.2/libpanel-applet/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/libpanel-applet/Makefile.in	2008-11-25 14:24:00.000000000 +0100
-+++ gnome-panel-2.24.2/libpanel-applet/Makefile.in	2008-12-26 18:42:10.207586857 +0100
-@@ -313,7 +313,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/libpanel-applet/Makefile.in	2008-12-27 18:41:51.447482361 +0100
++++ gnome-panel-2.24.2/libpanel-applet/Makefile.in	2008-12-28 02:39:40.063482998 +0100
+@@ -211,6 +211,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27120,8 +27841,8 @@
  INCLUDES = \
 Index: gnome-panel-2.24.2/ltmain.sh
 ===================================================================
---- gnome-panel-2.24.2.orig/ltmain.sh	2008-10-04 20:32:58.000000000 +0200
-+++ gnome-panel-2.24.2/ltmain.sh	2008-12-26 18:40:49.619586846 +0100
+--- gnome-panel-2.24.2.orig/ltmain.sh	2008-12-27 18:41:51.419486624 +0100
++++ gnome-panel-2.24.2/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
 @@ -43,8 +43,8 @@ EXIT_FAILURE=1
  
  PROGRAM=ltmain.sh
@@ -27159,9 +27880,18 @@
  	no)
 Index: gnome-panel-2.24.2/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/Makefile.in	2008-11-25 14:24:00.000000000 +0100
-+++ gnome-panel-2.24.2/Makefile.in	2008-12-26 18:42:10.411586038 +0100
-@@ -273,7 +273,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/Makefile.in	2008-12-27 18:41:51.371484085 +0100
++++ gnome-panel-2.24.2/Makefile.in	2008-12-28 02:39:40.351481613 +0100
+@@ -171,6 +171,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -273,7 +275,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27171,9 +27901,18 @@
  distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out' | grep -v 'legal.xml'
 Index: gnome-panel-2.24.2/man/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/man/Makefile.in	2008-11-25 14:24:00.000000000 +0100
-+++ gnome-panel-2.24.2/man/Makefile.in	2008-12-26 18:42:10.299585491 +0100
-@@ -250,7 +250,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/man/Makefile.in	2008-12-27 18:41:51.311487632 +0100
++++ gnome-panel-2.24.2/man/Makefile.in	2008-12-28 02:39:40.187481858 +0100
+@@ -148,6 +148,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -250,7 +252,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27183,9 +27922,28 @@
  man_MANS = \
 Index: gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in
 ===================================================================
---- gnome-panel-2.24.2.orig/gnome-panel/libpanel-util/Makefile.in	2008-12-26 18:41:07.436094530 +0100
-+++ gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in	2008-12-26 18:42:07.219586077 +0100
-@@ -269,7 +269,6 @@ sharedstatedir = @sharedstatedir@
+--- gnome-panel-2.24.2.orig/gnome-panel/libpanel-util/Makefile.in	2008-12-27 18:41:52.455987423 +0100
++++ gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in	2008-12-28 02:39:36.787481648 +0100
+@@ -49,8 +49,7 @@ libpanel_util_la_LIBADD =
+ am__objects_1 =
+ am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
+ 	panel-error.lo panel-glib.lo panel-keyfile.lo \
+-	panel-power-manager.lo panel-session-manager.lo panel-show.lo \
+-	$(am__objects_1)
++	panel-power-manager.lo panel-show.lo $(am__objects_1)
+ libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -167,6 +166,8 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -269,7 +270,6 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -27193,3 +27951,20 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
+@@ -304,8 +304,6 @@ libpanel_util_la_SOURCES = \
+ 	panel-keyfile.h			\
+ 	panel-power-manager.c		\
+ 	panel-power-manager.h		\
+-	panel-session-manager.c		\
+-	panel-session-manager.h		\
+ 	panel-show.c			\
+ 	panel-show.h			\
+ 	$(NULL)
+@@ -367,7 +365,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-glib.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-power-manager.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-session-manager.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-show.Plo at am__quote@
+ 
+ .c.o:

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=18023&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series (original)
+++ desktop/experimental/gnome-panel/debian/patches/series Sun Dec 28 01:54:06 2008
@@ -1,4 +1,7 @@
 01_panel_submenus.patch
+02_panel_logout.patch
+03_switch-user_lock.patch
+04_gnome-panel-logout.patch
 08_clock_applet_event.patch
 09_default_icons.patch
 70_relibtoolize.patch




More information about the pkg-gnome-commits mailing list