r23791 - in /desktop/experimental/gdm3/debian: TODO changelog patches/13_gdmsetup.patch patches/90_relibtoolize.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Apr 13 22:57:48 UTC 2010


Author: joss
Date: Tue Apr 13 22:57:47 2010
New Revision: 23791

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23791
Log:
* 13_gdmsetup.patch: correctly pass the locale directory.
* 90_relibtoolize.patch: updated accordingly.
* Update TODO with the most obvious remaining bugs.

Modified:
    desktop/experimental/gdm3/debian/TODO
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
    desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch

Modified: desktop/experimental/gdm3/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/TODO?rev=23791&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/TODO [utf-8] (original)
+++ desktop/experimental/gdm3/debian/TODO [utf-8] Tue Apr 13 22:57:47 2010
@@ -1,21 +1,10 @@
-This file lists the most obvious breakages in GDM. There are probably a 
-lot of bugs remaining after that, these are only the blockers.
+Remaining important issues with GDM3:
 
- * There is no configuration GUI
-   => Ubuntu has one, in 08_use_polkit_for_settings.patch and 
-      09_gdmsetup.patch.
-   => Not that urgent.
+ * The background picture and the bottom bar take ages to display.
 
- * gdmflexiserver is missing many options, including xnest.
-   => Looks like Ubuntu has no bugs and GNOME has a sort of feature request,
-      but no one replied for implementing it.
-      Is "Login in a nested window" going to die?
-   => It is easy to implement, but it will require extending the D-Bus 
-      API so that gdmflexiserver has a way to communicate Xephyr’s 
-      $DISPLAY to gdm.
-   => Can probably wait.
+ * There’s a race condition that will often prevent the xsettings 
+   manager in g-s-d to start up in the user’s session.
 
- * Other Ubuntu patches we need
-   - 13_cache_ck_history.patch for speed improvement
-   - 19_no_greeter_for_autologin.patch, already fixed in git master
-   - 23_login_window_hint.patch for a focus fix
+ * The screen locks when you launch a nested session.
+
+ * gdmsetup spews debug information.

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=23791&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Tue Apr 13 22:57:47 2010
@@ -32,8 +32,11 @@
     necessary with gnome-session 2.30.
   * Require gnome-session-bin 2.30.
   * Install gdmsetup.desktop in /usr/share/gdm/applications.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 14 Apr 2010 00:03:39 +0200
+  * 13_gdmsetup.patch: correctly pass the locale directory.
+  * 90_relibtoolize.patch: updated accordingly.
+  * Update TODO with the most obvious remaining bugs.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 14 Apr 2010 00:57:23 +0200
 
 gdm3 (2.29.92-1) experimental; urgency=low
 

Modified: desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch?rev=23791&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Tue Apr 13 22:57:47 2010
@@ -14,8 +14,8 @@
 #
 Index: gdm-2.30.0/configure.ac
 ===================================================================
---- gdm-2.30.0.orig/configure.ac	2010-04-13 23:55:12.673240111 +0200
-+++ gdm-2.30.0/configure.ac	2010-04-13 23:55:13.389737672 +0200
+--- gdm-2.30.0.orig/configure.ac	2010-04-14 00:52:54.469740508 +0200
++++ gdm-2.30.0/configure.ac	2010-04-14 00:52:54.505740821 +0200
 @@ -41,6 +41,7 @@ dnl ------------------------------------
  
  DBUS_GLIB_REQUIRED_VERSION=0.74
@@ -50,7 +50,7 @@
 Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/gdmsetup.c	2010-04-13 23:55:13.389737672 +0200
++++ gdm-2.30.0/gui/gdmsetup/gdmsetup.c	2010-04-14 00:52:54.505740821 +0200
 @@ -0,0 +1,370 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -425,7 +425,7 @@
 Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.desktop.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/gdmsetup.desktop.in	2010-04-13 23:55:13.389737672 +0200
++++ gdm-2.30.0/gui/gdmsetup/gdmsetup.desktop.in	2010-04-14 00:52:54.505740821 +0200
 @@ -0,0 +1,12 @@
 +[Desktop Entry]
 +_Name=Login Screen
@@ -442,7 +442,7 @@
 Index: gdm-2.30.0/gui/gdmsetup/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/Makefile.am	2010-04-13 23:55:13.389737672 +0200
++++ gdm-2.30.0/gui/gdmsetup/Makefile.am	2010-04-14 00:55:01.385238809 +0200
 @@ -0,0 +1,42 @@
 +NULL =
 +
@@ -453,7 +453,7 @@
 +	-DDMCONFDIR=\""$(dmconfdir)"\"		\
 +	-DDATADIR=\""$(datadir)"\"		\
 +	-DUIDIR=\""$(uidir)"\"			\
-+	-DGNOMELOCALEDIR=\""$(gdmlocaledir)"\" 	\
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	$(DISABLE_DEPRECATED_CFLAGS)		\
 +	$(GDMSETUP_CFLAGS)			\
 +	$(NULL)
@@ -488,8 +488,8 @@
 +	$(NULL)
 Index: gdm-2.30.0/gui/Makefile.am
 ===================================================================
---- gdm-2.30.0.orig/gui/Makefile.am	2010-04-13 23:54:51.793250131 +0200
-+++ gdm-2.30.0/gui/Makefile.am	2010-04-13 23:55:13.389737672 +0200
+--- gdm-2.30.0.orig/gui/Makefile.am	2010-03-29 23:42:03.000000000 +0200
++++ gdm-2.30.0/gui/Makefile.am	2010-04-14 00:52:54.505740821 +0200
 @@ -4,4 +4,5 @@ SUBDIRS =			\
  	simple-chooser		\
  	simple-greeter		\
@@ -498,8 +498,8 @@
  	$(NULL)
 Index: gdm-2.30.0/po/POTFILES.in
 ===================================================================
---- gdm-2.30.0.orig/po/POTFILES.in	2010-04-13 23:55:12.673240111 +0200
-+++ gdm-2.30.0/po/POTFILES.in	2010-04-13 23:55:13.389737672 +0200
+--- gdm-2.30.0.orig/po/POTFILES.in	2010-04-14 00:52:54.469740508 +0200
++++ gdm-2.30.0/po/POTFILES.in	2010-04-14 00:52:54.505740821 +0200
 @@ -60,6 +60,9 @@ data/greeter-autostart/gok.desktop.in
  data/greeter-autostart/metacity.desktop.in
  data/greeter-autostart/orca-screen-reader.desktop.in

Modified: desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch?rev=23791&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/90_relibtoolize.patch [utf-8] Tue Apr 13 22:57:47 2010
@@ -5,8 +5,10 @@
 autoconf
 rm -rf autom4te.cache/ config.h.in~
 
---- a/aclocal.m4
-+++ b/aclocal.m4
+Index: gdm-2.30.0/aclocal.m4
+===================================================================
+--- gdm-2.30.0.orig/aclocal.m4	2010-03-30 00:11:09.000000000 +0200
++++ gdm-2.30.0/aclocal.m4	2010-04-14 00:56:37.133735589 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -9536,8 +9538,10 @@
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
  m4_include([acinclude.m4])
---- a/common/Makefile.in
-+++ b/common/Makefile.in
+Index: gdm-2.30.0/common/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/common/Makefile.in	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/common/Makefile.in	2010-04-14 00:56:39.037234495 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -9561,7 +9565,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -42,13 +44,16 @@
+@@ -42,13 +44,16 @@ subdir = common
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -9580,7 +9584,7 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libgdmcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -78,11 +83,14 @@
+@@ -78,11 +83,14 @@ am_libgdmcommon_la_OBJECTS = libgdmcommo
  	libgdmcommon_la-gdm-signal-handler.lo $(am__objects_1) \
  	$(am__objects_2)
  libgdmcommon_la_OBJECTS = $(am_libgdmcommon_la_OBJECTS)
@@ -9599,7 +9603,7 @@
  am__EXEEXT_1 =
  PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
  am_gdm_crash_logger_OBJECTS =  \
-@@ -103,18 +111,32 @@
+@@ -103,18 +111,32 @@ am_test_settings_server_OBJECTS = test-s
  test_settings_server_OBJECTS = $(am_test_settings_server_OBJECTS)
  test_settings_server_DEPENDENCIES = libgdmcommon.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -9639,7 +9643,7 @@
  SOURCES = $(libgdmcommon_la_SOURCES) $(gdm_crash_logger_SOURCES) \
  	$(test_log_SOURCES) $(test_settings_client_SOURCES) \
  	$(test_settings_server_SOURCES)
-@@ -127,8 +149,22 @@
+@@ -127,8 +149,22 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -9664,7 +9668,7 @@
  DATA = $(gdm_DATA)
  ETAGS = etags
  CTAGS = ctags
-@@ -136,6 +172,7 @@
+@@ -136,6 +172,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -9672,7 +9676,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -176,7 +213,8 @@
+@@ -176,7 +213,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -9682,7 +9686,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -191,18 +229,20 @@
+@@ -191,18 +229,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -9705,7 +9709,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -234,6 +274,7 @@
+@@ -234,6 +274,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -9713,7 +9717,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -243,6 +284,7 @@
+@@ -243,6 +284,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -9721,7 +9725,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -253,13 +295,19 @@
+@@ -253,13 +295,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -9741,7 +9745,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -273,6 +321,7 @@
+@@ -273,6 +321,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -9749,7 +9753,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -311,7 +360,7 @@
+@@ -311,7 +360,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -9758,7 +9762,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -347,6 +396,7 @@
+@@ -347,6 +396,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -9766,7 +9770,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -511,14 +561,14 @@
+@@ -511,14 +561,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -9786,7 +9790,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -536,6 +586,7 @@
+@@ -536,6 +586,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9794,7 +9798,7 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -546,54 +597,71 @@
+@@ -546,54 +597,71 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libgdmcommon.la: $(libgdmcommon_la_OBJECTS) $(libgdmcommon_la_DEPENDENCIES) 
@@ -9896,7 +9900,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -622,141 +690,161 @@
+@@ -622,141 +690,161 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-settings-server.Po at am__quote@
  
  .c.o:
