r24275 - in /desktop/unstable/gnome-panel/debian: ./ patches/ source/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed May 5 17:56:46 UTC 2010


Author: joss
Date: Wed May  5 17:56:45 2010
New Revision: 24275

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24275
Log:
* Drop 02_panel_logout.patch to avoid bringing back libgnome 
  dependencies.
* Drop 03_switch-user_lock.patch and 04_gnome-panel-logout.patch as 
  well since they depend on it. 
* Break gnome-session < 2.26 accordingly.
* Break gnome-control-center < 2.26 and gnome-power-manager < 2.26, 
  since earlier versions might need it.
* 08_clock_applet_event.patch: dropped, upstream integrated a 
  different fix.
* Switch to 3.0 source format.

Added:
    desktop/unstable/gnome-panel/debian/source/
    desktop/unstable/gnome-panel/debian/source/format
Removed:
    desktop/unstable/gnome-panel/debian/patches/02_panel_logout.patch
    desktop/unstable/gnome-panel/debian/patches/03_switch-user_lock.patch
    desktop/unstable/gnome-panel/debian/patches/04_gnome-panel-logout.patch
    desktop/unstable/gnome-panel/debian/patches/08_clock_applet_event.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in
    desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
    desktop/unstable/gnome-panel/debian/patches/series
    desktop/unstable/gnome-panel/debian/rules

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Wed May  5 17:56:45 2010
@@ -1,5 +1,6 @@
 gnome-panel (2.30.0-1) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * New upstream stable release:
     + debian/patches/30_xrandr_crashes.patch,
       debian/patches/10_clock_applet_link_gnome_desktop.patch:
@@ -9,7 +10,19 @@
     + debian/control.in:
       - Update build dependencies and dependencies.
 
- -- Sebastian Dröge <slomo at debian.org>  Wed, 05 May 2010 09:52:06 +0200
+  [ Josselin Mouette ]
+  * Drop 02_panel_logout.patch to avoid bringing back libgnome 
+    dependencies.
+  * Drop 03_switch-user_lock.patch and 04_gnome-panel-logout.patch as 
+    well since they depend on it. 
+  * Break gnome-session < 2.26 accordingly.
+  * Break gnome-control-center < 2.26 and gnome-power-manager < 2.26, 
+    since earlier versions might need it.
+  * 08_clock_applet_event.patch: dropped, upstream integrated a 
+    different fix.
+  * Switch to 3.0 source format.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 05 May 2010 19:55:08 +0200
 
 gnome-panel (2.28.0-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Wed May  5 17:56:45 2010
@@ -7,11 +7,10 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>
 Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
-               quilt,
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.14),
                dpkg-dev (>= 1.13.19),
@@ -62,7 +61,7 @@
          python-gconf,
          policykit-1-gnome
 Recommends: gnome-applets (>= 2.12.1-1),
-            gnome-session,
+            gnome-session (>= 2.26),
             evolution-data-server,
             gnome-icon-theme (>= 2.24),
             alacarte,
@@ -72,8 +71,10 @@
           gnome-terminal | x-terminal-emulator,
           nautilus,
           evolution,
-          epiphany-browser,
-          gnome-session (>= 2.23.6) | gdm
+          epiphany-browser
+Breaks: gnome-session (<< 2.26),
+        gnome-power-manager (<< 2.26),
+        gnome-control-center (<< 2.26)
 Description: launcher and docking facility for GNOME
  The GNOME Panel is an essential part of the GNOME Desktop, providing
  toolbar-like “panels” which can be attached to the sides of your desktop.

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Wed May  5 17:56:45 2010
@@ -6,7 +6,6 @@
 Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
-               quilt,
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.14),
                dpkg-dev (>= 1.13.19),
@@ -57,7 +56,7 @@
          python-gconf,
          policykit-1-gnome
 Recommends: gnome-applets (>= 2.12.1-1),
-            gnome-session,
+            gnome-session (>= 2.26),
             evolution-data-server,
             gnome-icon-theme (>= 2.24),
             alacarte,
@@ -67,8 +66,10 @@
           gnome-terminal | x-terminal-emulator,
           nautilus,
           evolution,
-          epiphany-browser,
-          gnome-session (>= 2.23.6) | gdm
+          epiphany-browser
+Breaks: gnome-session (<< 2.26),
+        gnome-power-manager (<< 2.26),
+        gnome-control-center (<< 2.26)
 Description: launcher and docking facility for GNOME
  The GNOME Panel is an essential part of the GNOME Desktop, providing
  toolbar-like “panels” which can be attached to the sides of your desktop.

Modified: desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] Wed May  5 17:56:45 2010
@@ -1,6 +1,13 @@
-diff -Naur gnome-panel-2.30.0.old/aclocal.m4 gnome-panel-2.30.0/aclocal.m4
---- gnome-panel-2.30.0.old/aclocal.m4	2010-03-30 02:52:39.000000000 +0200
-+++ gnome-panel-2.30.0/aclocal.m4	2010-05-05 10:03:27.282509637 +0200
+libtoolize --force --copy
+aclocal -I m4
+automake -acf -Wno-portability
+autoconf
+rm -rf autom4te.cache
+
+Index: gnome-panel-2.30.0/aclocal.m4
+===================================================================
+--- gnome-panel-2.30.0.orig/aclocal.m4	2010-03-30 02:52:39.000000000 +0200
++++ gnome-panel-2.30.0/aclocal.m4	2010-05-05 19:51:55.315835236 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -3993,25 +4000,17 @@
  
  m4_include([m4/d-type.m4])
  m4_include([m4/gnome-doc-utils.m4])
-diff -Naur gnome-panel-2.30.0.old/applets/clock/Makefile.in gnome-panel-2.30.0/applets/clock/Makefile.in
---- gnome-panel-2.30.0.old/applets/clock/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/clock/Makefile.in	2010-05-05 10:03:29.542500074 +0200
+Index: gnome-panel-2.30.0/applets/clock/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/clock/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/clock/Makefile.in	2010-05-05 19:54:01.611335860 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -337,6 +337,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -362,6 +364,7 @@
+@@ -362,6 +362,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4019,7 +4018,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -1308,7 +1311,7 @@
+@@ -1308,7 +1309,7 @@ uninstall-xmluiDATA:
  #     (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):
@@ -4028,7 +4027,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -1333,7 +1336,7 @@
+@@ -1333,7 +1334,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -4037,25 +4036,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/applets/clock/pixmaps/Makefile.in gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in
---- gnome-panel-2.30.0.old/applets/clock/pixmaps/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in	2010-05-05 10:03:29.622501653 +0200
+Index: gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/clock/pixmaps/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in	2010-05-05 19:54:01.711336636 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4063,25 +4054,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/applets/fish/Makefile.in gnome-panel-2.30.0/applets/fish/Makefile.in
---- gnome-panel-2.30.0.old/applets/fish/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/fish/Makefile.in	2010-05-05 10:03:29.738500274 +0200
+Index: gnome-panel-2.30.0/applets/fish/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/fish/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/fish/Makefile.in	2010-05-05 19:54:01.855334959 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -221,6 +221,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -246,6 +248,7 @@
+@@ -246,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4089,25 +4072,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/applets/Makefile.in gnome-panel-2.30.0/applets/Makefile.in
---- gnome-panel-2.30.0.old/applets/Makefile.in	2010-03-30 02:52:44.000000000 +0200
-+++ gnome-panel-2.30.0/applets/Makefile.in	2010-05-05 10:03:29.310501463 +0200
+Index: gnome-panel-2.30.0/applets/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/Makefile.in	2010-03-30 02:52:44.000000000 +0200
++++ gnome-panel-2.30.0/applets/Makefile.in	2010-05-05 19:54:01.243334000 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -177,6 +177,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -202,6 +204,7 @@
+@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4115,7 +4090,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -348,7 +351,7 @@
+@@ -348,7 +349,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):
@@ -4124,7 +4099,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -373,7 +376,7 @@
+@@ -373,7 +374,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -4133,25 +4108,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/applets/notification_area/Makefile.in gnome-panel-2.30.0/applets/notification_area/Makefile.in
---- gnome-panel-2.30.0.old/applets/notification_area/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/notification_area/Makefile.in	2010-05-05 10:03:29.874499535 +0200
+Index: gnome-panel-2.30.0/applets/notification_area/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/notification_area/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/notification_area/Makefile.in	2010-05-05 19:54:02.067835427 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -248,6 +248,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -273,6 +275,7 @@
+@@ -273,6 +273,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4159,25 +4126,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/applets/wncklet/Makefile.in gnome-panel-2.30.0/applets/wncklet/Makefile.in
---- gnome-panel-2.30.0.old/applets/wncklet/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/applets/wncklet/Makefile.in	2010-05-05 10:03:30.030499037 +0200
+Index: gnome-panel-2.30.0/applets/wncklet/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/applets/wncklet/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/wncklet/Makefile.in	2010-05-05 19:54:02.271835596 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -232,6 +232,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -257,6 +259,7 @@
+@@ -257,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4185,9 +4144,10 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/compile gnome-panel-2.30.0/compile
---- gnome-panel-2.30.0.old/compile	2010-03-30 02:52:44.000000000 +0200
-+++ gnome-panel-2.30.0/compile	2010-05-05 10:03:29.221527585 +0200
+Index: gnome-panel-2.30.0/compile
+===================================================================
+--- gnome-panel-2.30.0.orig/compile	2010-03-30 02:52:44.000000000 +0200
++++ gnome-panel-2.30.0/compile	2010-05-05 19:51:55.323840793 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # Wrapper for compilers which do not understand `-c -o'.
@@ -4197,7 +4157,7 @@
  
  # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
  # Foundation, Inc.
-@@ -124,9 +124,9 @@
+@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
  ret=$?
  
  if test -f "$cofile"; then
@@ -4209,9 +4169,10 @@
  fi
  
  rmdir "$lockdir"
-diff -Naur gnome-panel-2.30.0.old/config.h.in gnome-panel-2.30.0/config.h.in
---- gnome-panel-2.30.0.old/config.h.in	2010-03-30 02:52:43.000000000 +0200
-+++ gnome-panel-2.30.0/config.h.in	2010-05-05 10:03:28.678500745 +0200
+Index: gnome-panel-2.30.0/config.h.in
+===================================================================
+--- gnome-panel-2.30.0.orig/config.h.in	2010-03-30 02:52:43.000000000 +0200
++++ gnome-panel-2.30.0/config.h.in	2010-05-05 19:51:55.323840793 +0200
 @@ -135,6 +135,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -4222,9 +4183,10 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-diff -Naur gnome-panel-2.30.0.old/configure gnome-panel-2.30.0/configure
---- gnome-panel-2.30.0.old/configure	2010-03-30 02:52:43.000000000 +0200
-+++ gnome-panel-2.30.0/configure	2010-05-05 10:03:28.378498856 +0200
+Index: gnome-panel-2.30.0/configure
+===================================================================
+--- gnome-panel-2.30.0.orig/configure	2010-03-30 02:52:43.000000000 +0200
++++ gnome-panel-2.30.0/configure	2010-05-05 19:51:55.363834840 +0200
 @@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -4256,7 +4218,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
@@ -4285,7 +4247,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
@@ -4300,7 +4262,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;
@@ -4309,7 +4271,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
  
@@ -4323,7 +4285,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.
@@ -4342,7 +4304,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
@@ -4363,7 +4325,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +132,301 @@
+@@ -133,330 +132,301 @@ export LC_ALL
  LANGUAGE=C
  export LANGUAGE
  
@@ -4941,7 +4903,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" ||
@@ -4951,7 +4913,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
  }
  
@@ -4986,7 +4948,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
@@ -4995,7 +4957,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
@@ -5008,7 +4970,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -573,7 +531,6 @@
+@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
  
  
  
@@ -5016,7 +4978,7 @@
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
  
-@@ -722,7 +679,8 @@
+@@ -722,7 +679,8 @@ fi
  
  
  
@@ -5026,7 +4988,7 @@
  
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,7 +698,6 @@
+@@ -740,7 +698,6 @@ cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -5034,7 +4996,7 @@
  
  # Identity of this package.
  PACKAGE_NAME='gnome-panel'
-@@ -748,6 +705,7 @@
+@@ -748,6 +705,7 @@ PACKAGE_TARNAME='gnome-panel'
  PACKAGE_VERSION='2.30.0'
  PACKAGE_STRING='gnome-panel 2.30.0'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel'
@@ -5042,7 +5004,7 @@
  
  # Factoring default headers for most tests.
  ac_includes_default="\
-@@ -866,6 +824,8 @@
+@@ -866,6 +824,8 @@ FISH_LIBS
  FISH_CFLAGS
  LIBPANEL_APPLET_LIBS
  LIBPANEL_APPLET_CFLAGS
@@ -5051,7 +5013,7 @@
  PANEL_LIBS
  PANEL_CFLAGS
  EGG_SMCLIENT_LIBS
-@@ -1021,6 +981,7 @@
+@@ -1021,6 +981,7 @@ bindir
  program_transform_name
  prefix
  exec_prefix
@@ -5059,7 +5021,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1076,6 +1037,8 @@
+@@ -1076,6 +1037,8 @@ EGG_SMCLIENT_CFLAGS
  EGG_SMCLIENT_LIBS
  PANEL_CFLAGS
  PANEL_LIBS
@@ -5068,7 +5030,7 @@
  LIBPANEL_APPLET_CFLAGS
  LIBPANEL_APPLET_LIBS
  FISH_CFLAGS