@@ -10113,7 +10117,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdm-crash-logger.c' object='gdm_crash_logger-gdm-crash-logger.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gdm_crash_logger_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gdm_crash_logger-gdm-crash-logger.obj `if test -f 'gdm-crash-logger.c'; then $(CYGPATH_W) 'gdm-crash-logger.c'; else $(CYGPATH_W) '$(srcdir)/gdm-crash-logger.c'; fi`
-@@ -769,65 +857,72 @@
+@@ -769,65 +857,72 @@ clean-libtool:
  install-gdmDATA: $(gdm_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(gdmdir)" || $(MKDIR_P) "$(DESTDIR)$(gdmdir)"
@@ -10211,7 +10215,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -848,13 +943,17 @@
+@@ -848,13 +943,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -10233,7 +10237,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -888,6 +987,7 @@
+@@ -888,6 +987,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -10241,7 +10245,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -910,6 +1010,8 @@
+@@ -910,6 +1010,8 @@ dvi-am:
  
  html: html-am
  
@@ -10250,7 +10254,7 @@
  info: info-am
  
  info-am:
-@@ -918,18 +1020,28 @@
+@@ -918,18 +1020,28 @@ install-data-am: install-gdmDATA
  
  install-dvi: install-dvi-am
  
@@ -10279,7 +10283,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -952,7 +1064,7 @@
+@@ -952,7 +1064,7 @@ ps-am:
  
  uninstall-am: uninstall-gdmDATA uninstall-libexecPROGRAMS
  
@@ -10288,7 +10292,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \
-@@ -980,6 +1092,7 @@
+@@ -980,6 +1092,7 @@ gdm-marshal.c: gdm-marshal.list
  
  gdm-marshal.h: gdm-marshal.list
  	@GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --header > $@
@@ -10296,8 +10300,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/compile
-+++ b/compile
+Index: gdm-2.30.0/compile
+===================================================================
+--- gdm-2.30.0.orig/compile	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/compile	2010-04-14 00:56:38.685736056 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Wrapper for compilers which do not understand `-c -o'.
@@ -10311,7 +10317,7 @@
  # Written by Tom Tromey <tromey at cygnus.com>.
  #
  # This program is free software; you can redistribute it and/or modify
-@@ -17,8 +18,7 @@
+@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
@@ -10321,7 +10327,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -103,13 +103,13 @@
+@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile";
  fi
  
  # Name of file we expect compiler to create.
@@ -10338,7 +10344,7 @@
  while true; do
    if mkdir "$lockdir" >/dev/null 2>&1; then
      break
-@@ -124,9 +124,9 @@
+@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
  ret=$?
  
  if test -f "$cofile"; then
@@ -10350,7 +10356,7 @@
  fi
  
  rmdir "$lockdir"
-@@ -138,5 +138,6 @@
+@@ -138,5 +138,6 @@ exit $ret
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -10358,8 +10364,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
---- a/config.guess
-+++ b/config.guess
+Index: gdm-2.30.0/config.guess
+===================================================================
+--- gdm-2.30.0.orig/config.guess	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/config.guess	2010-04-14 00:56:38.689735656 +0200
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -10374,7 +10382,7 @@
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -27,16 +27,16 @@
+@@ -27,16 +27,16 @@ timestamp='2006-07-02'
  # the same distribution terms that you use for the rest of that program.
  
  
@@ -10396,7 +10404,7 @@
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
-@@ -56,8 +56,9 @@
+@@ -56,8 +56,9 @@ version="\
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
@@ -10408,7 +10416,7 @@
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -161,6 +162,7 @@
+@@ -161,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -10416,7 +10424,7 @@
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -169,7 +171,7 @@
+@@ -169,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -10425,7 +10433,7 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -323,14 +325,33 @@
+@@ -323,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
@@ -10461,7 +10469,7 @@
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -531,7 +552,7 @@
+@@ -531,7 +552,7 @@ EOF
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
@@ -10470,7 +10478,7 @@
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -639,7 +660,7 @@
+@@ -639,7 +660,7 @@ EOF
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -10479,7 +10487,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -780,7 +801,7 @@
+@@ -780,7 +801,7 @@ EOF
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
  	exit ;;
@@ -10488,7 +10496,7 @@
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit ;;
      i*:windows32*:*)
-@@ -790,15 +811,24 @@
+@@ -790,15 +811,24 @@ EOF
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
@@ -10519,7 +10527,7 @@
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -828,8 +858,29 @@
+@@ -828,8 +858,29 @@ EOF
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
@@ -10550,7 +10558,7 @@
  	exit ;;
      avr32*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -843,6 +894,17 @@
+@@ -843,6 +894,17 @@ EOF
      frv:Linux:*:*)
      	echo frv-unknown-linux-gnu
  	exit ;;
@@ -10568,7 +10576,7 @@
      ia64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-@@ -852,74 +914,33 @@
+@@ -852,74 +914,33 @@ EOF
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
@@ -10653,7 +10661,7 @@
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
-@@ -929,8 +950,11 @@
+@@ -929,8 +950,11 @@ EOF
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
  	exit ;;
@@ -10667,7 +10675,7 @@
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
-@@ -950,69 +974,9 @@
+@@ -950,69 +974,9 @@ EOF
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
  	exit ;;
@@ -10740,7 +10748,7 @@
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  	# earlier versions are messed up and put the nodename in both
-@@ -1041,7 +1005,7 @@
+@@ -1041,7 +1005,7 @@ EOF
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -10749,7 +10757,7 @@
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1085,8 +1049,11 @@
+@@ -1085,8 +1049,11 @@ EOF
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -10763,7 +10771,7 @@
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1124,6 +1091,16 @@
+@@ -1124,6 +1091,16 @@ EOF
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -10780,7 +10788,7 @@
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1136,7 +1113,7 @@
+@@ -1136,7 +1113,7 @@ EOF
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -10789,7 +10797,7 @@
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-@@ -1199,6 +1176,9 @@
+@@ -1199,6 +1176,9 @@ EOF
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -10799,7 +10807,7 @@
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1208,6 +1188,15 @@
+@@ -1208,6 +1188,15 @@ EOF
      SX-6:SUPER-UX:*:*)
  	echo sx6-nec-superux${UNAME_RELEASE}
  	exit ;;
@@ -10815,7 +10823,7 @@
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit ;;
-@@ -1217,6 +1206,16 @@
+@@ -1217,6 +1206,16 @@ EOF
      *:Darwin:*:*)
  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  	case $UNAME_PROCESSOR in
@@ -10832,7 +10840,7 @@
  	    unknown) UNAME_PROCESSOR=powerpc ;;
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1298,6 +1297,9 @@
+@@ -1298,6 +1297,9 @@ EOF
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -10842,7 +10850,7 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1458,9 +1460,9 @@
+@@ -1458,9 +1460,9 @@ This script, last modified $timestamp, h
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -10854,8 +10862,10 @@
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
---- a/config.sub
-+++ b/config.sub
+Index: gdm-2.30.0/config.sub
+===================================================================
+--- gdm-2.30.0.orig/config.sub	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/config.sub	2010-04-14 00:56:38.689735656 +0200
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -10870,7 +10880,7 @@
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -32,13 +32,16 @@
+@@ -32,13 +32,16 @@ timestamp='2006-09-20'
  
  
  # Please send patches to <config-patches at gnu.org>.  Submit a context
@@ -10888,7 +10898,7 @@
  # This file is supposed to be the same for all GNU packages
  # and recognize all the CPU types, system types and aliases
  # that are meaningful with *any* GNU software.
-@@ -72,8 +75,9 @@
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
  version="\
  GNU config.sub ($timestamp)
  
@@ -10900,7 +10910,7 @@
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -122,6 +126,7 @@
+@@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
  case $maybe_os in
    nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
@@ -10908,7 +10918,7 @@
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -148,10 +153,13 @@
+@@ -148,10 +153,13 @@ case $os in
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -10923,7 +10933,7 @@
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -245,17 +253,20 @@
+@@ -245,17 +253,20 @@ case $basic_machine in
  	| bfin \
  	| c4x | clipper \
  	| d10v | d30v | dlx | dsp16xx \
@@ -10947,7 +10957,7 @@
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -268,6 +279,7 @@
+@@ -268,6 +279,7 @@ case $basic_machine in
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -10955,7 +10965,7 @@
  	| mt \
  	| msp430 \
  	| nios | nios2 \
-@@ -276,20 +288,22 @@
+@@ -276,20 +288,22 @@ case $basic_machine in
  	| pdp10 | pdp11 | pj | pjl \
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
@@ -10981,7 +10991,7 @@
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
  		os=-none
-@@ -324,19 +338,22 @@
+@@ -324,19 +338,22 @@ case $basic_machine in
  	| clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
@@ -11007,7 +11017,7 @@
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -357,21 +374,27 @@
+@@ -357,21 +374,27 @@ case $basic_machine in
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
@@ -11039,7 +11049,7 @@
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -435,6 +458,10 @@
+@@ -435,6 +458,10 @@ case $basic_machine in
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -11050,7 +11060,7 @@
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -443,10 +470,26 @@
+@@ -443,10 +470,26 @@ case $basic_machine in
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -11077,7 +11087,7 @@
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -475,8 +518,8 @@
+@@ -475,8 +518,8 @@ case $basic_machine in
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
@@ -11088,7 +11098,7 @@
  		os=-elf
  		;;
  	crds | unos)
-@@ -514,6 +557,10 @@
+@@ -514,6 +557,10 @@ case $basic_machine in
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -11099,7 +11109,7 @@
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
-@@ -668,6 +715,14 @@
+@@ -668,6 +715,14 @@ case $basic_machine in
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -11114,7 +11124,7 @@
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -679,10 +734,17 @@
+@@ -679,10 +734,17 @@ case $basic_machine in
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
@@ -11132,7 +11142,7 @@
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -809,6 +871,14 @@
+@@ -809,6 +871,14 @@ case $basic_machine in
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -11147,7 +11157,7 @@
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -925,6 +995,9 @@
+@@ -925,6 +995,9 @@ case $basic_machine in
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -11157,7 +11167,7 @@
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -1014,6 +1087,15 @@
+@@ -1014,6 +1087,15 @@ case $basic_machine in
  		basic_machine=tic6x-unknown
  		os=-coff
  		;;
@@ -11173,7 +11183,7 @@
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
-@@ -1089,6 +1171,10 @@
+@@ -1089,6 +1171,10 @@ case $basic_machine in
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -11184,7 +11194,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1127,7 +1213,7 @@
+@@ -1127,7 +1213,7 @@ case $basic_machine in
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -11193,7 +11203,7 @@
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1177,6 +1263,9 @@
+@@ -1177,6 +1263,9 @@ case $os in
          # First match some system type aliases
          # that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
@@ -11203,7 +11213,7 @@
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1197,10 +1286,11 @@
+@@ -1197,10 +1286,11 @@ case $os in
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -11218,7 +11228,7 @@
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1209,7 +1299,7 @@
+@@ -1209,7 +1299,7 @@ case $os in
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
@@ -11227,7 +11237,7 @@
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1219,7 +1309,7 @@
+@@ -1219,7 +1309,7 @@ case $os in
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -11236,7 +11246,7 @@
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1349,6 +1439,11 @@
+@@ -1349,6 +1439,11 @@ case $os in
  	-zvmoe)
  		os=-zvmoe
  		;;
@@ -11248,7 +11258,7 @@
  	-none)
  		;;
  	*)
-@@ -1414,6 +1509,9 @@
+@@ -1414,6 +1509,9 @@ case $basic_machine in
  	m68*-cisco)
  		os=-aout
  		;;
@@ -11258,7 +11268,7 @@
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1543,7 +1641,7 @@
+@@ -1543,7 +1641,7 @@ case $basic_machine in
  			-sunos*)
  				vendor=sun
  				;;
@@ -11267,8 +11277,10 @@
  				vendor=ibm
  				;;
  			-beos*)
---- a/configure
-+++ b/configure
+Index: gdm-2.30.0/configure
+===================================================================
+--- gdm-2.30.0.orig/configure	2010-03-30 00:11:15.000000000 +0200
++++ gdm-2.30.0/configure	2010-04-14 00:56:42.689233009 +0200
 @@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -11300,7 +11312,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +26,15 @@
+@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -11329,7 +11341,7 @@
  as_nl='
  '
  export as_nl
-@@ -46,7 +42,13 @@
+@@ -46,7 +42,13 @@ export as_nl
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -11344,7 +11356,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -57,7 +59,7 @@
+@@ -57,7 +59,7 @@ else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -11353,7 +11365,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@
+@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
    }
  fi
  
@@ -11367,7 +11379,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +91,15 @@
+@@ -96,15 +91,15 @@ fi
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -11386,7 +11398,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -116,12 +111,16 @@
+@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -11407,7 +11419,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +132,301 @@
+@@ -133,330 +132,301 @@ export LC_ALL
  LANGUAGE=C
  export LANGUAGE
  
@@ -11985,7 +11997,7 @@
    sed -n '
      p
      /[$]LINENO/=
-@@ -473,8 +443,7 @@
+@@ -473,8 +443,7 @@ test \$exitcode = 0") || {
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -11995,7 +12007,7 @@
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +453,18 @@
+@@ -484,29 +453,18 @@ test \$exitcode = 0") || {
    exit
  }
  
@@ -12030,7 +12042,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -536,7 +494,7 @@
+@@ -536,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -12039,7 +12051,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -555,10 +513,10 @@
+@@ -555,10 +513,10 @@ else
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -12052,7 +12064,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -573,26 +531,25 @@
+@@ -573,26 +531,25 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
  
  
  
@@ -12084,7 +12096,7 @@
    :
  else
    # Restart under the correct shell.
-@@ -602,9 +559,9 @@
+@@ -602,9 +559,9 @@ fi
  if test "X$1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -12096,7 +12108,7 @@
    exit 0
  fi
  
-@@ -612,122 +569,118 @@
+@@ -612,122 +569,118 @@ fi
  # if CDPATH is set.
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
@@ -12312,7 +12324,7 @@
  
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -745,7 +698,6 @@
+@@ -745,7 +698,6 @@ cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -12320,7 +12332,7 @@
  
  # Identity of this package.
  PACKAGE_NAME='gdm'
-@@ -753,6 +705,7 @@
+@@ -753,6 +705,7 @@ PACKAGE_TARNAME='gdm'
  PACKAGE_VERSION='2.30.0'
  PACKAGE_STRING='gdm 2.30.0'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdm'
@@ -12328,7 +12340,7 @@
  
  ac_unique_file="daemon/gdm-manager.c"
  # Factoring default headers for most tests.
-@@ -791,7 +744,9 @@
+@@ -791,7 +744,9 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
@@ -12339,7 +12351,7 @@
  LIBOBJS
  X_XNEST_UNSCALED_FONTPATH
  X_XNEST_CONFIG_OPTIONS
-@@ -851,6 +806,7 @@
+@@ -851,6 +806,7 @@ XDMCP_SUPPORT_TRUE
  XDMCP_LIBS
  PAM_LIBS
  HAVE_PAM
@@ -12347,7 +12359,7 @@
  PAM_PREFIX
  GDM_GROUPNAME
  GDM_USERNAME
-@@ -884,6 +840,8 @@
+@@ -884,6 +840,8 @@ LIBXKLAVIER_LIBS
  LIBXKLAVIER_CFLAGS
  SIMPLE_GREETER_LIBS
  SIMPLE_GREETER_CFLAGS
@@ -12356,7 +12368,7 @@
  HAVE_DEVICEKIT_POWER
  DEVKIT_POWER_LIBS
  DEVKIT_POWER_CFLAGS
-@@ -958,15 +916,23 @@
+@@ -958,15 +916,23 @@ INTLTOOL_EXTRACT
  INTLTOOL_MERGE
  INTLTOOL_UPDATE
  USE_NLS
@@ -12385,7 +12397,7 @@
  host_os
  host_vendor
  host_cpu
-@@ -975,6 +941,7 @@
+@@ -975,6 +941,7 @@ build_os
  build_vendor
  build_cpu
  build
@@ -12393,7 +12405,7 @@
  am__fastdepCXX_FALSE
  am__fastdepCXX_TRUE
  CXXDEPMODE
-@@ -1003,6 +970,8 @@
+@@ -1003,6 +970,8 @@ CC
  MAINT
  MAINTAINER_MODE_FALSE
  MAINTAINER_MODE_TRUE
@@ -12402,7 +12414,7 @@
  am__untar
  am__tar
  AMTAR
-@@ -1056,6 +1025,7 @@
+@@ -1056,6 +1025,7 @@ bindir
  program_transform_name
  prefix
  exec_prefix
@@ -12410,7 +12422,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1066,15 +1036,15 @@
+@@ -1066,15 +1036,15 @@ SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
@@ -12428,7 +12440,7 @@
  enable_nls
  with_help_dir
  with_omf_dir
-@@ -1103,6 +1073,7 @@
+@@ -1103,6 +1073,7 @@ enable_ipv6
  with_user
  with_group
  with_pam_prefix
@@ -12436,7 +12448,7 @@
  with_dbus_sys
  with_dbus_services
  enable_rbac_shutdown
-@@ -1133,8 +1104,6 @@
+@@ -1133,8 +1104,6 @@ CXX
  CXXFLAGS
  CCC
  CXXCPP
@@ -12445,7 +12457,7 @@
  PKG_CONFIG
  GTHREAD_CFLAGS
  GTHREAD_LIBS
-@@ -1153,6 +1122,8 @@
+@@ -1153,6 +1122,8 @@ GCONF_CFLAGS
  GCONF_LIBS
  DEVKIT_POWER_CFLAGS
  DEVKIT_POWER_LIBS
@@ -12454,7 +12466,7 @@
  SIMPLE_GREETER_CFLAGS
  SIMPLE_GREETER_LIBS
  LIBXKLAVIER_CFLAGS
-@@ -1271,8 +1242,7 @@
+@@ -1271,8 +1242,7 @@ do
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -12464,7 +12476,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1298,8 +1268,7 @@
+@@ -1298,8 +1268,7 @@ do
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -12474,7 +12486,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1503,8 +1472,7 @@
+@@ -1503,8 +1472,7 @@ do
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -12484,7 +12496,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1520,8 +1488,7 @@
+@@ -1520,8 +1488,7 @@ do
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -12494,7 +12506,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1551,17 +1518,17 @@
+@@ -1551,17 +1518,17 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -12518,7 +12530,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1578,15 +1545,13 @@
+@@ -1578,15 +1545,13 @@ done
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -12536,7 +12548,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1609,8 +1574,7 @@
+@@ -1609,8 +1574,7 @@ do
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -12546,7 +12558,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1640,11 +1604,9 @@
+@@ -1640,11 +1604,9 @@ test "$silent" = yes && exec 6>/dev/null
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -12560,7 +12572,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1683,13 +1645,11 @@
+@@ -1683,13 +1645,11 @@ else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -12576,7 +12588,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1797,6 +1757,8 @@
+@@ -1797,6 +1757,8 @@ Optional Features:
    --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -12585,7 +12597,7 @@
    --enable-maintainer-mode  enable make rules and dependencies not useful
  			  (and sometimes confusing) to the casual installer
    --disable-dependency-tracking  speeds up one-time build
-@@ -1828,10 +1790,9 @@
+@@ -1828,10 +1790,9 @@ Optional Features:
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -12597,7 +12609,7 @@
    --with-help-dir=DIR     path to help docs
    --with-omf-dir=DIR      path to OMF files
    --with-help-formats=FORMATS
-@@ -1862,6 +1823,8 @@
+@@ -1862,6 +1823,8 @@ Optional Packages:
    --with-group=<username> specify gdm's user name
    --with-pam-prefix=<prefix>
                            specify where pam files go
@@ -12606,7 +12618,7 @@
    --with-dbus-sys=<dir>   where D-BUS system.d directory is
    --with-dbus-services=<dir>
                            where D-BUS services directory is
-@@ -1890,14 +1853,12 @@
+@@ -1890,14 +1853,12 @@ Some influential environment variables:
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
@@ -12622,7 +12634,7 @@
    PKG_CONFIG  path to pkg-config utility
    GTHREAD_CFLAGS
                C compiler flags for GTHREAD, overriding pkg-config
-@@ -1925,6 +1886,10 @@
+@@ -1925,6 +1886,10 @@ Some influential environment variables:
                C compiler flags for DEVKIT_POWER, overriding pkg-config
    DEVKIT_POWER_LIBS
                linker flags for DEVKIT_POWER, overriding pkg-config
@@ -12633,7 +12645,7 @@
    SIMPLE_GREETER_CFLAGS
                C compiler flags for SIMPLE_GREETER, overriding pkg-config
    SIMPLE_GREETER_LIBS
-@@ -2011,124 +1976,656 @@
+@@ -2011,124 +1976,656 @@ test -n "$ac_init_help" && exit $ac_stat
  if $ac_init_version; then
    cat <<\_ACEOF
  gdm configure 2.30.0
@@ -13384,7 +13396,7 @@
  # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
-@@ -2148,13 +2645,13 @@
+@@ -2148,13 +2645,13 @@ _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -13400,7 +13412,7 @@
        esac ;;
      esac
    done
-@@ -2226,39 +2723,41 @@
+@@ -2226,39 +2723,41 @@ _ASBOX
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -13447,7 +13459,7 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2276,8 +2775,8 @@
+@@ -2276,8 +2775,8 @@ fi
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
@@ -13458,7 +13470,7 @@
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2285,10 +2784,10 @@
+@@ -2285,10 +2784,10 @@ $as_echo "$as_me: loading site script $a
  done
  
  if test -r "$cache_file"; then
@@ -13473,7 +13485,7 @@
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2296,7 +2795,7 @@
+@@ -2296,7 +2795,7 @@ $as_echo "$as_me: loading cache $cache_f
      esac
    fi
  else
@@ -13482,7 +13494,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2311,11 +2810,11 @@
+@@ -2311,11 +2810,11 @@ 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,)
@@ -13496,7 +13508,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2325,17 +2824,17 @@
+@@ -2325,17 +2824,17 @@ $as_echo "$as_me: error: \`$ac_var' was
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -13518,7 +13530,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2347,77 +2846,46 @@
+@@ -2347,77 +2846,46 @@ $as_echo "$as_me:   current value: \`$ac
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -13622,7 +13634,7 @@
  
  # These three variables are undocumented and unsupported,
  # and are intended to be withdrawn in a future Autoconf release.
-@@ -2442,10 +2910,10 @@
+@@ -2442,10 +2910,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -13635,7 +13647,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2453,11 +2921,11 @@
+@@ -2453,11 +2921,11 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13651,7 +13663,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2494,7 +2962,7 @@
+@@ -2494,7 +2962,7 @@ case $as_dir/ in
      ;;
  esac
  
@@ -13660,7 +13672,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2510,7 +2978,7 @@
+@@ -2510,7 +2978,7 @@ fi
      INSTALL=$ac_install_sh
    fi
  fi
@@ -13669,7 +13681,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2521,21 +2989,34 @@
+@@ -2521,21 +2989,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -13707,7 +13719,7 @@
     fi
     rm -f conftest.file
     if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2545,11 +3026,8 @@
+@@ -2545,11 +3026,8 @@ 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".
@@ -13721,7 +13733,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2558,13 +3036,10 @@
+@@ -2558,13 +3036,10 @@ then
     # Ok.
     :
  else
@@ -13738,7 +13750,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2579,20 +3054,136 @@
+@@ -2579,20 +3054,136 @@ program_transform_name=`$as_echo "$progr
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
@@ -13879,7 +13891,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2600,7 +3191,7 @@
+@@ -2600,7 +3191,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13888,7 +13900,7 @@
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2612,11 +3203,12 @@
+@@ -2612,11 +3203,12 @@ do
  	   esac
  	 done
         done
@@ -13902,7 +13914,7 @@
    if test "${ac_cv_path_mkdir+set}" = set; then
      MKDIR_P="$ac_cv_path_mkdir -p"
    else
-@@ -2624,11 +3216,10 @@
+@@ -2624,11 +3216,10 @@ fi
      # value for MKDIR_P within a source directory, because that will
      # break other packages using the cache if that directory is
      # removed, or if the value is a relative name.
@@ -13915,7 +13927,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2641,9 +3232,9 @@
+@@ -2641,9 +3232,9 @@ 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
@@ -13927,7 +13939,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2654,24 +3245,24 @@
+@@ -2654,24 +3245,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13957,7 +13969,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2679,11 +3270,11 @@
+@@ -2679,11 +3270,11 @@ fi
    test -n "$AWK" && break
  done
  
@@ -13971,7 +13983,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2701,11 +3292,11 @@
+@@ -2701,11 +3292,11 @@ esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -13985,7 +13997,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2725,9 +3316,7 @@
+@@ -2725,9 +3316,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -13996,7 +14008,7 @@
    fi
  fi
  
-@@ -2771,108 +3360,6 @@
+@@ -2771,108 +3360,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
@@ -14105,7 +14117,7 @@
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
  # Always define AMTAR for backward compatibility.
-@@ -2885,17 +3372,29 @@
+@@ -2885,17 +3372,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
  
  
  
@@ -14138,7 +14150,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2918,44 +3417,44 @@
+@@ -2918,44 +3417,44 @@ ac_config_commands="$ac_config_commands
  am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -14202,7 +14214,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -2980,9 +3479,9 @@
+@@ -2980,9 +3479,9 @@ 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
@@ -14214,7 +14226,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2993,24 +3492,24 @@
+@@ -2993,24 +3492,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14244,7 +14256,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3020,9 +3519,9 @@
+@@ -3020,9 +3519,9 @@ 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
@@ -14256,7 +14268,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3033,24 +3532,24 @@
+@@ -3033,24 +3532,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14286,7 +14298,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3059,7 +3558,7 @@
+@@ -3059,7 +3558,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -14295,7 +14307,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3073,9 +3572,9 @@
+@@ -3073,9 +3572,9 @@ 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
@@ -14307,7 +14319,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3086,24 +3585,24 @@
+@@ -3086,24 +3585,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14337,7 +14349,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3113,9 +3612,9 @@
+@@ -3113,9 +3612,9 @@ 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
@@ -14349,7 +14361,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3127,18 +3626,18 @@
+@@ -3127,18 +3626,18 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14371,7 +14383,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3157,10 +3656,10 @@
+@@ -3157,10 +3656,10 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -14384,7 +14396,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3172,9 +3671,9 @@
+@@ -3172,9 +3671,9 @@ 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
@@ -14396,7 +14408,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3185,24 +3684,24 @@
+@@ -3185,24 +3684,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14426,7 +14438,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3216,9 +3715,9 @@
+@@ -3216,9 +3715,9 @@ 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
@@ -14438,7 +14450,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3229,24 +3728,24 @@
+@@ -3229,24 +3728,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14468,7 +14480,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3259,7 +3758,7 @@
+@@ -3259,7 +3758,7 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -14477,7 +14489,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3270,57 +3769,37 @@
+@@ -3270,57 +3769,37 @@ fi
  fi
  
  
@@ -14555,7 +14567,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3336,8 +3815,8 @@
+@@ -3336,8 +3815,8 @@ ac_clean_files="$ac_clean_files a.out a.
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -14566,7 +14578,7 @@
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
  # The possible output files:
-@@ -3353,17 +3832,17 @@
+@@ -3353,17 +3832,17 @@ do
  done
  rm -f $ac_rmfiles
  
@@ -14589,7 +14601,7 @@
    # 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'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3380,7 +3859,7 @@
+@@ -3380,7 +3859,7 @@ do
  	# certainly right.
  	break;;
      *.* )
@@ -14598,7 +14610,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3399,84 +3878,42 @@
+@@ -3399,84 +3878,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
  else
    ac_file=''
  fi
@@ -14704,7 +14716,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3491,32 +3928,83 @@
+@@ -3491,32 +3928,83 @@ for ac_file in conftest.exe conftest con
    esac
  done
  else
@@ -14804,7 +14816,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3528,17 +4016,17 @@
+@@ -3528,17 +4016,17 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -14827,7 +14839,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3551,31 +4039,23 @@
+@@ -3551,31 +4039,23 @@ else
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14866,7 +14878,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3589,37 +4069,16 @@
+@@ -3589,37 +4069,16 @@ main ()
    return 0;
  }
  _ACEOF
@@ -14907,7 +14919,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3628,20 +4087,16 @@
+@@ -3628,20 +4087,16 @@ else
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -14931,7 +14943,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3652,35 +4107,11 @@
+@@ -3652,35 +4107,11 @@ main ()
    return 0;
  }
  _ACEOF
@@ -14970,7 +14982,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3691,36 +4122,12 @@
+@@ -3691,36 +4122,12 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15011,7 +15023,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3731,42 +4138,17 @@
+@@ -3731,42 +4138,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15056,7 +15068,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3783,18 +4165,14 @@
+@@ -3783,18 +4165,14 @@ else
      CFLAGS=
    fi
  fi
@@ -15078,7 +15090,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3851,32 +4229,9 @@
+@@ -3851,32 +4229,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -15112,7 +15124,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -3887,17 +4242,19 @@
+@@ -3887,17 +4242,19 @@ fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -15135,7 +15147,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3907,9 +4264,9 @@
+@@ -3907,9 +4264,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -15147,7 +15159,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3935,6 +4292,11 @@
+@@ -3935,6 +4292,11 @@ else
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -15159,7 +15171,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -3952,7 +4314,17 @@
+@@ -3952,7 +4314,17 @@ else
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -15177,7 +15189,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3962,19 +4334,23 @@
+@@ -3962,19 +4334,23 @@ else
  	break
        fi
        ;;
@@ -15207,7 +15219,7 @@
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -3998,7 +4374,7 @@
+@@ -3998,7 +4374,7 @@ else
  fi
  
  fi
@@ -15216,7 +15228,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4019,14 +4395,14 @@
+@@ -4019,14 +4395,14 @@ 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
@@ -15233,7 +15245,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -4041,11 +4417,7 @@
+@@ -4041,11 +4417,7 @@ do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -15246,7 +15258,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4054,78 +4426,34 @@
+@@ -4054,78 +4426,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -15330,7 +15342,7 @@
    break
  fi
  
-@@ -4137,7 +4465,7 @@
+@@ -4137,7 +4465,7 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -15339,7 +15351,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -4148,11 +4476,7 @@
+@@ -4148,11 +4476,7 @@ do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -15352,7 +15364,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4161,87 +4485,40 @@
+@@ -4161,87 +4485,40 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -15449,7 +15461,7 @@
  fi
  
  ac_ext=c
-@@ -4251,9 +4528,9 @@
+@@ -4251,9 +4528,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -15461,7 +15473,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4264,7 +4541,7 @@
+@@ -4264,7 +4541,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -15470,7 +15482,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4284,7 +4561,7 @@
+@@ -4284,7 +4561,7 @@ case `"$ac_path_GREP" --version 2>&1` in
      $as_echo 'GREP' >> "conftest.nl"
      "$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
@@ -15479,7 +15491,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -4299,26 +4576,24 @@
+@@ -4299,26 +4576,24 @@ esac
        $ac_path_GREP_found && break 3
      done
    done
@@ -15511,7 +15523,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4332,7 +4607,7 @@
+@@ -4332,7 +4607,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -15520,7 +15532,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4352,7 +4627,7 @@
+@@ -4352,7 +4627,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -15529,7 +15541,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4367,12 +4642,10 @@
+@@ -4367,12 +4642,10 @@ esac
        $ac_path_EGREP_found && break 3
      done
    done
@@ -15544,7 +15556,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4380,21 +4653,17 @@
+@@ -4380,21 +4653,17 @@ fi
  
     fi
  fi
@@ -15570,7 +15582,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4409,48 +4678,23 @@
+@@ -4409,48 +4678,23 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15624,7 +15636,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4460,18 +4704,14 @@
+@@ -4460,18 +4704,14 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -15646,7 +15658,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4481,14 +4721,10 @@
+@@ -4481,14 +4721,10 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -15663,7 +15675,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -4515,118 +4751,34 @@
+@@ -4515,118 +4751,34 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15795,7 +15807,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4637,139 +4789,8 @@
+@@ -4637,139 +4789,8 @@ done
  
  
  
@@ -15937,7 +15949,7 @@
    MINIX=yes
  else
    MINIX=
-@@ -4778,34 +4799,23 @@
+@@ -4778,34 +4799,23 @@ fi
  
    if test "$MINIX" = yes; then
  
@@ -15978,7 +15990,7 @@
  /* end confdefs.h.  */
  
  #	  define __EXTENSIONS__ 1
-@@ -4818,69 +4828,35 @@
+@@ -4818,69 +4828,35 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16060,7 +16072,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4895,48 +4871,23 @@
+@@ -4895,48 +4871,23 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16114,7 +16126,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4946,18 +4897,14 @@
+@@ -4946,18 +4897,14 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -16136,7 +16148,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4967,14 +4914,10 @@
+@@ -4967,14 +4914,10 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -16153,7 +16165,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -5001,51 +4944,22 @@
+@@ -5001,51 +4944,22 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16212,7 +16224,7 @@
  
  fi
  
-@@ -5063,9 +4977,9 @@
+@@ -5063,9 +4977,9 @@ 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
@@ -16224,7 +16236,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
-@@ -5076,24 +4990,24 @@
+@@ -5076,24 +4990,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -16254,7 +16266,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5107,9 +5021,9 @@
+@@ -5107,9 +5021,9 @@ 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
@@ -16266,7 +16278,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CXX"; then
-@@ -5120,24 +5034,24 @@
+@@ -5120,24 +5034,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -16296,7 +16308,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5150,7 +5064,7 @@
+@@ -5150,7 +5064,7 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -16305,7 +16317,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5161,53 +5075,36 @@
+@@ -5161,53 +5075,36 @@ fi
    fi
  fi
  # Provide some information about the compiler.
@@ -16378,7 +16390,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5221,37 +5118,16 @@
+@@ -5221,37 +5118,16 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16419,7 +16431,7 @@
  $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GXX=yes
-@@ -5260,20 +5136,16 @@
+@@ -5260,20 +5136,16 @@ else
  fi
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
@@ -16443,7 +16455,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5284,35 +5156,11 @@
+@@ -5284,35 +5156,11 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16482,7 +16494,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5323,36 +5171,12 @@
+@@ -5323,36 +5171,12 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16523,7 +16535,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5363,42 +5187,17 @@
+@@ -5363,42 +5187,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -16568,7 +16580,7 @@
  $as_echo "$ac_cv_prog_cxx_g" >&6; }
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
-@@ -5423,9 +5222,9 @@
+@@ -5423,9 +5222,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CXX"  am_compiler_list=
  
@@ -16580,7 +16592,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5451,6 +5250,11 @@
+@@ -5451,6 +5250,11 @@ else
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -16592,7 +16604,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -5468,7 +5272,17 @@
+@@ -5468,7 +5272,17 @@ else
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -16610,7 +16622,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -5478,19 +5292,23 @@
+@@ -5478,19 +5292,23 @@ else
  	break
        fi
        ;;
@@ -16640,7 +16652,7 @@
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -5514,7 +5332,7 @@
+@@ -5514,7 +5332,7 @@ else
  fi
  
  fi
@@ -16649,7 +16661,7 @@
  $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
-@@ -5530,22 +5348,18 @@
+@@ -5530,22 +5348,18 @@ fi
  
  
  if test "x$CC" != xcc; then
@@ -16676,7 +16688,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5561,63 +5375,63 @@
+@@ -5561,63 +5375,63 @@ _ACEOF
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
  rm -f conftest2.*
@@ -16765,7 +16777,7 @@
        then
  	# cc works too.
  	:
-@@ -5634,23 +5448,22 @@
+@@ -5634,23 +5448,22 @@ rm -f core conftest*
  
  fi
  if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -16795,7 +16807,7 @@
     # Losing compiler, so override with the script.
     # FIXME: It is wrong to rewrite CC.
     # But if we don't then we get into trouble of one sort or another.
-@@ -5660,109 +5473,54 @@
+@@ -5660,109 +5473,54 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$
  fi
  
  
@@ -16931,7 +16943,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -5778,28 +5536,24 @@
+@@ -5778,28 +5536,24 @@ IFS=$ac_save_IFS
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -16965,7 +16977,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -5815,66 +5569,177 @@
+@@ -5815,66 +5569,177 @@ IFS=$ac_save_IFS
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
@@ -17184,7 +17196,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -5883,7 +5748,7 @@
+@@ -5883,7 +5748,7 @@ fi
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -17193,7 +17205,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -5897,9 +5762,9 @@
+@@ -5897,9 +5762,9 @@ $as_echo_n "checking for ld used by $CC.
      [\\/]* | ?:[\\/]*)
        re_direlt='/[^/][^/]*/\.\./'
        # Canonicalize the pathname of ld
@@ -17206,7 +17218,7 @@
        done
        test -z "$LD" && LD="$ac_prog"
        ;;