-@@ -1203,8 +1166,7 @@
+@@ -1203,8 +1166,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 &&
@@ -5078,7 +5040,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1230,8 +1192,7 @@
+@@ -1230,8 +1192,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 &&
@@ -5088,7 +5050,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1435,8 +1396,7 @@
+@@ -1435,8 +1396,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 &&
@@ -5098,7 +5060,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1452,8 +1412,7 @@
+@@ -1452,8 +1412,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 &&
@@ -5108,7 +5070,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1483,17 +1442,17 @@
+@@ -1483,17 +1442,17 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -5132,7 +5094,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1510,15 +1469,13 @@
+@@ -1510,15 +1469,13 @@ done
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -5150,7 +5112,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1541,8 +1498,7 @@
+@@ -1541,8 +1498,7 @@ do
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -5160,7 +5122,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1572,11 +1528,9 @@
+@@ -1572,11 +1528,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 .` ||
@@ -5174,7 +5136,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1615,13 +1569,11 @@
+@@ -1615,13 +1569,11 @@ else
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -5190,7 +5152,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1750,11 +1702,12 @@
+@@ -1750,11 +1702,12 @@ Optional Features:
    --enable-polkit         Enable PolicyKit support (auto)
    --enable-network-manager
                            Enable NetworkManager support (auto)
@@ -5207,7 +5169,7 @@
    --disable-rebuilds      disable all source autogeneration rules
  
  Optional Packages:
-@@ -1784,7 +1737,7 @@
+@@ -1784,7 +1737,7 @@ 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>
@@ -5216,7 +5178,7 @@
                you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
    PKG_CONFIG  path to pkg-config utility
-@@ -1795,6 +1748,9 @@
+@@ -1795,6 +1748,9 @@ Some influential environment variables:
    PANEL_CFLAGS
                C compiler flags for PANEL, overriding pkg-config
    PANEL_LIBS  linker flags for PANEL, overriding pkg-config
@@ -5226,7 +5188,7 @@
    LIBPANEL_APPLET_CFLAGS
                C compiler flags for LIBPANEL_APPLET, overriding pkg-config
    LIBPANEL_APPLET_LIBS
-@@ -1894,21 +1850,378 @@
+@@ -1894,21 +1850,378 @@ test -n "$ac_init_help" && exit $ac_stat
  if $ac_init_version; then
    cat <<\_ACEOF
  gnome-panel configure 2.30.0
@@ -5609,7 +5571,7 @@
  
    $ $0 $@
  
-@@ -1944,8 +2257,8 @@
+@@ -1944,8 +2257,8 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5620,7 +5582,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1982,9 +2295,9 @@
+@@ -1982,9 +2295,9 @@ do
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -5632,7 +5594,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -2000,13 +2313,13 @@
+@@ -2000,13 +2313,13 @@ do
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -5649,7 +5611,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -2031,13 +2344,13 @@
+@@ -2031,13 +2344,13 @@ _ASBOX
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -5665,7 +5627,7 @@
        esac ;;
      esac
    done
-@@ -2109,39 +2422,41 @@
+@@ -2109,39 +2422,41 @@ _ASBOX
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -5712,7 +5674,7 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2159,8 +2474,8 @@
+@@ -2159,8 +2474,8 @@ fi
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
@@ -5723,7 +5685,7 @@
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2168,10 +2483,10 @@
+@@ -2168,10 +2483,10 @@ $as_echo "$as_me: loading site script $a
  done
  
  if test -r "$cache_file"; then
@@ -5738,7 +5700,7 @@
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2179,7 +2494,7 @@
+@@ -2179,7 +2494,7 @@ $as_echo "$as_me: loading cache $cache_f
      esac
    fi
  else
@@ -5747,7 +5709,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2194,11 +2509,11 @@
+@@ -2194,11 +2509,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,)
@@ -5761,7 +5723,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2208,17 +2523,17 @@
+@@ -2208,17 +2523,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
@@ -5783,7 +5745,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2230,43 +2545,20 @@
+@@ -2230,43 +2545,20 @@ $as_echo "$as_me:   current value: \`$ac
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -5834,7 +5796,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2281,24 +2573,16 @@
+@@ -2281,24 +2573,16 @@ am__api_version='1.11'
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5867,7 +5829,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2324,10 +2608,10 @@
+@@ -2324,10 +2608,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.
@@ -5880,7 +5842,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2335,11 +2619,11 @@
+@@ -2335,11 +2619,11 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5896,7 +5858,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2376,7 +2660,7 @@
+@@ -2376,7 +2660,7 @@ case $as_dir/ in
      ;;
  esac
  
@@ -5905,7 +5867,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2392,7 +2676,7 @@
+@@ -2392,7 +2676,7 @@ fi
      INSTALL=$ac_install_sh
    fi
  fi
@@ -5914,7 +5876,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2403,7 +2687,7 @@
+@@ -2403,7 +2687,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -5923,7 +5885,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2414,15 +2698,11 @@
+@@ -2414,15 +2698,11 @@ am_lf='
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -5941,7 +5903,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2444,11 +2724,8 @@
+@@ -2444,11 +2724,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".
@@ -5955,7 +5917,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2457,13 +2734,10 @@
+@@ -2457,13 +2734,10 @@ then
     # Ok.
     :
  else
@@ -5972,7 +5934,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2491,7 +2765,7 @@
+@@ -2491,7 +2765,7 @@ if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -5981,7 +5943,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2512,9 +2786,9 @@
+@@ -2512,9 +2786,9 @@ if test "$cross_compiling" != no; then
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5993,7 +5955,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2525,24 +2799,24 @@
+@@ -2525,24 +2799,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6023,7 +5985,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2552,9 +2826,9 @@
+@@ -2552,9 +2826,9 @@ if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -6035,7 +5997,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2565,24 +2839,24 @@
+@@ -2565,24 +2839,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6065,7 +6027,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2591,7 +2865,7 @@
+@@ -2591,7 +2865,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6074,7 +6036,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2604,10 +2878,10 @@
+@@ -2604,10 +2878,10 @@ fi
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -6087,7 +6049,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2615,7 +2889,7 @@
+@@ -2615,7 +2889,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6096,7 +6058,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 #(
-@@ -2627,11 +2901,12 @@
+@@ -2627,11 +2901,12 @@ do
  	   esac
  	 done
         done
@@ -6110,7 +6072,7 @@
    if test "${ac_cv_path_mkdir+set}" = set; then
      MKDIR_P="$ac_cv_path_mkdir -p"
    else
-@@ -2639,11 +2914,10 @@
+@@ -2639,11 +2914,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.
@@ -6123,7 +6085,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2656,9 +2930,9 @@
+@@ -2656,9 +2930,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
@@ -6135,7 +6097,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2669,24 +2943,24 @@
+@@ -2669,24 +2943,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6165,7 +6127,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2694,11 +2968,11 @@
+@@ -2694,11 +2968,11 @@ fi
    test -n "$AWK" && break
  done
  
@@ -6179,7 +6141,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2716,11 +2990,11 @@
+@@ -2716,11 +2990,11 @@ esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -6193,7 +6155,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2740,9 +3014,7 @@
+@@ -2740,9 +3014,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
@@ -6204,7 +6166,7 @@
    fi
  fi
  
-@@ -2799,7 +3071,7 @@
+@@ -2799,7 +3071,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
  
  
  # Check whether --enable-silent-rules was given.
@@ -6213,7 +6175,7 @@
    enableval=$enable_silent_rules;
  fi
  
-@@ -2835,16 +3107,16 @@
+@@ -2835,16 +3107,16 @@ LIB_PANEL_APPLET_LT_VERSION=2:67:2
  
  
  
@@ -6233,7 +6195,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2872,16 +3144,16 @@
+@@ -2872,16 +3144,16 @@ fi
  
  
  
@@ -6253,7 +6215,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -2897,7 +3169,7 @@
+@@ -2897,7 +3169,7 @@ am__doit:
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -6262,7 +6224,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -2925,12 +3197,12 @@
+@@ -2925,12 +3197,12 @@ if test "$am__include" = "#"; then
  fi
  
  
@@ -6277,7 +6239,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -2955,9 +3227,9 @@
+@@ -2955,9 +3227,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
@@ -6289,7 +6251,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2968,24 +3240,24 @@
+@@ -2968,24 +3240,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6319,7 +6281,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2995,9 +3267,9 @@
+@@ -2995,9 +3267,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
@@ -6331,7 +6293,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3008,24 +3280,24 @@
+@@ -3008,24 +3280,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6361,7 +6323,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3034,7 +3306,7 @@
+@@ -3034,7 +3306,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6370,7 +6332,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3048,9 +3320,9 @@
+@@ -3048,9 +3320,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
@@ -6382,7 +6344,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3061,24 +3333,24 @@
+@@ -3061,24 +3333,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6412,7 +6374,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3088,9 +3360,9 @@
+@@ -3088,9 +3360,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
@@ -6424,7 +6386,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3102,18 +3374,18 @@
+@@ -3102,18 +3374,18 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6446,7 +6408,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3132,10 +3404,10 @@
+@@ -3132,10 +3404,10 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -6459,7 +6421,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3147,9 +3419,9 @@
+@@ -3147,9 +3419,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
@@ -6471,7 +6433,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3160,24 +3432,24 @@
+@@ -3160,24 +3432,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6501,7 +6463,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3191,9 +3463,9 @@
+@@ -3191,9 +3463,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
@@ -6513,7 +6475,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3204,24 +3476,24 @@
+@@ -3204,24 +3476,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6543,7 +6505,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3234,7 +3506,7 @@
+@@ -3234,7 +3506,7 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -6552,7 +6514,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3245,57 +3517,37 @@
+@@ -3245,57 +3517,37 @@ fi
  fi
  
  
@@ -6630,7 +6592,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3311,8 +3563,8 @@
+@@ -3311,8 +3563,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.
@@ -6641,7 +6603,7 @@
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
  # The possible output files:
-@@ -3328,17 +3580,17 @@
+@@ -3328,17 +3580,17 @@ do
  done
  rm -f $ac_rmfiles
  
@@ -6664,7 +6626,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,
-@@ -3355,7 +3607,7 @@
+@@ -3355,7 +3607,7 @@ do
  	# certainly right.
  	break;;
      *.* )
@@ -6673,7 +6635,7 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3374,84 +3626,42 @@
+@@ -3374,84 +3626,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
  else
    ac_file=''
  fi
@@ -6779,7 +6741,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
-@@ -3466,32 +3676,83 @@
+@@ -3466,32 +3676,83 @@ for ac_file in conftest.exe conftest con
    esac
  done
  else
@@ -6879,7 +6841,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3503,17 +3764,17 @@
+@@ -3503,17 +3764,17 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -6902,7 +6864,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3526,31 +3787,23 @@
+@@ -3526,31 +3787,23 @@ else
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6941,7 +6903,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3564,37 +3817,16 @@
+@@ -3564,37 +3817,16 @@ main ()
    return 0;
  }
  _ACEOF
@@ -6982,7 +6944,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3603,20 +3835,16 @@
+@@ -3603,20 +3835,16 @@ else
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -7006,7 +6968,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3627,35 +3855,11 @@
+@@ -3627,35 +3855,11 @@ main ()
    return 0;
  }
  _ACEOF
@@ -7045,7 +7007,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3666,36 +3870,12 @@
+@@ -3666,36 +3870,12 @@ main ()
    return 0;
  }
  _ACEOF
@@ -7086,7 +7048,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3706,42 +3886,17 @@
+@@ -3706,42 +3886,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -7131,7 +7093,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3758,18 +3913,14 @@
+@@ -3758,18 +3913,14 @@ else
      CFLAGS=
    fi
  fi
@@ -7153,7 +7115,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3826,32 +3977,9 @@
+@@ -3826,32 +3977,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -7187,7 +7149,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -3862,17 +3990,19 @@
+@@ -3862,17 +3990,19 @@ fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -7210,7 +7172,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3882,9 +4012,9 @@
+@@ -3882,9 +4012,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -7222,7 +7184,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3992,7 +4122,7 @@
+@@ -3992,7 +4122,7 @@ else
  fi
  
  fi
@@ -7231,7 +7193,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -4012,35 +4142,31 @@
+@@ -4012,35 +4142,31 @@ fi
  
  case "$am__api_version" in
      1.01234)
@@ -7273,7 +7235,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -4053,14 +4179,14 @@
+@@ -4053,14 +4179,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7291,7 +7253,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4068,19 +4194,19 @@
+@@ -4068,19 +4194,19 @@ esac
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -7315,7 +7277,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -4093,14 +4219,14 @@
+@@ -4093,14 +4219,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7333,7 +7295,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4108,19 +4234,19 @@
+@@ -4108,19 +4234,19 @@ esac
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -7357,7 +7319,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -4133,14 +4259,14 @@
+@@ -4133,14 +4259,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7375,7 +7337,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4148,18 +4274,16 @@
+@@ -4148,18 +4274,16 @@ esac
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -7397,7 +7359,7 @@
  fi
  
    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4281,9 +4405,9 @@
+@@ -4281,9 +4405,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
  # Check the gettext tools to make sure they are GNU
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -7409,7 +7371,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -4296,14 +4420,14 @@
+@@ -4296,14 +4420,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7427,7 +7389,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4311,19 +4435,19 @@
+@@ -4311,19 +4435,19 @@ esac
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -7451,7 +7413,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -4336,14 +4460,14 @@
+@@ -4336,14 +4460,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7469,7 +7431,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4351,19 +4475,19 @@
+@@ -4351,19 +4475,19 @@ esac
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -7493,7 +7455,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -4376,14 +4500,14 @@
+@@ -4376,14 +4500,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7511,7 +7473,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4391,19 +4515,19 @@
+@@ -4391,19 +4515,19 @@ esac
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -7535,7 +7497,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -4416,14 +4540,14 @@
+@@ -4416,14 +4540,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7553,7 +7515,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4432,33 +4556,29 @@
+@@ -4432,33 +4556,29 @@ esac
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -7593,7 +7555,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -4471,14 +4591,14 @@
+@@ -4471,14 +4591,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7611,7 +7573,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -4486,41 +4606,35 @@
+@@ -4486,41 +4606,35 @@ esac
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -7662,7 +7624,7 @@
     fi
  fi
  
-@@ -4530,11 +4644,7 @@
+@@ -4530,11 +4644,7 @@ fi
  # Set DATADIRNAME correctly if it is not set yet
  # (copied from glib-gettext.m4)
  if test -z "$DATADIRNAME"; then
@@ -7675,7 +7637,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -4546,61 +4656,41 @@
+@@ -4546,61 +4656,41 @@ extern int _nl_msg_cat_cntr;
    return 0;
  }
  _ACEOF
@@ -7765,7 +7727,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -4608,104 +4698,11 @@
+@@ -4608,104 +4698,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -7872,7 +7834,7 @@
    ;
    return 0;
  }
-@@ -4717,54 +4714,27 @@
+@@ -4717,54 +4714,27 @@ for ac_lib in '' cposix; do
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -7935,7 +7897,7 @@
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -4777,9 +4747,9 @@
+@@ -4777,9 +4747,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
@@ -7947,7 +7909,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4790,24 +4760,24 @@
+@@ -4790,24 +4760,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -7977,7 +7939,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4817,9 +4787,9 @@
+@@ -4817,9 +4787,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
@@ -7989,7 +7951,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -4830,24 +4800,24 @@
+@@ -4830,24 +4800,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8019,7 +7981,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4856,7 +4826,7 @@
+@@ -4856,7 +4826,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8028,7 +7990,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -4870,9 +4840,9 @@
+@@ -4870,9 +4840,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
@@ -8040,7 +8002,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4883,24 +4853,24 @@
+@@ -4883,24 +4853,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8070,7 +8032,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4910,9 +4880,9 @@
+@@ -4910,9 +4880,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
@@ -8082,7 +8044,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4924,18 +4894,18 @@
+@@ -4924,18 +4894,18 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8104,7 +8066,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -4954,10 +4924,10 @@
+@@ -4954,10 +4924,10 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -8117,7 +8079,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -4969,9 +4939,9 @@
+@@ -4969,9 +4939,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
@@ -8129,7 +8091,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4982,24 +4952,24 @@
+@@ -4982,24 +4952,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8159,7 +8121,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5013,9 +4983,9 @@
+@@ -5013,9 +4983,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
@@ -8171,7 +8133,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -5026,24 +4996,24 @@
+@@ -5026,24 +4996,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8201,7 +8163,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -5056,7 +5026,7 @@
+@@ -5056,7 +5026,7 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8210,7 +8172,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -5067,62 +5037,42 @@
+@@ -5067,62 +5037,42 @@ fi
  fi
  
  
@@ -8295,7 +8257,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5136,37 +5086,16 @@
+@@ -5136,37 +5086,16 @@ main ()
    return 0;
  }
  _ACEOF
@@ -8336,7 +8298,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -5175,20 +5104,16 @@
+@@ -5175,20 +5104,16 @@ else
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -8360,7 +8322,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5199,35 +5124,11 @@
+@@ -5199,35 +5124,11 @@ main ()
    return 0;
  }
  _ACEOF
@@ -8399,7 +8361,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5238,36 +5139,12 @@
+@@ -5238,36 +5139,12 @@ main ()
    return 0;
  }
  _ACEOF
@@ -8440,7 +8402,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5278,42 +5155,17 @@
+@@ -5278,42 +5155,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -8485,7 +8447,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -5330,18 +5182,14 @@
+@@ -5330,18 +5182,14 @@ else
      CFLAGS=
    fi
  fi
@@ -8507,7 +8469,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -5398,32 +5246,9 @@
+@@ -5398,32 +5246,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -8541,7 +8503,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -5434,17 +5259,19 @@
+@@ -5434,17 +5259,19 @@ fi
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -8564,7 +8526,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5454,9 +5281,9 @@
+@@ -5454,9 +5281,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -8576,7 +8538,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5564,7 +5391,7 @@
+@@ -5564,7 +5391,7 @@ else
  fi
  
  fi
@@ -8585,7 +8547,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -5584,14 +5411,14 @@
+@@ -5584,14 +5411,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
@@ -8602,7 +8564,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -5606,11 +5433,7 @@
+@@ -5606,11 +5433,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.
@@ -8615,7 +8577,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -5619,78 +5442,34 @@
+@@ -5619,78 +5442,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -8699,7 +8661,7 @@
    break
  fi
  
-@@ -5702,7 +5481,7 @@
+@@ -5702,7 +5481,7 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -8708,7 +8670,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -5713,11 +5492,7 @@
+@@ -5713,11 +5492,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.
@@ -8721,7 +8683,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -5726,87 +5501,40 @@
+@@ -5726,87 +5501,40 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
@@ -8818,7 +8780,7 @@
  fi
  
  ac_ext=c
-@@ -5816,9 +5544,9 @@
+@@ -5816,9 +5544,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -8830,7 +8792,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -5829,7 +5557,7 @@
+@@ -5829,7 +5557,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8839,7 +8801,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
-@@ -5849,7 +5577,7 @@
+@@ -5849,7 +5577,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
@@ -8848,7 +8810,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"
-@@ -5864,26 +5592,24 @@
+@@ -5864,26 +5592,24 @@ esac
        $ac_path_GREP_found && break 3
      done
    done
@@ -8880,7 +8842,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5897,7 +5623,7 @@
+@@ -5897,7 +5623,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8889,7 +8851,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
-@@ -5917,7 +5643,7 @@
+@@ -5917,7 +5643,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
@@ -8898,7 +8860,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"
-@@ -5932,12 +5658,10 @@
+@@ -5932,12 +5658,10 @@ esac
        $ac_path_EGREP_found && break 3
      done
    done
@@ -8913,7 +8875,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -5945,21 +5669,17 @@
+@@ -5945,21 +5669,17 @@ fi
  
     fi
  fi
@@ -8939,7 +8901,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -5974,48 +5694,23 @@
+@@ -5974,48 +5694,23 @@ main ()
    return 0;
  }
  _ACEOF
@@ -8993,7 +8955,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -6025,18 +5720,14 @@
+@@ -6025,18 +5720,14 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -9015,7 +8977,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -6046,14 +5737,10 @@
+@@ -6046,14 +5737,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.
@@ -9032,7 +8994,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -6080,85 +5767,48 @@
+@@ -6080,85 +5767,48 @@ main ()
    return 0;
  }
  _ACEOF
@@ -9132,7 +9094,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -6174,28 +5824,24 @@
+@@ -6174,28 +5824,24 @@ IFS=$ac_save_IFS
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -9166,7 +9128,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -6218,9 +5864,9 @@
+@@ -6218,9 +5864,9 @@ case $host in
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -9178,7 +9140,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AS"; then
-@@ -6231,24 +5877,24 @@
+@@ -6231,24 +5877,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9208,7 +9170,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6258,9 +5904,9 @@
+@@ -6258,9 +5904,9 @@ if test -z "$ac_cv_prog_AS"; then
    ac_ct_AS=$AS
    # Extract the first word of "as", so it can be a program name with args.
  set dummy as; ac_word=$2
@@ -9220,7 +9182,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AS"; then
-@@ -6271,24 +5917,24 @@
+@@ -6271,24 +5917,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9250,7 +9212,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6297,7 +5943,7 @@
+@@ -6297,7 +5943,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9259,7 +9221,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6310,9 +5956,9 @@
+@@ -6310,9 +5956,9 @@ fi
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -9271,7 +9233,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLTOOL"; then
-@@ -6323,24 +5969,24 @@
+@@ -6323,24 +5969,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9301,7 +9263,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6350,9 +5996,9 @@
+@@ -6350,9 +5996,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
    ac_ct_DLLTOOL=$DLLTOOL
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
@@ -9313,7 +9275,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DLLTOOL"; then
-@@ -6363,24 +6009,24 @@
+@@ -6363,24 +6009,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9343,7 +9305,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6389,7 +6035,7 @@
+@@ -6389,7 +6035,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9352,7 +9314,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6402,9 +6048,9 @@
+@@ -6402,9 +6048,9 @@ fi
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9364,7 +9326,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -6415,24 +6061,24 @@
+@@ -6415,24 +6061,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9394,7 +9356,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6442,9 +6088,9 @@
+@@ -6442,9 +6088,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -9406,7 +9368,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -6455,24 +6101,24 @@
+@@ -6455,24 +6101,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9436,7 +9398,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6481,7 +6127,7 @@
+@@ -6481,7 +6127,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9445,7 +9407,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6516,14 +6162,14 @@
+@@ -6516,14 +6162,14 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
  
  case `pwd` in
    *\ * | *\	*)
@@ -9463,7 +9425,7 @@
  
  
  
-@@ -6539,9 +6185,9 @@
+@@ -6539,9 +6185,9 @@ macro_revision='1.3012'
  
  ltmain="$ac_aux_dir/ltmain.sh"
  
@@ -9475,7 +9437,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6549,7 +6195,7 @@
+@@ -6549,7 +6195,7 @@ else
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -9484,7 +9446,7 @@
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6558,7 +6204,7 @@
+@@ -6558,7 +6204,7 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9493,7 +9455,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6578,7 +6224,7 @@
+@@ -6578,7 +6224,7 @@ case `"$ac_path_SED" --version 2>&1` in
      $as_echo '' >> "conftest.nl"
      "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9502,7 +9464,7 @@
      if test $ac_count -gt ${ac_path_SED_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_SED="$ac_path_SED"
-@@ -6593,19 +6239,17 @@
+@@ -6593,19 +6239,17 @@ esac
        $ac_path_SED_found && break 3
      done
    done
@@ -9525,7 +9487,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -6623,9 +6267,9 @@
+@@ -6623,9 +6267,9 @@ Xsed="$SED -e 1s/^X//"
  
  
  
@@ -9537,7 +9499,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6639,7 +6283,7 @@
+@@ -6639,7 +6283,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9546,7 +9508,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6659,7 +6303,7 @@
+@@ -6659,7 +6303,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
      $as_echo 'FGREP' >> "conftest.nl"
      "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9555,7 +9517,7 @@
      if test $ac_count -gt ${ac_path_FGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6674,12 +6318,10 @@
+@@ -6674,12 +6318,10 @@ esac
        $ac_path_FGREP_found && break 3
      done
    done
@@ -9570,7 +9532,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -6687,7 +6329,7 @@
+@@ -6687,7 +6329,7 @@ fi
  
     fi
  fi
@@ -9579,7 +9541,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -6713,7 +6355,7 @@
+@@ -6713,7 +6355,7 @@ test -z "$GREP" && GREP=grep
  
  
  # Check whether --with-gnu-ld was given.
@@ -9588,7 +9550,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -6722,7 +6364,7 @@
+@@ -6722,7 +6364,7 @@ fi
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -9597,7 +9559,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -6752,13 +6394,13 @@
+@@ -6752,13 +6394,13 @@ $as_echo_n "checking for ld used by $CC.
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -9614,7 +9576,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -6789,18 +6431,16 @@
+@@ -6789,18 +6431,16 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -9638,7 +9600,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6813,7 +6453,7 @@
+@@ -6813,7 +6453,7 @@ case `$LD -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -9647,7 +9609,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -6825,9 +6465,9 @@
+@@ -6825,9 +6465,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
  
@@ -9659,7 +9621,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -6874,7 +6514,7 @@
+@@ -6874,7 +6514,7 @@ else
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -9668,7 +9630,7 @@
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
-@@ -6885,9 +6525,9 @@
+@@ -6885,9 +6525,9 @@ else
    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
@@ -9680,7 +9642,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -6898,24 +6538,24 @@
+@@ -6898,24 +6538,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9710,7 +9672,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6929,9 +6569,9 @@
+@@ -6929,9 +6569,9 @@ if test -z "$DUMPBIN"; 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
@@ -9722,7 +9684,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -6942,24 +6582,24 @@
+@@ -6942,24 +6582,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9752,7 +9714,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6972,7 +6612,7 @@
+@@ -6972,7 +6612,7 @@ done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9761,7 +9723,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6992,44 +6632,44 @@
+@@ -6992,44 +6632,44 @@ test -z "$NM" && NM=nm
  
  
  
@@ -9817,7 +9779,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -7147,10 +6787,10 @@
+@@ -7147,10 +6787,10 @@ else
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9830,7 +9792,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7164,7 +6804,7 @@
+@@ -7164,7 +6804,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -9839,7 +9801,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -7174,17 +6814,17 @@
+@@ -7174,17 +6814,17 @@ xsi_shell=no
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -9860,7 +9822,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -7219,14 +6859,14 @@
+@@ -7219,14 +6859,14 @@ esac
  
  
  
@@ -9878,7 +9840,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -7255,9 +6895,9 @@
+@@ -7255,9 +6895,9 @@ esac
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9890,7 +9852,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -7268,24 +6908,24 @@
+@@ -7268,24 +6908,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9920,7 +9882,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7295,9 +6935,9 @@
+@@ -7295,9 +6935,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -9932,7 +9894,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -7308,24 +6948,24 @@
+@@ -7308,24 +6948,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9962,7 +9924,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7334,7 +6974,7 @@
+@@ -7334,7 +6974,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9971,7 +9933,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7351,9 +6991,9 @@
+@@ -7351,9 +6991,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
  
  
  
@@ -9983,7 +9945,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7468,11 +7108,11 @@
+@@ -7468,11 +7108,11 @@ irix5* | irix6* | nonstopux*)
    ;;
  
  # This must be Linux ELF.
@@ -9997,7 +9959,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7547,7 +7187,7 @@
+@@ -7547,7 +7187,7 @@ tpf*)
  esac
  
  fi
@@ -10006,7 +9968,7 @@
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7567,9 +7207,9 @@
+@@ -7567,9 +7207,9 @@ test -z "$deplibs_check_method" && depli
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -10018,7 +9980,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -7580,24 +7220,24 @@
+@@ -7580,24 +7220,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10048,7 +10010,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7607,9 +7247,9 @@
+@@ -7607,9 +7247,9 @@ if test -z "$ac_cv_prog_AR"; then
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -10060,7 +10022,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -7620,24 +7260,24 @@
+@@ -7620,24 +7260,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10090,7 +10052,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7646,7 +7286,7 @@
+@@ -7646,7 +7286,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10099,7 +10061,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7672,9 +7312,9 @@
+@@ -7672,9 +7312,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -10111,7 +10073,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -7685,24 +7325,24 @@
+@@ -7685,24 +7325,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10141,7 +10103,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7712,9 +7352,9 @@
+@@ -7712,9 +7352,9 @@ if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -10153,7 +10115,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -7725,24 +7365,24 @@
+@@ -7725,24 +7365,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10183,7 +10145,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7751,7 +7391,7 @@
+@@ -7751,7 +7391,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10192,7 +10154,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7771,9 +7411,9 @@
+@@ -7771,9 +7411,9 @@ test -z "$STRIP" && STRIP=:
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -10204,7 +10166,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -7784,24 +7424,24 @@
+@@ -7784,24 +7424,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10234,7 +10196,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7811,9 +7451,9 @@
+@@ -7811,9 +7451,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -10246,7 +10208,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -7824,24 +7464,24 @@
+@@ -7824,24 +7464,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10276,7 +10238,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7850,7 +7490,7 @@
+@@ -7850,7 +7490,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10285,7 +10247,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7928,9 +7568,9 @@
+@@ -7928,9 +7568,9 @@ compiler=$CC
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10297,7 +10259,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -8046,18 +7686,18 @@
+@@ -8046,18 +7686,18 @@ void nm_test_func(void){}
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -10322,7 +10284,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -8110,11 +7750,11 @@
+@@ -8110,11 +7750,11 @@ _LT_EOF
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -10337,7 +10299,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -8148,10 +7788,10 @@
+@@ -8148,10 +7788,10 @@ 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
@@ -10350,7 +10312,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -8177,7 +7817,7 @@
+@@ -8177,7 +7817,7 @@ fi
  
  
  # Check whether --enable-libtool-lock was given.
@@ -10359,7 +10321,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -8189,11 +7829,11 @@
+@@ -8189,11 +7829,11 @@ case $host in
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -10374,7 +10336,7 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -8207,12 +7847,12 @@
+@@ -8207,12 +7847,12 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -10391,7 +10353,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -8246,11 +7886,11 @@
+@@ -8246,11 +7886,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -10406,7 +10368,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -8299,9 +7939,9 @@
+@@ -8299,9 +7939,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -10418,7 +10380,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -8310,11 +7950,7 @@
+@@ -8310,11 +7950,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -10431,7 +10393,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8325,38 +7961,13 @@
+@@ -8325,38 +7961,13 @@ main ()
    return 0;
  }
  _ACEOF
@@ -10474,7 +10436,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8364,7 +7975,7 @@
+@@ -8364,7 +7975,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -10483,7 +10445,7 @@
  $as_echo "$lt_cv_cc_needs_belf" >&6; }
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8374,11 +7985,11 @@
+@@ -8374,11 +7985,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -10498,7 +10460,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -8404,9 +8015,9 @@
+@@ -8404,9 +8015,9 @@ need_locks="$enable_libtool_lock"
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -10510,7 +10472,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -8417,24 +8028,24 @@
+@@ -8417,24 +8028,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10540,7 +10502,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8444,9 +8055,9 @@
+@@ -8444,9 +8055,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
@@ -10552,7 +10514,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8457,24 +8068,24 @@
+@@ -8457,24 +8068,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10582,7 +10544,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8483,7 +8094,7 @@
+@@ -8483,7 +8094,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10591,7 +10553,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8496,9 +8107,9 @@
+@@ -8496,9 +8107,9 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -10603,7 +10565,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -8509,24 +8120,24 @@
+@@ -8509,24 +8120,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10633,7 +10595,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8536,9 +8147,9 @@
+@@ -8536,9 +8147,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
@@ -10645,7 +10607,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -8549,24 +8160,24 @@
+@@ -8549,24 +8160,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10675,7 +10637,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8575,7 +8186,7 @@
+@@ -8575,7 +8186,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10684,7 +10646,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8588,9 +8199,9 @@
+@@ -8588,9 +8199,9 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10696,7 +10658,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -8601,24 +8212,24 @@
+@@ -8601,24 +8212,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10726,7 +10688,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8628,9 +8239,9 @@
+@@ -8628,9 +8239,9 @@ if test -z "$ac_cv_prog_LIPO"; then
    ac_ct_LIPO=$LIPO
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; ac_word=$2
@@ -10738,7 +10700,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -8641,24 +8252,24 @@
+@@ -8641,24 +8252,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10768,7 +10730,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8667,7 +8278,7 @@
+@@ -8667,7 +8278,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10777,7 +10739,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8680,9 +8291,9 @@
+@@ -8680,9 +8291,9 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10789,7 +10751,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -8693,24 +8304,24 @@
+@@ -8693,24 +8304,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10819,7 +10781,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8720,9 +8331,9 @@
+@@ -8720,9 +8331,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
    ac_ct_OTOOL=$OTOOL
    # Extract the first word of "otool", so it can be a program name with args.
  set dummy otool; ac_word=$2
@@ -10831,7 +10793,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -8733,24 +8344,24 @@
+@@ -8733,24 +8344,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10861,7 +10823,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8759,7 +8370,7 @@
+@@ -8759,7 +8370,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10870,7 +10832,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8772,9 +8383,9 @@
+@@ -8772,9 +8383,9 @@ fi
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10882,7 +10844,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -8785,24 +8396,24 @@
+@@ -8785,24 +8396,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10912,7 +10874,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8812,9 +8423,9 @@
+@@ -8812,9 +8423,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
    ac_ct_OTOOL64=$OTOOL64
    # Extract the first word of "otool64", so it can be a program name with args.
  set dummy otool64; ac_word=$2
@@ -10924,7 +10886,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -8825,24 +8436,24 @@
+@@ -8825,24 +8436,24 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10954,7 +10916,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8851,7 +8462,7 @@
+@@ -8851,7 +8462,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10963,7 +10925,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8887,9 +8498,9 @@
+@@ -8887,9 +8498,9 @@ fi
  
  
  
@@ -10975,7 +10937,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -8914,22 +8525,18 @@
+@@ -8914,22 +8525,18 @@ else
  	rm -f conftest.*
        fi
  fi
@@ -11002,7 +10964,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8940,42 +8547,17 @@
+@@ -8940,42 +8547,17 @@ main ()
    return 0;
  }
  _ACEOF
@@ -11050,7 +11012,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -9013,69 +8595,14 @@
+@@ -9013,69 +8595,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
    esac
  
  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -11126,7 +11088,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -9085,62 +8612,13 @@
+@@ -9085,62 +8612,13 @@ fi
  done
  
  
@@ -11194,7 +11156,7 @@
  _ACEOF
  
  fi
-@@ -9158,7 +8636,7 @@
+@@ -9158,7 +8636,7 @@ done
  
  
              # Check whether --enable-shared was given.
@@ -11203,7 +11165,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -9189,7 +8667,7 @@
+@@ -9189,7 +8667,7 @@ fi
  
  
    # Check whether --enable-static was given.
@@ -11212,7 +11174,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -9221,7 +8699,7 @@
+@@ -9221,7 +8699,7 @@ fi
  
  
  # Check whether --with-pic was given.
@@ -11221,7 +11183,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -9237,7 +8715,7 @@
+@@ -9237,7 +8715,7 @@ test -z "$pic_mode" && pic_mode=default
  
  
    # Check whether --enable-fast-install was given.
@@ -11230,7 +11192,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -9318,9 +8796,9 @@
+@@ -9318,9 +8796,9 @@ if test -n "${ZSH_VERSION+set}" ; then
     setopt NO_GLOB_SUBST
  fi
  
@@ -11242,7 +11204,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -9333,7 +8811,7 @@
+@@ -9333,7 +8811,7 @@ else
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -11251,7 +11213,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -9426,9 +8904,9 @@
+@@ -9426,9 +8904,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -11263,7 +11225,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9479,10 +8957,10 @@
+@@ -9479,10 +8957,10 @@ fi
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -11276,7 +11238,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9492,9 +8970,9 @@
+@@ -9492,9 +8970,9 @@ fi
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -11288,7 +11250,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9545,10 +9023,10 @@
+@@ -9545,10 +9023,10 @@ fi
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -11301,7 +11263,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9629,9 +9107,9 @@
+@@ -9629,9 +9107,9 @@ lt_prog_compiler_no_builtin_flag=
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -11313,7 +11275,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9647,11 +9125,11 @@
+@@ -9647,11 +9125,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11327,7 +11289,7 @@
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9664,7 +9142,7 @@
+@@ -9664,7 +9142,7 @@ else
     $RM conftest*
  
  fi
@@ -11336,7 +11298,7 @@
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9684,7 +9162,7 @@
+@@ -9684,7 +9162,7 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -11345,7 +11307,7 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -9816,7 +9294,7 @@
+@@ -9816,7 +9294,7 @@ $as_echo_n "checking for $compiler optio
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -11354,7 +11316,7 @@
        case $cc_basename in
        # old Intel for x86_64 which still supported -KPIC.
        ecc*)
-@@ -9956,7 +9434,7 @@
+@@ -9956,7 +9434,7 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -11363,7 +11325,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -9968,9 +9446,9 @@
+@@ -9968,9 +9446,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -11375,7 +11337,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -9986,11 +9464,11 @@
+@@ -9986,11 +9464,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11389,7 +11351,7 @@
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -10003,7 +9481,7 @@
+@@ -10003,7 +9481,7 @@ else
     $RM conftest*
  
  fi
@@ -11398,7 +11360,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10027,9 +9505,9 @@
+@@ -10027,9 +9505,9 @@ fi
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -11410,7 +11372,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -10055,7 +9533,7 @@
+@@ -10055,7 +9533,7 @@ else
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -11419,7 +11381,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10070,9 +9548,9 @@
+@@ -10070,9 +9548,9 @@ fi
  
  
  