-@@ -5913,13 +5778,13 @@
+@@ -5913,13 +5778,13 @@ $as_echo_n "checking for ld used by $CC.
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -17223,7 +17235,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -5950,18 +5815,16 @@
+@@ -5950,18 +5815,16 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17247,7 +17259,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5974,39 +5837,21 @@
+@@ -5974,39 +5837,21 @@ case `$LD -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -17297,7 +17309,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -6050,1217 +5895,1069 @@
+@@ -6050,1217 +5895,1069 @@ else
      done
      IFS="$lt_save_ifs"
    done
@@ -19383,7 +19395,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -7273,33 +6970,18 @@
+@@ -7273,33 +6970,18 @@ symcode='[BCDEGRST]'
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -19419,7 +19431,7 @@
    ;;
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
-@@ -7324,57 +7006,85 @@
+@@ -7324,57 +7006,85 @@ sysv4)
    ;;
  esac
  
@@ -19523,7 +19535,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -7383,53 +7093,55 @@
+@@ -7383,53 +7093,55 @@ EOF
        fi
  
        # Make sure that we snagged all the symbols we need.
@@ -19602,7 +19614,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -7447,7 +7159,7 @@
+@@ -7447,7 +7159,7 @@ EOF
      echo "$progname: failed program was:" >&5
      cat conftest.$ac_ext >&5
    fi
@@ -19611,7 +19623,7 @@
  
    # Do not use the global_symbol_pipe unless it works.
    if test "$pipe_works" = yes; then
-@@ -7463,6041 +7175,3696 @@
+@@ -7463,6041 +7175,3696 @@ 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
@@ -28598,7 +28610,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -13511,20 +10878,6 @@
+@@ -13511,20 +10878,6 @@ shlibpath_overrides_runpath=unknown
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -28619,7 +28631,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -13542,7 +10895,7 @@
+@@ -13542,7 +10895,7 @@ aix3*)
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -28628,7 +28640,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13561,7 +10914,7 @@
+@@ -13561,7 +10914,7 @@ aix4* | aix5*)
        aix4 | aix4.[01] | aix4.[01].*)
        if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
  	   echo ' yes '
@@ -28637,7 +28649,7 @@
  	:
        else
  	can_build_shared=no
-@@ -13587,9 +10940,18 @@
+@@ -13587,9 +10940,18 @@ aix4* | aix5*)
    ;;
  
  amigaos*)
@@ -28659,7 +28671,7 @@
    ;;
  
  beos*)
-@@ -13612,25 +10974,28 @@
+@@ -13612,25 +10974,28 @@ bsdi[45]*)
    # libtool to hard-code these into programs
    ;;
  
@@ -28693,7 +28705,7 @@
      shlibpath_overrides_runpath=yes
  
      case $host_os in
-@@ -13639,20 +11004,20 @@
+@@ -13639,20 +11004,20 @@ cygwin* | mingw* | pw32*)
        soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
        ;;
@@ -28719,7 +28731,7 @@
        fi
        ;;
      pw32*)
-@@ -13676,17 +11041,13 @@
+@@ -13676,17 +11041,13 @@ darwin* | rhapsody*)
    version_type=darwin
    need_lib_prefix=no
    need_version=no
@@ -28740,7 +28752,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -13703,18 +11064,6 @@
+@@ -13703,18 +11064,6 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -28759,7 +28771,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -13752,7 +11101,7 @@
+@@ -13752,7 +11101,7 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -28768,7 +28780,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -13791,18 +11140,18 @@
+@@ -13791,18 +11140,18 @@ hpux9* | hpux10* | hpux11*)
      fi
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
@@ -28799,7 +28811,7 @@
      shrext_cmds='.sl'
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
-@@ -13815,7 +11164,7 @@
+@@ -13815,7 +11164,7 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -28808,7 +28820,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13870,7 +11219,7 @@
+@@ -13870,7 +11219,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be Linux ELF.
@@ -28817,7 +28829,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13879,6 +11228,32 @@
+@@ -13879,6 +11228,32 @@ linux*)
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -28850,7 +28862,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
-@@ -13886,7 +11261,7 @@
+@@ -13886,7 +11261,7 @@ linux*)
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -28859,7 +28871,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -13899,7 +11274,7 @@
+@@ -13899,7 +11274,7 @@ linux*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -28868,7 +28880,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13908,14 +11283,14 @@
+@@ -13908,14 +11283,14 @@ knetbsd*-gnu)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -28885,7 +28897,7 @@
      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
-@@ -13936,14 +11311,16 @@
+@@ -13936,14 +11311,16 @@ newsos6)
    shlibpath_overrides_runpath=yes
    ;;
  
@@ -28905,7 +28917,7 @@
    ;;
  
  openbsd*)
-@@ -13952,13 +11329,13 @@
+@@ -13952,13 +11329,13 @@ openbsd*)
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
    case $host_os in
@@ -28922,7 +28934,7 @@
      case $host_os in
        openbsd2.[89] | openbsd2.[89].*)
  	shlibpath_overrides_runpath=no
-@@ -13992,6 +11369,10 @@
+@@ -13992,6 +11369,10 @@ osf3* | osf4* | osf5*)
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -28933,7 +28945,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14026,7 +11407,6 @@
+@@ -14026,7 +11407,6 @@ sysv4 | sysv4.3*)
      sni)
        shlibpath_overrides_runpath=no
        need_lib_prefix=no
@@ -28941,7 +28953,7 @@
        runpath_var=LD_RUN_PATH
        ;;
      siemens)
-@@ -14057,13 +11437,12 @@
+@@ -14057,13 +11437,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -28956,7 +28968,7 @@
      case $host_os in
        sco3.2v5*)
          sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-@@ -14073,6 +11452,17 @@
+@@ -14073,6 +11452,17 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
    sys_lib_dlsearch_path_spec='/usr/lib'
    ;;
  
@@ -28974,7 +28986,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14084,7 +11474,7 @@
+@@ -14084,7 +11474,7 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -28983,7 +28995,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -14093,11370 +11483,4645 @@
+@@ -14093,11370 +11483,4645 @@ if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -44123,7 +44135,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -25465,92 +16130,36 @@
+@@ -25465,92 +16130,36 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44236,7 +44248,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -25558,71 +16167,35 @@
+@@ -25558,71 +16167,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44324,7 +44336,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -25631,85 +16204,49 @@
+@@ -25631,85 +16204,49 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44436,7 +44448,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -25717,71 +16254,35 @@
+@@ -25717,71 +16254,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44524,7 +44536,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -25790,481 +16291,551 @@
+@@ -25790,481 +16291,551 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -45464,7 +45476,7 @@
  fi
  
  
-@@ -26277,68 +16848,41 @@
+@@ -26277,68 +16848,41 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -45549,7 +45561,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -26347,46 +16891,68 @@
+@@ -26347,46 +16891,68 @@ fi
  
  
  pkg_failed=no
@@ -45644,7 +45656,7 @@
  fi
  
  
-@@ -26399,68 +16965,53 @@
+@@ -26399,68 +16965,53 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -45740,7 +45752,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -26469,150 +17020,68 @@
+@@ -26469,150 +17020,68 @@ fi
  
  
  pkg_failed=no
@@ -45937,7 +45949,7 @@
  fi
  
  
-@@ -26625,231 +17094,292 @@
+@@ -26625,231 +17094,292 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -46399,7 +46411,7 @@
  fi
  
  
-@@ -26862,253 +17392,516 @@
+@@ -26862,253 +17392,516 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -47107,7 +47119,7 @@
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
-@@ -27121,16 +17914,12 @@
+@@ -27121,16 +17914,12 @@ 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 . . . .
@@ -47126,7 +47138,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -27141,40 +17930,13 @@
+@@ -27141,40 +17930,13 @@ main ()
    return 0;
  }
  _ACEOF
@@ -47171,7 +47183,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -27185,46 +17947,19 @@
+@@ -27185,46 +17947,19 @@ main ()
    return 0;
  }
  _ACEOF
@@ -47225,7 +47237,7 @@
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
-@@ -27240,11 +17975,7 @@
+@@ -27240,11 +17975,7 @@ rm -f core conftest.err conftest.$ac_obj
      # libraries were built with DECnet support.  And Karl Berry says
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -47238,7 +47250,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27262,44 +17993,17 @@
+@@ -27262,44 +17993,17 @@ return XOpenDisplay ();
    return 0;
  }
  _ACEOF
@@ -47288,7 +47300,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27317,59 +18021,30 @@
+@@ -27317,59 +18021,30 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -47357,7 +47369,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27387,52 +18062,25 @@
+@@ -27387,52 +18062,25 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -47418,7 +47430,7 @@
      LIBS="$ac_xsave_LIBS"
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -27443,105 +18091,20 @@
+@@ -27443,105 +18091,20 @@ 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.
@@ -47529,7 +47541,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27559,59 +18122,30 @@
+@@ -27559,59 +18122,30 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -47598,7 +47610,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27629,242 +18163,46 @@
+@@ -27629,242 +18163,46 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -47867,7 +47879,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -27872,71 +18210,47 @@
+@@ -27872,71 +18210,47 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47962,7 +47974,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -27954,76 +18268,39 @@
+@@ -27954,76 +18268,39 @@ return remove ();
    return 0;
  }
  _ACEOF
@@ -48057,7 +48069,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -28032,13 +18309,6 @@
+@@ -28032,13 +18309,6 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern "C"
  #endif
  char shmat ();
@@ -48071,7 +48083,7 @@
  int
  main ()
  {
-@@ -28047,55 +18317,41 @@
+@@ -28047,55 +18317,41 @@ return shmat ();
    return 0;
  }
  _ACEOF
@@ -48155,7 +48167,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -28104,178 +18360,300 @@
+@@ -28104,178 +18360,300 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -48593,7 +48605,7 @@
  fi
  
  
-@@ -28288,887 +18666,993 @@
+@@ -28288,887 +18666,993 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -50285,7 +50297,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -29176,252 +19660,153 @@
+@@ -29176,252 +19660,153 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -50650,7 +50662,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -29429,107 +19814,51 @@
+@@ -29429,107 +19814,51 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -50787,7 +50799,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -29537,457 +19866,476 @@
+@@ -29537,457 +19866,476 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -51642,7 +51654,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -29995,78 +20343,53 @@
+@@ -29995,78 +20343,53 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -51749,7 +51761,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -30075,167 +20398,109 @@
+@@ -30075,167 +20398,109 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -51984,7 +51996,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -30244,88 +20509,53 @@
+@@ -30244,88 +20509,53 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52100,7 +52112,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -30333,62 +20563,40 @@
+@@ -30333,62 +20563,40 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -52184,7 +52196,7 @@
  
  else
    mkdtemp_missing=true
-@@ -30404,10 +20612,10 @@
+@@ -30404,10 +20612,10 @@ fi
  
  
  
@@ -52197,7 +52209,7 @@
    enableval=$enable_ipv6;
  else
    enable_ipv6=no
-@@ -30415,11 +20623,7 @@
+@@ -30415,11 +20623,7 @@ fi
  
  
  if test x$enable_ipv6 = xyes; then
@@ -52210,7 +52222,7 @@
  /* end confdefs.h.  */
  
      #include <sys/types.h>
-@@ -30435,141 +20639,32 @@
+@@ -30435,141 +20639,32 @@ main ()
    return 0;
  }
  _ACEOF
@@ -52359,7 +52371,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -30587,157 +20682,42 @@
+@@ -30587,157 +20682,42 @@ return getaddrinfo ();
    return 0;
  }
  _ACEOF
@@ -52530,7 +52542,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -30755,47 +20735,20 @@
+@@ -30755,47 +20735,20 @@ return inet_ntop ();
    return 0;
  }
  _ACEOF
@@ -52586,7 +52598,7 @@
    "LIBS=$LIBS -l$lib";have_inet_ntop=yes;break
  fi
  
-@@ -30806,21 +20759,19 @@
+@@ -30806,21 +20759,19 @@ fi
        if test x$have_inet_ntop = xyes; then
          have_ipv6=yes
  
@@ -52612,7 +52624,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -30828,7 +20779,7 @@
+@@ -30828,7 +20779,7 @@ fi
  withval=""
  
  # Check whether --with-user was given.
@@ -52621,7 +52633,7 @@
    withval=$with_user;
  fi
  
-@@ -30849,7 +20800,7 @@
+@@ -30849,7 +20800,7 @@ _ACEOF
  withval=""
  
  # Check whether --with-group was given.
@@ -52630,7 +52642,7 @@
    withval=$with_group;
  fi
  
-@@ -30871,9 +20822,9 @@
+@@ -30871,9 +20822,9 @@ _ACEOF
  withval=""
  
  # Check whether --with-pam-prefix was given.
@@ -52642,7 +52654,7 @@
  $as_echo "\"PAM files will be installed in prefix ${withval}.\"" >&6; }
               fi
  fi
-@@ -30886,19 +20837,37 @@
+@@ -30886,19 +20837,37 @@ else
  fi
  
  
@@ -52687,7 +52699,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -30906,53 +20875,28 @@
+@@ -30906,53 +20875,28 @@ cat >>conftest.$ac_ext <<_ACEOF
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
@@ -52757,7 +52769,7 @@
    have_pam=yes
  fi
  
-@@ -30960,157 +20904,17 @@
+@@ -30960,157 +20904,17 @@ fi
  if test "x$have_pam" = "xyes"; then
          PAM_LIBS="${PAM_LIBS} -lpam"
  else
@@ -52921,7 +52933,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -31119,18 +20923,14 @@
+@@ -31119,18 +20923,14 @@ fi
  
  done
  
@@ -52943,7 +52955,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -31148,93 +20948,56 @@
+@@ -31148,93 +20948,56 @@ return pam_syslog ();
    return 0;
  }
  _ACEOF
@@ -53053,7 +53065,7 @@
  $as_echo "\"not found - assume const, Linux-type PAM\"" >&6; }
  
  fi
-@@ -31242,14 +21005,10 @@
+@@ -31242,14 +21005,10 @@ rm -f conftest*
  
  fi
  
@@ -53070,7 +53082,7 @@
  		#ifdef HAVE_USERSEC_H
  		#include <usersec.h>
  		#endif
-@@ -31264,1106 +21023,874 @@
+@@ -31264,1106 +21023,874 @@ main ()
    return 0;
  }
  _ACEOF
@@ -54845,7 +54857,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -32372,1109 +21899,736 @@
+@@ -32372,1109 +21899,736 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56484,7 +56496,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -33483,690 +22637,303 @@
+@@ -33483,690 +22637,303 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57362,7 +57374,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -34175,143 +22942,73 @@
+@@ -34175,143 +22942,73 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57545,7 +57557,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -34320,3542 +23017,3194 @@
+@@ -34320,3542 +23017,3194 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -63791,7 +63803,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -37878,15 +26227,12 @@
+@@ -37878,15 +26227,12 @@ $as_echo "$as_me: error: po/Makefile.in.
  done # for ac_tag
  
  
@@ -63809,7 +63821,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -37907,10 +26253,10 @@
+@@ -37907,10 +26253,10 @@ if test "$no_create" != yes; then
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -63822,8 +63834,10 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
---- a/daemon/Makefile.in
-+++ b/daemon/Makefile.in
+Index: gdm-2.30.0/daemon/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/daemon/Makefile.in	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/daemon/Makefile.in	2010-04-14 00:56:39.241235152 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -63847,7 +63861,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -51,18 +53,19 @@
+@@ -51,18 +53,19 @@ subdir = daemon
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -63871,7 +63885,7 @@
  PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
  am__gdm_binary_SOURCES_DIST = main.c gdm-display-access-file.c \
  	gdm-display-access-file.h gdm-display-store.c \
-@@ -101,7 +104,10 @@
+@@ -101,7 +104,10 @@ gdm_binary_DEPENDENCIES = $(top_builddir
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -63883,7 +63897,7 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(gdm_binary_LDFLAGS) $(LDFLAGS) -o $@
  am_gdm_factory_slave_OBJECTS = factory-slave-main.$(OBJEXT) \
-@@ -114,9 +120,10 @@
+@@ -114,9 +120,10 @@ gdm_factory_slave_OBJECTS = $(am_gdm_fac
  gdm_factory_slave_DEPENDENCIES =  \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -63897,7 +63911,7 @@
  am_gdm_product_slave_OBJECTS = product-slave-main.$(OBJEXT) \
  	gdm-server.$(OBJEXT) gdm-session.$(OBJEXT) \
  	gdm-session-direct.$(OBJEXT) gdm-session-record.$(OBJEXT) \
-@@ -127,9 +134,10 @@
+@@ -127,9 +134,10 @@ gdm_product_slave_DEPENDENCIES =  \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -63911,7 +63925,7 @@
  am__gdm_session_worker_SOURCES_DIST = session-worker-main.c \
  	ck-connector.h ck-connector.c gdm-session-settings.h \
  	gdm-session-settings.c gdm-session-auditor.h \
-@@ -148,9 +156,10 @@
+@@ -148,9 +156,10 @@ gdm_session_worker_OBJECTS = $(am_gdm_se
  gdm_session_worker_DEPENDENCIES =  \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -63925,7 +63939,7 @@
  am_gdm_simple_slave_OBJECTS = simple-slave-main.$(OBJEXT) \
  	gdm-greeter-server.$(OBJEXT) ck-connector.$(OBJEXT) \
  	gdm-welcome-session.$(OBJEXT) gdm-greeter-session.$(OBJEXT) \
-@@ -163,9 +172,10 @@
+@@ -163,9 +172,10 @@ gdm_simple_slave_DEPENDENCIES =  \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -63939,7 +63953,7 @@
  am_gdm_xdmcp_chooser_slave_OBJECTS =  \
  	xdmcp-chooser-slave-main.$(OBJEXT) \
  	gdm-chooser-server.$(OBJEXT) ck-connector.$(OBJEXT) \
-@@ -185,20 +195,54 @@
+@@ -185,20 +195,54 @@ test_session_DEPENDENCIES = $(top_buildd
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -64002,7 +64016,7 @@
  SOURCES = $(gdm_binary_SOURCES) $(EXTRA_gdm_binary_SOURCES) \
  	$(gdm_factory_slave_SOURCES) $(gdm_product_slave_SOURCES) \
  	$(gdm_session_worker_SOURCES) $(gdm_simple_slave_SOURCES) \
-@@ -215,6 +259,7 @@
+@@ -215,6 +259,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -64010,7 +64024,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -255,7 +300,8 @@
+@@ -255,7 +300,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -64020,7 +64034,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -270,18 +316,20 @@
+@@ -270,18 +316,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -64043,7 +64057,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -313,6 +361,7 @@
+@@ -313,6 +361,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -64051,7 +64065,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -322,6 +371,7 @@
+@@ -322,6 +371,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -64059,7 +64073,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -332,13 +382,19 @@
+@@ -332,13 +382,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -64079,7 +64093,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -352,6 +408,7 @@
+@@ -352,6 +408,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -64087,7 +64101,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -390,7 +447,7 @@
+@@ -390,7 +447,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -64096,7 +64110,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -426,6 +483,7 @@
+@@ -426,6 +483,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -64104,7 +64118,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -726,14 +784,14 @@
+@@ -726,14 +784,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -64124,7 +64138,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -751,109 +809,157 @@
+@@ -751,109 +809,157 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64346,7 +64360,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -907,22 +1013,25 @@
+@@ -907,22 +1013,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xdmcp-chooser-slave-main.Po at am__quote@
  
  .c.o:
@@ -64378,7 +64392,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -938,45 +1047,49 @@
+@@ -938,45 +1047,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -64444,7 +64458,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -997,13 +1110,17 @@
+@@ -997,13 +1110,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -64466,7 +64480,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1037,6 +1154,7 @@
+@@ -1037,6 +1154,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64474,7 +64488,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1059,6 +1177,8 @@
+@@ -1059,6 +1177,8 @@ dvi-am:
  
  html: html-am
  
@@ -64483,7 +64497,7 @@
  info: info-am
  
  info-am:
-@@ -1067,19 +1187,29 @@
+@@ -1067,19 +1187,29 @@ install-data-am:
  
  install-dvi: install-dvi-am
  
@@ -64513,7 +64527,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1103,7 +1233,7 @@
+@@ -1103,7 +1233,7 @@ ps-am:
  uninstall-am: uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS \
  	uninstall-sbinSCRIPTS
  
@@ -64522,7 +64536,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \
-@@ -1156,6 +1286,7 @@
+@@ -1156,6 +1286,7 @@ gdm-product-display-glue.h: gdm-product-
  
  gdm: $(srcdir)/gdm.in
  	sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
@@ -64530,8 +64544,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/faces/Makefile.in
-+++ b/data/faces/Makefile.in
+Index: gdm-2.30.0/data/faces/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/faces/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/faces/Makefile.in	2010-04-14 00:56:39.449234910 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -64555,7 +64571,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -36,13 +38,22 @@
+@@ -36,13 +38,22 @@ subdir = data/faces
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -64580,7 +64596,7 @@
  SOURCES =
  DIST_SOURCES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -50,14 +61,29 @@
+@@ -50,14 +61,29 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -64612,7 +64628,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -98,7 +124,8 @@
+@@ -98,7 +124,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -64622,7 +64638,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -113,18 +140,20 @@
+@@ -113,18 +140,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -64645,7 +64661,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -156,6 +185,7 @@
+@@ -156,6 +185,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -64653,7 +64669,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -165,6 +195,7 @@
+@@ -165,6 +195,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -64661,7 +64677,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -175,13 +206,19 @@
+@@ -175,13 +206,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -64681,7 +64697,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -195,6 +232,7 @@
+@@ -195,6 +232,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -64689,7 +64705,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -233,7 +271,7 @@
+@@ -233,7 +271,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -64698,7 +64714,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -269,6 +307,7 @@
+@@ -269,6 +307,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -64706,7 +64722,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -323,14 +362,14 @@
+@@ -323,14 +362,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -64726,7 +64742,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -348,6 +387,7 @@
+@@ -348,6 +387,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64734,7 +64750,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,20 +397,23 @@
+@@ -357,20 +397,23 @@ clean-libtool:
  install-imageDATA: $(image_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(imagedir)" || $(MKDIR_P) "$(DESTDIR)$(imagedir)"
@@ -64767,7 +64783,7 @@
  tags: TAGS
  TAGS:
  
-@@ -394,13 +437,17 @@
+@@ -394,13 +437,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -64789,7 +64805,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -431,6 +478,7 @@
+@@ -431,6 +478,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64797,7 +64813,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -449,6 +497,8 @@
+@@ -449,6 +497,8 @@ dvi-am:
  
  html: html-am
  
@@ -64806,7 +64822,7 @@
  info: info-am
  
  info-am:
-@@ -457,18 +507,28 @@
+@@ -457,18 +507,28 @@ install-data-am: install-imageDATA
  
  install-dvi: install-dvi-am
  
@@ -64835,7 +64851,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -503,6 +563,7 @@
+@@ -503,6 +563,7 @@ uninstall-am: uninstall-imageDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-imageDATA
  
@@ -64843,8 +64859,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/greeter-autostart/Makefile.in
-+++ b/data/greeter-autostart/Makefile.in
+Index: gdm-2.30.0/data/greeter-autostart/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/greeter-autostart/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/greeter-autostart/Makefile.in	2010-04-14 00:56:39.541235004 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -64868,7 +64886,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -37,13 +39,22 @@
+@@ -37,13 +39,22 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
  	$(srcdir)/at-spi-registryd-wrapper.desktop.in.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -64893,7 +64911,7 @@
  SOURCES =
  DIST_SOURCES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -51,14 +62,29 @@
+@@ -51,14 +62,29 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -64925,7 +64943,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -99,7 +125,8 @@
+@@ -99,7 +125,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -64935,7 +64953,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -114,18 +141,20 @@
+@@ -114,18 +141,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -64958,7 +64976,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -157,6 +186,7 @@
+@@ -157,6 +186,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -64966,7 +64984,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -166,6 +196,7 @@
+@@ -166,6 +196,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -64974,7 +64992,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -176,13 +207,19 @@
+@@ -176,13 +207,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -64994,7 +65012,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -196,6 +233,7 @@
+@@ -196,6 +233,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -65002,7 +65020,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -234,7 +272,7 @@
+@@ -234,7 +272,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -65011,7 +65029,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -270,6 +308,7 @@
+@@ -270,6 +308,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -65019,7 +65037,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -338,14 +377,14 @@
+@@ -338,14 +377,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -65039,7 +65057,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -363,6 +402,7 @@
+@@ -363,6 +402,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65047,7 +65065,7 @@
  at-spi-registryd-wrapper.desktop.in: $(top_builddir)/config.status $(srcdir)/at-spi-registryd-wrapper.desktop.in.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  
-@@ -374,20 +414,23 @@
+@@ -374,20 +414,23 @@ clean-libtool:
  install-desktopDATA: $(desktop_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@@ -65080,7 +65098,7 @@
  tags: TAGS
  TAGS:
  
-@@ -411,13 +454,17 @@
+@@ -411,13 +454,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -65102,7 +65120,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -448,6 +495,7 @@
+@@ -448,6 +495,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -65110,7 +65128,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -468,6 +516,8 @@
+@@ -468,6 +516,8 @@ dvi-am:
  
  html: html-am
  
@@ -65119,7 +65137,7 @@
  info: info-am
  
  info-am:
-@@ -476,18 +526,28 @@
+@@ -476,18 +526,28 @@ install-data-am: install-desktopDATA
  
  install-dvi: install-dvi-am
  
@@ -65148,7 +65166,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -527,6 +587,7 @@
+@@ -527,6 +587,7 @@ uninstall-am: uninstall-desktopDATA
  	$(edit) $< >$@
  
  @INTLTOOL_DESKTOP_RULE@
@@ -65156,8 +65174,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/Makefile.in
-+++ b/data/Makefile.in
+Index: gdm-2.30.0/data/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/Makefile.in	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/data/Makefile.in	2010-04-14 00:56:39.357234327 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -65181,7 +65201,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -34,16 +36,25 @@
+@@ -34,16 +36,25 @@ build_triplet = @build@
  host_triplet = @host@
  subdir = data
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -65211,7 +65231,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -58,22 +69,65 @@
+@@ -58,22 +69,65 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -65283,7 +65303,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -114,7 +168,8 @@
+@@ -114,7 +168,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -65293,7 +65313,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -129,18 +184,20 @@
+@@ -129,18 +184,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -65316,7 +65336,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -172,6 +229,7 @@
+@@ -172,6 +229,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -65324,7 +65344,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -181,6 +239,7 @@
+@@ -181,6 +239,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -65332,7 +65352,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -191,13 +250,19 @@
+@@ -191,13 +250,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -65352,7 +65372,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -211,6 +276,7 @@
+@@ -211,6 +276,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -65360,7 +65380,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -249,13 +315,13 @@
+@@ -249,13 +315,13 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -65376,7 +65396,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -285,6 +351,7 @@
+@@ -285,6 +351,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -65384,7 +65404,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -325,11 +392,15 @@
+@@ -325,11 +392,15 @@ schemas_in_files = gdm.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
  localealiasdir = $(datadir)/gdm
  localealias_DATA = locale.alias
@@ -65400,7 +65420,7 @@
  	gdm.schemas.in.in	\
  	gdm.conf-custom.in 	\
  	Xsession.in 		\
-@@ -352,7 +423,8 @@
+@@ -352,7 +423,8 @@ CLEANFILES = \
  	$(NULL)
  
  DISTCLEANFILES = \
@@ -65410,7 +65430,7 @@
  	gdm.schemas			\
  	$(NULL)
  
-@@ -367,14 +439,14 @@
+@@ -367,14 +439,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -65430,7 +65450,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -392,8 +464,11 @@
+@@ -392,8 +464,11 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65442,7 +65462,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -403,54 +478,83 @@
+@@ -403,54 +478,83 @@ clean-libtool:
  install-dbusconfDATA: $(dbusconf_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(dbusconfdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)"
@@ -65552,7 +65572,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -459,7 +563,7 @@
+@@ -459,7 +563,7 @@ uninstall-schemasDATA:
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -65561,7 +65581,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -476,7 +580,7 @@
+@@ -476,7 +580,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -65570,7 +65590,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -484,7 +588,7 @@
+@@ -484,7 +588,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -65579,7 +65599,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -510,16 +614,16 @@
+@@ -510,16 +614,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -65599,7 +65619,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -527,14 +631,14 @@
+@@ -527,14 +631,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -65617,7 +65637,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -546,39 +650,43 @@
+@@ -546,39 +650,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -65675,7 +65695,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -599,29 +707,44 @@
+@@ -599,29 +707,44 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -65730,7 +65750,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -631,7 +754,7 @@
+@@ -631,7 +754,7 @@ check: check-recursive
  all-am: Makefile $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -65739,7 +65759,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-recursive
-@@ -655,6 +778,7 @@
+@@ -655,6 +778,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -65747,7 +65767,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -675,29 +799,40 @@
+@@ -675,29 +799,40 @@ dvi-am:
  
  html: html-recursive
  
@@ -65790,7 +65810,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -717,12 +852,12 @@
+@@ -717,12 +852,12 @@ ps: ps-recursive
  ps-am:
  
  uninstall-am: uninstall-dbusconfDATA uninstall-localealiasDATA \
@@ -65807,7 +65827,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic clean-libtool \
-@@ -733,13 +868,14 @@
+@@ -733,13 +868,14 @@ uninstall-am: uninstall-dbusconfDATA uni
  	install-dvi install-dvi-am install-exec install-exec-am \
  	install-html install-html-am install-info install-info-am \
  	install-localealiasDATA install-man install-pdf install-pdf-am \
@@ -65829,7 +65849,7 @@
  
  
  Xsession: $(srcdir)/Xsession.in
-@@ -764,6 +900,8 @@
+@@ -764,6 +900,8 @@ gdm.conf-custom: $(srcdir)/gdm.conf-cust
  
  @INTLTOOL_SCHEMAS_RULE@
  
@@ -65838,7 +65858,7 @@
  gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
  	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
  		-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
-@@ -792,6 +930,8 @@
+@@ -792,6 +930,8 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in
  		-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
  		-e 's,[@]sbindir[@],$(sbindir),g' \
  		<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
@@ -65847,7 +65867,7 @@
  
  uninstall-hook:
  	rm -f \
-@@ -913,6 +1053,7 @@
+@@ -913,6 +1053,7 @@ install-data-hook: gdm.conf-custom Xsess
  	chown -R root:gdm $(DESTDIR)$(workingdir)/.gconf.mandatory || :
  	chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
  	chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml
@@ -65855,8 +65875,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/pixmaps/16x16/Makefile.in
-+++ b/data/pixmaps/16x16/Makefile.in
+Index: gdm-2.30.0/data/pixmaps/16x16/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/pixmaps/16x16/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/pixmaps/16x16/Makefile.in	2010-04-14 00:56:39.629235508 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -65880,7 +65902,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,13 +40,22 @@
+@@ -38,13 +40,22 @@ subdir = data/pixmaps/16x16
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -65905,7 +65927,7 @@
  SOURCES =
  DIST_SOURCES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -52,14 +63,29 @@
+@@ -52,14 +63,29 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -65937,7 +65959,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -100,7 +126,8 @@
+@@ -100,7 +126,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -65947,7 +65969,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -115,18 +142,20 @@
+@@ -115,18 +142,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -65970,7 +65992,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +187,7 @@
+@@ -158,6 +187,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -65978,7 +66000,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +197,7 @@
+@@ -167,6 +197,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -65986,7 +66008,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +208,19 @@
+@@ -177,13 +208,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -66006,7 +66028,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +234,7 @@
+@@ -197,6 +234,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -66014,7 +66036,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +273,7 @@
+@@ -235,7 +273,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -66023,7 +66045,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -271,6 +309,7 @@
+@@ -271,6 +309,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -66031,7 +66053,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -307,14 +346,14 @@
+@@ -307,14 +346,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -66051,7 +66073,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -332,6 +371,7 @@
+@@ -332,6 +371,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66059,7 +66081,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -341,20 +381,23 @@
+@@ -341,20 +381,23 @@ clean-libtool:
  install-appsiconDATA: $(appsicon_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -66092,7 +66114,7 @@
  tags: TAGS
  TAGS:
  
-@@ -378,13 +421,17 @@
+@@ -378,13 +421,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66114,7 +66136,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -415,6 +462,7 @@
+@@ -415,6 +462,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66122,7 +66144,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -434,6 +482,8 @@
+@@ -434,6 +482,8 @@ dvi-am:
  
  html: html-am
  
@@ -66131,7 +66153,7 @@
  info: info-am
  
  info-am:
-@@ -442,18 +492,28 @@
+@@ -442,18 +492,28 @@ install-data-am: install-appsiconDATA
  
  install-dvi: install-dvi-am
  
@@ -66160,7 +66182,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -488,6 +548,7 @@
+@@ -488,6 +548,7 @@ uninstall-am: uninstall-appsiconDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-appsiconDATA
  
@@ -66168,8 +66190,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/pixmaps/32x32/Makefile.in
-+++ b/data/pixmaps/32x32/Makefile.in
+Index: gdm-2.30.0/data/pixmaps/32x32/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/pixmaps/32x32/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/pixmaps/32x32/Makefile.in	2010-04-14 00:56:39.717234544 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66193,7 +66217,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,13 +40,22 @@
+@@ -38,13 +40,22 @@ subdir = data/pixmaps/32x32
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -66218,7 +66242,7 @@
  SOURCES =
  DIST_SOURCES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -52,14 +63,29 @@
+@@ -52,14 +63,29 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -66250,7 +66274,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -100,7 +126,8 @@
+@@ -100,7 +126,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -66260,7 +66284,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -115,18 +142,20 @@
+@@ -115,18 +142,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -66283,7 +66307,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +187,7 @@
+@@ -158,6 +187,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -66291,7 +66315,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +197,7 @@
+@@ -167,6 +197,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -66299,7 +66323,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +208,19 @@
+@@ -177,13 +208,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -66319,7 +66343,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +234,7 @@
+@@ -197,6 +234,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -66327,7 +66351,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +273,7 @@
+@@ -235,7 +273,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -66336,7 +66360,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -271,6 +309,7 @@
+@@ -271,6 +309,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -66344,7 +66368,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -308,14 +347,14 @@
+@@ -308,14 +347,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -66364,7 +66388,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -333,6 +372,7 @@
+@@ -333,6 +372,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66372,7 +66396,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -342,20 +382,23 @@
+@@ -342,20 +382,23 @@ clean-libtool:
  install-appsiconDATA: $(appsicon_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -66405,7 +66429,7 @@
  tags: TAGS
  TAGS:
  
-@@ -379,13 +422,17 @@
+@@ -379,13 +422,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66427,7 +66451,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -416,6 +463,7 @@
+@@ -416,6 +463,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66435,7 +66459,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -435,6 +483,8 @@
+@@ -435,6 +483,8 @@ dvi-am:
  
  html: html-am
  
@@ -66444,7 +66468,7 @@
  info: info-am
  
  info-am:
-@@ -443,18 +493,28 @@
+@@ -443,18 +493,28 @@ install-data-am: install-appsiconDATA
  
  install-dvi: install-dvi-am
  
@@ -66473,7 +66497,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -489,6 +549,7 @@
+@@ -489,6 +549,7 @@ uninstall-am: uninstall-appsiconDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-appsiconDATA
  
@@ -66481,8 +66505,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/pixmaps/48x48/Makefile.in
-+++ b/data/pixmaps/48x48/Makefile.in
+Index: gdm-2.30.0/data/pixmaps/48x48/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/pixmaps/48x48/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/pixmaps/48x48/Makefile.in	2010-04-14 00:56:39.809235140 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66506,7 +66532,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,13 +40,22 @@
+@@ -38,13 +40,22 @@ subdir = data/pixmaps/48x48
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -66531,7 +66557,7 @@
  SOURCES =
  DIST_SOURCES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -52,14 +63,29 @@
+@@ -52,14 +63,29 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -66563,7 +66589,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -100,7 +126,8 @@
+@@ -100,7 +126,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -66573,7 +66599,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -115,18 +142,20 @@
+@@ -115,18 +142,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -66596,7 +66622,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +187,7 @@
+@@ -158,6 +187,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -66604,7 +66630,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +197,7 @@
+@@ -167,6 +197,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -66612,7 +66638,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +208,19 @@
+@@ -177,13 +208,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -66632,7 +66658,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +234,7 @@
+@@ -197,6 +234,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -66640,7 +66666,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +273,7 @@
+@@ -235,7 +273,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -66649,7 +66675,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -271,6 +309,7 @@
+@@ -271,6 +309,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -66657,7 +66683,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -309,14 +348,14 @@
+@@ -309,14 +348,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -66677,7 +66703,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -334,6 +373,7 @@
+@@ -334,6 +373,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66685,7 +66711,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -343,20 +383,23 @@
+@@ -343,20 +383,23 @@ clean-libtool:
  install-appsiconDATA: $(appsicon_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(appsicondir)" || $(MKDIR_P) "$(DESTDIR)$(appsicondir)"
@@ -66718,7 +66744,7 @@
  tags: TAGS
  TAGS:
  
-@@ -380,13 +423,17 @@
+@@ -380,13 +423,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -66740,7 +66766,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -417,6 +464,7 @@
+@@ -417,6 +464,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -66748,7 +66774,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -436,6 +484,8 @@
+@@ -436,6 +484,8 @@ dvi-am:
  
  html: html-am
  
@@ -66757,7 +66783,7 @@
  info: info-am
  
  info-am:
-@@ -444,18 +494,28 @@
+@@ -444,18 +494,28 @@ install-data-am: install-appsiconDATA
  
  install-dvi: install-dvi-am
  
@@ -66786,7 +66812,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -490,6 +550,7 @@
+@@ -490,6 +550,7 @@ uninstall-am: uninstall-appsiconDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-appsiconDATA
  
@@ -66794,8 +66820,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/data/pixmaps/Makefile.in
-+++ b/data/pixmaps/Makefile.in
+Index: gdm-2.30.0/data/pixmaps/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/data/pixmaps/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/data/pixmaps/Makefile.in	2010-04-14 00:56:39.905236795 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66819,7 +66847,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -36,13 +38,22 @@
+@@ -36,13 +38,22 @@ subdir = data/pixmaps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -66844,7 +66872,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -57,19 +68,62 @@
+@@ -57,19 +68,62 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -66909,7 +66937,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -110,7 +164,8 @@
+@@ -110,7 +164,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -66919,7 +66947,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -125,18 +180,20 @@
+@@ -125,18 +180,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -66942,7 +66970,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -168,6 +225,7 @@
+@@ -168,6 +225,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -66950,7 +66978,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -177,6 +235,7 @@
+@@ -177,6 +235,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -66958,7 +66986,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -187,13 +246,19 @@
+@@ -187,13 +246,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -66978,7 +67006,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -207,6 +272,7 @@
+@@ -207,6 +272,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -66986,7 +67014,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -245,7 +311,7 @@
+@@ -245,7 +311,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -66995,7 +67023,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -281,6 +347,7 @@
+@@ -281,6 +347,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -67003,7 +67031,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -311,14 +378,14 @@
+@@ -311,14 +378,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -67023,7 +67051,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -336,6 +403,7 @@
+@@ -336,6 +403,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67031,7 +67059,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -345,20 +413,23 @@
+@@ -345,20 +413,23 @@ clean-libtool:
  install-pixmapDATA: $(pixmap_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
@@ -67064,7 +67092,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -367,7 +438,7 @@
+@@ -367,7 +438,7 @@ uninstall-pixmapDATA:
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -67073,7 +67101,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -384,7 +455,7 @@
+@@ -384,7 +455,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -67082,7 +67110,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -392,7 +463,7 @@
+@@ -392,7 +463,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -67091,7 +67119,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -418,16 +489,16 @@
+@@ -418,16 +489,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -67111,7 +67139,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -435,14 +506,14 @@
+@@ -435,14 +506,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -67129,7 +67157,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -454,39 +525,43 @@
+@@ -454,39 +525,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -67187,7 +67215,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -507,29 +582,44 @@
+@@ -507,29 +582,44 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -67242,7 +67270,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -562,6 +652,7 @@
+@@ -562,6 +652,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -67250,7 +67278,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -580,6 +671,8 @@
+@@ -580,6 +671,8 @@ dvi-am:
  
  html: html-recursive
  
@@ -67259,7 +67287,7 @@
  info: info-recursive
  
  info-am:
-@@ -588,18 +681,28 @@
+@@ -588,18 +681,28 @@ install-data-am: install-pixmapDATA
  
  install-dvi: install-dvi-recursive
  
@@ -67288,7 +67316,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -620,8 +723,8 @@
+@@ -620,8 +723,8 @@ ps-am:
  
  uninstall-am: uninstall-pixmapDATA
  
@@ -67299,7 +67327,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic clean-libtool \
-@@ -638,6 +741,7 @@
+@@ -638,6 +741,7 @@ uninstall-am: uninstall-pixmapDATA
  	tags tags-recursive uninstall uninstall-am \
  	uninstall-pixmapDATA
  
@@ -67307,8 +67335,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/depcomp
-+++ b/depcomp
+Index: gdm-2.30.0/depcomp
+===================================================================
+--- gdm-2.30.0.orig/depcomp	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/depcomp	2010-04-14 00:56:41.025236393 +0200
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -67323,7 +67353,7 @@
  
  # 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
-@@ -17,9 +17,7 @@
+@@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -67334,7 +67364,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -87,6 +85,15 @@
+@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
     depmode=dashmstdout
  fi
  
@@ -67350,7 +67380,7 @@
  case "$depmode" in
  gcc3)
  ## gcc 3 implements dependency tracking that does exactly what
-@@ -192,14 +199,14 @@
+@@ -192,14 +199,14 @@ sgi)
  ' < "$tmpdepfile" \
      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
      tr '
@@ -67368,7 +67398,7 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -215,34 +222,39 @@
+@@ -215,34 +222,39 @@ aix)
    # current directory.  Also, the AIX compiler puts `$object:' at the
    # start of each line; $object doesn't have directory information.
    # Version 6 uses the directory in both cases.