@@ -11431,7 +11393,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10091,11 +9569,11 @@
+@@ -10091,11 +9569,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11445,7 +11407,7 @@
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10117,7 +9595,7 @@
+@@ -10117,7 +9595,7 @@ else
     $RM conftest*
  
  fi
@@ -11454,7 +11416,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10125,9 +9603,9 @@
+@@ -10125,9 +9603,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
  
  
  
@@ -11466,7 +11428,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10146,11 +9624,11 @@
+@@ -10146,11 +9624,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
@@ -11480,7 +11442,7 @@
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10172,7 +9650,7 @@
+@@ -10172,7 +9650,7 @@ else
     $RM conftest*
  
  fi
@@ -11489,7 +11451,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10181,7 +9659,7 @@
+@@ -10181,7 +9659,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
@@ -11498,7 +11460,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -10189,10 +9667,10 @@
+@@ -10189,10 +9667,10 @@ $as_echo_n "checking if we can lock with
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -11511,7 +11473,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -10205,7 +9683,7 @@
+@@ -10205,7 +9683,7 @@ fi
  
  
  
@@ -11520,7 +11482,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -10265,6 +9743,9 @@
+@@ -10265,6 +9743,9 @@ $as_echo_n "checking whether the $compil
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -11530,7 +11492,7 @@
    esac
  
    ld_shlibs=yes
-@@ -10286,6 +9767,7 @@
+@@ -10286,6 +9767,7 @@ $as_echo_n "checking whether the $compil
      fi
      supports_anon_versioning=no
      case `$LD -v 2>&1` in
@@ -11538,7 +11500,7 @@
        *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10377,7 +9859,7 @@
+@@ -10377,7 +9859,7 @@ _LT_EOF
        archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -11547,7 +11509,7 @@
        tmp_diet=no
        if test "$host_os" = linux-dietlibc; then
  	case $cc_basename in
-@@ -10447,7 +9929,7 @@
+@@ -10447,7 +9929,7 @@ _LT_EOF
        fi
        ;;
  
@@ -11556,7 +11518,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -10622,6 +10104,7 @@
+@@ -10622,6 +10104,7 @@ _LT_EOF
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -11564,7 +11526,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10647,11 +10130,7 @@
+@@ -10647,11 +10130,7 @@ _LT_EOF
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -11577,7 +11539,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10662,27 +10141,7 @@
+@@ -10662,27 +10141,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -11606,7 +11568,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10696,16 +10155,9 @@
+@@ -10696,16 +10155,9 @@ aix_libpath=`dump -H conftest$ac_exeext
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -11625,7 +11587,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10718,11 +10170,7 @@
+@@ -10718,11 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -11638,7 +11600,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10733,27 +10181,7 @@
+@@ -10733,27 +10181,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -11667,7 +11629,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10767,16 +10195,9 @@
+@@ -10767,16 +10195,9 @@ aix_libpath=`dump -H conftest$ac_exeext
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -11686,7 +11648,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10988,42 +10409,16 @@
+@@ -10988,42 +10409,16 @@ if test -z "$aix_libpath"; then aix_libp
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11734,7 +11696,7 @@
          LDFLAGS="$save_LDFLAGS"
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11036,7 +10431,7 @@
+@@ -11036,7 +10431,7 @@ rm -f core conftest.err conftest.$ac_obj
        link_all_deplibs=yes
        ;;
  
@@ -11743,7 +11705,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11279,7 +10674,7 @@
+@@ -11279,7 +10674,7 @@ rm -f core conftest.err conftest.$ac_obj
      fi
    fi
  
@@ -11752,7 +11714,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -11316,16 +10711,16 @@
+@@ -11316,16 +10711,16 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -11773,7 +11735,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -11339,11 +10734,11 @@
+@@ -11339,11 +10734,11 @@ $as_echo_n "checking whether -lc should
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -11788,7 +11750,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -11354,7 +10749,7 @@
+@@ -11354,7 +10749,7 @@ $as_echo_n "checking whether -lc should
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -11797,7 +11759,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -11518,7 +10913,7 @@
+@@ -11518,7 +10913,7 @@ esac
  
  
  
@@ -11806,7 +11768,7 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -11926,7 +11321,7 @@
+@@ -11926,7 +11321,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be Linux ELF.
@@ -11815,7 +11777,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -11940,11 +11335,7 @@
+@@ -11940,11 +11335,7 @@ linux* | k*bsd*-gnu)
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11828,7 +11790,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11955,41 +11346,13 @@
+@@ -11955,41 +11346,13 @@ main ()
    return 0;
  }
  _ACEOF
@@ -11874,7 +11836,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -12013,6 +11376,18 @@
+@@ -12013,6 +11376,18 @@ rm -f core conftest.err conftest.$ac_obj
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -11893,7 +11855,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -12201,7 +11576,7 @@
+@@ -12201,7 +11576,7 @@ uts4*)
    dynamic_linker=no
    ;;
  esac
@@ -11902,7 +11864,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -12303,7 +11678,7 @@
+@@ -12303,7 +11678,7 @@ fi
  
  
  
@@ -11911,7 +11873,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12328,7 +11703,7 @@
+@@ -12328,7 +11703,7 @@ else
    # directories.
    hardcode_action=unsupported
  fi
@@ -11920,7 +11882,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -12373,18 +11748,14 @@
+@@ -12373,18 +11748,14 @@ else
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -11942,7 +11904,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12402,43 +11773,18 @@
+@@ -12402,43 +11773,18 @@ return dlopen ();
    return 0;
  }
  _ACEOF
@@ -11992,7 +11954,7 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -12451,106 +11797,18 @@
+@@ -12451,106 +11797,18 @@ fi
      ;;
  
    *)
@@ -12104,7 +12066,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12568,145 +11826,32 @@
+@@ -12568,145 +11826,32 @@ return shl_load ();
    return 0;
  }
  _ACEOF
@@ -12261,7 +12223,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12724,57 +11869,28 @@
+@@ -12724,57 +11869,28 @@ return dlopen ();
    return 0;
  }
  _ACEOF
@@ -12328,7 +12290,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12792,57 +11908,28 @@
+@@ -12792,57 +11908,28 @@ return dlopen ();
    return 0;
  }
  _ACEOF
@@ -12395,7 +12357,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12860,43 +11947,18 @@
+@@ -12860,43 +11947,18 @@ return dld_link ();
    return 0;
  }
  _ACEOF
@@ -12445,7 +12407,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -12935,9 +11997,9 @@
+@@ -12935,9 +11997,9 @@ fi
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -12457,7 +12419,7 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -12946,7 +12008,7 @@
+@@ -12946,7 +12008,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
@@ -12466,7 +12428,7 @@
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13005,11 +12067,11 @@
+@@ -13005,11 +12067,11 @@ int main ()
    return status;
  }
  _LT_EOF
@@ -12481,7 +12443,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13026,14 +12088,14 @@
+@@ -13026,14 +12088,14 @@ rm -fr conftest*
  
  
  fi
@@ -12499,7 +12461,7 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -13042,7 +12104,7 @@
+@@ -13042,7 +12104,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
@@ -12508,7 +12470,7 @@
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13101,11 +12163,11 @@
+@@ -13101,11 +12163,11 @@ int main ()
    return status;
  }
  _LT_EOF
@@ -12523,7 +12485,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13122,7 +12184,7 @@
+@@ -13122,7 +12184,7 @@ rm -fr conftest*
  
  
  fi
@@ -12532,7 +12494,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -13161,12 +12223,12 @@
+@@ -13161,12 +12223,12 @@ fi
  
  striplib=
  old_striplib=
@@ -12547,7 +12509,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -13175,15 +12237,15 @@
+@@ -13175,15 +12237,15 @@ else
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -12566,7 +12528,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -13201,12 +12263,12 @@
+@@ -13201,12 +12263,12 @@ fi
  
  
    # Report which library types will actually be built
@@ -12582,7 +12544,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -13227,14 +12289,14 @@
+@@ -13227,14 +12289,14 @@ $as_echo_n "checking whether to build sh
      fi
      ;;
    esac
@@ -12600,7 +12562,7 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -13271,22 +12333,18 @@
+@@ -13271,22 +12333,18 @@ CC="$lt_save_CC"
  
  #AC_PROG_SED available in 2.59b
  if test "x$CC" != xcc; then
@@ -12627,7 +12589,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13302,63 +12360,63 @@
+@@ -13302,63 +12360,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.*
@@ -12716,7 +12678,7 @@
        then
  	# cc works too.
  	:
-@@ -13375,15 +12433,13 @@
+@@ -13375,15 +12433,13 @@ rm -f core conftest*
  
  fi
  if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -12735,7 +12697,7 @@
  
  fi
  
-@@ -13413,9 +12469,9 @@
+@@ -13413,9 +12469,9 @@ fi
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12747,7 +12709,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -13428,14 +12484,14 @@
+@@ -13428,14 +12484,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12765,7 +12727,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13443,10 +12499,10 @@
+@@ -13443,10 +12499,10 @@ esac
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -12778,7 +12740,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -13460,20 +12516,18 @@
+@@ -13460,20 +12516,18 @@ test -n "$PYTHON" || PYTHON=":"
  
  
    if test "$PYTHON" = :; then
@@ -12803,7 +12765,7 @@
  $as_echo "$am_cv_python_version" >&6; }
    PYTHON_VERSION=$am_cv_python_version
  
-@@ -13485,23 +12539,23 @@
+@@ -13485,23 +12539,23 @@ $as_echo "$am_cv_python_version" >&6; }
  
  
  
@@ -12832,7 +12794,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test "x$prefix" = xNONE
-@@ -13517,10 +12571,18 @@
+@@ -13517,10 +12571,18 @@ else
         am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
         am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
         ;;
@@ -12852,7 +12814,7 @@
  $as_echo "$am_cv_python_pythondir" >&6; }
    pythondir=$am_cv_python_pythondir
  
-@@ -13529,9 +12591,9 @@
+@@ -13529,9 +12591,9 @@ $as_echo "$am_cv_python_pythondir" >&6;
    pkgpythondir=\${pythondir}/$PACKAGE
  
  
@@ -12864,7 +12826,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test "x$exec_prefix" = xNONE
-@@ -13547,10 +12609,18 @@
+@@ -13547,10 +12609,18 @@ else
         am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
         am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
         ;;
@@ -12884,7 +12846,7 @@
  $as_echo "$am_cv_python_pyexecdir" >&6; }
    pyexecdir=$am_cv_python_pyexecdir
  
-@@ -13565,9 +12635,9 @@
+@@ -13565,9 +12635,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
  
  # Extract the first word of "glib-genmarshal", so it can be a program name with args.
  set dummy glib-genmarshal; ac_word=$2
@@ -12896,7 +12858,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_GENMARSHAL in
-@@ -13580,14 +12650,14 @@
+@@ -13580,14 +12650,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12914,7 +12876,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13595,19 +12665,19 @@
+@@ -13595,19 +12665,19 @@ esac
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -12938,7 +12900,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -13620,14 +12690,14 @@
+@@ -13620,14 +12690,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12956,7 +12918,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13635,10 +12705,10 @@
+@@ -13635,10 +12705,10 @@ esac
  fi
  GCONFTOOL=$ac_cv_path_GCONFTOOL
  if test -n "$GCONFTOOL"; then
@@ -12969,7 +12931,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -13647,7 +12717,7 @@
+@@ -13647,7 +12717,7 @@ fi
  
  
      # Check whether --enable-compile-warnings was given.
@@ -12978,7 +12940,7 @@
    enableval=$enable_compile_warnings;
  else
    enable_compile_warnings="maximum"
-@@ -13678,13 +12748,9 @@
+@@ -13678,13 +12748,9 @@ fi
  	for option in -Wno-sign-compare; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -12994,7 +12956,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -13695,35 +12761,14 @@
+@@ -13695,35 +12761,14 @@ main ()
    return 0;
  }
  _ACEOF
@@ -13033,7 +12995,7 @@
  $as_echo "$has_option" >&6; }
  		if test $has_option = yes; then
  		  warning_flags="$warning_flags $option"
-@@ -13737,26 +12782,24 @@
+@@ -13737,26 +12782,24 @@ $as_echo "$has_option" >&6; }
  	fi
  	;;
      *)
@@ -13065,7 +13027,7 @@
  $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
      complCFLAGS=
      if test "x$enable_iso_c" != "xno"; then
-@@ -13771,7 +12814,7 @@
+@@ -13771,7 +12814,7 @@ $as_echo_n "checking what language compl
  	esac
  	fi
      fi
@@ -13074,7 +13036,7 @@
  $as_echo "$complCFLAGS" >&6; }
  
      WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13779,7 +12822,7 @@
+@@ -13779,7 +12822,7 @@ $as_echo "$complCFLAGS" >&6; }
  
  
  # Check whether --enable-deprecations was given.
@@ -13083,7 +13045,7 @@
    enableval=$enable_deprecations;
  else
    enable_deprecations=no
-@@ -13791,253 +12834,24 @@
+@@ -13791,253 +12834,24 @@ if test "x$enable_deprecations" = "xyes"
  
  fi
  
@@ -13346,7 +13308,7 @@
  _ACEOF
  
  fi
-@@ -14068,9 +12882,9 @@
+@@ -14068,9 +12882,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -13358,7 +13320,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -14083,14 +12897,14 @@
+@@ -14083,14 +12897,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13376,7 +13338,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14098,10 +12912,10 @@
+@@ -14098,10 +12912,10 @@ esac
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -13389,7 +13351,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14111,9 +12925,9 @@
+@@ -14111,9 +12925,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -13401,7 +13363,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -14126,14 +12940,14 @@
+@@ -14126,14 +12940,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13419,7 +13381,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -14141,10 +12955,10 @@
+@@ -14141,10 +12955,10 @@ esac
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -13432,7 +13394,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -14153,7 +12967,7 @@
+@@ -14153,7 +12967,7 @@ fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -13441,7 +13403,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -14166,13 +12980,13 @@
+@@ -14166,13 +12980,13 @@ fi
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -13458,7 +13420,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -14180,40 +12994,44 @@
+@@ -14180,40 +12994,44 @@ $as_echo "no" >&6; }
  fi
  
  pkg_failed=no
@@ -13522,7 +13484,7 @@
  fi
  
  
-@@ -14226,25 +13044,14 @@
+@@ -14226,25 +13044,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13551,7 +13513,7 @@
  
  $EGG_SMCLIENT_PKG_ERRORS
  
-@@ -14254,22 +13061,11 @@
+@@ -14254,22 +13061,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
  and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -13577,7 +13539,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14278,52 +13074,55 @@
+@@ -14278,52 +13074,55 @@ and EGG_SMCLIENT_LIBS to avoid the need
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13655,7 +13617,7 @@
  fi
  
  
-@@ -14336,25 +13135,14 @@
+@@ -14336,25 +13135,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13684,7 +13646,7 @@
  
  $PANEL_PKG_ERRORS
  
-@@ -14364,22 +13152,11 @@
+@@ -14364,22 +13152,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables PANEL_CFLAGS
  and PANEL_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -13710,7 +13672,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14388,12 +13165,11 @@
+@@ -14388,12 +13165,11 @@ and PANEL_LIBS to avoid the need to call
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13725,7 +13687,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14402,40 +13178,44 @@
+@@ -14402,40 +13178,44 @@ fi
  
  
  pkg_failed=no
@@ -13796,7 +13758,7 @@
  fi
  
  
-@@ -14448,64 +13228,41 @@
+@@ -14448,64 +13228,41 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -13877,7 +13839,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14514,40 +13271,44 @@
+@@ -14514,40 +13271,44 @@ fi
  
  
  pkg_failed=no
@@ -13946,7 +13908,7 @@
  fi
  
  
-@@ -14560,27 +13321,109 @@
+@@ -14560,27 +13321,109 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14067,7 +14029,7 @@
  
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
  installed software in a non-standard prefix.
-@@ -14588,22 +13431,11 @@
+@@ -14588,22 +13431,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables FISH_CFLAGS
  and FISH_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -14093,7 +14055,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14612,12 +13444,11 @@
+@@ -14612,12 +13444,11 @@ and FISH_LIBS to avoid the need to call
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14108,7 +14070,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14626,40 +13457,44 @@
+@@ -14626,40 +13457,44 @@ fi
  
  
  pkg_failed=no
@@ -14172,7 +14134,7 @@
  fi
  
  
-@@ -14672,25 +13507,14 @@
+@@ -14672,25 +13507,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14201,7 +14163,7 @@
  
  $NOTIFICATION_AREA_PKG_ERRORS
  
-@@ -14700,22 +13524,11 @@
+@@ -14700,22 +13524,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS
  and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -14227,7 +14189,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14724,12 +13537,11 @@
+@@ -14724,12 +13537,11 @@ and NOTIFICATION_AREA_LIBS to avoid the
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14242,7 +14204,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -14738,40 +13550,44 @@
+@@ -14738,40 +13550,44 @@ fi
  
  
  pkg_failed=no
@@ -14306,7 +14268,7 @@
  fi
  
  
-@@ -14784,25 +13600,14 @@
+@@ -14784,25 +13600,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14335,7 +14297,7 @@
  
  $WNCKLET_PKG_ERRORS
  
-@@ -14812,22 +13617,11 @@
+@@ -14812,22 +13617,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables WNCKLET_CFLAGS
  and WNCKLET_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -14361,7 +14323,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -14836,265 +13630,35 @@
+@@ -14836,265 +13630,35 @@ and WNCKLET_LIBS to avoid the need to ca
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14637,7 +14599,7 @@
  _ACEOF
  
  fi
-@@ -15102,7 +13666,7 @@
+@@ -15102,7 +13666,7 @@ done
  
  
  # Check whether --enable-eds was given.
@@ -14646,7 +14608,7 @@
    enableval=$enable_eds;
  else
    enable_eds=auto
-@@ -15115,25 +13679,23 @@
+@@ -15115,25 +13679,23 @@ if test "x$enable_eds" = "xyes"; then
    CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
  else
    if test "x$enable_eds" != "xno"; then
@@ -14676,7 +14638,7 @@
  
  fi
   if test -n "$LIBECAL_REQUIREMENT"; then
-@@ -15148,40 +13710,44 @@
+@@ -15148,40 +13710,44 @@ fi
  
  
  pkg_failed=no
@@ -14740,7 +14702,7 @@
  fi
  
  
-@@ -15194,25 +13760,14 @@
+@@ -15194,25 +13760,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14769,7 +14731,7 @@
  
  $CLOCK_PKG_ERRORS
  
-@@ -15222,22 +13777,11 @@
+@@ -15222,22 +13777,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables CLOCK_CFLAGS
  and CLOCK_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -14795,7 +14757,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -15246,12 +13790,11 @@
+@@ -15246,12 +13790,11 @@ and CLOCK_LIBS to avoid the need to call
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14810,7 +14772,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -15260,40 +13803,44 @@
+@@ -15260,40 +13803,44 @@ fi
  
  
  pkg_failed=no
@@ -14874,7 +14836,7 @@
  fi
  
  
-@@ -15306,25 +13853,14 @@
+@@ -15306,25 +13853,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -14903,7 +14865,7 @@
  
  $CLOCK_MECHANISM_PKG_ERRORS
  
-@@ -15334,22 +13870,11 @@
+@@ -15334,22 +13870,11 @@ installed software in a non-standard pre
  Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
  and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -14929,7 +14891,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -15358,12 +13883,11 @@
+@@ -15358,12 +13883,11 @@ and CLOCK_MECHANISM_LIBS to avoid the ne
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14944,7 +14906,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -15380,7 +13904,7 @@
+@@ -15380,7 +13904,7 @@ NETWORK_MANAGER_REQUIRED=0.6
  POLKIT_CFLAGS=
  POLKIT_LIBS=
  # Check whether --enable-polkit was given.
@@ -14953,7 +14915,7 @@
    enableval=$enable_polkit; enable_polkit=$enableval
  else
    enable_polkit=auto
-@@ -15392,40 +13916,44 @@
+@@ -15392,40 +13916,44 @@ else
    HAVE_POLKIT=no
  
  pkg_failed=no
@@ -15017,7 +14979,7 @@
  fi
  
  
-@@ -15438,14 +13966,14 @@
+@@ -15438,14 +13966,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15035,7 +14997,7 @@
  $as_echo "no" >&6; }
                  HAVE_POLKIT=no
  elif test $pkg_failed = untried; then
-@@ -15453,22 +13981,18 @@
+@@ -15453,22 +13981,18 @@ elif test $pkg_failed = untried; then
  else
  	POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
  	POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
@@ -15061,7 +15023,7 @@
  
    fi
  fi
-@@ -15484,7 +14008,7 @@
+@@ -15484,7 +14008,7 @@ fi
  
  
  # Check whether --enable-network_manager was given.
@@ -15070,7 +15032,7 @@
    enableval=$enable_network_manager; enable_network_manager=$enableval
  else
    enable_network_manager=auto
-@@ -15495,40 +14019,44 @@
+@@ -15495,40 +14019,44 @@ if test "x$enable_network_manager" = "xn
  else
  
  pkg_failed=no
@@ -15134,7 +15096,7 @@
  fi
  
  
-@@ -15541,14 +14069,14 @@
+@@ -15541,14 +14069,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15152,7 +15114,7 @@
  $as_echo "no" >&6; }
                  HAVE_NETWORK_MANAGER=no
  elif test $pkg_failed = untried; then
-@@ -15556,16 +14084,14 @@
+@@ -15556,16 +14084,14 @@ elif test $pkg_failed = untried; then
  else
  	NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
  	NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -15171,7 +15133,7 @@
  
  fi
  
-@@ -15575,7 +14101,7 @@
+@@ -15575,7 +14101,7 @@ PANEL_INPROCESS_ALL=
  PANEL_INPROCESS_APPLETS=
  
  # Check whether --with-in-process-applets was given.
@@ -15180,7 +15142,7 @@
    withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
  		if test $i = "none"; then
  			PANEL_INPROCESS_NONE=1
-@@ -15606,30 +14132,22 @@
+@@ -15606,30 +14132,22 @@ for i in $PANEL_INPROCESS_APPLETS; do
  	if test $i = "clock"; then
  		CLOCK_COMPILE_INPROCESS=1
  
@@ -15215,7 +15177,7 @@
  
  	fi; fi; fi; fi
  done
-@@ -15671,24 +14189,15 @@
+@@ -15671,24 +14189,15 @@ fi
  
  
  # For the run dialog
@@ -15243,7 +15205,7 @@
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -15702,41 +14211,18 @@
+@@ -15702,41 +14211,18 @@ return 0;
    return 0;
  }
  _ACEOF
@@ -15291,7 +15253,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
-@@ -15747,17 +14233,13 @@
+@@ -15747,17 +14233,13 @@ fi
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -15312,7 +15274,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -15782,70 +14264,39 @@
+@@ -15782,70 +14264,39 @@ for ac_lib in '' dir; do
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -15394,7 +15356,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -15870,70 +14321,39 @@
+@@ -15870,70 +14321,39 @@ for ac_lib in '' x; do
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -15476,7 +15438,7 @@
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -15960,60 +14380,33 @@
+@@ -15960,60 +14380,33 @@ struct dirent dp; dp.d_type = 0;
    return 0;
  }
  _ACEOF
@@ -15545,7 +15507,7 @@
    withval=$with_x;
  fi
  
-@@ -16023,10 +14416,8 @@
+@@ -16023,10 +14416,8 @@ if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -15558,7 +15520,7 @@
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
-@@ -16074,21 +14465,25 @@
+@@ -16074,21 +14465,25 @@ fi
  # Check X11 before X11Rn because it is often a symlink to the current release.
  ac_x_header_dirs='
  /usr/X11/include
@@ -15584,7 +15546,7 @@
  /usr/local/include/X11R6
  /usr/local/include/X11R5
  /usr/local/include/X11R4
-@@ -16110,37 +14505,14 @@
+@@ -16110,37 +14505,14 @@ ac_x_header_dirs='
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Xlib.h.
    # First, try using that file with no special directory specified.
@@ -15624,7 +15586,7 @@
    for ac_dir in $ac_x_header_dirs; do
    if test -r "$ac_dir/X11/Xlib.h"; then
      ac_x_includes=$ac_dir
-@@ -16148,7 +14520,6 @@
+@@ -16148,7 +14520,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
    fi
  done
  fi
@@ -15632,7 +15594,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
-@@ -16158,11 +14529,7 @@
+@@ -16158,11 +14529,7 @@ if test "$ac_x_libraries" = no; then
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
    LIBS="-lX11 $LIBS"
@@ -15645,7 +15607,7 @@
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  int
-@@ -16173,35 +14540,12 @@
+@@ -16173,35 +14540,12 @@ XrmInitialize ()
    return 0;
  }
  _ACEOF
@@ -15683,7 +15645,7 @@
  for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
  do
    # Don't even attempt the hair of trying to link an X program!
-@@ -16213,10 +14557,8 @@
+@@ -16213,10 +14557,8 @@ do
    done
  done
  fi
@@ -15696,7 +15658,7 @@
  fi # $ac_x_libraries = no
  
  case $ac_x_includes,$ac_x_libraries in #(
-@@ -16237,7 +14579,7 @@
+@@ -16237,7 +14579,7 @@ fi
  fi # $with_x != no
  
  if test "$have_x" != yes; then
@@ -15705,7 +15667,7 @@
  $as_echo "$have_x" >&6; }
    no_x=yes
  else
-@@ -16248,46 +14590,50 @@
+@@ -16248,46 +14590,50 @@ else
    ac_cv_have_x="have_x=yes\
  	ac_x_includes='$x_includes'\
  	ac_x_libraries='$x_libraries'"
@@ -15776,7 +15738,7 @@
  fi
  
  
-@@ -16300,14 +14646,14 @@
+@@ -16300,14 +14646,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -15794,7 +15756,7 @@
  $as_echo "no" >&6; }
  
    # pkg-config modules not found (only present since X11R7 aka Xorg); use
-@@ -16315,9 +14661,7 @@
+@@ -16315,9 +14661,7 @@ $as_echo "no" >&6; }
    if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
@@ -15805,7 +15767,7 @@
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
-@@ -16330,16 +14674,12 @@
+@@ -16330,16 +14674,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 . . . .
@@ -15824,7 +15786,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -16350,40 +14690,13 @@
+@@ -16350,40 +14690,13 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15869,7 +15831,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -16394,46 +14707,19 @@
+@@ -16394,46 +14707,19 @@ main ()
    return 0;
  }
  _ACEOF
@@ -15923,7 +15885,7 @@
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
-@@ -16449,11 +14735,7 @@
+@@ -16449,11 +14735,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"
@@ -15936,7 +15898,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16471,44 +14753,17 @@
+@@ -16471,44 +14753,17 @@ return XOpenDisplay ();
    return 0;
  }
  _ACEOF
@@ -15986,7 +15948,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16526,59 +14781,30 @@
+@@ -16526,59 +14781,30 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -16055,7 +16017,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16596,52 +14822,25 @@
+@@ -16596,52 +14822,25 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -16116,7 +16078,7 @@
      LIBS="$ac_xsave_LIBS"
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -16652,105 +14851,20 @@
+@@ -16652,105 +14851,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.
@@ -16227,7 +16189,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16768,59 +14882,30 @@
+@@ -16768,59 +14882,30 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -16296,7 +16258,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -16838,43 +14923,18 @@
+@@ -16838,43 +14923,18 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -16346,7 +16308,7 @@
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
-@@ -16888,105 +14948,20 @@
+@@ -16888,105 +14948,20 @@ fi
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -16457,7 +16419,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17004,76 +14979,39 @@
+@@ -17004,76 +14979,39 @@ return connect ();
    return 0;
  }
  _ACEOF
@@ -16552,7 +16514,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -17082,13 +15020,6 @@
+@@ -17082,13 +15020,6 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern "C"
  #endif
  char remove ();
@@ -16566,7 +16528,7 @@
  int
  main ()
  {
-@@ -17097,55 +15028,38 @@
+@@ -17097,55 +15028,38 @@ return remove ();
    return 0;
  }
  _ACEOF
@@ -16646,7 +16608,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17154,216 +15068,32 @@
+@@ -17154,216 +15068,32 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -16875,7 +16837,7 @@
  
    # Check for libraries that X11R6 Xt/Xaw programs need.
    ac_save_LDFLAGS=$LDFLAGS
-@@ -17374,18 +15104,14 @@
+@@ -17374,18 +15104,14 @@ fi
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -16897,7 +16859,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17403,43 +15129,18 @@
+@@ -17403,43 +15129,18 @@ return IceConnectionNumber ();
    return 0;
  }
  _ACEOF
@@ -16947,7 +16909,7 @@
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
-@@ -17449,28 +15150,21 @@
+@@ -17449,28 +15150,21 @@ fi
  
    # X not found
    if test x$no_x = xyes ; then
@@ -16980,7 +16942,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17488,43 +15182,18 @@
+@@ -17488,43 +15182,18 @@ return XFree ();
    return 0;
  }
  _ACEOF
@@ -17030,7 +16992,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBX11 1
  _ACEOF
-@@ -17532,24 +15201,17 @@
+@@ -17532,24 +15201,17 @@ _ACEOF
    LIBS="-lX11 $LIBS"
  
  else
@@ -17059,7 +17021,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17567,43 +15229,18 @@
+@@ -17567,43 +15229,18 @@ return XauFileName ();
    return 0;
  }
  _ACEOF
@@ -17109,7 +17071,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBXAU 1
  _ACEOF
-@@ -17611,9 +15248,7 @@
+@@ -17611,9 +15248,7 @@ _ACEOF
    LIBS="-lXau $LIBS"
  
  else
@@ -17120,7 +17082,7 @@
  fi
  
    CFLAGS="$gp_save_cflags"
-@@ -17628,9 +15263,7 @@
+@@ -17628,9 +15263,7 @@ elif test $pkg_failed = untried; then
    if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
@@ -17131,7 +17093,7 @@
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
-@@ -17643,16 +15276,12 @@
+@@ -17643,16 +15276,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 . . . .
@@ -17150,7 +17112,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -17663,40 +15292,13 @@
+@@ -17663,40 +15292,13 @@ main ()
    return 0;
  }
  _ACEOF
@@ -17195,7 +17157,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -17707,46 +15309,19 @@
+@@ -17707,46 +15309,19 @@ main ()
    return 0;
  }
  _ACEOF
@@ -17249,7 +17211,7 @@
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
-@@ -17762,11 +15337,7 @@
+@@ -17762,11 +15337,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"
@@ -17262,7 +17224,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17784,44 +15355,17 @@
+@@ -17784,44 +15355,17 @@ return XOpenDisplay ();
    return 0;
  }
  _ACEOF
@@ -17312,7 +17274,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17839,59 +15383,30 @@
+@@ -17839,59 +15383,30 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -17381,7 +17343,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17909,52 +15424,25 @@
+@@ -17909,52 +15424,25 @@ return dnet_ntoa ();
    return 0;
  }
  _ACEOF
@@ -17442,7 +17404,7 @@
      LIBS="$ac_xsave_LIBS"
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17965,105 +15453,20 @@
+@@ -17965,105 +15453,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.
@@ -17560,7 +17522,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18081,59 +15484,30 @@
+@@ -18081,59 +15484,30 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -17629,7 +17591,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18151,43 +15525,18 @@
+@@ -18151,43 +15525,18 @@ return gethostbyname ();
    return 0;
  }
  _ACEOF
@@ -17679,7 +17641,7 @@
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
-@@ -18201,105 +15550,20 @@
+@@ -18201,105 +15550,20 @@ fi
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -17790,7 +17752,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18317,148 +15581,38 @@
+@@ -18317,148 +15581,38 @@ return connect ();
    return 0;
  }
  _ACEOF
@@ -17950,7 +17912,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18476,76 +15630,39 @@
+@@ -18476,76 +15630,39 @@ return remove ();
    return 0;
  }
  _ACEOF
@@ -18045,7 +18007,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -18554,13 +15671,6 @@
+@@ -18554,13 +15671,6 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern "C"
  #endif
  char shmat ();
@@ -18059,7 +18021,7 @@
  int
  main ()
  {
-@@ -18569,109 +15679,18 @@
+@@ -18569,109 +15679,18 @@ return shmat ();
    return 0;
  }
  _ACEOF
@@ -18175,7 +18137,7 @@
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
-@@ -18687,18 +15706,14 @@
+@@ -18687,18 +15706,14 @@ fi
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -18197,7 +18159,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18716,43 +15731,18 @@
+@@ -18716,43 +15731,18 @@ return IceConnectionNumber ();
    return 0;
  }
  _ACEOF
@@ -18247,7 +18209,7 @@
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
-@@ -18762,28 +15752,21 @@
+@@ -18762,28 +15752,21 @@ fi
  
    # X not found
    if test x$no_x = xyes ; then
@@ -18280,7 +18242,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18801,43 +15784,18 @@
+@@ -18801,43 +15784,18 @@ return XFree ();
    return 0;
  }
  _ACEOF
@@ -18330,7 +18292,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBX11 1
  _ACEOF
-@@ -18845,24 +15803,17 @@
+@@ -18845,24 +15803,17 @@ _ACEOF
    LIBS="-lX11 $LIBS"
  
  else
@@ -18359,7 +18321,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18880,43 +15831,18 @@
+@@ -18880,43 +15831,18 @@ return XauFileName ();
    return 0;
  }
  _ACEOF
@@ -18409,7 +18371,7 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBXAU 1
  _ACEOF
-@@ -18924,9 +15850,7 @@
+@@ -18924,9 +15850,7 @@ _ACEOF
    LIBS="-lXau $LIBS"
  
  else
@@ -18420,7 +18382,7 @@
  fi
  
    CFLAGS="$gp_save_cflags"