@@ -67420,7 +67450,7 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -323,7 +335,12 @@
+@@ -323,7 +335,12 @@ hp2)
    if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
      # Add `dependent.h:' lines.
@@ -67434,7 +67464,7 @@
    else
      echo "#dummy" > "$depfile"
    fi
-@@ -399,7 +416,7 @@
+@@ -399,7 +416,7 @@ dashmstdout)
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -67443,7 +67473,7 @@
        shift
      done
      shift
-@@ -450,32 +467,39 @@
+@@ -450,32 +467,39 @@ makedepend)
    "$@" || exit $?
    # Remove any Libtool call
    if test "$libtool" = yes; then
@@ -67487,7 +67517,7 @@
    touch "$tmpdepfile"
    ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
    rm -f "$depfile"
-@@ -495,7 +519,7 @@
+@@ -495,7 +519,7 @@ cpp)
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -67496,7 +67526,7 @@
        shift
      done
      shift
-@@ -533,13 +557,27 @@
+@@ -533,13 +557,27 @@ cpp)
  
  msvisualcpp)
    # Important note: in order to support this mode, a compiler *must*
@@ -67526,7 +67556,7 @@
      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
  	set fnord "$@"
  	shift
-@@ -552,16 +590,23 @@
+@@ -552,16 +590,23 @@ msvisualcpp)
  	;;
      esac
    done