-@@ -18937,7 +15861,7 @@
+@@ -18937,7 +15861,7 @@ fi
  else
  	X_CFLAGS=$pkg_cv_X_CFLAGS
  	X_LIBS=$pkg_cv_X_LIBS
@@ -18429,7 +18391,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -18947,9 +15871,7 @@
+@@ -18947,9 +15871,7 @@ fi
  
  if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
  
@@ -18440,7 +18402,7 @@
  
  	have_randr=yes
  else
-@@ -18976,151 +15898,12 @@
+@@ -18976,151 +15898,12 @@ _ACEOF
  
  
  
@@ -18597,7 +18559,7 @@
  _ACEOF
  
  fi
-@@ -19128,16 +15911,12 @@
+@@ -19128,16 +15911,12 @@ fi
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -18617,7 +18579,7 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -19148,46 +15927,19 @@
+@@ -19148,46 +15927,19 @@ return LC_MESSAGES
    return 0;
  }
  _ACEOF
@@ -18670,7 +18632,7 @@
  
      fi
    fi
-@@ -19200,155 +15952,20 @@
+@@ -19200,155 +15952,20 @@ _ACEOF
      XGETTEXT=:
      INTLLIBS=
  
@@ -18831,7 +18793,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -19361,54 +15978,25 @@
+@@ -19361,54 +15978,25 @@ return !ngettext ("","", 1)
    return 0;
  }
  _ACEOF
@@ -18894,7 +18856,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -19421,141 +16009,26 @@
+@@ -19421,141 +16009,26 @@ return !dgettext ("","")
    return 0;
  }
  _ACEOF
@@ -19046,7 +19008,7 @@
  _ACEOF
  
  fi
-@@ -19570,18 +16043,14 @@
+@@ -19570,18 +16043,14 @@ done
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -19068,7 +19030,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19591,63 +16060,34 @@
+@@ -19591,63 +16060,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern "C"
  #endif
  char bindtextdomain ();
@@ -19149,7 +19111,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19665,55 +16105,26 @@
+@@ -19665,55 +16105,26 @@ return ngettext ();
    return 0;
  }
  _ACEOF
@@ -19214,7 +19176,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19731,43 +16142,18 @@
+@@ -19731,43 +16142,18 @@ return dgettext ();
    return 0;
  }
  _ACEOF
@@ -19264,7 +19226,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -19777,22 +16163,18 @@
+@@ -19777,22 +16163,18 @@ fi
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -19292,7 +19254,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19810,55 +16192,26 @@
+@@ -19810,55 +16192,26 @@ return ngettext ();
    return 0;
  }
  _ACEOF
@@ -19357,7 +19319,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19876,43 +16229,18 @@
+@@ -19876,43 +16229,18 @@ return dcgettext ();
    return 0;
  }
  _ACEOF
@@ -19407,7 +19369,7 @@
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
  else
-@@ -19934,102 +16262,12 @@
+@@ -19934,102 +16262,12 @@ fi
            glib_save_LIBS="$LIBS"
            LIBS="$LIBS -lintl $libintl_extra_libs"
            unset ac_cv_func_bind_textdomain_codeset
@@ -19515,7 +19477,7 @@
  _ACEOF
  
  fi
-@@ -20059,15 +16297,13 @@
+@@ -20059,15 +16297,13 @@ done
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -19534,7 +19496,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -20092,118 +16328,28 @@
+@@ -20092,118 +16328,28 @@ esac
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -19661,7 +19623,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -20218,14 +16364,14 @@
+@@ -20218,14 +16364,14 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -19681,7 +19643,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -20233,9 +16379,9 @@
+@@ -20233,9 +16379,9 @@ fi
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -19693,7 +19655,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -20248,14 +16394,14 @@
+@@ -20248,14 +16394,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -19711,7 +19673,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -20264,19 +16410,19 @@
+@@ -20264,19 +16410,19 @@ esac
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -19735,7 +19697,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -20301,144 +16447,33 @@
+@@ -20301,144 +16447,33 @@ esac
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -19896,7 +19858,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -20453,10 +16488,8 @@
+@@ -20453,10 +16488,8 @@ fi
  	    ;;
  	    esac
  fi
@@ -19909,7 +19871,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -20470,9 +16503,7 @@
+@@ -20470,9 +16503,7 @@ fi
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -19920,7 +19882,7 @@
  
      fi
  
-@@ -20480,7 +16511,7 @@
+@@ -20480,7 +16511,7 @@ _ACEOF
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -19929,7 +19891,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -20513,7 +16544,7 @@
+@@ -20513,7 +16544,7 @@ $as_echo "found xgettext program is not
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -19938,7 +19900,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -20538,7 +16569,7 @@
+@@ -20538,7 +16569,7 @@ $as_echo_n "checking for catalogs to be
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -19947,7 +19909,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -20576,9 +16607,9 @@
+@@ -20576,9 +16607,9 @@ $as_echo "$LINGUAS" >&6; }
  
      # Extract the first word of "gtkdoc-check", so it can be a program name with args.
  set dummy gtkdoc-check; ac_word=$2
@@ -19959,7 +19921,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_CHECK in
-@@ -20591,14 +16622,14 @@
+@@ -20591,14 +16622,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -19977,7 +19939,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20606,10 +16637,10 @@
+@@ -20606,10 +16637,10 @@ esac
  fi
  GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
  if test -n "$GTKDOC_CHECK"; then
@@ -19990,7 +19952,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20618,9 +16649,9 @@
+@@ -20618,9 +16649,9 @@ fi
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -20002,7 +19964,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_REBASE in
-@@ -20633,14 +16664,14 @@
+@@ -20633,14 +16664,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -20020,7 +19982,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20648,10 +16679,10 @@
+@@ -20648,10 +16679,10 @@ esac
  fi
  GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
  if test -n "$GTKDOC_REBASE"; then
@@ -20033,7 +19995,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20662,9 +16693,9 @@
+@@ -20662,9 +16693,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
  
    # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
  set dummy gtkdoc-mkpdf; ac_word=$2
@@ -20045,7 +20007,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_MKPDF in
-@@ -20677,14 +16708,14 @@
+@@ -20677,14 +16708,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -20063,7 +20025,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20692,10 +16723,10 @@
+@@ -20692,10 +16723,10 @@ esac
  fi
  GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
  if test -n "$GTKDOC_MKPDF"; then
@@ -20076,7 +20038,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20703,7 +16734,7 @@
+@@ -20703,7 +16734,7 @@ fi
  
  
  # Check whether --with-html-dir was given.
@@ -20085,7 +20047,7 @@
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -20713,7 +16744,7 @@
+@@ -20713,7 +16744,7 @@ fi
  
  
      # Check whether --enable-gtk-doc was given.
@@ -20094,7 +20056,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -20722,33 +16753,31 @@
+@@ -20722,33 +16753,31 @@ fi
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -20136,7 +20098,7 @@
    enableval=$enable_gtk_doc_pdf;
  else
    enable_gtk_doc_pdf=no
-@@ -20806,35 +16835,33 @@
+@@ -20806,35 +16835,33 @@ fi
  
  gdu_cv_version_required=0.3.2
  
@@ -20180,7 +20142,7 @@
    withval=$with_help_dir;
  else
    with_help_dir='${datadir}/gnome/help'
-@@ -20845,7 +16872,7 @@
+@@ -20845,7 +16872,7 @@ HELP_DIR="$with_help_dir"
  
  
  # Check whether --with-omf-dir was given.
@@ -20189,7 +20151,7 @@
    withval=$with_omf_dir;
  else
    with_omf_dir='${datadir}/omf'
-@@ -20856,7 +16883,7 @@
+@@ -20856,7 +16883,7 @@ OMF_DIR="$with_omf_dir"
  
  
  # Check whether --with-help-formats was given.
@@ -20198,7 +20160,7 @@
    withval=$with_help_formats;
  else
    with_help_formats=''
-@@ -20866,7 +16893,7 @@
+@@ -20866,7 +16893,7 @@ DOC_USER_FORMATS="$with_help_formats"
  
  
  # Check whether --enable-scrollkeeper was given.
@@ -20207,7 +20169,7 @@
    enableval=$enable_scrollkeeper;
  else
    enable_scrollkeeper=yes
-@@ -20904,13 +16931,13 @@
+@@ -20904,13 +16931,13 @@ fi
  
  
  # Check whether --with-gconf-source was given.
@@ -20223,7 +20185,7 @@
  $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
  
    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -20919,22 +16946,20 @@
+@@ -20919,22 +16946,20 @@ $as_echo "Using config source $GCONF_SCH
  
  
  # Check whether --with-gconf-schema-file-dir was given.
@@ -20250,7 +20212,7 @@
        esac
  fi
  
-@@ -20952,9 +16977,7 @@
+@@ -20952,9 +16977,7 @@ case $host in
  *-*-solaris*)
  	ostype=solaris
  
@@ -20261,7 +20223,7 @@
  
  	;;
  esac
-@@ -20963,9 +16986,9 @@
+@@ -20963,9 +16986,9 @@ for ac_prog in mawk gawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -20273,7 +20235,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $AWK in
-@@ -20978,14 +17001,14 @@
+@@ -20978,14 +17001,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -20291,7 +20253,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -20993,10 +17016,10 @@
+@@ -20993,10 +17016,10 @@ esac
  fi
  AWK=$ac_cv_path_AWK
  if test -n "$AWK"; then
@@ -20304,7 +20266,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -21008,9 +17031,9 @@
+@@ -21008,9 +17031,9 @@ for ac_prog in perl5 perl
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -20316,7 +20278,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PERL in
-@@ -21023,14 +17046,14 @@
+@@ -21023,14 +17046,14 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -20334,7 +20296,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -21038,10 +17061,10 @@
+@@ -21038,10 +17061,10 @@ esac
  fi
  PERL=$ac_cv_path_PERL
  if test -n "$PERL"; then
@@ -20347,7 +20309,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -21051,7 +17074,7 @@
+@@ -21051,7 +17074,7 @@ done
  
  
  # Check whether --enable-rebuilds was given.
@@ -20356,7 +20318,7 @@
    enableval=$enable_rebuilds;
  else
    enable_rebuilds=yes
-@@ -21095,13 +17118,13 @@
+@@ -21095,13 +17118,13 @@ _ACEOF
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -20372,7 +20334,7 @@
        esac ;;
      esac
    done
-@@ -21109,8 +17132,8 @@
+@@ -21109,8 +17132,8 @@ $as_echo "$as_me: WARNING: cache variabl
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -20383,7 +20345,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -21133,11 +17156,11 @@
+@@ -21133,11 +17156,11 @@ $as_echo "$as_me: WARNING: cache variabl
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -20397,7 +20359,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -21157,8 +17180,8 @@
+@@ -21157,8 +17180,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -20408,7 +20370,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -21174,143 +17197,90 @@
+@@ -21174,143 +17197,90 @@ else
  fi
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -20591,7 +20553,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -21320,17 +17290,18 @@
+@@ -21320,17 +17290,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -20617,7 +20579,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -21338,23 +17309,15 @@
+@@ -21338,23 +17309,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -20646,7 +20608,7 @@
  as_nl='
  '
  export as_nl
-@@ -21362,7 +17325,13 @@
+@@ -21362,7 +17325,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
@@ -20661,7 +20623,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -21373,7 +17342,7 @@
+@@ -21373,7 +17342,7 @@ else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -20670,7 +20632,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -21396,13 +17365,6 @@
+@@ -21396,13 +17365,6 @@ if test "${PATH_SEPARATOR+set}" != set;
    }
  fi
  
@@ -20684,7 +20646,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -21412,15 +17374,15 @@
+@@ -21412,15 +17374,15 @@ fi
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -20703,7 +20665,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -21432,12 +17394,16 @@
+@@ -21432,12 +17394,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
@@ -20724,7 +20686,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -21449,7 +17415,89 @@
+@@ -21449,7 +17415,89 @@ export LC_ALL
  LANGUAGE=C
  export LANGUAGE
  
@@ -20815,7 +20777,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -21463,8 +17511,12 @@
+@@ -21463,8 +17511,12 @@ else
    as_basename=false
  fi
  
@@ -20829,7 +20791,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -21484,76 +17536,25 @@
+@@ -21484,76 +17536,25 @@ $as_echo X/"$0" |
  	  }
  	  s/.*/./; q'`
  
@@ -20917,7 +20879,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -21582,8 +17583,56 @@
+@@ -21582,8 +17583,56 @@ fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -20975,7 +20937,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -21602,10 +17651,10 @@
+@@ -21602,10 +17651,10 @@ else
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -20988,7 +20950,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -21620,13 +17669,19 @@
+@@ -21620,13 +17669,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
  
  
  exec 6>&1
@@ -21010,7 +20972,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -21658,13 +17713,15 @@
+@@ -21658,13 +17713,15 @@ _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -21029,7 +20991,7 @@
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -21683,16 +17740,17 @@
+@@ -21683,16 +17740,17 @@ $config_headers
  Configuration commands:
  $config_commands
  
@@ -21051,7 +21013,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -21728,6 +17786,8 @@
+@@ -21728,6 +17786,8 @@ do
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -21060,7 +21022,7 @@
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -21735,20 +17795,19 @@
+@@ -21735,20 +17795,19 @@ do
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -21085,7 +21047,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21756,11 +17815,10 @@
+@@ -21756,11 +17815,10 @@ Try \`$0 --help' for more information."
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -21100,7 +21062,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -22104,9 +18162,7 @@
+@@ -22104,9 +18162,7 @@ do
      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -21111,7 +21073,7 @@
    esac
  done
  
-@@ -22133,7 +18189,7 @@
+@@ -22133,7 +18189,7 @@ $debug ||
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -21120,7 +21082,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -22144,11 +18200,7 @@
+@@ -22144,11 +18200,7 @@ $debug ||
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -21133,7 +21095,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -22156,10 +18208,16 @@
+@@ -22156,10 +18208,16 @@ $debug ||
  if test -n "$CONFIG_FILES"; then
  
  
@@ -21152,7 +21114,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -22173,24 +18231,18 @@
+@@ -22173,24 +18231,18 @@ _ACEOF
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -21180,7 +21142,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -22212,7 +18264,7 @@
+@@ -22212,7 +18264,7 @@ s/'"$ac_delim"'$//
  t delim
  :nl
  h
@@ -21189,7 +21151,7 @@
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -22226,7 +18278,7 @@
+@@ -22226,7 +18278,7 @@ s/.\{148\}//
  t nl
  :delim
  h
@@ -21198,7 +21160,7 @@
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -22279,9 +18331,7 @@
+@@ -22279,9 +18331,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -21209,7 +21171,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -22322,9 +18372,7 @@
+@@ -22322,9 +18372,7 @@ for ac_last_try in false false :; do
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -21220,7 +21182,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -22409,9 +18457,7 @@
+@@ -22409,9 +18457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -21231,7 +21193,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -22424,9 +18470,7 @@
+@@ -22424,9 +18470,7 @@ do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -21242,7 +21204,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -22454,12 +18498,10 @@
+@@ -22454,12 +18498,10 @@ $as_echo "$as_me: error: invalid tag $ac
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -21257,7 +21219,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -22470,7 +18512,7 @@
+@@ -22470,7 +18512,7 @@ $as_echo "$as_me: error: cannot find inp
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -21266,7 +21228,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -22483,9 +18525,7 @@
+@@ -22483,9 +18525,7 @@ $as_echo "$as_me: creating $ac_file" >&6
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -21277,7 +21239,7 @@
      esac
      ;;
    esac
-@@ -22513,47 +18553,7 @@
+@@ -22513,47 +18553,7 @@ $as_echo X"$ac_file" |
  	    q
  	  }
  	  s/.*/./; q'`
@@ -21326,7 +21288,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -22610,7 +18610,6 @@
+@@ -22610,7 +18610,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -21334,7 +21296,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -22620,12 +18619,11 @@
+@@ -22620,12 +18619,11 @@ ac_sed_dataroot='
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -21349,7 +21311,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -22635,7 +18633,7 @@
+@@ -22635,7 +18633,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -21358,7 +21320,7 @@
  esac
  _ACEOF
  
-@@ -22664,14 +18662,12 @@
+@@ -22664,14 +18662,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -21375,7 +21337,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -22681,9 +18677,7 @@
+@@ -22681,9 +18677,7 @@ which seems to be undefined.  Please mak
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -21386,7 +21348,7 @@
   ;;
    :H)
    #
-@@ -22694,25 +18688,19 @@
+@@ -22694,25 +18688,19 @@ $as_echo "$as_me: error: could not creat
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -21416,7 +21378,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -22750,7 +18738,7 @@
+@@ -22750,7 +18738,7 @@ $as_echo X"$_am_arg" |
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -21425,7 +21387,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -22845,47 +18833,7 @@
+@@ -22845,47 +18833,7 @@ $as_echo X"$file" |
  	    q
  	  }
  	  s/.*/./; q'`
@@ -21474,7 +21436,7 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -23538,9 +19486,7 @@
+@@ -23538,9 +19486,7 @@ _LT_EOF
        esac ;;
      "po/stamp-it":C)
      if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -21485,7 +21447,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -23563,15 +19509,12 @@
+@@ -23563,15 +19509,12 @@ $as_echo "$as_me: error: po/Makefile.in.
  done # for ac_tag
  
  
@@ -21503,7 +21465,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -23592,10 +19535,10 @@
+@@ -23592,10 +19535,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.
@@ -21516,25 +21478,17 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-diff -Naur gnome-panel-2.30.0.old/doc/Makefile.in gnome-panel-2.30.0/doc/Makefile.in
---- gnome-panel-2.30.0.old/doc/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/doc/Makefile.in	2010-05-05 10:03:30.110499290 +0200
+Index: gnome-panel-2.30.0/doc/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/doc/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/doc/Makefile.in	2010-05-05 19:54:02.355835023 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -177,6 +177,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -202,6 +204,7 @@
+@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21542,7 +21496,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -344,7 +347,7 @@
+@@ -344,7 +345,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):
@@ -21551,7 +21505,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -369,7 +372,7 @@
+@@ -369,7 +370,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -21560,25 +21514,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/doc/reference/Makefile.in gnome-panel-2.30.0/doc/reference/Makefile.in
---- gnome-panel-2.30.0.old/doc/reference/Makefile.in	2010-03-30 02:52:45.000000000 +0200
-+++ gnome-panel-2.30.0/doc/reference/Makefile.in	2010-05-05 10:03:30.166500476 +0200
+Index: gnome-panel-2.30.0/doc/reference/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/doc/reference/Makefile.in	2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/doc/reference/Makefile.in	2010-05-05 19:54:02.443334893 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -177,6 +177,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -202,6 +204,7 @@
+@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21586,7 +21532,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -340,7 +343,7 @@
+@@ -340,7 +341,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):
@@ -21595,7 +21541,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -365,7 +368,7 @@
+@@ -365,7 +366,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -21604,25 +21550,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/doc/reference/panel-applet/Makefile.in gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in
---- gnome-panel-2.30.0.old/doc/reference/panel-applet/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in	2010-05-05 10:03:30.234500883 +0200
+Index: gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/doc/reference/panel-applet/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in	2010-05-05 19:54:02.551835488 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -144,6 +144,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -169,6 +171,7 @@
+@@ -169,6 +169,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21630,25 +21568,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/gnome-panel/libegg/Makefile.in gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in
---- gnome-panel-2.30.0.old/gnome-panel/libegg/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in	2010-05-05 10:03:30.458499659 +0200
+Index: gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/gnome-panel/libegg/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in	2010-05-05 19:54:02.871834820 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -170,6 +170,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -195,6 +197,7 @@
+@@ -195,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21656,36 +21586,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/gnome-panel/libpanel-util/Makefile.in gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in
---- gnome-panel-2.30.0.old/gnome-panel/libpanel-util/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in	2010-05-05 10:03:30.554499783 +0200
+Index: gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/gnome-panel/libpanel-util/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in	2010-05-05 19:54:02.979334651 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -55,8 +55,8 @@
- am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
- 	panel-error.lo panel-glib.lo panel-gtk.lo \
- 	panel-icon-chooser.lo panel-keyfile.lo panel-launch.lo \
--	panel-list.lo panel-session-manager.lo panel-show.lo \
--	panel-xdg.lo $(am__objects_1)
-+	panel-list.lo panel-power-manager.lo panel-session-manager.lo \
-+	panel-show.lo panel-xdg.lo $(am__objects_1)
- libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -172,6 +172,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -197,6 +199,7 @@
+@@ -197,6 +197,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21693,97 +21604,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -318,6 +321,8 @@
- 	panel-launch.h			\
- 	panel-list.c			\
- 	panel-list.h			\
-+	panel-power-manager.c		\
-+	panel-power-manager.h		\
- 	panel-session-manager.c		\
- 	panel-session-manager.h		\
- 	panel-show.c			\
-@@ -387,6 +392,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-launch.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-list.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-power-manager.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-session-manager.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-show.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-xdg.Plo at am__quote@
-diff -Naur gnome-panel-2.30.0.old/gnome-panel/Makefile.in gnome-panel-2.30.0/gnome-panel/Makefile.in
---- gnome-panel-2.30.0.old/gnome-panel/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/gnome-panel/Makefile.in	2010-05-05 10:03:30.374499675 +0200
+Index: gnome-panel-2.30.0/gnome-panel/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/gnome-panel/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/Makefile.in	2010-05-05 19:54:02.755336991 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -36,7 +36,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
-+bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-logout$(EXEEXT) \
-+	gnome-desktop-item-edit$(EXEEXT)
- subdir = gnome-panel
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/gnome-panel.desktop.in.in
-@@ -97,7 +98,8 @@
- 	panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \
- 	panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \
- 	panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \
--	panel-addto.$(OBJEXT) panel-ditem-editor.$(OBJEXT) \
-+	panel-addto.$(OBJEXT) panel-logout.$(OBJEXT) \
-+	panel-gdm.$(OBJEXT) panel-ditem-editor.$(OBJEXT) \
- 	$(am__objects_1)
- am__objects_4 = $(am__objects_1)
- am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \
-@@ -110,6 +112,21 @@
- gnome_panel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
-+am_gnome_panel_logout_OBJECTS =  \
-+	gnome_panel_logout-gnome-panel-logout.$(OBJEXT) \
-+	gnome_panel_logout-panel-logout.$(OBJEXT) \
-+	gnome_panel_logout-panel-lockdown.$(OBJEXT) \
-+	gnome_panel_logout-panel-gdm.$(OBJEXT) \
-+	gnome_panel_logout-panel-session.$(OBJEXT) \
-+	gnome_panel_logout-panel-util.$(OBJEXT)
-+gnome_panel_logout_OBJECTS = $(am_gnome_panel_logout_OBJECTS)
-+gnome_panel_logout_DEPENDENCIES =  \
-+	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+gnome_panel_logout_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+	$(gnome_panel_logout_CFLAGS) $(CFLAGS) \
-+	$(gnome_panel_logout_LDFLAGS) $(LDFLAGS) -o $@
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -158,9 +175,10 @@
- AM_V_GEN = $(am__v_GEN_$(V))
- am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
- am__v_GEN_0 = @echo "  GEN   " $@;
--SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES)
-+SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) \
-+	$(gnome_panel_logout_SOURCES)
- DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \
--	$(gnome_panel_SOURCES)
-+	$(gnome_panel_SOURCES) $(gnome_panel_logout_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
- 	install-dvi-recursive install-exec-recursive \
-@@ -284,6 +302,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -309,6 +329,7 @@
+@@ -309,6 +309,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21791,183 +21622,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -486,6 +507,8 @@
- 	panel-force-quit.c	\
- 	panel-lockdown.c	\
- 	panel-addto.c		\
-+	panel-logout.c		\
-+	panel-gdm.c		\
- 	panel-ditem-editor.c	\
- 	$(NULL)
- 
-@@ -532,6 +555,8 @@
- 	panel-force-quit.h	\
- 	panel-lockdown.h	\
- 	panel-addto.h		\
-+	panel-logout.h		\
-+	panel-gdm.h		\
- 	panel-ditem-editor.h	\
- 	panel-icon-names.h	\
- 	$(NULL)
-@@ -549,6 +574,21 @@
- 	$(X_LIBS)
- 
- gnome_panel_LDFLAGS = -export-dynamic
-+gnome_panel_logout_SOURCES = \
-+	gnome-panel-logout.c  \
-+	panel-logout.c        \
-+	panel-lockdown.c      \
-+	panel-gdm.c	      \
-+	panel-session.c       \
-+	panel-util.c
-+
-+gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
-+gnome_panel_logout_LDADD = \
-+	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
-+	$(LOGOUT_LIBS)	   \
-+	$(X_LIBS)
-+
-+gnome_panel_logout_LDFLAGS = -export-dynamic
- gnome_desktop_item_edit_SOURCES = \
- 	gnome-desktop-item-edit.c \
- 	panel-ditem-editor.c	  \
-@@ -697,6 +737,9 @@
- gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES) 
- 	@rm -f gnome-panel$(EXEEXT)
- 	$(AM_V_CCLD)$(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
-+gnome-panel-logout$(EXEEXT): $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_DEPENDENCIES) 
-+	@rm -f gnome-panel-logout$(EXEEXT)
-+	$(AM_V_CCLD)$(gnome_panel_logout_LINK) $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_LDADD) $(LIBS)
- install-libexecSCRIPTS: $(libexec_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -745,6 +788,12 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/button-widget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawer.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-desktop-item-edit.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-gdm.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-lockdown.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-logout.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-session.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome_panel_logout-panel-util.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/launcher.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu.Po at am__quote@
-@@ -763,7 +812,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-force-quit.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-frame.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gconf.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gdm.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-lockdown.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-logout.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-marshal.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-bar.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-button.Po at am__quote@
-@@ -810,6 +861,102 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
-+gnome_panel_logout-gnome-panel-logout.o: gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
-+
-+gnome_panel_logout-gnome-panel-logout.obj: gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
-+
-+gnome_panel_logout-panel-logout.o: panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-logout.c' object='gnome_panel_logout-panel-logout.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
-+
-+gnome_panel_logout-panel-logout.obj: panel-logout.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-logout.c' object='gnome_panel_logout-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
-+
-+gnome_panel_logout-panel-lockdown.o: panel-lockdown.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
-+
-+gnome_panel_logout-panel-lockdown.obj: panel-lockdown.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
-+
-+gnome_panel_logout-panel-gdm.o: panel-gdm.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
-+
-+gnome_panel_logout-panel-gdm.obj: panel-gdm.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
-+
-+gnome_panel_logout-panel-session.o: panel-session.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-session.c' object='gnome_panel_logout-panel-session.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
-+
-+gnome_panel_logout-panel-session.obj: panel-session.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-session.c' object='gnome_panel_logout-panel-session.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
-+
-+gnome_panel_logout-panel-util.o: panel-util.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-util.c' object='gnome_panel_logout-panel-util.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
-+
-+gnome_panel_logout-panel-util.obj: panel-util.c
-+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
-+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
-+ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel-util.c' object='gnome_panel_logout-panel-util.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-@@ -943,7 +1090,7 @@
+@@ -943,7 +944,7 @@ uninstall-xmluiDATA:
  #     (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):
@@ -21976,7 +21631,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -968,7 +1115,7 @@
+@@ -968,7 +969,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -21985,25 +21640,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/help/clock/Makefile.in gnome-panel-2.30.0/help/clock/Makefile.in
---- gnome-panel-2.30.0.old/help/clock/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/clock/Makefile.in	2010-05-05 10:03:30.694500476 +0200
+Index: gnome-panel-2.30.0/help/clock/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/help/clock/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/clock/Makefile.in	2010-05-05 19:54:03.183334822 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -162,6 +162,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -187,6 +189,7 @@
+@@ -187,6 +187,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22011,25 +21658,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/help/fish/Makefile.in gnome-panel-2.30.0/help/fish/Makefile.in
---- gnome-panel-2.30.0.old/help/fish/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/fish/Makefile.in	2010-05-05 10:03:30.778499771 +0200
+Index: gnome-panel-2.30.0/help/fish/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/help/fish/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/fish/Makefile.in	2010-05-05 19:54:03.299335459 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -162,6 +162,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -187,6 +189,7 @@
+@@ -187,6 +187,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22037,25 +21676,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/help/Makefile.in gnome-panel-2.30.0/help/Makefile.in
---- gnome-panel-2.30.0.old/help/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/help/Makefile.in	2010-05-05 10:03:30.614500427 +0200
+Index: gnome-panel-2.30.0/help/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/help/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/Makefile.in	2010-05-05 19:54:03.067335154 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -177,6 +177,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -202,6 +204,7 @@
+@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22063,7 +21694,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -340,7 +343,7 @@
+@@ -340,7 +341,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):
@@ -22072,7 +21703,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -365,7 +368,7 @@
+@@ -365,7 +366,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -22081,25 +21712,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/icons/16x16/Makefile.in gnome-panel-2.30.0/icons/16x16/Makefile.in
---- gnome-panel-2.30.0.old/icons/16x16/Makefile.in	2010-03-30 02:52:46.000000000 +0200
-+++ gnome-panel-2.30.0/icons/16x16/Makefile.in	2010-05-05 10:03:30.838500061 +0200
+Index: gnome-panel-2.30.0/icons/16x16/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/16x16/Makefile.in	2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/icons/16x16/Makefile.in	2010-05-05 19:54:03.383334883 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22107,25 +21730,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/icons/22x22/Makefile.in gnome-panel-2.30.0/icons/22x22/Makefile.in
---- gnome-panel-2.30.0.old/icons/22x22/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/22x22/Makefile.in	2010-05-05 10:03:30.898499022 +0200
+Index: gnome-panel-2.30.0/icons/22x22/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/22x22/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/22x22/Makefile.in	2010-05-05 19:54:03.471335380 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22133,25 +21748,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/icons/24x24/Makefile.in gnome-panel-2.30.0/icons/24x24/Makefile.in
---- gnome-panel-2.30.0.old/icons/24x24/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/24x24/Makefile.in	2010-05-05 10:03:30.978499339 +0200
+Index: gnome-panel-2.30.0/icons/24x24/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/24x24/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/24x24/Makefile.in	2010-05-05 19:54:03.555335794 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22159,25 +21766,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/icons/32x32/Makefile.in gnome-panel-2.30.0/icons/32x32/Makefile.in
---- gnome-panel-2.30.0.old/icons/32x32/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/32x32/Makefile.in	2010-05-05 10:03:31.038500543 +0200
+Index: gnome-panel-2.30.0/icons/32x32/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/32x32/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/32x32/Makefile.in	2010-05-05 19:54:03.643336788 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22185,25 +21784,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/icons/48x48/Makefile.in gnome-panel-2.30.0/icons/48x48/Makefile.in
---- gnome-panel-2.30.0.old/icons/48x48/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/48x48/Makefile.in	2010-05-05 10:03:31.098500558 +0200
+Index: gnome-panel-2.30.0/icons/48x48/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/48x48/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/48x48/Makefile.in	2010-05-05 19:54:03.731334849 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22211,25 +21802,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/icons/Makefile.in gnome-panel-2.30.0/icons/Makefile.in
---- gnome-panel-2.30.0.old/icons/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/Makefile.in	2010-05-05 10:03:31.158501204 +0200
+Index: gnome-panel-2.30.0/icons/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/Makefile.in	2010-05-05 19:54:03.819334857 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -201,6 +201,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -226,6 +228,7 @@
+@@ -226,6 +226,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22237,7 +21820,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -393,7 +396,7 @@
+@@ -393,7 +394,7 @@ uninstall-geglDATA:
  #     (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):
@@ -22246,7 +21829,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -418,7 +421,7 @@
+@@ -418,7 +419,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -22255,25 +21838,17 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -Naur gnome-panel-2.30.0.old/icons/scalable/Makefile.in gnome-panel-2.30.0/icons/scalable/Makefile.in
---- gnome-panel-2.30.0.old/icons/scalable/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/icons/scalable/Makefile.in	2010-05-05 10:03:31.218500594 +0200
+Index: gnome-panel-2.30.0/icons/scalable/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/icons/scalable/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/scalable/Makefile.in	2010-05-05 19:54:03.911335438 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22281,25 +21856,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/idl/Makefile.in gnome-panel-2.30.0/idl/Makefile.in
---- gnome-panel-2.30.0.old/idl/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/idl/Makefile.in	2010-05-05 10:03:31.274499123 +0200
+Index: gnome-panel-2.30.0/idl/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/idl/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/idl/Makefile.in	2010-05-05 19:54:03.991334780 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -161,6 +161,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -186,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22307,25 +21874,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/libpanel-applet/Makefile.in gnome-panel-2.30.0/libpanel-applet/Makefile.in
---- gnome-panel-2.30.0.old/libpanel-applet/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/libpanel-applet/Makefile.in	2010-05-05 10:03:31.382499294 +0200
+Index: gnome-panel-2.30.0/libpanel-applet/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/libpanel-applet/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/libpanel-applet/Makefile.in	2010-05-05 19:54:04.131335471 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -227,6 +227,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -252,6 +254,7 @@
+@@ -252,6 +252,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22333,9 +21892,10 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/ltmain.sh gnome-panel-2.30.0/ltmain.sh
---- gnome-panel-2.30.0.old/ltmain.sh	2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/ltmain.sh	2010-05-05 10:03:23.597530530 +0200
+Index: gnome-panel-2.30.0/ltmain.sh
+===================================================================
+--- gnome-panel-2.30.0.orig/ltmain.sh	2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/ltmain.sh	2010-05-05 19:51:55.383841641 +0200
 @@ -1,6 +1,6 @@
  # Generated from ltmain.m4sh.
  
@@ -22365,7 +21925,7 @@
  
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -116,15 +116,15 @@
+@@ -116,15 +116,15 @@ $lt_unset CDPATH
  
  : ${CP="cp -f"}
  : ${ECHO="echo"}
@@ -22385,7 +21945,7 @@
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  : ${Xsed="$SED -e 1s/^X//"}
  