@@ -67554,7 +67584,7 @@
  none)
    exec "$@"
    ;;
-@@ -580,5 +625,6 @@
+@@ -580,5 +625,6 @@ exit 0
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -67562,8 +67592,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
+Index: gdm-2.30.0/docs/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/docs/Makefile.in	2010-03-30 00:30:46.000000000 +0200
++++ gdm-2.30.0/docs/Makefile.in	2010-04-14 00:56:40.029233688 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67587,7 +67619,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -60,19 +62,29 @@
+@@ -60,19 +62,29 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
  subdir = docs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -67619,7 +67651,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -113,7 +125,8 @@
+@@ -113,7 +125,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -67629,7 +67661,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -128,18 +141,20 @@
+@@ -128,18 +141,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -67652,7 +67684,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -171,6 +186,7 @@
+@@ -171,6 +186,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -67660,7 +67692,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -180,6 +196,7 @@
+@@ -180,6 +196,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -67668,7 +67700,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -190,13 +207,19 @@
+@@ -190,13 +207,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -67688,7 +67720,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -210,6 +233,7 @@
+@@ -210,6 +233,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -67696,7 +67728,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -248,7 +272,7 @@
+@@ -248,7 +272,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -67705,7 +67737,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -284,6 +308,7 @@
+@@ -284,6 +308,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -67713,7 +67745,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -421,14 +446,14 @@
+@@ -421,14 +446,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -67733,7 +67765,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -446,6 +471,7 @@
+@@ -446,6 +471,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67741,7 +67773,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -475,13 +501,17 @@
+@@ -475,13 +501,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -67763,7 +67795,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -512,6 +542,7 @@
+@@ -512,6 +542,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -67771,7 +67803,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -530,6 +561,8 @@
+@@ -530,6 +561,8 @@ dvi-am:
  
  html: html-am
  
@@ -67780,7 +67812,7 @@
  info: info-am
  
  info-am:
-@@ -538,18 +571,28 @@
+@@ -538,18 +571,28 @@ install-data-am: install-data-local
  
  install-dvi: install-dvi-am
  
@@ -67809,7 +67841,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -994,6 +1037,7 @@
+@@ -994,6 +1037,7 @@ dist-hook: doc-dist-hook
  
  #man_MANS = gdm.1
  #EXTRA_DIST = gdm.1
@@ -67817,8 +67849,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/gui/Makefile.in
-+++ b/gui/Makefile.in
+Index: gdm-2.30.0/gui/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/gui/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/gui/Makefile.in	2010-04-14 00:56:40.121234768 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67842,7 +67876,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -35,13 +37,22 @@
+@@ -35,13 +37,22 @@ subdir = gui
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -67867,7 +67901,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -53,13 +64,42 @@
+@@ -53,13 +64,42 @@ RECURSIVE_TARGETS = all-recursive check-
  	ps-recursive uninstall-recursive
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
@@ -67910,7 +67944,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -100,7 +140,8 @@
+@@ -100,7 +140,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -67920,7 +67954,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -115,18 +156,20 @@
+@@ -115,18 +156,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -67943,7 +67977,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -158,6 +201,7 @@
+@@ -158,6 +201,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -67951,7 +67985,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -167,6 +211,7 @@
+@@ -167,6 +211,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -67959,7 +67993,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -177,13 +222,19 @@
+@@ -177,13 +222,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -67979,7 +68013,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -197,6 +248,7 @@
+@@ -197,6 +248,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -67987,7 +68021,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -235,7 +287,7 @@
+@@ -235,7 +287,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -67996,7 +68030,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -271,6 +323,7 @@
+@@ -271,6 +323,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -68004,7 +68038,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -293,6 +346,7 @@
+@@ -293,6 +346,7 @@ SUBDIRS = \
  	simple-chooser		\
  	simple-greeter		\
  	user-switch-applet	\
@@ -68012,7 +68046,7 @@
  	$(NULL)
  
  all: all-recursive
-@@ -302,14 +356,14 @@
+@@ -302,14 +356,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -68032,7 +68066,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -327,6 +381,7 @@
+@@ -327,6 +381,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68040,7 +68074,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -341,7 +396,7 @@
+@@ -341,7 +396,7 @@ clean-libtool:
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -68049,7 +68083,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -358,7 +413,7 @@
+@@ -358,7 +413,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -68058,7 +68092,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -366,7 +421,7 @@
+@@ -366,7 +421,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -68067,7 +68101,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -392,16 +447,16 @@
+@@ -392,16 +447,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -68087,7 +68121,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -409,14 +464,14 @@
+@@ -409,14 +464,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -68105,7 +68139,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -428,39 +483,43 @@
+@@ -428,39 +483,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -68163,7 +68197,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -481,29 +540,44 @@
+@@ -481,29 +540,44 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -68218,7 +68252,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -533,6 +607,7 @@
+@@ -533,6 +607,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -68226,7 +68260,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -551,6 +626,8 @@
+@@ -551,6 +626,8 @@ dvi-am:
  
  html: html-recursive
  
@@ -68235,7 +68269,7 @@
  info: info-recursive
  
  info-am:
-@@ -559,18 +636,28 @@
+@@ -559,18 +636,28 @@ install-data-am:
  
  install-dvi: install-dvi-recursive
  
@@ -68264,7 +68298,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -591,8 +678,8 @@
+@@ -591,8 +678,8 @@ ps-am:
  
  uninstall-am:
  
@@ -68275,7 +68309,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic clean-libtool \
-@@ -608,6 +695,7 @@
+@@ -608,6 +695,7 @@ uninstall-am:
  	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
  	uninstall uninstall-am
  
@@ -68283,8 +68317,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/gui/simple-chooser/Makefile.in
-+++ b/gui/simple-chooser/Makefile.in
+Index: gdm-2.30.0/gui/simple-chooser/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/gui/simple-chooser/Makefile.in	2010-03-30 00:11:17.000000000 +0200
++++ gdm-2.30.0/gui/simple-chooser/Makefile.in	2010-04-14 00:56:40.365236810 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68308,7 +68344,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,16 +40,18 @@
+@@ -38,16 +40,18 @@ subdir = gui/simple-chooser
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -68330,7 +68366,7 @@
  PROGRAMS = $(libexec_PROGRAMS)
  am__objects_1 =
  am_gdm_host_chooser_OBJECTS = gdm-host-chooser.$(OBJEXT) \
-@@ -60,6 +64,9 @@
+@@ -60,6 +64,9 @@ gdm_host_chooser_DEPENDENCIES =  \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -68340,7 +68376,7 @@
  am_gdm_simple_chooser_OBJECTS = chooser-main.$(OBJEXT) \
  	gdm-chooser-host.$(OBJEXT) gdm-host-chooser-widget.$(OBJEXT) \
  	gdm-host-chooser-dialog.$(OBJEXT) gdm-chooser-client.$(OBJEXT) \
-@@ -70,18 +77,32 @@
+@@ -70,18 +77,32 @@ gdm_simple_chooser_DEPENDENCIES =  \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -68380,7 +68416,7 @@
  SOURCES = $(gdm_host_chooser_SOURCES) $(gdm_simple_chooser_SOURCES)
  DIST_SOURCES = $(gdm_host_chooser_SOURCES) \
  	$(gdm_simple_chooser_SOURCES)
-@@ -91,6 +112,7 @@
+@@ -91,6 +112,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -68388,7 +68424,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -131,7 +153,8 @@
+@@ -131,7 +153,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -68398,7 +68434,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -146,18 +169,20 @@
+@@ -146,18 +169,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -68421,7 +68457,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -189,6 +214,7 @@
+@@ -189,6 +214,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -68429,7 +68465,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -198,6 +224,7 @@
+@@ -198,6 +224,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -68437,7 +68473,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -208,13 +235,19 @@
+@@ -208,13 +235,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -68457,7 +68493,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -228,6 +261,7 @@
+@@ -228,6 +261,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -68465,7 +68501,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -266,7 +300,7 @@
+@@ -266,7 +300,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -68474,7 +68510,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -302,6 +336,7 @@
+@@ -302,6 +336,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -68482,7 +68518,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -392,14 +427,14 @@
+@@ -392,14 +427,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -68502,7 +68538,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -417,40 +452,56 @@
+@@ -417,40 +452,56 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68581,7 +68617,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -467,22 +518,25 @@
+@@ -467,22 +518,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdm-host-chooser.Po at am__quote@
  
  .c.o:
@@ -68613,7 +68649,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -498,45 +552,49 @@
+@@ -498,45 +552,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -68679,7 +68715,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -557,13 +615,17 @@
+@@ -557,13 +615,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -68701,7 +68737,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -594,6 +656,7 @@
+@@ -594,6 +656,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -68709,7 +68745,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -615,6 +678,8 @@
+@@ -615,6 +678,8 @@ dvi-am:
  
  html: html-am
  
@@ -68718,7 +68754,7 @@
  info: info-am
  
  info-am:
-@@ -623,18 +688,28 @@
+@@ -623,18 +688,28 @@ install-data-am:
  
  install-dvi: install-dvi-am
  
@@ -68747,7 +68783,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -673,6 +748,7 @@
+@@ -673,6 +748,7 @@ uninstall-am: uninstall-libexecPROGRAMS
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	tags uninstall uninstall-am uninstall-libexecPROGRAMS
  
@@ -68755,8 +68791,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/gui/simple-greeter/libnotificationarea/Makefile.in
-+++ b/gui/simple-greeter/libnotificationarea/Makefile.in
+Index: gdm-2.30.0/gui/simple-greeter/libnotificationarea/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/gui/simple-greeter/libnotificationarea/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/gui/simple-greeter/libnotificationarea/Makefile.in	2010-04-14 00:56:40.701235023 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68780,7 +68818,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,13 +40,16 @@
+@@ -38,13 +40,16 @@ subdir = gui/simple-greeter/libnotificat
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -68799,7 +68837,7 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libnotificationarea_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -54,26 +59,44 @@
+@@ -54,26 +59,44 @@ am_libnotificationarea_la_OBJECTS = fixe
  	na-tray-child.lo na-tray-manager.lo na-marshal.lo \
  	$(am__objects_1)
  libnotificationarea_la_OBJECTS = $(am_libnotificationarea_la_OBJECTS)
@@ -68854,7 +68892,7 @@
  SOURCES = $(libnotificationarea_la_SOURCES) $(testtray_SOURCES)
  DIST_SOURCES = $(libnotificationarea_la_SOURCES) $(testtray_SOURCES)
  ETAGS = etags
-@@ -82,6 +105,7 @@
+@@ -82,6 +105,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -68862,7 +68900,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -122,7 +146,8 @@
+@@ -122,7 +146,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -68872,7 +68910,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -137,18 +162,20 @@
+@@ -137,18 +162,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -68895,7 +68933,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -180,6 +207,7 @@
+@@ -180,6 +207,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -68903,7 +68941,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -189,6 +217,7 @@
+@@ -189,6 +217,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -68911,7 +68949,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -199,13 +228,19 @@
+@@ -199,13 +228,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -68931,7 +68969,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -219,6 +254,7 @@
+@@ -219,6 +254,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -68939,7 +68977,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -257,7 +293,7 @@
+@@ -257,7 +293,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -68948,7 +68986,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -293,6 +329,7 @@
+@@ -293,6 +329,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -68956,7 +68994,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -381,14 +418,14 @@
+@@ -381,14 +418,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -68976,7 +69014,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -406,6 +443,7 @@
+@@ -406,6 +443,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68984,7 +69022,7 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -416,17 +454,19 @@
+@@ -416,17 +454,19 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libnotificationarea.la: $(libnotificationarea_la_OBJECTS) $(libnotificationarea_la_DEPENDENCIES) 
@@ -69011,7 +69049,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -443,22 +483,25 @@
+@@ -443,22 +483,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testtray.Po at am__quote@
  
  .c.o:
@@ -69043,7 +69081,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -474,45 +517,49 @@
+@@ -474,45 +517,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -69109,7 +69147,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -533,13 +580,17 @@
+@@ -533,13 +580,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -69131,7 +69169,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -569,6 +620,7 @@
+@@ -569,6 +620,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -69139,7 +69177,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -591,6 +643,8 @@
+@@ -591,6 +643,8 @@ dvi-am:
  
  html: html-am
  
@@ -69148,7 +69186,7 @@
  info: info-am
  
  info-am:
-@@ -599,18 +653,28 @@
+@@ -599,18 +653,28 @@ install-data-am:
  
  install-dvi: install-dvi-am
  
@@ -69177,7 +69215,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -633,7 +697,7 @@
+@@ -633,7 +697,7 @@ ps-am:
  
  uninstall-am:
  