-@@ -5033,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@ func_mode_link ()
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -22397,7 +21957,7 @@
  	esac
        fi
        if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5344,19 +5347,19 @@ func_mode_link ()
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"
  	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -22427,7 +21987,7 @@
  	  continue
  	fi # $pass = conv
  
-@@ -5893,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@ func_mode_link ()
  	  if test "$link_all_deplibs" != no; then
  	    # Add the search paths of all dependency libraries
  	    for deplib in $dependency_libs; do
@@ -22435,7 +21995,7 @@
  	      case $deplib in
  	      -L*) path="$deplib" ;;
  	      *.la)
-@@ -6206,6 +6210,9 @@
+@@ -6206,6 +6210,9 @@ func_mode_link ()
  	    revision="$number_minor"
  	    lt_irix_increment=no
  	    ;;
@@ -22445,10 +22005,11 @@
  	  esac
  	  ;;
  	no)
-diff -Naur gnome-panel-2.30.0.old/m4/intltool.m4 gnome-panel-2.30.0/m4/intltool.m4
---- gnome-panel-2.30.0.old/m4/intltool.m4	2010-03-30 02:52:33.000000000 +0200
-+++ gnome-panel-2.30.0/m4/intltool.m4	2010-05-05 10:03:24.381510760 +0200
-@@ -172,7 +172,7 @@
+Index: gnome-panel-2.30.0/m4/intltool.m4
+===================================================================
+--- gnome-panel-2.30.0.orig/m4/intltool.m4	2010-03-30 02:52:33.000000000 +0200
++++ gnome-panel-2.30.0/m4/intltool.m4	2010-05-05 19:51:55.383841641 +0200
+@@ -172,7 +172,7 @@ IT_PO_SUBDIR([po])
  AC_DEFUN([IT_PO_SUBDIR],
  [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
  dnl
@@ -22457,10 +22018,11 @@
  dnl of config.status.
  AC_CONFIG_COMMANDS_PRE([
    AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff -Naur gnome-panel-2.30.0.old/m4/libtool.m4 gnome-panel-2.30.0/m4/libtool.m4
---- gnome-panel-2.30.0.old/m4/libtool.m4	2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/m4/libtool.m4	2010-05-05 10:03:23.701503879 +0200
-@@ -2445,7 +2445,7 @@
+Index: gnome-panel-2.30.0/m4/libtool.m4
+===================================================================
+--- gnome-panel-2.30.0.orig/m4/libtool.m4	2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/m4/libtool.m4	2010-05-05 19:51:55.387842219 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be Linux ELF.
@@ -22469,7 +22031,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -2485,6 +2485,18 @@
+@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22488,7 +22050,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -3072,11 +3084,11 @@
+@@ -3072,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
    ;;
  
  # This must be Linux ELF.
@@ -22502,7 +22064,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -3693,7 +3705,7 @@
+@@ -3693,7 +3705,7 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -22511,7 +22073,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -3757,7 +3769,7 @@
+@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -22520,7 +22082,7 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3977,7 +3989,7 @@
+@@ -3977,7 +3989,7 @@ m4_if([$1], [CXX], [
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -22529,7 +22091,7 @@
        case $cc_basename in
        # old Intel for x86_64 which still supported -KPIC.
        ecc*)
-@@ -4182,6 +4194,9 @@
+@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [
    cygwin* | mingw* | cegcc*)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -22539,7 +22101,7 @@
    *)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -4246,6 +4261,9 @@
+@@ -4246,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -22549,7 +22111,7 @@
    esac
  
    _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4267,6 +4285,7 @@
+@@ -4267,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
      fi
      supports_anon_versioning=no
      case `$LD -v 2>&1` in
@@ -22557,7 +22119,7 @@
        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4358,7 +4377,7 @@
+@@ -4358,7 +4377,7 @@ _LT_EOF
        _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -22566,7 +22128,7 @@
        tmp_diet=no
        if test "$host_os" = linux-dietlibc; then
  	case $cc_basename in
-@@ -4428,7 +4447,7 @@
+@@ -4428,7 +4447,7 @@ _LT_EOF
        fi
        ;;
  
@@ -22575,7 +22137,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -4603,6 +4622,7 @@
+@@ -4603,6 +4622,7 @@ _LT_EOF
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -22583,7 +22145,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -4841,7 +4861,7 @@
+@@ -4841,7 +4861,7 @@ _LT_EOF
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -22592,7 +22154,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -5841,7 +5861,7 @@
+@@ -5841,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
          _LT_TAGVAR(inherit_rpath, $1)=yes
          ;;
  
@@ -22601,9 +22163,10 @@
          case $cc_basename in
            KCC*)
  	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -Naur gnome-panel-2.30.0.old/m4/ltversion.m4 gnome-panel-2.30.0/m4/ltversion.m4
---- gnome-panel-2.30.0.old/m4/ltversion.m4	2010-03-30 02:52:32.000000000 +0200
-+++ gnome-panel-2.30.0/m4/ltversion.m4	2010-05-05 10:03:23.961516103 +0200
+Index: gnome-panel-2.30.0/m4/ltversion.m4
+===================================================================
+--- gnome-panel-2.30.0.orig/m4/ltversion.m4	2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/m4/ltversion.m4	2010-05-05 19:51:55.387842219 +0200
 @@ -9,15 +9,15 @@
  
  # Generated from ltversion.in.
@@ -22625,25 +22188,17 @@
  _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
  _LT_DECL(, macro_revision, 0)
  ])
-diff -Naur gnome-panel-2.30.0.old/Makefile.in gnome-panel-2.30.0/Makefile.in
---- gnome-panel-2.30.0.old/Makefile.in	2010-03-30 02:52:48.000000000 +0200
-+++ gnome-panel-2.30.0/Makefile.in	2010-05-05 10:03:31.522499556 +0200
+Index: gnome-panel-2.30.0/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/Makefile.in	2010-03-30 02:52:48.000000000 +0200
++++ gnome-panel-2.30.0/Makefile.in	2010-05-05 19:54:04.319337232 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -193,6 +193,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -218,6 +220,7 @@
+@@ -218,6 +218,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22651,7 +22206,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-@@ -420,7 +423,7 @@
+@@ -420,7 +421,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):
@@ -22660,7 +22215,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -445,7 +448,7 @@
+@@ -445,7 +446,7 @@ $(RECURSIVE_TARGETS):
  	fi; test -z "$$fail"
  
  $(RECURSIVE_CLEAN_TARGETS):
@@ -22669,7 +22224,7 @@
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-@@ -609,7 +612,8 @@
+@@ -609,7 +610,8 @@ distdir: $(DISTFILES)
  	  fi; \
  	done
  	-test -n "$(am__skip_mode_fix)" \
@@ -22679,7 +22234,7 @@
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -652,17 +656,17 @@
+@@ -652,17 +654,17 @@ dist dist-all: distdir
  distcheck: dist
  	case '$(DIST_ARCHIVES)' in \
  	*.tar.gz*) \
@@ -22701,25 +22256,17 @@
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
-diff -Naur gnome-panel-2.30.0.old/man/Makefile.in gnome-panel-2.30.0/man/Makefile.in
---- gnome-panel-2.30.0.old/man/Makefile.in	2010-03-30 02:52:47.000000000 +0200
-+++ gnome-panel-2.30.0/man/Makefile.in	2010-05-05 10:03:31.454501176 +0200
+Index: gnome-panel-2.30.0/man/Makefile.in
+===================================================================
+--- gnome-panel-2.30.0.orig/man/Makefile.in	2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/man/Makefile.in	2010-05-05 19:54:04.219334999 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -162,6 +162,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -187,6 +189,7 @@
+@@ -187,6 +187,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22727,10 +22274,11 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANEL_CFLAGS = @PANEL_CFLAGS@
  PANEL_LIBS = @PANEL_LIBS@
-diff -Naur gnome-panel-2.30.0.old/po/Makefile.in.in gnome-panel-2.30.0/po/Makefile.in.in
---- gnome-panel-2.30.0.old/po/Makefile.in.in	2010-03-30 02:52:33.000000000 +0200
-+++ gnome-panel-2.30.0/po/Makefile.in.in	2010-05-05 10:03:24.350529731 +0200
-@@ -56,7 +56,7 @@
+Index: gnome-panel-2.30.0/po/Makefile.in.in
+===================================================================
+--- gnome-panel-2.30.0.orig/po/Makefile.in.in	2010-03-30 02:52:33.000000000 +0200
++++ gnome-panel-2.30.0/po/Makefile.in.in	2010-05-05 19:51:55.391840841 +0200
+@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
  
  PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
  
@@ -22739,7 +22287,7 @@
  
  USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
  
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ install-data-yes: all
  	done
  
  # Empty stubs to satisfy archaic automake needs
@@ -22748,3 +22296,874 @@
  
  # Define this as empty until I found a useful application.
  install-exec installcheck:
+Index: gnome-panel-2.30.0/INSTALL
+===================================================================
+--- gnome-panel-2.30.0.orig/INSTALL	2010-05-05 19:54:34.367839113 +0200
++++ gnome-panel-2.30.0/INSTALL	2010-05-05 19:54:04.251339137 +0200
+@@ -2,18 +2,24 @@ Installation Instructions
+ *************************
+ 
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ 
+-This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++   Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved.  This file is offered as-is,
++without warranty of any kind.
+ 
+ Basic Installation
+ ==================
+ 
+-Briefly, the shell commands `./configure; make; make install' should
++   Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package.  The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package.  Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below.  The lack of an optional feature in a given package is not
++necessarily a bug.  More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+ 
+    The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation.  It uses
+@@ -42,7 +48,7 @@ may remove or edit it.
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+ 
+-The simplest way to compile this package is:
++   The simplest way to compile this package is:
+ 
+   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 @@ 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
+-     the package.
++     the package, generally using the just-built uninstalled binaries.
+ 
+   4. Type `make install' to install the programs and any data files and
+-     documentation.
++     documentation.  When installing into a prefix owned by root, it is
++     recommended that the package be configured and built as a regular
++     user, and only the `make install' phase executed with root
++     privileges.
++
++  5. Optionally, type `make installcheck' to repeat any self-tests, but
++     this time using the binaries in their final installed location.
++     This target does not install anything.  Running this target as a
++     regular user, particularly if the prior `make install' required
++     root privileges, verifies that the installation completed
++     correctly.
+ 
+-  5. You can remove the program binaries and object files from the
++  6. You can remove the program binaries and object files from the
+      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,15 +83,22 @@ The simplest way to compile this package
+      all sorts of other programs in order to regenerate files that came
+      with the distribution.
+ 
+-  6. Often, you can also type `make uninstall' to remove the installed
+-     files again.
++  7. Often, you can also type `make uninstall' to remove the installed
++     files again.  In practice, not all packages have tested that
++     uninstallation works correctly, even though it is required by the
++     GNU Coding Standards.
++
++  8. Some packages, particularly those that use Automake, provide `make
++     distcheck', which can by used by developers to test that all other
++     targets like `make install' and `make uninstall' work correctly.
++     This target is generally not run by end users.
+ 
+ Compilers and Options
+ =====================
+ 
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about.  Run `./configure --help' for
+-details on some of the pertinent environment variables.
++   Some systems require unusual options for compilation or linking that
++the `configure' script does not know about.  Run `./configure --help'
++for details on some of the pertinent environment variables.
+ 
+    You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment.  Here
+@@ -88,25 +111,41 @@ is an example:
+ Compiling For Multiple Architectures
+ ====================================
+ 
+-You can compile the package for more than one kind of computer at the
++   You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+ own directory.  To do this, you can use GNU `make'.  `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script.  `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'.  This
++is known as a "VPATH" build.
+ 
+    With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory.  After you have
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+ 
++   On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor.  Like
++this:
++
++     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++                 CPP="gcc -E" CXXCPP="g++ -E"
++
++   This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+ 
+-By default, `make install' installs the package's commands under
++   By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc.  You
+ can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+ 
+    You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files.  If you
+@@ -117,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
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them.  In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++   The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++   The first method involves providing an override variable for each
++affected directory.  For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'.  Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated.  The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++   The second method involves providing the `DESTDIR' variable.  For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names.  The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters.  On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+ 
+    If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+ 
+-Optional Features
+-=================
+-
+-Some packages pay attention to `--enable-FEATURE' options to
++   Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System).  The
+@@ -138,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.
+ 
++   Some packages offer the ability to configure how verbose the
++execution of `make' will be.  For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
++Particular systems
++==================
++
++   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
++a workaround.  If GNU CC is not installed, it is therefore recommended
++to try
++
++     ./configure CC="cc"
++
++and if that doesn't work, try
++
++     ./configure CC="cc -nodtk"
++
++   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++   On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'.  It is recommended to use the following options:
++
++     ./configure --prefix=/boot/common
++
+ Specifying the System Type
+ ==========================
+ 
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++   There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on.  Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--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:
+ 
+@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical nam
+ 
+ where SYSTEM can have one of these forms:
+ 
+-     OS KERNEL-OS
++     OS
++     KERNEL-OS
+ 
+    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
+@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
+ Sharing Defaults
+ ================
+ 
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++   If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `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.
+@@ -182,7 +292,7 @@ A warning: not all `configure' scripts l
+ Defining Variables
+ ==================
+ 
+-Variables not defined in a site shell script can be set in the
++   Variables not defined in a site shell script can be set in the
+ 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
+@@ -201,11 +311,19 @@ an Autoconf bug.  Until the bug is fixed
+ `configure' Invocation
+ ======================
+ 
+-`configure' recognizes the following options to control how it operates.
++   `configure' recognizes the following options to control how it
++operates.
+ 
+ `--help'
+ `-h'
+-     Print a summary of the options to `configure', and exit.
++     Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++     Print a summary of the options unique to this package's
++     `configure', and exit.  The `short' variant lists options used
++     only in the top level, while the `recursive' variant lists options
++     also present in any nested packages.
+ 
+ `--version'
+ `-V'
+@@ -232,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.
+ 
++`--prefix=DIR'
++     Use DIR as the installation prefix.  *note Installation Names::
++     for more details, including other options available for fine-tuning
++     the installation locations.
++
++`--no-create'
++`-n'
++     Run the configure checks, but stop before creating any output
++     files.
++
+ `configure' also accepts some other, not widely useful, options.  Run
+ `configure --help' for more details.
+ 
+Index: gnome-panel-2.30.0/config.guess
+===================================================================
+--- gnome-panel-2.30.0.orig/config.guess	2010-05-05 19:54:34.571840747 +0200
++++ gnome-panel-2.30.0/config.guess	2010-05-05 19:54:01.075837213 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-04-27'
++timestamp='2009-12-30'
+ 
+ # 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 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,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 \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+ 	SUN_ARCH="i386"
+@@ -656,7 +660,7 @@ EOF
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -807,12 +811,12 @@ EOF
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
++    *:Interix*:*)
+     	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -822,6 +826,9 @@ EOF
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     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
+@@ -851,6 +858,20 @@ EOF
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@ EOF
+     frv:Linux:*:*)
+     	echo frv-unknown-linux-gnu
+ 	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+@@ -882,78 +914,34 @@ EOF
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips64
+-	#undef mips64el
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+ 	echo or32-unknown-linux-gnu
+ 	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+ 	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -962,8 +950,11 @@ EOF
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@ EOF
+     xtensa*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     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
+@@ -1074,7 +1005,7 @@ EOF
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1182,7 +1113,7 @@ EOF
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1275,6 +1206,16 @@ EOF
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: gnome-panel-2.30.0/config.sub
+===================================================================
+--- gnome-panel-2.30.0.orig/config.sub	2010-05-05 19:54:34.479837708 +0200
++++ gnome-panel-2.30.0/config.sub	2010-05-05 19:54:01.079835835 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-04-17'
++timestamp='2010-01-22'
+ 
+ # 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 @@ timestamp='2009-04-17'
+ 
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # 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 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,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 | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++        -bluegene*)
++	        os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -281,6 +288,7 @@ case $basic_machine in
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
++	| rx \
+ 	| score \
+ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ 	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
++	| ubicom32 \
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
++	| romp-* | rs6000-* | rx-* \
+ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+ 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
+ 	| tron-* \
++	| ubicom32-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+@@ -719,6 +734,9 @@ case $basic_machine in
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++        microblaze)
++		basic_machine=microblaze-xilinx
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+@@ -1240,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.
++        -auroraux)
++	        os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1260,9 +1286,9 @@ 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* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+-	      | -kopensolaris* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++        -nacl*)
++	        ;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Wed May  5 17:56:45 2010
@@ -1,9 +1,5 @@
 01_panel_submenus.patch
-02_panel_logout.patch
-03_switch-user_lock.patch
-04_gnome-panel-logout.patch
 06_clock_permissions.patch
-08_clock_applet_event.patch
 09_default_icons.patch
 70_relibtoolize.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=24275&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/rules [utf-8] Wed May  5 17:56:45 2010
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

Added: desktop/unstable/gnome-panel/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/source/format?rev=24275&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/source/format (added)
+++ desktop/unstable/gnome-panel/debian/source/format [utf-8] Wed May  5 17:56:45 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-gnome-commits mailing list