@@ -69186,7 +69224,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-@@ -656,6 +720,7 @@
+@@ -656,6 +720,7 @@ na-marshal.h: na-marshal.list $(GLIB_GEN
  na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
  	echo "#include \"na-marshal.h\"" > $@ && \
  	$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
@@ -69194,8 +69232,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/gui/simple-greeter/Makefile.in
-+++ b/gui/simple-greeter/Makefile.in
+Index: gdm-2.30.0/gui/simple-greeter/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/gui/simple-greeter/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/gui/simple-greeter/Makefile.in	2010-04-14 00:56:40.573236559 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69219,7 +69259,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -45,13 +47,16 @@
+@@ -45,13 +47,16 @@ subdir = gui/simple-greeter
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -69238,7 +69278,7 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libgdmuser_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -59,12 +64,14 @@
+@@ -59,12 +64,14 @@ am__objects_1 =
  am_libgdmuser_la_OBJECTS = libgdmuser_la-gdm-user.lo \
  	libgdmuser_la-gdm-user-manager.lo $(am__objects_1)
  libgdmuser_la_OBJECTS = $(am_libgdmuser_la_OBJECTS)
@@ -69255,7 +69295,7 @@
  am__EXEEXT_1 =
  PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
  am_gdm_simple_greeter_OBJECTS = greeter-main.$(OBJEXT) \
-@@ -178,18 +185,32 @@
+@@ -178,18 +185,32 @@ test_user_manager_OBJECTS = $(am_test_us
  test_user_manager_DEPENDENCIES = libgdmuser.la \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -69295,7 +69335,7 @@
  SOURCES = $(libgdmuser_la_SOURCES) $(gdm_simple_greeter_SOURCES) \
  	$(test_filesystem_type_SOURCES) \
  	$(test_greeter_login_window_SOURCES) \
-@@ -216,19 +237,61 @@
+@@ -216,19 +237,61 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -69360,7 +69400,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -269,7 +332,8 @@
+@@ -269,7 +332,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -69370,7 +69410,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -284,18 +348,20 @@
+@@ -284,18 +348,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -69393,7 +69433,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -327,6 +393,7 @@
+@@ -327,6 +393,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -69401,7 +69441,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -336,6 +403,7 @@
+@@ -336,6 +403,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -69409,7 +69449,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -346,13 +414,19 @@
+@@ -346,13 +414,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -69429,7 +69469,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -366,6 +440,7 @@
+@@ -366,6 +440,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -69437,7 +69477,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -404,7 +479,7 @@
+@@ -404,7 +479,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -69446,7 +69486,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -440,6 +515,7 @@
+@@ -440,6 +515,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -69454,7 +69494,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -797,14 +873,14 @@
+@@ -797,14 +873,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -69474,7 +69514,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -822,6 +898,7 @@
+@@ -822,6 +898,7 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69482,7 +69522,7 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -832,75 +909,92 @@
+@@ -832,75 +909,92 @@ clean-noinstLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libgdmuser.la: $(libgdmuser_la_OBJECTS) $(libgdmuser_la_DEPENDENCIES) 
@@ -69612,7 +69652,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -947,39 +1041,44 @@
+@@ -947,39 +1041,44 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-user-manager.Po at am__quote@
  
  .c.o:
@@ -69669,7 +69709,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -989,37 +1088,43 @@
+@@ -989,37 +1088,43 @@ clean-libtool:
  install-schemasDATA: $(schemas_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@@ -69731,7 +69771,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -1028,7 +1133,7 @@
+@@ -1028,7 +1133,7 @@ uninstall-uiDATA:
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -69740,7 +69780,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -1045,7 +1150,7 @@
+@@ -1045,7 +1150,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -69749,7 +69789,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -1053,7 +1158,7 @@
+@@ -1053,7 +1158,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -69758,7 +69798,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -1079,16 +1184,16 @@
+@@ -1079,16 +1184,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -69778,7 +69818,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -1096,14 +1201,14 @@
+@@ -1096,14 +1201,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -69796,7 +69836,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -1115,39 +1220,43 @@
+@@ -1115,39 +1220,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -69854,7 +69894,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1168,29 +1277,44 @@
+@@ -1168,29 +1277,44 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -69909,7 +69949,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -1223,6 +1347,7 @@
+@@ -1223,6 +1347,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -69917,7 +69957,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -1246,6 +1371,8 @@
+@@ -1246,6 +1371,8 @@ dvi-am:
  
  html: html-recursive
  
@@ -69926,7 +69966,7 @@
  info: info-recursive
  
  info-am:
-@@ -1254,18 +1381,28 @@
+@@ -1254,18 +1381,28 @@ install-data-am: install-data-local inst
  
  install-dvi: install-dvi-recursive
  
@@ -69955,7 +69995,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -1289,8 +1426,8 @@
+@@ -1289,8 +1426,8 @@ ps-am:
  uninstall-am: uninstall-libexecPROGRAMS uninstall-schemasDATA \
  	uninstall-uiDATA
  
@@ -69966,7 +70006,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic \
-@@ -1322,6 +1459,7 @@
+@@ -1322,6 +1459,7 @@ uninstall-am: uninstall-libexecPROGRAMS
  @GCONF_SCHEMAS_INSTALL_TRUE@		done \
  @GCONF_SCHEMAS_INSTALL_TRUE@	fi
  @GCONF_SCHEMAS_INSTALL_FALSE at install-data-local:
@@ -69974,8 +70014,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/gui/user-switch-applet/Makefile.in
-+++ b/gui/user-switch-applet/Makefile.in
+Index: gdm-2.30.0/gui/user-switch-applet/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/gui/user-switch-applet/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/gui/user-switch-applet/Makefile.in	2010-04-14 00:56:40.825234870 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69999,7 +70041,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,17 +40,19 @@
+@@ -38,17 +40,19 @@ subdir = gui/user-switch-applet
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -70022,7 +70064,7 @@
  PROGRAMS = $(libexec_PROGRAMS)
  am__objects_1 =
  am_gdm_user_switch_applet_OBJECTS = applet.$(OBJEXT) \
-@@ -59,18 +63,35 @@
+@@ -59,18 +63,35 @@ gdm_user_switch_applet_DEPENDENCIES =  \
  	$(top_builddir)/gui/simple-greeter/libgdmuser.la \
  	$(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -70065,7 +70107,7 @@
  SOURCES = $(gdm_user_switch_applet_SOURCES)
  DIST_SOURCES = $(gdm_user_switch_applet_SOURCES)
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -78,9 +99,22 @@
+@@ -78,9 +99,22 @@ am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -70091,7 +70133,7 @@
  DATA = $(server_DATA) $(ui_DATA)
  ETAGS = etags
  CTAGS = ctags
-@@ -88,6 +122,7 @@
+@@ -88,6 +122,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -70099,7 +70141,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -128,7 +163,8 @@
+@@ -128,7 +163,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -70109,7 +70151,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -143,18 +179,20 @@
+@@ -143,18 +179,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -70132,7 +70174,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -186,6 +224,7 @@
+@@ -186,6 +224,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -70140,7 +70182,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -195,6 +234,7 @@
+@@ -195,6 +234,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -70148,7 +70190,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -205,13 +245,19 @@
+@@ -205,13 +245,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -70168,7 +70210,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -225,6 +271,7 @@
+@@ -225,6 +271,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -70176,7 +70218,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -263,7 +310,7 @@
+@@ -263,7 +310,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -70185,7 +70227,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -299,6 +346,7 @@
+@@ -299,6 +346,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -70193,7 +70235,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -384,14 +432,14 @@
+@@ -384,14 +432,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -70213,7 +70255,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -409,37 +457,53 @@
+@@ -409,37 +457,53 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70288,7 +70330,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -451,22 +515,25 @@
+@@ -451,22 +515,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdm-entry-menu-item.Po at am__quote@
  
  .c.o:
@@ -70320,7 +70362,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -479,82 +546,92 @@
+@@ -479,82 +546,92 @@ clean-libtool:
  install-serverDATA: $(server_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
@@ -70447,7 +70489,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -575,13 +652,17 @@
+@@ -575,13 +652,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -70469,7 +70511,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -612,6 +693,7 @@
+@@ -612,6 +693,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -70477,7 +70519,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -635,6 +717,8 @@
+@@ -635,6 +717,8 @@ dvi-am:
  
  html: html-am
  
@@ -70486,7 +70528,7 @@
  info: info-am
  
  info-am:
-@@ -643,18 +727,28 @@
+@@ -643,18 +727,28 @@ install-data-am: install-serverDATA inst
  
  install-dvi: install-dvi-am
  
@@ -70515,7 +70557,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -701,6 +795,7 @@
+@@ -701,6 +795,7 @@ $(server_in_files): $(server_in_files:.s
  	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
  
  @INTLTOOL_SERVER_RULE@
@@ -70523,9 +70565,11 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/INSTALL
-+++ b/INSTALL
-@@ -2,18 +2,24 @@
+Index: gdm-2.30.0/INSTALL
+===================================================================
+--- gdm-2.30.0.orig/INSTALL	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/INSTALL	2010-04-14 00:56:41.133234897 +0200
+@@ -2,18 +2,24 @@ Installation Instructions
  *************************
  
  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -70555,7 +70599,7 @@
  
     The `configure' shell script attempts to guess correct values for
  various system-dependent variables used during compilation.  It uses
-@@ -42,7 +48,7 @@
+@@ -42,7 +48,7 @@ may remove or edit it.
  you want to change it or regenerate `configure' using a newer version
  of `autoconf'.
  
@@ -70564,7 +70608,7 @@
  
    1. `cd' to the directory containing the package's source code and type
       `./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@
+@@ -53,12 +59,22 @@ The simplest way to compile this package
    2. Type `make' to compile the package.
  
    3. Optionally, type `make check' to run any self-tests that come with
@@ -70590,7 +70634,7 @@
       source code directory by typing `make clean'.  To also remove the
       files that `configure' created (so you can compile the package for
       a different kind of computer), type `make distclean'.  There is
-@@ -67,12 +83,22 @@
+@@ -67,12 +83,22 @@ The simplest way to compile this package
       all sorts of other programs in order to regenerate files that came
       with the distribution.
  
@@ -70616,7 +70660,7 @@
  
     You can give `configure' initial values for configuration parameters
  by setting variables in the command line or in the environment.  Here
-@@ -85,25 +111,41 @@
+@@ -85,25 +111,41 @@ is an example:
  Compiling For Multiple Architectures
  ====================================
  
@@ -70662,7 +70706,7 @@
  
     You can specify separate installation prefixes for
  architecture-specific files and architecture-independent files.  If you
-@@ -114,16 +156,47 @@
+@@ -114,16 +156,47 @@ Documentation and other data files still
     In addition, if you use an unusual directory layout you can give
  options like `--bindir=DIR' to specify different values for particular
  kinds of files.  Run `configure --help' for a list of the directories
@@ -70715,7 +70759,7 @@
  `configure', where FEATURE indicates an optional part of the package.
  They may also pay attention to `--with-PACKAGE' options, where PACKAGE
  is something like `gnu-as' or `x' (for the X Window System).  The
-@@ -135,14 +208,53 @@
+@@ -135,14 +208,53 @@ find the X include and library files aut
  you can use the `configure' options `--x-includes=DIR' and
  `--x-libraries=DIR' to specify their locations.
  
@@ -70774,7 +70818,7 @@
  `--build=TYPE' option.  TYPE can either be a short name for the system
  type, such as `sun4', or a canonical name which has the form:
  
-@@ -150,7 +262,8 @@
+@@ -150,7 +262,8 @@ type, such as `sun4', or a canonical nam
  
  where SYSTEM can have one of these forms:
  
@@ -70784,7 +70828,7 @@
  
     See the file `config.sub' for the possible values of each field.  If
  `config.sub' isn't included in this package, then this package doesn't
-@@ -168,9 +281,9 @@
+@@ -168,9 +281,9 @@ eventually be run) with `--host=TYPE'.
  Sharing Defaults
  ================
  
@@ -70797,7 +70841,7 @@
  `configure' looks for `PREFIX/share/config.site' if it exists, then
  `PREFIX/etc/config.site' if it exists.  Or, you can set the
  `CONFIG_SITE' environment variable to the location of the site script.
-@@ -179,7 +292,7 @@
+@@ -179,7 +292,7 @@ A warning: not all `configure' scripts l
  Defining Variables
  ==================
  
@@ -70806,7 +70850,7 @@
  environment passed to `configure'.  However, some packages may run
  configure again during the build, and the customized values of these
  variables may be lost.  In order to avoid this problem, you should set
-@@ -198,11 +311,19 @@
+@@ -198,11 +311,19 @@ an Autoconf bug.  Until the bug is fixed
  `configure' Invocation
  ======================
  
@@ -70828,7 +70872,7 @@
  
  `--version'
  `-V'
-@@ -229,6 +350,16 @@
+@@ -229,6 +350,16 @@ an Autoconf bug.  Until the bug is fixed
       Look for the package's source code in directory DIR.  Usually
       `configure' can determine that directory automatically.
  
@@ -70845,8 +70889,10 @@
  `configure' also accepts some other, not widely useful, options.  Run
  `configure --help' for more details.
  
---- a/install-sh
-+++ b/install-sh
+Index: gdm-2.30.0/install-sh
+===================================================================
+--- gdm-2.30.0.orig/install-sh	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/install-sh	2010-04-14 00:56:38.709735127 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -70856,7 +70902,7 @@
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ IFS=" ""	$nl"
  # set DOITPROG to echo to test this script
  
  # Don't use :- since 4.3BSD and earlier shells don't like it.
@@ -70865,7 +70911,7 @@
  if test -z "$doit"; then
    doit_exec=exec
  else
-@@ -58,34 +58,49 @@
+@@ -58,34 +58,49 @@ fi
  # Put in absolute file names if you don't have them in your path;
  # or use environment vars.
  
@@ -70929,7 +70975,7 @@
     or: $0 [OPTION]... SRCFILES... DIRECTORY
     or: $0 [OPTION]... -t DIRECTORY SRCFILES...
     or: $0 [OPTION]... -d DIRECTORIES...
-@@ -95,65 +110,55 @@
+@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to
  In the 4th, create DIRECTORIES.
  
  Options:
@@ -71023,7 +71069,7 @@
  
      --version) echo "$0 $scriptversion"; exit $?;;
  
-@@ -165,21 +170,22 @@
+@@ -165,21 +170,22 @@ while test $# -ne 0; do
  
      *)  break;;
    esac
@@ -71050,7 +71096,7 @@
    done
  fi
  
-@@ -224,7 +230,7 @@
+@@ -224,7 +230,7 @@ for src
  do
    # Protect names starting with `-'.
    case $src in
@@ -71059,7 +71105,7 @@
    esac
  
    if test -n "$dir_arg"; then
-@@ -242,22 +248,22 @@
+@@ -242,22 +248,22 @@ do
        exit 1
      fi
  
@@ -71086,7 +71132,7 @@
  	exit 1
        fi
        dstdir=$dst
-@@ -378,26 +384,19 @@
+@@ -378,26 +384,19 @@ do
        # directory the slow way, step by step, checking for races as we go.
  
        case $dstdir in
@@ -71119,7 +71165,7 @@
        IFS=$oIFS
  
        prefixes=
-@@ -459,41 +458,54 @@
+@@ -459,41 +458,54 @@ do
      # ignore errors from any of these, just make sure not to ignore
      # errors from the above "$doit $cpprog $src $dsttmp" command.
      #
@@ -71209,7 +71255,7 @@
  
      trap '' 0
    fi
-@@ -503,5 +515,6 @@
+@@ -503,5 +515,6 @@ done
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -71217,8 +71263,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
---- a/ltmain.sh
-+++ b/ltmain.sh
+Index: gdm-2.30.0/ltmain.sh
+===================================================================
+--- gdm-2.30.0.orig/ltmain.sh	2010-02-17 19:27:15.000000000 +0100
++++ gdm-2.30.0/ltmain.sh	2010-04-14 00:56:28.553239731 +0200
 @@ -1,30 +1,174 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -71410,7 +71458,7 @@
  
  # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
  # is ksh but when the shell is invoked as "sh" and the current value of
-@@ -34,112 +178,174 @@
+@@ -34,112 +178,174 @@ basename="s,^.*/,,g"
  progpath="$0"
  
  # The name of this program:
@@ -71679,7 +71727,7 @@
  
  # func_mktempdir [string]
  # Make a temporary directory that won't clash with other running
-@@ -149,7 +355,7 @@
+@@ -149,7 +355,7 @@ func_mktempdir ()
  {
      my_template="${TMPDIR-/tmp}/${1-$progname}"
  
@@ -71688,7 +71736,7 @@
        # Return a directory name, but don't create it in dry-run mode
        my_tmpdir="${my_template}-$$"
      else
-@@ -158,546 +364,818 @@
+@@ -158,546 +364,818 @@ func_mktempdir ()
        my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
  
        if test ! -d "$my_tmpdir"; then
@@ -72946,7 +72994,7 @@
  	  # Accept the current argument as the source file.
  	  # The previous "srcfile" becomes the current argument.
  	  #
-@@ -709,64 +1187,42 @@
+@@ -709,64 +1187,42 @@ if test -z "$show_help"; then
        esac    #  case $arg_mode
  
        # Aesthetically quote the previous argument.
@@ -73028,7 +73076,7 @@
        ;;
      esac
  
-@@ -774,7 +1230,15 @@
+@@ -774,7 +1230,15 @@ if test -z "$show_help"; then
  
      for arg in $later; do
        case $arg in
@@ -73044,7 +73092,7 @@
  	build_old_libs=yes
  	continue
  	;;
-@@ -791,28 +1255,17 @@
+@@ -791,28 +1255,17 @@ if test -z "$show_help"; then
        esac
      done
  
@@ -73082,7 +73130,7 @@
  
      # Delete any leftover library objects.
      if test "$build_old_libs" = yes; then
-@@ -821,12 +1274,9 @@
+@@ -821,12 +1274,9 @@ if test -z "$show_help"; then
        removelist="$lobj $libobj ${libobj}T"
      fi
  
@@ -73096,7 +73144,7 @@
        pic_mode=default
        ;;
      esac
-@@ -838,10 +1288,8 @@
+@@ -838,10 +1288,8 @@ if test -z "$show_help"; then
      # Calculate the filename of the output object if compiler does
      # not support -o with -c
      if test "$compiler_c_o" = no; then
@@ -73108,7 +73156,7 @@
      else
        output_obj=
        need_locks=no
-@@ -851,13 +1299,13 @@
+@@ -851,13 +1299,13 @@ if test -z "$show_help"; then
      # Lock this critical section if it is needed
      # We use this script file to make the link, it avoids creating a new file
      if test "$need_locks" = yes; then
@@ -73125,7 +73173,7 @@
  *** ERROR, $lockfile exists and contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -868,34 +1316,22 @@
+@@ -868,34 +1316,22 @@ repeat this compilation, it may succeed,
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -73169,7 +73217,7 @@
  
      # Only build a PIC object if we are building libtool libraries.
      if test "$build_libtool_libs" = yes; then
-@@ -909,32 +1345,19 @@
+@@ -909,32 +1345,19 @@ EOF
  	command="$base_compile $qsrcfile"
        fi
  
@@ -73206,7 +73254,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -948,45 +1371,27 @@
+@@ -948,45 +1371,27 @@ repeat this compilation, it may succeed,
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -73257,7 +73305,7 @@
        else
  	command="$base_compile $qsrcfile $pic_flag"
        fi
-@@ -996,17 +1401,12 @@
+@@ -996,17 +1401,12 @@ EOF
  
        # Suppress compiler output if we already did a PIC compilation.
        command="$command$suppress_output"
@@ -73278,7 +73326,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -1020,5423 +1420,6784 @@
+@@ -1020,5423 +1420,6784 @@ repeat this compilation, it may succeed,
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -84909,7 +84957,7 @@
      files=
      rmforce=
      exit_status=0
-@@ -6448,30 +8209,28 @@
+@@ -6448,30 +8209,28 @@ relink_command=\"$relink_command\""
      for arg
      do
        case $arg in
@@ -84949,7 +84997,7 @@
        test "$mode" = uninstall && objdir="$dir"
  
        # Remember objdir for removal later, being careful to avoid duplicates
-@@ -6483,9 +8242,9 @@
+@@ -6483,9 +8242,9 @@ relink_command=\"$relink_command\""
        fi
  
        # Don't error if the file doesn't exist and rm -f was used.
@@ -84962,7 +85010,7 @@
  	:
        elif test -d "$file"; then
  	exit_status=1
-@@ -6499,8 +8258,8 @@
+@@ -6499,8 +8258,8 @@ relink_command=\"$relink_command\""
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
@@ -84973,7 +85021,7 @@
  
  	  # Delete the libtool libraries and symlinks.
  	  for n in $library_names; do
-@@ -6515,39 +8274,17 @@
+@@ -6515,39 +8274,17 @@ relink_command=\"$relink_command\""
  	    *" $dlname "*) ;;
  	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
  	    esac
@@ -85016,7 +85064,7 @@
  	    fi
  	    # FIXME: should reinstall the best remaining shared library.
  	    ;;
-@@ -6557,20 +8294,20 @@
+@@ -6557,20 +8294,20 @@ relink_command=\"$relink_command\""
  
        *.lo)
  	# Possibly a libtool object, so verify it.
@@ -85043,7 +85091,7 @@
  	    rmfiles="$rmfiles $dir/$non_pic_object"
  	  fi
  	fi
-@@ -6581,17 +8318,26 @@
+@@ -6581,17 +8318,26 @@ relink_command=\"$relink_command\""
  	  noexename=$name
  	  case $file in
  	  *.exe)
@@ -85075,7 +85123,7 @@
  
  	    # note $name still contains .exe if it was in $file originally
  	    # as does the version of $file that was added into $rmfiles
-@@ -6606,237 +8352,38 @@
+@@ -6606,237 +8352,38 @@ relink_command=\"$relink_command\""
  	fi
  	;;
        esac
@@ -85327,7 +85375,7 @@
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6850,14 +8397,17 @@
+@@ -6850,14 +8397,17 @@ exit $?
  # configuration.  But we'll never go from static-only to shared-only.
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
@@ -85347,8 +85395,10 @@
  # End:
 +# vi:sw=2
 +
---- /dev/null
-+++ b/m4/libtool.m4
+Index: gdm-2.30.0/m4/libtool.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/m4/libtool.m4	2010-04-14 00:56:28.641242681 +0200
 @@ -0,0 +1,7377 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
@@ -92727,8 +92777,10 @@
 +    ;;
 +  esac
 +])
---- /dev/null
-+++ b/m4/lt~obsolete.m4
+Index: gdm-2.30.0/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/m4/lt~obsolete.m4	2010-04-14 00:56:29.025240511 +0200
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -92822,8 +92874,10 @@
 +m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
---- /dev/null
-+++ b/m4/ltoptions.m4
+Index: gdm-2.30.0/m4/ltoptions.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/m4/ltoptions.m4	2010-04-14 00:56:28.733239854 +0200
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -93193,8 +93247,10 @@
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
---- /dev/null
-+++ b/m4/ltsugar.m4
+Index: gdm-2.30.0/m4/ltsugar.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/m4/ltsugar.m4	2010-04-14 00:56:28.825238984 +0200
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -93319,8 +93375,10 @@
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
---- /dev/null
-+++ b/m4/ltversion.m4
+Index: gdm-2.30.0/m4/ltversion.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/m4/ltversion.m4	2010-04-14 00:56:28.921238683 +0200
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -93345,8 +93403,10 @@
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
---- a/Makefile.in
-+++ b/Makefile.in
+Index: gdm-2.30.0/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/Makefile.in	2010-04-14 00:56:41.201234951 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -93370,7 +93430,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -39,8 +41,10 @@
+@@ -39,8 +41,10 @@ DIST_COMMON = README $(am__configure_dep
  	install-sh ltmain.sh missing mkinstalldirs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -93383,7 +93443,7 @@
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -48,6 +52,13 @@
+@@ -48,6 +52,13 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
@@ -93397,7 +93457,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -59,6 +70,9 @@
+@@ -59,6 +70,9 @@ RECURSIVE_TARGETS = all-recursive check-
  	ps-recursive uninstall-recursive
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
@@ -93407,7 +93467,7 @@
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
-@@ -66,15 +80,41 @@
+@@ -66,15 +80,41 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
  am__remove_distdir = \
@@ -93452,7 +93512,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -115,7 +155,8 @@
+@@ -115,7 +155,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -93462,7 +93522,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -130,18 +171,20 @@
+@@ -130,18 +171,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -93485,7 +93545,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -173,6 +216,7 @@
+@@ -173,6 +216,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -93493,7 +93553,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -182,6 +226,7 @@
+@@ -182,6 +226,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -93501,7 +93561,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -192,13 +237,19 @@
+@@ -192,13 +237,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -93521,7 +93581,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -212,6 +263,7 @@
+@@ -212,6 +263,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -93529,7 +93589,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -250,7 +302,7 @@
+@@ -250,7 +302,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -93538,7 +93598,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -286,6 +338,7 @@
+@@ -286,6 +338,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -93546,7 +93606,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -342,15 +395,15 @@
+@@ -342,15 +395,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -93567,7 +93627,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -366,9 +419,10 @@
+@@ -366,9 +419,10 @@ $(top_builddir)/config.status: $(top_src
  	$(SHELL) ./config.status --recheck
  
  $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
@@ -93580,7 +93640,7 @@
  
  config.h: stamp-h1
  	@if test ! -f $@; then \
-@@ -380,7 +434,7 @@
+@@ -380,7 +434,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
  $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
@@ -93589,7 +93649,7 @@
  	rm -f stamp-h1
  	touch $@
  
-@@ -394,7 +448,7 @@
+@@ -394,7 +448,7 @@ clean-libtool:
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -93598,7 +93658,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -403,7 +457,7 @@
+@@ -403,7 +457,7 @@ distclean-libtool:
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -93607,7 +93667,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -420,7 +474,7 @@
+@@ -420,7 +474,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -93616,7 +93676,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -428,7 +482,7 @@
+@@ -428,7 +482,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -93625,7 +93685,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -454,16 +508,16 @@
+@@ -454,16 +508,16 @@ $(RECURSIVE_CLEAN_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -93645,7 +93705,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -471,14 +525,14 @@
+@@ -471,14 +525,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -93663,7 +93723,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -490,46 +544,50 @@
+@@ -490,46 +544,50 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -93729,7 +93789,7 @@
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  	list='$(DISTFILES)'; \
-@@ -545,39 +603,55 @@
+@@ -545,39 +603,55 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -93797,7 +93857,7 @@
  dist-gzip: distdir
  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
-@@ -585,6 +659,14 @@
+@@ -585,6 +659,14 @@ dist-bzip2: distdir
  	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  	$(am__remove_distdir)
  
@@ -93812,7 +93872,7 @@
  dist-tarZ: distdir
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
-@@ -608,13 +690,17 @@
+@@ -608,13 +690,17 @@ dist dist-all: distdir
  distcheck: dist
  	case '$(DIST_ARCHIVES)' in \
  	*.tar.gz*) \
@@ -93833,7 +93893,7 @@
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
-@@ -622,9 +708,11 @@
+@@ -622,9 +708,11 @@ distcheck: dist
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
@@ -93846,7 +93906,7 @@
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -646,13 +734,15 @@
+@@ -646,13 +734,15 @@ distcheck: dist
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
@@ -93864,7 +93924,7 @@
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  	   || { echo "ERROR: files left after uninstall:" ; \
  	        if test -n "$(DESTDIR)"; then \
-@@ -694,6 +784,7 @@
+@@ -694,6 +784,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -93872,7 +93932,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -715,6 +806,8 @@
+@@ -715,6 +806,8 @@ dvi-am:
  
  html: html-recursive
  
@@ -93881,7 +93941,7 @@
  info: info-recursive
  
  info-am:
-@@ -723,18 +816,28 @@
+@@ -723,18 +816,28 @@ install-data-am:
  
  install-dvi: install-dvi-recursive
  
@@ -93910,7 +93970,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -757,24 +860,25 @@
+@@ -757,24 +860,25 @@ ps-am:
  
  uninstall-am:
  
@@ -93950,8 +94010,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
---- a/missing
-+++ b/missing
+Index: gdm-2.30.0/missing
+===================================================================
+--- gdm-2.30.0.orig/missing	2010-03-30 00:11:16.000000000 +0200
++++ gdm-2.30.0/missing	2010-04-14 00:56:38.713733261 +0200
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -93966,7 +94028,7 @@
  # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
-@@ -18,9 +18,7 @@
+@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -93977,7 +94039,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -89,6 +87,9 @@
+@@ -89,6 +87,9 @@ Supported PROGRAM values:
    tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
@@ -93987,7 +94049,7 @@
  Send bug reports to <bug-automake at gnu.org>."
      exit $?
      ;;
-@@ -106,15 +107,22 @@
+@@ -106,15 +107,22 @@ Send bug reports to <bug-automake at gnu.or
  
  esac
  
@@ -94013,7 +94075,7 @@
      if test -n "$run"; then
         echo 1>&2 "ERROR: \`tar' requires --run"
         exit 1
-@@ -138,7 +146,7 @@
+@@ -138,7 +146,7 @@ esac
  
  # If it does not exist, or fails to run (possibly an outdated version),
  # try to emulate it.
@@ -94022,7 +94084,7 @@
    aclocal*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
-@@ -148,7 +156,7 @@
+@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only
      touch aclocal.m4
      ;;
  
@@ -94031,7 +94093,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
-@@ -157,7 +165,7 @@
+@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only
      touch configure
      ;;
  
@@ -94040,7 +94102,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-@@ -187,7 +195,7 @@
+@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only
  	   while read f; do touch "$f"; done
      ;;
  
@@ -94049,7 +94111,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is needed, but is $msg.
           You might have modified some files without having the
-@@ -210,7 +218,7 @@
+@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
      fi
      ;;
  
@@ -94058,7 +94120,7 @@
      echo 1>&2 "\
  WARNING: \`$1' $msg.  You should only need it if
           you modified a \`.y' file.  You may need the \`Bison' package
-@@ -240,7 +248,7 @@
+@@ -240,7 +248,7 @@ WARNING: \`$1' $msg.  You should only ne
      fi
      ;;
  
@@ -94067,7 +94129,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.l' file.  You may need the \`Flex' package
-@@ -263,7 +271,7 @@
+@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg.  You should only
      fi
      ;;
  
@@ -94076,7 +94138,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
  	 you modified a dependency of a manual page.  You may need the
-@@ -277,11 +285,11 @@
+@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg.  You should only
      else
  	test -z "$file" || exec >$file
  	echo ".ab help2man is required to generate this page"
@@ -94090,7 +94152,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -310,7 +318,7 @@
+@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only
      touch $file
      ;;
  
@@ -94099,7 +94161,7 @@
      shift
  
      # We have already tried tar in the generic part.
-@@ -363,5 +371,6 @@
+@@ -363,5 +371,6 @@ exit 0
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -94107,8 +94169,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
---- a/mkinstalldirs
-+++ b/mkinstalldirs
+Index: gdm-2.30.0/mkinstalldirs
+===================================================================
+--- gdm-2.30.0.orig/mkinstalldirs	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/mkinstalldirs	2010-04-14 00:56:41.141238499 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -94118,7 +94182,7 @@
  
  # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
  # Created: 1993-05-16
-@@ -157,5 +157,6 @@
+@@ -157,5 +157,6 @@ exit $errstatus
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -94126,8 +94190,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
+Index: gdm-2.30.0/tests/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/tests/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/tests/Makefile.in	2010-04-14 00:56:40.965235546 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -94151,7 +94217,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,13 +40,16 @@
+@@ -38,13 +40,16 @@ subdir = tests
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -94170,7 +94236,7 @@
  am__EXEEXT_1 =
  am__EXEEXT_2 = m-common$(EXEEXT) $(am__EXEEXT_1)
  PROGRAMS = $(noinst_PROGRAMS)
-@@ -57,29 +62,49 @@
+@@ -57,29 +62,49 @@ am__DEPENDENCIES_1 =
  m_common_DEPENDENCIES = $(top_builddir)/common/libgdmcommon.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
@@ -94230,7 +94296,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -120,7 +145,8 @@
+@@ -120,7 +145,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -94240,7 +94306,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -135,18 +161,20 @@
+@@ -135,18 +161,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -94263,7 +94329,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -178,6 +206,7 @@
+@@ -178,6 +206,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -94271,7 +94337,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -187,6 +216,7 @@
+@@ -187,6 +216,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -94279,7 +94345,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -197,13 +227,19 @@
+@@ -197,13 +227,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -94299,7 +94365,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -217,6 +253,7 @@
+@@ -217,6 +253,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -94307,7 +94373,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -255,7 +292,7 @@
+@@ -255,7 +292,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -94316,7 +94382,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -291,6 +328,7 @@
+@@ -291,6 +328,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -94324,7 +94390,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -344,14 +382,14 @@
+@@ -344,14 +382,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -94344,7 +94410,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -369,16 +407,19 @@
+@@ -369,16 +407,19 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -94370,7 +94436,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -391,64 +432,73 @@
+@@ -391,64 +432,73 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/m_common-s-common-utils.Po at am__quote@
  
  .c.o:
@@ -94462,7 +94528,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='s-common-utils.c' object='m_common-s-common-utils.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m_common_CFLAGS) $(CFLAGS) -c -o m_common-s-common-utils.obj `if test -f 's-common-utils.c'; then $(CYGPATH_W) 's-common-utils.c'; else $(CYGPATH_W) '$(srcdir)/s-common-utils.c'; fi`
-@@ -464,53 +514,58 @@
+@@ -464,53 +514,58 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -94538,7 +94604,7 @@
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -519,49 +574,63 @@
+@@ -519,49 +574,63 @@ check-TESTS: $(TESTS)
  	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
  	      all=`expr $$all + 1`; \
  	      case " $(XFAIL_TESTS) " in \
@@ -94614,7 +94680,7 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
-@@ -572,11 +641,15 @@
+@@ -572,11 +641,15 @@ check-TESTS: $(TESTS)
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -94632,7 +94698,7 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
-@@ -596,13 +669,17 @@
+@@ -596,13 +669,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -94654,7 +94720,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -631,6 +708,7 @@
+@@ -631,6 +708,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -94662,7 +94728,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -652,6 +730,8 @@
+@@ -652,6 +730,8 @@ dvi-am:
  
  html: html-am
  
@@ -94671,7 +94737,7 @@
  info: info-am
  
  info-am:
-@@ -660,18 +740,28 @@
+@@ -660,18 +740,28 @@ install-data-am:
  
  install-dvi: install-dvi-am
  
@@ -94700,7 +94766,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -694,7 +784,7 @@
+@@ -694,7 +784,7 @@ ps-am:
  
  uninstall-am:
  
@@ -94709,7 +94775,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-@@ -710,6 +800,7 @@
+@@ -710,6 +800,7 @@ uninstall-am:
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	tags uninstall uninstall-am
  
@@ -94717,8 +94783,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/utils/Makefile.in
-+++ b/utils/Makefile.in
+Index: gdm-2.30.0/utils/Makefile.in
+===================================================================
+--- gdm-2.30.0.orig/utils/Makefile.in	2010-03-30 00:11:18.000000000 +0200
++++ gdm-2.30.0/utils/Makefile.in	2010-04-14 00:56:41.089234890 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -94742,7 +94810,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -39,16 +41,18 @@
+@@ -39,16 +41,18 @@ subdir = utils
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
@@ -94764,7 +94832,7 @@
  PROGRAMS = $(bin_PROGRAMS)
  am__objects_1 =
  am_gdm_screenshot_OBJECTS = gdm-screenshot.$(OBJEXT) $(am__objects_1)
-@@ -57,24 +61,61 @@
+@@ -57,24 +61,61 @@ am__DEPENDENCIES_1 =
  gdm_screenshot_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -94834,7 +94902,7 @@
  SOURCES = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES)
  DIST_SOURCES = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES)
  ETAGS = etags
-@@ -83,6 +124,7 @@
+@@ -83,6 +124,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
  AMTAR = @AMTAR@
@@ -94842,7 +94910,7 @@
  APPLET_CFLAGS = @APPLET_CFLAGS@
  APPLET_LIBS = @APPLET_LIBS@
  AR = @AR@
-@@ -123,7 +165,8 @@
+@@ -123,7 +165,8 @@ DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLA
  DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
  DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
  DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -94852,7 +94920,7 @@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
-@@ -138,18 +181,20 @@
+@@ -138,18 +181,20 @@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
  EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@
  EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@
  EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
@@ -94875,7 +94943,7 @@
  GDM_PID_FILE = @GDM_PID_FILE@
  GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
  GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -181,6 +226,7 @@
+@@ -181,6 +226,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LANG_CONFIG_FILE = @LANG_CONFIG_FILE@
@@ -94883,7 +94951,7 @@
  LDFLAGS = @LDFLAGS@
  LIBDIR = @LIBDIR@
  LIBEXECDIR = @LIBEXECDIR@
-@@ -190,6 +236,7 @@
+@@ -190,6 +236,7 @@ LIBTOOL = @LIBTOOL@
  LIBWRAP_LIBS = @LIBWRAP_LIBS@
  LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
  LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
@@ -94891,7 +94959,7 @@
  LN_S = @LN_S@
  LOCALSTATEDIR = @LOCALSTATEDIR@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -200,13 +247,19 @@
+@@ -200,13 +247,19 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
  MSGMERGE = @MSGMERGE@
@@ -94911,7 +94979,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PAM_LIBS = @PAM_LIBS@
  PAM_PREFIX = @PAM_PREFIX@
-@@ -220,6 +273,7 @@
+@@ -220,6 +273,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
  RANLIB = @RANLIB@
  RBAC_LIBS = @RBAC_LIBS@
  SBINDIR = @SBINDIR@
@@ -94919,7 +94987,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@
-@@ -258,7 +312,7 @@
+@@ -258,7 +312,7 @@ abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -94928,7 +94996,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -294,6 +348,7 @@
+@@ -294,6 +348,7 @@ libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
  logdir = @logdir@
@@ -94936,7 +95004,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -380,14 +435,14 @@
+@@ -380,14 +435,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -94956,7 +95024,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -405,59 +460,90 @@
+@@ -405,59 +460,90 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95081,7 +95149,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -469,22 +555,25 @@
+@@ -469,22 +555,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdmflexiserver.Po at am__quote@
  
  .c.o:
@@ -95113,7 +95181,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -500,45 +589,49 @@
+@@ -500,45 +589,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -95179,7 +95247,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -559,13 +652,17 @@
+@@ -559,13 +652,17 @@ distdir: $(DISTFILES)
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -95201,7 +95269,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -597,6 +694,7 @@
+@@ -597,6 +694,7 @@ clean-generic:
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -95209,7 +95277,7 @@
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
-@@ -618,6 +716,8 @@
+@@ -618,6 +716,8 @@ dvi-am:
  
  html: html-am
  
@@ -95218,7 +95286,7 @@
  info: info-am
  
  info-am:
-@@ -626,18 +726,28 @@
+@@ -626,18 +726,28 @@ install-data-am:
  
  install-dvi: install-dvi-am
  
@@ -95247,7 +95315,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -683,6 +793,7 @@
+@@ -683,6 +793,7 @@ gdm-restart: gdm-restart.in Makefile
  	$(edit) $< >$@
  gdm-safe-restart: gdm-safe-restart.in Makefile
  	$(edit) $< >$@
@@ -95255,8 +95323,10 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
---- a/config.h.in
-+++ b/config.h.in
+Index: gdm-2.30.0/config.h.in
+===================================================================
+--- gdm-2.30.0.orig/config.h.in	2010-03-30 00:11:15.000000000 +0200
++++ gdm-2.30.0/config.h.in	2010-04-14 00:56:12.829736053 +0200
 @@ -71,6 +71,9 @@
  /* Group to use */
  #undef GDM_GROUPNAME
@@ -95288,8 +95358,10 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
---- /dev/null
-+++ b/gui/gdmsetup/Makefile.in
+Index: gdm-2.30.0/gui/gdmsetup/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/gui/gdmsetup/Makefile.in	2010-04-14 00:56:40.241234523 +0200
 @@ -0,0 +1,766 @@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
@@ -95663,7 +95735,7 @@
 +	-DDMCONFDIR=\""$(dmconfdir)"\"		\
 +	-DDATADIR=\""$(datadir)"\"		\
 +	-DUIDIR=\""$(uidir)"\"			\
-+	-DGNOMELOCALEDIR=\""$(gdmlocaledir)"\" 	\
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 +	$(DISABLE_DEPRECATED_CFLAGS)		\
 +	$(GDMSETUP_CFLAGS)			\
 +	$(NULL)




More information about the pkg-gnome-commits mailing list