--- gnome-session-2.22.1.1.orig/debian/default.session
+++ gnome-session-2.22.1.1/debian/default.session
@@ -0,0 +1,23 @@
+# This is the default session that is launched if the user doesn't
+# already have a session.
+# The RestartCommand specifies the command to run from the $PATH.
+# The Priority determines the order in which the commands are started
+# (with Priority = 0 first) and defaults to 50.
+# The id provides a name that is unique within this file and passed to the
+# app as the client id which it must use to register with gnome-session.
+# The clients must be numbered from 0 to the value of num_clients - 1.
+
+[Default]
+num_clients=4
+0,id=default0
+0,Priority=10
+0,RestartCommand=gnome-wm --sm-client-id default0
+1,id=default1
+1,Priority=40
+1,RestartCommand=gnome-panel --sm-client-id default1
+2,id=default2
+2,Priority=40
+2,RestartCommand=nautilus --no-default-window --sm-client-id default2
+3,id=default3
+3,Priority=60
+3,RestartCommand=gnome-cups-icon --sm-client-id default3
--- gnome-session-2.22.1.1.orig/debian/prerm
+++ gnome-session-2.22.1.1/debian/prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
+  update-alternatives --remove x-session-manager /usr/bin/gnome-session
+  update-alternatives --remove desktop-splash \
+    /usr/share/pixmaps/splash/gnome-splash.png
+  update-alternatives --remove desktop-splash \
+    /usr/share/pixmaps/splash/gnome-debian-splash.png
+fi
+
+#DEBHELPER#
--- gnome-session-2.22.1.1.orig/debian/changelog
+++ gnome-session-2.22.1.1/debian/changelog
@@ -0,0 +1,2109 @@
+gnome-session (2.22.1.1-0ubuntu2netbook1dennis4) hardy; urgency=low
+
+  * 23_no_gsd_error:
+    - Don't show 'couldn't launch gnome-settings-daemon' error, because
+      it sometimes shows up when it doesn't need to.
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 04 Feb 2009 16:12:20 -0500
+
+gnome-session (2.22.1.1-0ubuntu2netbook1dennis3) hardy; urgency=low
+
+  * Non-maintainer upload.
+  * 22_fix_hang_on_time_setting_main.c.patch:
+    - Fix hang-issue on time-settings when time is incorrect. (LP: #292398)
+  * 22_disable_time_setting_main.c.patch:
+    - Disable time-admin being called (LP: #292398)
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul@gmail.com>  Thu, 27 Nov 2008 07:46:46 +0000
+
+gnome-session (2.22.1.1-0ubuntu2netbook1dennis2) hardy; urgency=low
+
+  * 22_dennis_logout.patch:
+    - Don't override normal gtk method for drawing the background.  Part of
+      LP: #261673
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 29 Oct 2008 09:12:28 -0400
+
+gnome-session (2.22.1.1-0ubuntu2netbook1dennis1) hardy; urgency=low
+
+  * New netbook version
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 24 Sep 2008 16:23:34 -0400
+
+gnome-session (2.22.1.1-0ubuntu2dennis3) hardy; urgency=low
+
+  * revert changes to 22_dennis_logout.patch so it's not fullscreen 
+
+ -- Bill Filler <bill.filler@canonical.com>  Fri, 19 Sep 2008 17:46:11 -0400
+
+gnome-session (2.22.1.1-0ubuntu2dennis2) hardy; urgency=low
+
+  * modified 22_dennis_logout.patch to make dialog fill screen 
+
+ -- Bill Filler <bill.filler@canonical.com>  Tue, 16 Sep 2008 15:32:57 -0400
+
+gnome-session (2.22.1.1-0ubuntu2dennis1) hardy; urgency=low
+
+  * added debian/patches/22_dennis_logout.patch
+    -make logout dialog match Frog UI Spec (LP: #261673) 
+
+ -- Bill Filler <bill.filler@canonical.com>  Thu, 11 Sep 2008 16:56:28 -0400
+
+gnome-session (2.22.1.1-0ubuntu2) hardy; urgency=low
+
+  * Don't drop the previous changes
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 10 Apr 2008 16:50:47 +0100
+
+gnome-session (2.22.1.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Fix a crash in the trash migration code (lp: #214574)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 10 Apr 2008 16:03:41 +0100
+
+gnome-session (2.22.1-0ubuntu3) hardy; urgency=low
+
+  * ensure that metacity is the default window manager
+    after a dapper->hardy upgrade
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 09 Apr 2008 11:58:59 +0200
+
+gnome-session (2.22.1-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/19_gnome-wm-tweaking.patch:
+    - if compiz is not installed fallback to metacity correctly and
+      if that is not availalbe a x-window-terminal-emulator
+  * debian/control.in: 
+    - add missing gnome-keyring build-dependency
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 10:58:26 +0200
+
+gnome-session (2.22.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    Session Manager
+    - Migrate Trash files to the new trash location (lp: #207816)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 08 Apr 2008 10:02:12 +0200
+
+gnome-session (2.22.0-0ubuntu1) hardy; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 11 Mar 2008 15:22:34 +0100
+
+gnome-session (2.21.93-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    Misc
+    - Remove hard dependency on esound, this is handled by 
+      gnome-settings-daemon now 
+    Session Manager
+    - Don't start the sound server, and play the login sound when
+      gnome-settings-daemon tells us the sound server has started
+  * debian/patches/90_from_svn_gsd_starts_esd.patch:
+    - dropped, fixed in the new version
+  * debian/patches/70_autoreconf.patch:
+    - new version update
+     
+ -- Sebastien Bacher <seb128@canonical.com>  Sat, 08 Mar 2008 14:57:56 +0100
+
+gnome-session (2.21.92-0ubuntu2) hardy; urgency=low
+
+  * debian/control.in:
+    - don't use esd
+  * debian/patches/70_autoreconf.patch:
+    - new changes update
+  * debian/patches/90_from_svn_gsd_starts_esd.patch:
+    - change from svn, doesn't start esd gsd does it now and use gnome-sound
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 29 Feb 2008 11:47:19 +0100
+
+gnome-session (2.21.92-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    Misc
+    - Require gnome-keyring >= 2.21.92 
+    Session Manager
+    - Correctly handle the environment variables given by gnome-keyring to
+      make it work in the whole session 
+    Translators
+  * debian/control.in:
+    - updated gnome-keyring requirement
+  * debian/patches/11_session_dialog.patch:
+    - updated to correct center the dialog, thanks Bruce Cowan (lp: #56825)
+  * debian/patches/70_autoreconf.patch:
+    - new version update
+  * debian/patches/91_from_bugzilla_set_keyring_environment.patch:
+    - dropped, the new version fixes the issue
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 27 Feb 2008 13:18:38 +0100
+
+gnome-session (2.21.91-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/02_gsd-spawn.patch:
+    - use updated patch version from debian
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 18 Feb 2008 15:21:27 +0100
+
+gnome-session (2.21.91-0ubuntu1) hardy; urgency=low
+
+  * New upstream release; bug fix and translations.
+    - Upstream NEWS:
+      . Make login sound work again
+    - Refresh patches 01_ignore-gdm-lang, 08_ubuntu_use_apport_on_crash,
+      20_dont_fade_on_ltsp_client to apply cleanly.
+    - Drop patch 90_from_bugzilla_fix_session_sounds as a different fix was
+      put in the new upstream release; the final fix is waiting for changes in
+      gnome-settings-daemon.
+    - Fix series ordering.
+    - Update 90_autoreconf_update and rename to 70_autoreconf.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 14 Feb 2008 11:32:23 +0100
+
+gnome-session (2.21.90-0ubuntu2) hardy; urgency=low
+
+  * Use the non critical warning change again, it was not listed in series
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 31 Jan 2008 17:32:23 +0100
+
+gnome-session (2.21.90-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    Session Manager
+    - Use max dithering again for splash
+    - Change capplet title
+    - HIG fixes in the capplet 
+  * debian/control.in:
+    - updated the requirements
+  * debian/patches/90_autoreconf_update.patch:
+    - new version update and renamed
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 29 Jan 2008 18:50:16 +0100
+
+gnome-session (2.20.2-1ubuntu2) hardy; urgency=low
+
+  * debian/patches/91_from_bugzilla_set_keyring_environment.patch:
+    - patch from bugzilla, set the keyring environment correctly
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 18 Dec 2007 11:49:24 +0100
+
+gnome-session (2.20.2-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining changes:
+    - debian/control:
+      + Update maintainer field.
+      + Depend on gnome-power-manager.
+      + Require libgnome-settings-daemon-dev >= 1:2.21.2-0ubuntu2.
+        Fixes FTBFS.
+    - debian/patches/08_ubuntu_use_apport_on_crash.patch:
+      + use bug-buddy only if /apps/bug-buddy/run_on_crash is set,
+        otherwise use apport
+    - debian/patches/11_session_dialog.patch:
+      + new session dialog by Manu Cornet <manu@manucornet.net>
+    - debian/patches/19_gnome-wm-tweaking.patch:
+      + set the current wm to gconf and get the default one from gconf
+      + use the x-terminal-emulator instead of xterm for gnome-wm
+    - debian/patches/20_dont_fade_on_ltsp_client.patch:
+      + patch by Oliver Grawert <ogra@ubuntu.com>,don't use fading on ltsp client
+    - debian/patches/series:
+      + Added ubuntu patches.
+    - debian/rules:
+      + install the icons for the new dialog
+    - debian/gnome-session.install:
+      + don't install the debian gnome-wm version
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Fri, 07 Dec 2007 19:26:11 +0100
+
+gnome-session (2.20.2-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-wm:
+    + Fix indentation.
+    + Support for compiz. Closes: #448560, thanks Andreas Klöckner.
+    + Also use compiz if metacity is unavailable.
+  * 02_gsd-spawn.patch: spawn gnome-settings-daemon using g_spawn
+    instead of DBus. Closes: #339785.
+  * Require libgnome-settings-daemon-dev 1:2.20.1-2 to obtain the g-s-d
+    path from pkgconfig.
+  * Switch to quilt for patch handling.
+    + Refresh 01_ignore-gdm-lang.patch.
+  * 90_autoconf.patch: re-run autoconf and autoheader in the sources.
+
+  [ Loic Minier ]
+  * Only suggest desktop-base; the desktop meta packages should pull branding,
+    not gnome-session and gnome-session has a default branding anyway.
+  * New patch, 02_no_warning_crash, doesn't make critical warnings fatal when
+    the version number has 3 dots as in dev releases as this makes the desktop
+    too unstable.
+  * New upstream stable release; translation updates.
+    - Update patch 90_autoconf.
+  * Don't force an upper bound in gnome-control-center versions as this makes
+    updates too hard; some configuration might be missing in the interim, but
+    the session should still start properly.
+  * Rename README.debian to README.Debian.
+  * Disable the splash screen by default to speed up login and document how to
+    enable it in README.Debian.
+  * New patch, 10_update_notifier, adds update-notifier to the list of known
+    applications.
+  * New patch, 09_splash_hide, hides splash screen unconditionally when all
+    apps have been launched as to avoid it staying visible with broken apps.
+  * New patch, 03_powermanagement, shows hibernate option in logout dialog if
+    gdm supports it; will probably disappear with either the gnome-session or
+    the gdm rewrite.
+  * New patch, 90_from_bugzilla_fix_session_sounds, fixes playback of session
+    sounds; GNOME #466458.
+  * Refresh patches 03_powermanagement, 09_splash_hide, and 10_update_notifier
+    to apply cleanly.
+  * Rename patch 90_autoconf to 90_autoconf-autoheader to clarify that both
+    autoconf and autoheader need to be run.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 27 Nov 2007 13:28:35 +0100
+
+gnome-session (2.20.1-1ubuntu2) hardy; urgency=low
+
+  * debian/control.in:
+    - don't conflicts with the new gnome-control-center versions
+
+ -- Sebastien Bacher <seb128@canonical.com>  Sat, 24 Nov 2007 14:12:01 +0100
+
+gnome-session (2.20.1-1ubuntu1) hardy; urgency=low
+
+  * Sync with Debian
+  * debian/control.in:
+    - don't Recommends desktop-base
+    - gnome-session Depends on gnome-power-manager
+    - maintainer is the Ubuntu Desktop Team
+  * debian/gconf-defaults:
+    - use no splash image on the default installation
+  * debian/gnome-session.install:
+    - don't install the debian gnome-wm version
+  * debian/patches/02_no_warning_crash.patch:
+    - don't crash on warning, users expect stability
+  * debian/patches/03_powermanagement.patch:
+    - powermanagement features.
+  * debian/patches/08_ubuntu_use_apport_on_crash.patch:
+    - use bug-buddy only if /apps/bug-buddy/run_on_crash is set,
+      otherwise use apport
+  * debian/patches/09_splash_hide.patch:
+    - fix some issue with splashscreen staying on screen when not needed.
+  * debian/patches/10_update_notifier:
+    - added update-notifier to the list of known applications
+  * debian/patches/11_session_dialog.patch:
+    - new session dialog by Manu Cornet <manu@manucornet.net>
+  * debian/patches/19_gnome-wm-tweaking.patch:
+    - set the current wm to gconf and get the default one from gconf
+    - use the x-terminal-emulator instead of xterm for gnome-wm
+  * debian/patches/20_dont_fade_on_ltsp_client.patch:
+    - patch by Oliver Grawert <ogra@ubuntu.com>,don't use fading on ltsp client
+  * debian/patches/90_from_bugzilla_fix_session_sounds.patch:
+    - patch from GNOME bug #466458, fix the session sounds
+  * debian/pixmaps:
+    - icons for the new dialog, by Manu Cornet <manu@manucornet.net>
+  * debian/rules:
+    - install the icons for the new dialog
+
+ -- Sebastien Bacher <seb128@canonical.com>  Wed, 21 Nov 2007 15:25:05 +0100
+
+gnome-session (2.20.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 26 Oct 2007 12:21:23 +0200
+
+gnome-session (2.20.0-2) unstable; urgency=low
+
+  * Conflict with bug-buddy << 2.20 for breakpad support.
+    Closes: #443638.
+  * 01_ignore-gdm-lang.patch: ignore GDM_LANG. This only serves the
+    purpose to break anything that modifies locale settings.
+    Closes: #445646.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 11 Oct 2007 22:35:32 +0200
+
+gnome-session (2.20.0-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * default.session: don't run vino-session as gnome-session has
+    included this feature for 3 years, d'uh.
+
+  [ Sebastian Dröge ]
+  * New upstream release, no API changes:
+    + Clarifies session saving text (Closes: #259718).
+  * Upload to unstable, drop check-dist include.
+  * debian/control.in:
+    + Build depend on libgtk2.0-dev (>= 2.11.1) because gdk_window_set_opacity
+      was added in that version but configure checks for >= 2.3.1.
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 20 Sep 2007 12:38:07 +0200
+
+gnome-session (2.19.5-1) experimental; urgency=low
+
+  * New upstream development releases.
+    - Target at experimental; include check-dist.
+    - Add a libglib2.0-dev (>= 2.13.0) build-dep.
+    - Drop patch 01_splash-memory-corruption, merged upstream.
+    - New patch, 60_dates-no-padding, fixes build on the 8th and 9th of the
+      month and in August and September; GNOME #454797.
+  * Drop obsolete patch to display a warning when switching from GNOME 1 to
+    GNOME 2, 02_conversion.
+  * Uuencode debian/gnome-debian-splash.png instead of shipping it as a SNG;
+    this makes the file smaller; build-depend on sharutils (priority standard)
+    instead of sng (priority optional).
+  * New upstream development release; bug fixes and translations.
+    - Drop patch 60_dates-no-padding; fixed differently upstream.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 10 Jul 2007 18:44:14 +0200
+
+gnome-session (2.18.3-1) unstable; urgency=low
+
+  * New upstream stable release; translation.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 06 Jul 2007 23:08:26 +0200
+
+gnome-session (2.18.2-2) unstable; urgency=low
+
+  * default.session: remove gnome-volume-manager, it is now run through
+    the autostart facility.
+  * gnome-wm: add support for openbox (closes: #429729).
+  * 01_splash-memory-corruption.diff: patch from upstream r4382,
+    backported by Michel Dänzer. Fixes memory corruption with some
+    icons (closes: #430630, #425742).
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 27 Jun 2007 21:28:43 +0200
+
+gnome-session (2.18.2-1) unstable; urgency=low
+
+  * New upstream stable release.
+    - Drop patch 01_clever_save; merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 28 May 2007 16:18:59 +0200
+
+gnome-session (2.18.0-2) unstable; urgency=low
+
+  [ Sven Arvidsson ]
+  * Add the only missing manpage (Closes: #252006)
+
+  [ Josselin Mouette ]
+  * 01_clever_save.diff: stolen from upstream's SVN. Be more clever when 
+    saving the session, so that e.g. multiple xterms are not forgotten.
+    Closes: #364463.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 15 May 2007 20:45:31 +0200
+
+gnome-session (2.18.0-1) unstable; urgency=low
+
+  * New upstream major stable release; fixes and translations.
+    - Pass --with-at-spi-registryd-directory=/usr/lib/at-spi to configure.
+    - Drop patches 05_session_save, 07_kill_esd, merged upstream.
+  * Upload to unstable; drop check-dist include.
+  * Wrap build-deps and deps.
+  * Bump up Debhelper compatibility level to 5.
+  * Fix URL in copyright.
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+    cdbs >= 0.4.41.
+  * Prepend -z defs to LDFLAGS for additional safety.
+  * Rewrite rules generating the PNG splash; misc cleanups.
+  * Fix copyright to really document licensing and copyright holders.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 22 Apr 2007 15:23:12 +0200
+
+gnome-session (2.16.3-2) experimental; urgency=low
+
+  * Merge SVN 2.14.3-1 up-to 2.14.3-6; r7581:8951.
+    - Drop patch 06_ro_po, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 12:24:06 +0100
+
+gnome-session (2.16.3-1) experimental; urgency=medium
+
+  [ Josselin Mouette ]
+  * Quote the readlink call to handle the case where the
+    x-session-manager alternative is broken (closes: #403931).
+  * Medium urgency because it has the potential to cause all X sessions
+    to fail starting.
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * New upstream stable release; bug fixes and translations.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 12:04:03 +0100
+
+gnome-session (2.16.2-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * New upstream release.
+  * gnome-debian-splash.sng: updated.
+  * Update build-dependencies.
+  * Build-depend on libdbus-glib-1-dev and libgnome-keyring-dev.
+  * 03_implicit_conversion.diff: removed, integrated upstream.
+  * 05_session_save.diff: patch the session properties capplet.
+    + Add a "save current session" button.
+    + Remove the "ask on exit" checkbox, as it isn't used anymore.
+    + Add 36 translations based on the existing ones (minus the "- ").
+    + Remove the annoying "session saved" dialog from the session
+      manager.
+
+  [ Loic Minier ]
+  * Fix watch file to track stable releases and use HTTP.
+
+  [ Josselin Mouette ]
+  * Build-depend on libgnome-settings-daemon-dev.
+  * Tighten dependencies on gnome-control-center with ${gnome:Version}.
+  * Require gnome-pkg-tools 0.6.
+  * Call gnome-version.mk.
+  * 04_manpages.diff: removed, integrated upstream.
+  * 05_session_save.diff: update patch for new version.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 27 Nov 2006 20:43:07 +0100
+
+gnome-session (2.14.3-6) unstable; urgency=low
+
+  * Add a get-orig-source target to retrieve the upstream tarball.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 13 Jan 2007 23:30:57 +0100
+
+gnome-session (2.14.3-5) unstable; urgency=medium
+
+  * Quote the readlink call to handle the case where the 
+    x-session-manager alternative is broken (closes: #403931).
+  * Medium urgency because it has the potential to cause all X sessions 
+    to fail starting.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 20 Dec 2006 21:37:44 +0100
+
+gnome-session (2.14.3-4) unstable; urgency=low
+
+  * 06_ro_po.diff: new Romanian translation from Eddy Petrișor
+    (closes: #403595).
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 19 Dec 2006 21:25:14 +0100
+
+gnome-session (2.14.3-3) unstable; urgency=low
+
+  * gnome-debian-splash.sng: grab new version, without the "2.14"
+    string.
+  * 05_session_save.diff: pack the "save session" button correctly.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 10 Oct 2006 19:14:02 +0200
+
+gnome-session (2.14.3-2) unstable; urgency=low
+
+  * 05_session_save.diff: patch the session properties capplet.
+    + Allow editing of sessions (bugzilla #336820).
+    + Add a "save current session" button.
+    + Remove the "ask on exit" checkbox, as it isn't used anymore.
+    + Add 36 translations based on the existing ones (minus the "- ").
+    + Remove the annoying "session saved" dialog from the session
+      manager.
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  4 Oct 2006 22:26:30 +0200
+
+gnome-session (2.14.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Drop 01_create_autostart patch, merged upstream.
+  * Suggest gnome-user-guide | gnome2-user-guide. (Closes: #371106, #371107,
+    #371108, #371109, #371110, #371111, #371112, #371113, #371114, #371115,
+    #371116, #371117, #371118, #371119, #371120, #371121, #371122, #371123,
+    #371124, #371125, #371126, #371127, #371128, #371129, #371130, #371131,
+    #371132, #371133)
+
+ -- Loic Minier <lool@dooz.org>  Tue,  8 Aug 2006 11:15:38 +0200
+
+gnome-session (2.14.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 31 May 2006 18:36:45 +0200
+
+gnome-session (2.14.1-2) unstable; urgency=low
+
+  * 03_implicit_conversion.diff: Fix for implicit conversion 
+    (closes: #368062).
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 25 May 2006 00:49:18 +0200
+
+gnome-session (2.14.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Standards-version is 3.7.2.
+  * 07_kill_esd.diff: updated.
+  * Build-depend on libwrap0-dev.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 18 May 2006 07:51:21 +0200
+
+gnome-session (2.14.0-2) unstable; urgency=low
+
+  * Update watch file.
+  * 01_create_autostart.diff: create the autostart directory when it 
+    doesn't exist (closes: #360590, #360431).
+
+ -- Josselin Mouette <joss@debian.org>  Fri,  7 Apr 2006 09:59:27 +0200
+
+gnome-session (2.14.0-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Launch esd with a cwd of "/" to avoid blocking pam_mount / pam_umount,
+    thanks Daniel Kahn Gillmor. (Closes: #335944)
+    [debian/patches/07_kill_esd.diff]
+
+  [ Josselin Mouette ]
+  * New upstream release.
+  * Build-depend on libnotify-dev.
+  * Enable IPv6.
+  * gnome-debian-splash.sng: update for GNOME 2.14.
+  * 02_conversion.diff: updated for the new version.
+  * Build-depend on libgnome-desktop-dev.
+
+ -- Josselin Mouette <joss@debian.org>  Sat,  1 Apr 2006 16:58:40 +0200
+
+gnome-session (2.12.0-4) unstable; urgency=low
+
+  * Only depend on dbus, dbus-1-utils isn't necessary.
+  * rules: don't remove empty directories (really closes: #340765).
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 22 Jan 2006 15:35:55 +0100
+
+gnome-session (2.12.0-3) unstable; urgency=low
+
+  * 03_splash.diff: removed.
+  * gconf-defaults: ship the defaults here.
+  * control.in: require debhelper 5.0.13.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  8 Jan 2006 12:02:30 +0100
+
+gnome-session (2.12.0-2) unstable; urgency=low
+
+  * dirs: create /usr/share/images/desktop-base (closes: #340765).
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  8 Jan 2006 01:27:42 +0100
+
+gnome-session (2.12.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Edit upstream logo to add the debian swirl:
+    + Add it, using the sng format.
+    + Build-depend on sng.
+    + Call sng in the build target.
+    + Install it in /usr/share/pixmaps/splash/.
+    + 03_splash.diff: use it by default.
+    + Add it to the desktop-base alternative.
+    + Only recommend desktop-base.
+  * 02_conversion.diff: update to apply cleanly.
+  * Update watch file.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  9 Oct 2005 03:19:58 +0200
+
+gnome-session (2.10.0-8) unstable; urgency=low
+
+  * rules: set --as-needed again.
+  * Rebuild against the latest gconf2 (closes: #330476, #330913).
+  * Build-depend on gconf2 2.10.1-6.
+
+ -- Josselin Mouette <joss@debian.org>  Mon,  3 Oct 2005 20:57:52 +0200
+
+gnome-session (2.10.0-7) unstable; urgency=medium
+
+  * The "now all dependencies in GNOME are back to the old times 
+    madness, why not do the same here?" release.
+  * rules: remove --as-needed (closes: #325639).
+  * default.session:
+    + Remove gnome-smproxy. It slows down the startup process and 
+      sometimes hangs.
+    + Remove magicdev, which is deprecated.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  4 Sep 2005 11:13:41 +0200
+
+gnome-session (2.10.0-6) unstable; urgency=high
+
+  Matt Kraai <kraai@ftbfs.org>:
+  * Added a build-dependency on libxau-dev to fix FTBFS. (Closes: #323327)
+
+  Loic Minier <lool@dooz.org>:
+  * Recommend the dbus-1-utils package as it is xorg starts a dbus session by
+    default now (use-session-dbus in /etc/X11/Xsession.options).
+    (Closes: #320015)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 28 Aug 2005 14:52:19 +0200
+
+gnome-session (2.10.0-5) unstable; urgency=medium
+
+  * Depend on gnome-control-center instead of capplets.
+  * Remove unuseful conflicts field.
+  * Fix a typo in the description (closes: #299992).
+  * Standards-version is 3.6.2.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 25 Jun 2005 19:11:59 +0200
+
+gnome-session (2.10.0-4) unstable; urgency=low
+
+  * Undo previous changes, we are renaming the menus.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  9 Jun 2005 11:53:39 +0200
+
+gnome-session (2.10.0-3) unstable; urgency=low
+
+  * 70gnome-session_menus: set the XDG_CONFIG_DIRS environment variable, so
+    that the menus use GNOME's implementation.
+  * gnome-session.install: install the file in /etc/X11/Xsession.d.
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  8 Jun 2005 23:09:56 +0200
+
+gnome-session (2.10.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Update debian/watch.
+  * rules: avoid the LDFLAGS hack overwriting all environment.
+
+ -- Josselin Mouette <joss@debian.org>  Tue,  7 Jun 2005 21:47:24 +0200
+
+gnome-session (2.10.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update build-dependencies.
+  * 06_shutdown.diff: removed, similar functionality is integrated upstream.
+  * 20_ca_po.diff: removed, integrated upstream.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 13 Apr 2005 20:15:32 +0200
+
+gnome-session (2.8.1-6) unstable; urgency=medium
+
+  * Use --as-needed option in LDFLAGS to reduce the dependencies.
+    + Incidentally removes the dependency upon libhowl0 (closes: #298849).
+  * gnome-wm: add support for fvwm (closes: #289969).
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 10 Mar 2005 21:44:15 +0100
+
+gnome-session (2.8.1-5) unstable; urgency=medium
+
+  * 20_ca_po.diff: fixes to the Catalan translation.
+
+ -- Jordi Mallach <jordi@debian.org>  Fri,  7 Jan 2005 17:54:47 +0100
+
+gnome-session (2.8.1-4) unstable; urgency=medium
+
+  * 09_splash_hide.diff: disabled, this patch only manages to make things
+    worse (closes: #284090).
+  * postinst,prerm: install alternative for the splash image
+    (closes: #282653).
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  5 Dec 2004 19:54:49 +0100
+
+gnome-session (2.8.1-3) unstable; urgency=low
+
+  * 09_splash_hide.diff: stop displaying splash when all applications are 
+    launched, it avoids waiting when some of them are broken. Thanks seb128.
+  * 07_kill_esd.diff: kill esd upon logout (closes: #187730).
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 23 Nov 2004 15:08:47 +0100
+
+gnome-session (2.8.1-2) unstable; urgency=low
+
+  * Forward-port changes from 2.6 branch:
+    + 55gnome-session_gnomerc: support arguments to gnome-session.
+    + control.in:
+      - Depend on capplets.
+      - Recommend nautilus, gnome-panel and a window manager.
+    + patches/05_debian_gnome_upgrade_check.diff, patches/00_Makefile.am.diff,
+      patches/01_autoreconf.diff, gnome-1-to-2, gnome-launchers-1-to-2,
+      gnome-panel-1-to-2, gnome-stuff-1-to-2, nautilus-666666.desktop:
+      removed.
+    + gnome-session.install: don't install those.
+    + rules: don't have to fix the permissions.
+    + 02_conversion.diff: only print a warning, don't launch the broken
+      upgrade script
+    + gnome-volume-daemon: removed, obsolete.
+  * Upload to unstable.
+  * control.in: 
+    + Bump build-dependencies to 2.8 versions.
+    + Build-depend on libgconf2-dev, not gconf2.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 19 Nov 2004 14:40:42 +0100
+
+gnome-session (2.8.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/03_splash.diff: (change from trunk)
+  - use the desktop-splash alternative as the default splash
+  * debian/control{,.in}: (change from trunk)
+  - the change above required desktop-base 0.3.15, so updated
+    Depends
+  * debian/patches/00_acinclude.m4.diff:
+  - removed, not needed anymore
+  * debian/patches/01_autoreconf.patch: 
+  - updated, result of "libtoolize --force --copy;
+    aclocal-1.7; autoheader; automake-1.7 -acf; autoconf; rm -rf
+    autom4te.cache" with the 00_ patch applied.
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 24 Oct 2004 12:47:32 -0300
+
+gnome-session (2.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/01_autoreconf.patch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 29 Sep 2004 21:43:42 +0200
+
+gnome-session (2.6.2-5) unstable; urgency=low
+
+  * 06_shutdown.diff: test for /var/run/gdm.pid (closes: #261969).
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 31 Jul 2004 12:23:23 +0200
+
+gnome-session (2.6.2-4) unstable; urgency=low
+
+  * 06_shutdown.diff: new, provide reboot or halt using gdmflexiserver if
+    available.
+  * rules: remove halt/reboot configure switches.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 26 Jul 2004 23:22:29 +0200
+
+gnome-session (2.6.2-3) unstable; urgency=low
+
+  * Rebuild with working dh_gconf (closes: #258139, #258144).
+
+ -- Josselin Mouette <joss@debian.org>  Thu,  8 Jul 2004 16:44:01 +0200
+
+gnome-session (2.6.2-2) unstable; urgency=low
+
+  * gnome-volume-daemon:
+    + removed, it didn't register correctly with the SM (closes: #253729).
+    + gnome-session.install: don't install it.
+  * default.session:
+    + start both magicdev and g-v-m, they now conflict with each other.
+
+ -- Josselin Mouette <joss@debian.org>  Tue,  6 Jul 2004 22:30:07 +0200
+
+gnome-session (2.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * 01_autoreconf.patch: updated, result of "libtoolize --force --copy;
+    aclocal-1.7; autoheader; automake-1.7 -acf; autoconf; rm -rf
+    autom4te.cache" with 00_ patches applied.
+  * gnome-volume-daemon:
+    + new script, runs gnome-volume-manager if available, or falls back
+      to magicdev.
+    + gnome-session.install: install it.
+    + rules: chmod it.
+    + default.session: use it instead of gnome-volume-manager.
+  * gnome-wm: store the window manager in the "current" gconf key, not the
+    "default" one.
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 29 Jun 2004 23:25:01 +0200
+
+gnome-session (2.6.1-6) unstable; urgency=low
+
+  * Gustavo Noronha Silva <kov@debian.org>
+  - debian/README.Debian:
+   + did some small cleanups
+   + wrote a small explanation of why the splash screen is
+     different from GNOME's upstream and how to get it back
+     and set it up
+  * Josselin Mouette <joss@debian.org>
+  - debian/default.session:
+    + add gnome-volume-manager, gnome-cups-icon and vino-session to the
+      default session.
+  - debian/postinst:
+    + make gnome-session's priority 50, to be greater than KDE. Thus the
+      default DM is gdm and the default session is gnome-session.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 24 Jun 2004 14:02:52 +0200
+
+gnome-session (2.6.1-5) unstable; urgency=low
+
+  * Grrrr, configure doesn't check for libXmu while it is needed. Add
+    libxmu-dev to build-depends.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 28 May 2004 15:05:42 +0200
+
+gnome-session (2.6.1-4) unstable; urgency=low
+
+  * Add explicit build dependencies on X libraries (closes: #251367).
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 28 May 2004 12:13:39 +0200
+
+gnome-session (2.6.1-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * Tighten dependencies on liborbit2-dev.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 26 May 2004 16:11:18 +0200
+
+gnome-session (2.6.1-2) experimental; urgency=low
+
+  * 55gnome-session_gnomerc: handle the case where we are running
+    x-session-manager, symlinked to gnome-session.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 22 Apr 2004 11:37:15 +0200
+
+gnome-session (2.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Source .gnomerc at startup (closes: #242065):
+    - gnome-session.install: install 55gnome-session_gnomerc in Xsession
+      directory.
+    - 55gnome-session_gnomerc: source .gnomerc if we are running
+      gnome-session.
+  * gnome-wm: get the default window manager from gconf. It now uses the
+    /desktop/gnome/applications/window_manager/default key
+    (closes: #241361, #244694). The x-window-manager alternative is now only
+    used when nothing else is found.
+  * patches/01_autoreconf.diff: updated, result of
+    libtoolize --force --copy; aclocal-1.7; autoheader; automake-1.7 -acf;
+    autoconf; rm -rf autom4te.cache.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 21 Apr 2004 17:12:10 +0200
+
+gnome-session (2.6.0-3) experimental; urgency=low
+
+  * rules: force poweroff and reboot paths (closes: #242091)
+  * gnome-wm: don't set the gconf key, it is unused.
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  7 Apr 2004 12:31:16 +0200
+
+gnome-session (2.6.0-2) experimental; urgency=low
+
+  * Move gnome-sesssion.install to gnome-session.install.
+  * Forward-port changes from 2.4.2-4:
+    + Use metacity by default:
+      - gnome-wm: use metacity or sawfish when it is available
+      - default.session: let gnome-wm discover the window manager
+    + docs: removed, cdbs takes care of these.
+    + postinst,prerm: remove gconf stuff, dh_gconf does it for us.
+    + control.in: require debhelper 4.1.84
+    + Provide a session for the display managers:
+      - add gnome-session.desktop
+      - gnome-session.install: install it
+    + patches/:
+      - 01_configure.diff, 03_Makefile.in.diff: removed
+      - 00_Makefile.am.diff patches gnome-session/Makefile.am
+    + Use the splash screen from desktop-base by default.
+      - patches/03_splash.diff: for the code and gconf stuff
+      - control.in: depend on desktop-base.
+    + control.in: don't depend on debianutils, woody provides a sufficient
+      version.
+    + fix permissions:
+      - compat: use debhelper v4
+      - rules: chmod 755 the debian scripts
+  * control.in: require 2.6 versions of packages.
+  * patches/:
+    + updated 00_acinclude.m4.diff includes a copy of
+      gnome2-macros/compiler-flags.m4 as aclocal 1.7 seems unable to
+      find it.
+    + updated 01_autoreconf.diff is the result of running
+      libtoolize --force --copy; aclocal; autoheader; automake -acf;
+      autoconf.
+    + update patches/03_splash.diff for the new version.
+
+ -- Josselin Mouette <joss@debian.org>  Thu,  1 Apr 2004 15:33:35 +0200
+
+gnome-session (2.6.0-1) experimental; urgency=low
+
+  * New upstream release
+  * GNOME Team Upload
+  * Gustavo Noronha Silva <kov@debian.org>:
+   + debian/control.in:
+    - set maintainer to Josselin Mouette <joss@debian.org>
+    - Build-Depends on cdbs and gnome-pkg-tools
+   + debian/patches/*:
+    - converted all from dpatch to cdbs' simple-patch, some
+      of them were regenerated for various reasons, including
+      failure on apply and not including diff for Makefile.am
+   + debian/rules:
+    - use cdbs
+   + gnome-session.install:
+    - install some debian specific files that were installed
+      manually through debian/rules before
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sun, 28 Mar 2004 13:23:41 -0300
+
+gnome-session (2.4.2-2) unstable; urgency=low
+
+  * Orphaned package.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 19 Mar 2004 15:50:59 +0100
+
+gnome-session (2.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 14 Jan 2004 20:47:13 +0100
+
+gnome-session (2.4.1-3) unstable; urgency=low
+
+  * debian/prerm Unregister schemas file from the database.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  9 Jan 2004 15:42:34 +0100
+
+gnome-session (2.4.1-2) unstable; urgency=low
+
+  * Build with --with-window-manager=metacity (CLoses: #216769)
+  * Update desktop migration from .gnome-desktop to Desktop
+  * Update Build-dependencies to GNOME 2.4 packages
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  1 Nov 2003 16:45:42 +0100
+
+gnome-session (2.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 18 Oct 2003 17:27:21 +0200
+
+gnome-session (2.2.2-4) unstable; urgency=low
+
+  * Fix broken manpage (thanks to Marcin Owsiany) (Closes: #204604)
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 10 Aug 2003 20:10:08 +0200
+
+gnome-session (2.2.2-3) unstable; urgency=low
+
+  * Fix typo in gnome-session.1 (Closes: #192575)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 14 Jul 2003 15:25:48 +0200
+
+gnome-session (2.2.2-2) unstable; urgency=low
+
+  * Add changes from Greg Hudson for conversion scripts. Thanks.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 28 May 2003 21:55:00 +0200
+
+gnome-session (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 16 May 2003 17:22:21 +0200
+
+gnome-session (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Cleanup debian/prerm (Closes: #180928)
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 11 Mar 2003 14:16:20 +0100
+
+gnome-session (2.2.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add a note about GNOME 2 compliant window manager (Closes: #174021)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  4 Feb 2003 15:26:22 +0100
+
+gnome-session (2.2.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 22 Jan 2003 13:20:07 +0100
+
+gnome-session (2.1.90-1) unstable; urgency=low
+
+  * New upstream releae.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 19 Jan 2003 15:27:47 +0100
+
+gnome-session (2.0.9-3) unstable; urgency=low
+
+  * FIx manpage for gnome-session-save (Closes: #171661)
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  4 Dec 2002 12:47:04 +0100
+
+gnome-session (2.0.9-2) unstable; urgency=low
+
+  * New pacthe against gnome-session/Makefile.in to really add the binaries
+    conversion.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 27 Nov 2002 13:11:27 +0100
+
+gnome-session (2.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix lintian warnings with manpages.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 15 Nov 2002 14:26:18 +0100
+
+gnome-session (2.0.8-8) unstable; urgency=low
+
+  * Handle fully-qualified panel path in conversion script.
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  6 Nov 2002 17:14:54 +0100
+
+gnome-session (2.0.8-7) unstable; urgency=low
+
+  * Fix wrong indentation (Closes: #167454)
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  2 Nov 2002 19:27:57 +0100
+
+gnome-session (2.0.8-6) unstable; urgency=low
+
+  * Colin's fix :
+     * Correctly transitions the background
+     * Handles the multiload applet
+     * Handles aligned panels
+     * Tries to convert menu items
+     * Doesn't crash on invalid UTF-8
+     * Doesn't crash on an empty launchers dir
+  * Me :
+     * Don't try to overwrite gconf gnome-terminal configuration
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  1 Nov 2002 18:05:20 +0100
+
+gnome-session (2.0.8-5) unstable; urgency=low
+
+  * Add a note in the confirmation dialog box for how to report bugs.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 28 Oct 2002 21:01:02 +0100
+
+gnome-session (2.0.8-4) unstable; urgency=low
+
+  * Oops, forget to apply yesterday changes in conversion code.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 28 Oct 2002 17:32:53 +0100
+
+gnome-session (2.0.8-3) unstable; urgency=low
+
+  * Fix gnome-wm. Gnome don't like symlink.
+  * This package contains conversion scripts for GNOME 1 to GNOME 2 (Closes: #153682)
+  * Upload to unstable
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 28 Oct 2002 11:34:22 +0100
+
+gnome-session (2.0.8-2) experimental; urgency=low
+
+  * Uploaded officially to experimental
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 22 Oct 2002 18:00:11 +0200
+
+gnome-session (2.0.8-1.1upgradetest) experimental; urgency=low
+ 
+  * EXPERIMENTAL TESTING RELEASE
+  * Add upgrade scripts.
+ 
+ -- Colin Walters <walters@debian.org>  Sat, 19 Oct 2002 22:54:05 -0400
+
+gnome-session (2.0.8-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add metacity in gnome-wm
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 14 Oct 2002 16:09:35 +0200
+
+gnome-session (2.0.7-4) experimental; urgency=low
+
+  * Change the default window manager in the default sesion file by
+    x-window-manager (was gnome-wm)
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  9 Oct 2002 23:43:32 +0200
+
+gnome-session (2.0.7-3) experimental; urgency=low
+
+  * Upload with original tarball.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 29 Sep 2002 17:40:55 +0200
+
+gnome-session2 (2.0.7-2) experimental; urgency=low
+
+  * Update to standards version 3.5.7
+  * Upload without the 2 suffix
+  * Update libgnomeui-dev build-dependency to 2.0.5-3
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 28 Sep 2002 17:59:43 +0200
+
+gnome-session2 (2.0.7-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  5 Sep 2002 18:56:12 +0200
+
+gnome-session2 (2.0.6-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 27 Aug 2002 10:38:48 +0200
+
+gnome-session2 (2.0.5-3) experimental; urgency=low
+
+  * Build against the latest gconf2 1.2.1-2.1 (Closes: #157727)
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 22 Aug 2002 19:04:39 +0200
+
+gnome-session2 (2.0.5-2) experimental; urgency=low
+
+  * Add esound in build-depends
+  * Build against the latest libgnomevfs2-dev 2.0.2-4
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 16 Aug 2002 17:31:02 +0200
+
+gnome-session2 (2.0.5-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  8 Aug 2002 16:28:59 +0200
+
+gnome-session2 (2.0.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  5 Aug 2002 19:40:25 +0200
+
+gnome-session2 (2.0.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Use gconftool-2 to store window-manager preference
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 30 Jul 2002 18:16:53 +0200
+
+gnome-session2 (2.0.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 15 Jul 2002 15:20:51 +0200
+
+gnome-session2 (2.0.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 17 Jun 2002 15:46:23 +0200
+
+gnome-session2 (2.0.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 10 Jun 2002 16:03:08 +0200
+
+gnome-session2 (1.5.21-1) experimental; urgency=low
+
+  * new upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  4 Jun 2002 16:34:27 +0200
+
+gnome-session2 (1.5.20-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 28 May 2002 15:22:12 +0200
+
+gnome-session2 (1.5.19-3) experimental; urgency=low
+
+  * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target.
+  * debian/postinst check if schemas files are present before calling
+    gconftool-2
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 27 May 2002 16:03:24 +0200
+
+gnome-session2 (1.5.19-2) experimental; urgency=low
+
+  * Fix a typo in postinst (Closes: #147600)
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 21 May 2002 11:15:32 +0200
+
+gnome-session2 (1.5.19-1) experimental; urgency=low
+
+  * New upstream release
+  * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 15 May 2002 20:04:03 +0200
+
+gnome-session2 (1.5.18-1) experimental; urgency=low
+
+  * new upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 29 Apr 2002 20:45:49 +0200
+
+gnome-session2 (1.5.17-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 22 Apr 2002 16:34:38 +0200
+
+gnome-session2 (1.5.16-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 17 Apr 2002 15:41:33 +0200
+
+gnome-session2 (1.5.15-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  1 Apr 2002 22:33:26 +0200
+
+gnome-session2 (1.5.13-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 29 Mar 2002 16:38:29 +0100
+
+gnome-session2 (1.5.11-1) experimental; urgency=low
+
+  * new upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 26 Feb 2002 15:10:17 +0100
+
+gnome-session2 (1.5.10-3) experimental; urgency=low
+
+  * Fix broken postinst. Thanks to Mark Nelson.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 25 Feb 2002 17:44:33 +0100
+
+gnome-session2 (1.5.10-2) experimental; urgency=low
+
+  * Should build-depends on intltool
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 25 Feb 2002 15:37:19 +0100
+
+gnome-session2 (1.5.10-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 18 Feb 2002 22:31:35 +0100
+
+gnome-session2 (1.5.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 15 Feb 2002 00:40:12 +0100
+
+gnome-core2 (1.5.7-1) experimental; urgency=low
+
+  * New upstrema release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  5 Feb 2002 14:41:01 +0100
+
+gnome-core2 (1.5.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 20 Jan 2002 16:21:40 +0100
+
+gnome-core (1.4.0.4-16) unstable; urgency=low
+
+  * Fix typo in gnome-terminal.wrapper (Closes: #127768)
+  * Remove gnome-hint patche (Closes: #121390, #129184)
+  * debian/control Replace libpng-dev by libpng2-dev in Build-Depends
+    (Closes: #128377)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 14 Jan 2002 15:04:52 +0100
+
+gnome-core (1.4.0.4-15) unstable; urgency=low
+
+  * Build against the latest gnome-libs to update the libzvt2 dependency
+    (Closes: #127309, #127271)
+  * debian/control Replace libpng2-dev by libpng-dev in Build-Depends.
+  * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  1 Jan 2002 15:27:43 +0100
+
+gnome-core (1.4.0.4-14) unstable; urgency=low
+
+  * Fix typo in gnome-terminal.1 (Closes: #123073)
+  * Fix base page for doc-base in libpanel-applet-dev package.
+  * Fix typo in gnome-help documentation (Closes: #126566)
+  * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427)
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 27 Dec 2001 14:47:36 +0100
+
+gnome-core (1.4.0.4-13) unstable; urgency=low
+
+  * Default font for gnome-terminal is "fixed" only (Closes: #117126)
+  * Patch against gnome-hint.c Don't use gettext for font descriptor
+    (Closes: #116606)
+  * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path
+    (Closes: #120312)
+  * Revert my change on logout.c Only root can shutdown/reboot from the
+    panel (Closes: #119316, #120127)
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 20 Nov 2001 11:36:05 +0100
+
+gnome-core (1.4.0.4-12) unstable; urgency=low
+
+  * gnome-wm honour --default-wm (Closes: #115668)
+  * Build against the latest gnome-libs
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 21 Oct 2001 14:11:19 +0200
+
+gnome-core (1.4.0.4-11) unstable; urgency=low
+
+  * debian/control lynx comeback in Recommends (Closes: #114142)
+  * debian/control replaces xml-i18n-tools by intltool (Closes: #115024)
+  * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369)
+  * Build against the latest orbit (Closes: #115309)
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 12 Oct 2001 10:46:49 +0200
+
+gnome-core (1.4.0.4-10) unstable; urgency=low
+
+  * Fix typo in panel/panel.hints (Closes: #113590)
+  * Replace lynx by w3m (Closes: #113613)
+  * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736)
+  * Move gnome-help.desktop in gnome-help package
+  * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above
+  * Patch against gsm/logout.c Now you can reboot/halt your machine from the
+    panel. This only work for root, because shutdown doesn't understand the
+    -a option. Read README.debian in gnome-panel package.
+  * debian/rules Remove less files in clean target (Closes: #114020)
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  1 Oct 2001 11:34:06 +0200
+
+gnome-core (1.4.0.4-9) unstable; urgency=low
+
+  * Add Debian menu for panel and gmenu (Closes: #112176)
+  * Remove /var/lib/gnome on purge (Closes: #113005)
+  * Remove /etc/gnome/config on purge (Closes: #112994)
+  * Remove /etc/gnome on purge (Closes: #112995)
+  * debian/control replace cygnus-stylesheets by docbook-utils
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 24 Sep 2001 18:39:19 +0200
+
+gnome-core (1.4.0.4-8) unstable; urgency=high
+
+  * High urgency, because the current release in testing has a missing
+    dependency on libpanel-applet0 and the panel package doesn't work if
+    libpanel-applet0 isn't installed (Closes: #111517)
+  * debian/control for gnome-help, move lynx from depends to recommends
+    (Closes: #109652)
+  * debian/control gnome-panel suggests fortune-mod (Closes: #110865)
+  * debian/control gnome-help suggests gnome-users-guide not
+    gnome-users-guide-en (Closes: #111200)
+  * Don't change cursor color (Closes: #97697)
+  * Change default font for gnome-terminal (Closes: #111319)
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  7 Sep 2001 15:06:07 +0200
+
+gnome-core (1.4.0.4-7) unstable; urgency=low
+
+  * Fix path in gnome-session.1 (Closes: #107724)
+  * debian/*.sgml Use docbook 4.1
+  * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2)
+    (CLoses: #107948)
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  8 Aug 2001 08:07:56 +0200
+
+gnome-core (1.4.0.4-6) unstable; urgency=low
+
+  * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0
+    (Closes: #105772)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 18 Jul 2001 19:02:59 +0200
+
+gnome-core (1.4.0.4-5) unstable; urgency=low
+
+  * Patch against gnome-edit to use EDITOR if the default gnome editor is
+    unavailable.
+  * Remove gnome-wm patch, and move the patched file in debian/
+  * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager
+    (Closes: #103430
+  * New patch from Michael Urman to hide task names in tasklist_applet
+    (Closes: #104587)
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 14 Jul 2001 16:58:12 +0200
+
+gnome-core (1.4.0.4-4) unstable; urgency=low
+
+  * Gnome-help Provides: man-browser, www-browser, info-browser
+  * Switch to debhelper V3
+  * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest
+    package number.
+  * Build-depends on groff-base instead of groff
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 22 Jun 2001 17:02:37 +0200
+
+gnome-core (1.4.0.4-3) unstable; urgency=low
+
+  * New patch: Allows to save/load the keyboard secure state (Closes: #83028)
+  * New patch: Remove a warning in configure
+  * gnome-help replace gnome-panel-data (Closes: #99499)
+  * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784)
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  2 Jun 2001 14:41:45 +0200
+
+gnome-core (1.4.0.4-2) unstable; urgency=low
+
+  * New patch: Replace Distribution by Debian in configuration dialog box.
+  * New patch: Upstream patch to allow Debian menu in default configuration.
+  * New patch: Fix some wrong path.
+  * Move gnome-feedback doc from gnome-help-data to gnome-core.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 15 May 2001 15:36:51 +0200
+
+gnome-core (1.4.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  9 May 2001 23:56:27 +0200
+
+gnome-core (1.4.0.3-2) unstable; urgency=low
+
+  * Remove debugging code (/tmp/languages file)
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  7 May 2001 16:48:18 +0200
+
+gnome-core (1.4.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * New: tooltips for long task names in tasklist_applet (Closes: #63898)
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  3 May 2001 15:51:58 +0200
+
+gnome-core (1.4.0.2-3) unstable; urgency=low
+
+  * Fix wrong dif.gz file (Closes: #94499)
+  * Build against the latest lignome-dev (Closes: #95301, #95691)
+  * gnome-terminal should depends on gnome-bin (Closes: #95498)
+  * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  1 May 2001 11:03:14 +0200
+
+gnome-core (1.4.0.2-2) unstable; urgency=low
+
+  * New/old patch against manpages, never applied by upstream.
+  * gnome-help depends on lynx.
+  * Use x-terminal-emulator in gnome-download instead of xterm.
+  * Move gnome-convert and gnome-download from gnome-core to gnome-help.
+  * Move gnome-login-check from gnome-core to gnome-session.
+  * Move gnome-panel-add-launcher from gnome-core to gnome-panel.
+  * Move sesion-properties* from gnome-core to gnome-session.
+  * debian/control Add Replaces for the changes above.
+  * Write manpages (Closes: #87085)
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 17 Apr 2001 18:54:15 +0200
+
+gnome-core (1.4.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on latest gettext (Closes: #93198)
+  * Icon box in menu editor is back (Closes: #91938)
+  * Build-depends on latest xml-i18n-tools and libgnome-dev
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 11 Apr 2001 15:16:20 +0200
+
+gnome-core (1.4.0.1-2) unstable; urgency=low
+
+  * Build depends on versionned gettext 0.10.35-17 (Closes: #93198)
+  * Write manpage for gnome-session and add docbook-to-man in build-depnds
+  * Write manpages for gnome-help (Closes: #87089)
+
+ -- Christian Marillat <marillat@debian.org>  Sat,  7 Apr 2001 15:52:40 +0200
+
+gnome-core (1.4.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847)
+  * debian/gnome-session.README.debian remove references to .xsession. This
+    is now obsolete by the new x-session-manager scheme.
+
+ -- Christian Marillat <marillat@debian.org>  Sun,  1 Apr 2001 15:01:51 +0200
+
+gnome-core (1.4.0-2) unstable; urgency=low
+
+  * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416)
+  * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700)
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 22 Mar 2001 16:44:12 +0100
+
+gnome-core (1.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124)
+  * Remove manpages patche included by upstream.
+  * gnome-session don't always saves session on logout (Closes: #89630)
+  * Can add a launcher in the panel (Closes: #90018)
+  * Deskguide don't crashes on Fill with mini-images (Closes: #86952)
+  * Deskguide don't fail to run (Closes: #89769)
+  * Pager applet don't fail to run (Closes: #89025)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 19 Mar 2001 13:01:26 +0100
+
+gnome-core (1.3.1-2) unstable; urgency=low
+
+  * Remove taslisk-applet manpage (Closes: #88994)
+  * New patch against gnome-terminal.1 (Closes: #89005)
+  * Move /usr/lib/libtasklist_applet.so in libpanel-applet0
+    (Closes: #89053, #89008, #89012, #89091, #89003)
+  * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910)
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 10 Mar 2001 10:45:14 +0100
+
+gnome-core (1.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed default.session patch
+  * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because
+    the session-properties-capplet is now in this package.
+  * debian/{postinst,prerm} Call scrollkeeper
+  * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in
+    build-depends and scrollkeeper in depends for gnome-core
+  * Menu and laucnh keys works now (Closes: #86955)
+  * Dead keys work in gnome-terminal (Closes: #63102)
+  * Gnome-terminal isn't broken (Closes: #86752)
+  * New patch htmlurl.h (This file was broken by upstream author)
+  * XFMail doesn't crash the tasklist applet in this release (Closes: #88515)
+  * debian/gnome-core.menu New file for the session properties capplet
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  5 Mar 2001 11:40:15 +0100
+
+gnome-core (1.2.4-11) unstable; urgency=low
+
+  * Update (again) the Build-depends field (Closes: #87419)
+  * Add a debian directory for the gnome-help-browser and add suggest doc-base
+   for gnome-help. Now we can watch debian documentation registered with doc-base.
+  * Add a lintian override file for libpanel-applet0
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 25 Feb 2001 16:14:09 +0100
+
+gnome-core (1.2.4-10) unstable; urgency=low
+
+  * Update the Build-depends field (Closes: #86441, #87419)
+  * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328)
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 24 Feb 2001 18:03:20 +0100
+
+gnome-core (1.2.4-9) unstable; urgency=low
+
+  * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950)
+  * Build against the latest gnome-libs (1.2.11) (Close: #85932)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 14 Feb 2001 13:49:26 +0100
+
+gnome-core (1.2.4-8) unstable; urgency=low
+
+  * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for
+    gnome-help (Closes: #80974)
+  * debian/gnome-help.mime Rewrote (Closes: #82891)
+  * debian/control gnome-core depends on gnome-bin (Closes: #82951)
+  * Wrote gnome-panel.README.Debian (Closes: #82954)
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 22 Jan 2001 16:04:58 +0100
+
+gnome-core (1.2.4-7) unstable; urgency=low
+
+  * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 27 Dec 2000 19:24:08 +0100
+
+gnome-core (1.2.4-6) unstable; urgency=low
+
+  * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219)
+  * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405)
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 24 Dec 2000 03:27:12 +0100
+
+gnome-core (1.2.4-5) unstable; urgency=low
+
+  * Install gnome-terminal.wrapper as x-terminal-emulator and remove
+    debian/patches/gnome-terminal.dpatch (Closes: 64326)
+    Thanks to  Eric Gillespie, Jr. <epg@progenylinux.com>
+  * Add Recommends: gnome-applets on gnome-panel (Closes: #72208)
+  * gnome-sesion provides x-session-manager and install alternative (Closes: #60667)
+  * Added hints=Gnome for all menu files.
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 20 Dec 2000 23:19:55 +0100
+
+gnome-core (1.2.4-4) unstable; urgency=low
+
+  * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils
+    for gnome-session. Thanks to Joseph Carter <knghtbrd@progeny.com> for the file
+    (Closes: #79776)
+  * Rewrote default.session patch
+  * Add patch form Doug Larrick <doug@ties.org> for gwmthumbnail.c (Closes: #78550)
+
+ -- Christian Marillat <marillat@debian.org>  Sun, 17 Dec 2000 12:04:54 +0100
+
+gnome-core (1.2.4-3) unstable; urgency=low
+
+  * Change gnome-help.mime to call the right file (Closes: #77986)
+    Thanks Malcolm Parsons <malcolm@ivywell.screaming.net> for the patch.
+  * Patch gsm/default.in (two entries with same id) (Closes: #78276)
+    Thanks to Normal User <gohmandj@mrs.umn.edu> (Nice name)
+  * Move gnome-control-center from Depends to Suggests.
+  * Remove libgtkhtml-dev from Build-Depends (Closes: #79527)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 13 Dec 2000 18:01:34 +0100
+
+gnome-core (1.2.4-2) unstable; urgency=low
+
+  * Remove README and NEWS files (Closes: #77250)
+  * Disable thumbnails by default in deskguide_applet (Closes: #77205)
+  * debian/rules --with-window-manager is now sawfish (was x-window-manager)
+    and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401)
+  * Should close this old bug (Closes: #51198)
+  * Patch gnome-edit to use x-terminal-emulator instead of xterm.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 20 Nov 2000 11:35:55 +0100
+
+gnome-core (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Thu, 16 Nov 2000 00:43:15 +0100
+
+gnome-core (1.2.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add gnome-help example and manpage in gnome-help package (Closes: #49977)
+  * This release should close these old bugs (Closes: #60561, #60768, #45053)
+  * Gnome-panel don't use all CPU time (Closes: #75251, #60209)
+  * Remove gmenu patch included by upstream.
+
+ -- Christian Marillat <marillat@debian.org>  Wed,  8 Nov 2000 17:09:42 +0100
+
+gnome-core (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Debian menus aren't empty (Closes: #70470)
+  * Launcher can find icon (Closes: #62502)
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 24 Oct 2000 15:51:11 +0200
+
+gnome-core (1.2.2.1-3) unstable; urgency=low
+
+  * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451)
+  * Patch gnome-terminal to accept -T option (Closes: #74450)
+  * Move README.debian in gnome-session package (Closes: #60440)
+  * mesg work in gnome-terminal (Closes: #71728)
+  * Upstream fix these old bugs in Gnome-terminal
+      Problem with menubar (Closes: #57516)
+      Problem with console-apt Closes: #60079)
+      Problem with screen (Closes: #50156)
+  * Binaries don't should go in /usr/X11R6/bin (Closes: #24031)
+    Quoting Debian policy :
+    "Packages using the X Window System should abide by the FHS standard"
+    "whenever possible; they should install binaries, libraries, manual"
+    "pages, and other files in FHS-mandated locations wherever possible."
+    "This means that files must not be installed into /usr/X11R6/bin/'"
+  * hostname isn't harcoded (Closes: #72536)
+  * Error messages mention Lynx (Closes: #62216)
+  * Display correctly deskuse.html (Closes: #49974)
+  * Add patch from malcolm <malcolm@ivywell.screaming.net> (Closes: #64820)
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 14 Oct 2000 23:39:49 +0200
+
+gnome-core (1.2.2.1-2) unstable; urgency=low
+
+  * Typo in debian/gnome-terminal.postinst
+  * Add gnome-terminal manpage (Closes: #69188)
+  * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog)
+  * Gnome-terminal write to /var/run/utmp (Closes: #59053)
+  * delete/backspace keys works (Closes: #57198)
+  * Install GnomeHelp file in /etc/gnome/config (Closes: #73012)
+  * Convert png icons in xpm for Debian menu.
+  * Rearange documentation for dhelp (Closes: #56672)
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  5 Oct 2000 00:59:44 +0200
+
+gnome-core (1.2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Patch all manpages (Closes: #70009)
+  * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570)
+  * gmenu don't jam up all translations (Closes: #46446)
+  * panel remember its configuration between session
+    (Closes: #47734, #54190)
+  * Icons are now centered (Closes: #63868)
+  * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755,
+    #58278, #61083, #69428))
+  * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463)
+  * debian/control remove Conflicts: asclock (Closes: #52077)
+  * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356)
+  * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973)
+  * debian/control move gmc from Recommends to Suggests (Closes: #59415)
+  * The first search in gnome-wm search is x-window-manager
+    (Closes: #50940, #65969, #62143)
+  * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219)
+  * Bugs closed by previous NMU in gnome-terminal
+    (Closes: #64579, #63592, #63332, #56584, #55477, #54428)
+  * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 27 Sep 2000 16:02:16 +0200
+
+gnome-core (1.2.2-1) unstable; urgency=low
+
+  * New maintainer, thanks James.
+  * New upstream release.
+  * Switch to debhelper V2
+  * Move README.debian in gnome-session package (Closes: #65235) and
+    update this file (Closes: #71339)
+  * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483)
+  * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050)
+  * Remove gtkhtml patch.
+  * The desk guide show thumbnail (Closes: #72359)
+  * Missing package under sparc (Closes: #71438)
+  * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039)
+  * Added icons in Debian menu.
+  * Eject in drivemount check if '-u' is available (Closes: #63954)
+  * Patch gmenu to find Debian menu.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 26 Sep 2000 17:34:23 +0200
+
+gnome-core (1.2.1-0.2) unstable; urgency=low
+
+  * NMU.
+  * Install these libraries libfish_applet.so libgen_util_applet.so
+    libpanel_status.so (Closes: #69428, #69590)
+  * Copy latest gnome aclocal in macros/ and run macros/autogen.sh
+    This is needed to build gnome-help-browser against libgtkhtml4.
+  * In debian/control
+        gnome-session depends on gnome-panel (>= ${Source-Version}).
+        gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version.
+        gnome-terminal don't depends on gnome-core.
+  * URL's are clickable in gnome-terminal (Closes: 63103).
+  * debian/gnome-panel.undocumented removed printer_applet.1
+  * Cut and paste work in gnome-terminal (Closes: #63592).
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 23 Aug 2000 21:23:36 +0200
+
+gnome-core (1.2.1-0.1) unstable; urgency=low
+
+  * New upstream release (Closes: #58806, #66467)
+  * NMU.
+  * Standards-Version to 3.1.1.1 Added Build-depends field.
+  * Removed patches: dialer, drivemount-floppy, modemlights, term,
+   help-browser, debian-menu, url-match.
+  * Added patches: gtkhtml.
+  * Build against libgtkhtml3. Closes: #58679, #36806, #49734
+  * Default manpath and infopath are wrong. Closes: #56081
+  * gmenu segfaults. Close: #53764, #54050
+  * gnome-panel: panel no longer works. Closes: #58278
+  * gnome-panel: gnomepager-applet should put braces around. Closes: #52584
+  * Backspace and delete work correctly. Closes: #54428
+  * TERM never select xterm-debian. Closes: #56584, #55477, #64579
+  * Disable arrows option is now saved. Closes: #54755
+  * No more files in /usr/share. Closes: #61083
+  * Show debian menus. Closes #66214
+  * New help documentation for panel. Closes: #40036
+  * Gnome-terminal write to /var/run/utmp. Closes #59053
+  * gnome-terminal provide x-terminal-emulator. Closes #61805, #56225
+  * README.Debian is here. Closes: #65235
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 25 Jul 2000 19:09:21 +0200
+
+gnome-core (1.0.55-2) frozen unstable; urgency=low
+
+  * Make x-window-manager run first by gnome-wm script to conform to
+    debian policy (Closes: #61617) (This is an important bug)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 21 May 2000 19:31:19 -0400
+
+gnome-core (1.0.55-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Sun,  2 Jan 2000 07:32:36 -0500
+
+gnome-core (1.0.54-2) unstable; urgency=low
+
+  * Fix the gnome-pager forgets size settings bug (was saved to wrong
+    section). Closes: #49839, #46845.
+
+ -- James LewisMoss <dres@debian.org>  Fri, 12 Nov 1999 07:54:46 -0500
+
+gnome-core (1.0.54-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Thu,  4 Nov 1999 23:20:14 -0500
+
+gnome-core (1.0.53-4) unstable; urgency=low
+
+  * New maintainer.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 25 Oct 1999 23:17:31 -0400
+
+gnome-core (1.0.53-3) unstable; urgency=low
+
+  * Ok, I made a mistake by setgiding gnome-terminal to
+    utmp. Reverted the change. Closes: #47960
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 18 Oct 1999 19:17:27 +0200
+
+gnome-core (1.0.53-2) unstable; urgency=low
+
+  * gnome-session does launch a default window-manager. It does launch
+    gnome-wm if no other information has been found. gnome-wm now
+    reads the list of window managers from /etc/X11/window-managers
+    once it has tried gnome compliant wm. Closes: #38347, #47370
+  * Patched gnome-terminal. TERM=xterm-debian again ... actually this
+    closes: #47552, #44960, #41065
+  * gnome-terminal is now setgid utmp and can thus register itself
+    in the UTMP database. Closes: #40507
+  * The URL match does now accept % characters. Closes: #47281
+  * libpanel-applet0.postinst check for the changelog.gz mysteriously
+    staying around. Closes: #45871
+  * Unreproducable bugs without answer from the submitter.
+    Closes: #41195, #42865
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat, 16 Oct 1999 19:52:38 +0200
+
+gnome-core (1.0.53-1) unstable; urgency=low
+
+  * New upstream version. 
+  * gnome-session does now depend on gnome-panel and recommends
+    gmc (both are needed for a full Gnome desktop).
+  * gnome-terminal does not have a border. Closes: #38972
+
+ -- Raphael Hertzog <hertzog@debian.org>  Tue, 12 Oct 1999 21:17:58 +0200
+
+gnome-core (1.0.52-1) unstable; urgency=low
+
+  * New maintainer. Steve said that he wanted to give away some of
+    his packages. I've asked to take gnome-core, he never replied, so
+    I'm taking it but I will give it back to him if he wanted to
+    keep it. In the meantime I can better manage bugs with my name 
+    in the Maintainer field.
+  * New upstream version.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon,  4 Oct 1999 21:28:18 +0200
+
+gnome-core (1.0.50-0.1) unstable; urgency=low
+
+  * New upstream version.
+  * NMU again.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Thu, 30 Sep 1999 22:10:03 +0200
+
+gnome-core (1.0.41-0.1) unstable; urgency=low
+
+  * New upstream version.
+  * NMU again.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 27 Sep 1999 13:10:31 +0200
+
+gnome-core (1.0.9-0.1) unstable; urgency=low
+
+  * New upstream version. Closes: #43253, #44098
+  * Apply patches before configuring (and relaunch automake && autoconf
+    because one of the patches is applied on Makefile.am).
+  * NMU. Thanks to Christian Marillat <marillat@alpes-net.fr> for his work.
+  * Imlib bug corrected: closes: #39085
+  * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031
+  * The panel does start correctly wihout complaining about a
+    missing name service. Closes: #39380, #39634, #40478
+  * The panel doesn't consume all CPU resources. Closes: #30654
+  * The panel launches apps from where it has been launched itself.
+    Closes: #32319
+  * The panel keeps the settings. Closes: #37052, #40579, #43496
+  * Old core dump corrected upstream. Closes: #39400, #40328, #42167
+    Closes: #44344, #44724, #44732, #44759, #44773
+  * Bug in menu-method, not in gnome-panel. Already reported against
+    menu. Closes: #40089
+  * cdplayer_applet works again. Closes: #42192
+  * gnome pager works well: Closes: #42499, #42610
+  * modem_lights draws itself correctly. Closes: #43861, #45055
+  * The dialer applets doesn't exit when stopping while 
+    not yet connected. Closes: #45287
+  * No more Debian menu in the panel. Closes: #41040
+  * GnomeICU works with this panel. Closes: #39626, #39515
+  * gnome-panel-data conflicts with asclock. 
+    Closes: #40712, #40715, #40808, #41430
+    A better solution will be needed. Maybe put asclock in his own
+    package or create a asclock-data package that will be shared.
+  * Updated the modemlights patch. Closes: #43512
+  * Added a patch for gnome-wm. Closes: #38366
+  * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are
+    not libraries to be linked with, just simple modules). Closes: #38596
+  * Asclock works well without xearth (the code still mentions xearth
+    however). Closes: #40530
+  * New patch (help-browser) for changing the default MANPATH and INFOPATH in
+    gnome-help-browser.c  Closes: #41452
+  * Moved help-browser to the new "Help" menu section.
+  * Added gnome-help.mime. Closes: #42205
+  * Gnome-session does launch gnome-panel ! (I suppose that it failed
+    to launch since panel was broken). Closes: #42937
+  * gnome-sesion doesn't core dump. Closes: #36640
+  * The terminal does remember the TERM var. Closes: #43067
+  * The terminal keeps its size when dragging the manu bar in and out.
+    Closes: #44762
+  * The menu section of gnome-terminal corrected. Closes: #37635
+    
+ -- Raphael Hertzog <hertzog@debian.org>  Wed, 22 Sep 1999 13:24:34 +0200
+
+gnome-core (1.0.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Removed "term" patch
+
+ -- Steve Haslam <araqnid@debian.org>  Mon, 28 Jun 1999 01:36:31 +0100
+
+gnome-core (1.0.6-2) unstable; urgency=low
+
+  * debian-menu.dpatch: created to fix guessing Debian menus
+    (/etc/menu-methods/gnome-panel now) and to make Debian menus the default
+    instead of GNOME system menus.
+  * gnome-help now suggests gnome-users-guide-en (closes: #35724)
+  * /etc/menu-methods/gnome-panel now creates .directory files and searches
+    /usr/X11R6/include/X11/pixmaps for menu icons
+
+ -- Steve Haslam <araqnid@debian.org>  Sun, 13 Jun 1999 15:28:52 +0100
+
+gnome-core (1.0.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Steve Haslam <araqnid@debian.org>  Sat,  5 Jun 1999 12:57:08 +0100
+
+gnome-core (1.0.5-3) unstable; urgency=low
+
+  * debian/gnome-terminal.menu: managed to lose change mentioned in last
+    revision. Replaced.
+  * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in
+    gnome-session.undocumented too).
+
+ -- Steve Haslam <araqnid@debian.org>  Mon, 31 May 1999 19:15:54 +0100
+
+gnome-core (1.0.5-2) unstable; urgency=low
+
+  * debian/gnome-terminal.menu: changed section to XShells (Bug#37635)
+  * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call
+    (Bug#37632)
+  * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928)
+    from Decklin Foster
+  * Call dh_strip when making libpanel-applet-dev (Closes Bug#31244)
+  * Removed /usr/share/gnome/apps/Debian symlink, (closes #38100)
+  * Sanified build system a la gnome-libs
+  * debian/control: made gnome-help, gnome-help-data and gnome-panel-data
+    packages.
+
+ -- Steve Haslam <araqnid@debian.org>  Sun, 23 May 1999 14:35:44 +0100
+
+gnome-core (1.0.5-1) unstable; urgency=low
+
+  * New maintainer.
+
+ -- Steve Haslam <araqnid@debian.org>  Tue, 11 May 1999 01:01:12 +0100
+
+gnome-core (1.0.5-0.2) unstable; urgency=low
+
+  * gnome-panel.files.in: added asclock themes, libgkb_applet.a
+  * gnome-core.files.in: added gnome-wm, gnome-edit
+  * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm
+  * gsm/Makefile.am: put default.session, default.wm in /etc/gnome
+  * debian/gnome-session.conffiles.in: added above two files
+  * debian/gnome-session.files.in: updated this too
+
+ -- Steve Haslam <araqnid@debian.org>  Sun, 18 Apr 1999 16:47:23 +0100
+
+gnome-core (1.0.5-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * New upstream version
+
+ -- Steve Haslam <araqnid@debian.org>  Thu, 15 Apr 1999 23:22:23 +0100
+
+gnome-core (1.0.1-0.3) unstable; urgency=low
+
+  * Weehay!  More broken dependencies. This one libghttp -1.1,
+    a bogus package that only ever existed on my machine.
+
+ -- Jules Bean <jules@debian.org>  Mon,  8 Mar 1999 08:24:00 +0000
+
+gnome-core (1.0.1-0.2) unstable; urgency=low
+
+  * Another NMU, this time to fix bogus dependencies on libgtop0
+    and libglib1.1
+
+ -- Jules Bean <jules@debian.org>  Sun,  7 Mar 1999 14:21:12 +0000
+
+gnome-core (1.0.1-0.1) unstable; urgency=low
+
+  * NMU for GNOME-1.0
+  * Hacked to patch SIGPIPE bug
+  * Don't delete GIFs in rules
+
+ -- Jules Bean <jules@debian.org>  Fri,  5 Mar 1999 18:36:29 +0100
+
+gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Fri, 26 Feb 1999 23:18:10 -0800
+
+gnome-core (0.99.3.2-4) unstable; urgency=low
+
+  * Recompiled yet again - dual dependency on libglib.
+    Fixes: BUG#32510
+
+ -- Jim Pick <jim@jimpick.com>  Thu, 28 Jan 1999 00:00:22 -0800
+
+gnome-core (0.99.3.2-3) unstable; urgency=low
+
+  * Recompiled again to due to dependencies.
+
+ -- Jim Pick <jim@jimpick.com>  Sun, 24 Jan 1999 01:10:07 -0800
+
+gnome-core (0.99.3.2-2) unstable; urgency=low
+
+  * Recompiled with libgnome 0.99.4.
+
+ -- Jim Pick <jim@jimpick.com>  Fri, 22 Jan 1999 16:44:45 -0800
+
+gnome-core (0.99.3.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Wed, 20 Jan 1999 11:42:46 -0800
+
+gnome-core (0.30-2) frozen unstable; urgency=low
+
+  * Recompiled with new libs.
+  * Fixed reference to /usr/X11R6 in README.Debian.
+  * Added warnings (Gnome is ALPHA).
+  * Patched dialer_applet to use pon/poff.
+  * Patched drivemount_applet to default to /floppy.
+
+ -- Jim Pick <jim@jimpick.com>  Tue, 24 Nov 1998 10:56:08 -0800
+
+gnome-core (0.30-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Thu, 24 Sep 1998 21:28:02 -0700
+
+gnome-core (0.28.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Hopefully fixes panel applet bug.
+
+ -- Jim Pick <jim@jimpick.com>  Wed, 19 Aug 1998 20:12:25 -0700
+
+gnome-core (0.28-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Mon, 17 Aug 1998 12:59:26 -0700
+
+gnome-core (0.27-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added /usr/doc/gnome
+
+ -- Jim Pick <jim@jimpick.com>  Sat, 15 Aug 1998 14:21:06 -0700
+
+gnome-core (0.25-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Thu,  6 Aug 1998 22:51:22 -0700
+
+gnome-core (0.20-2) unstable; urgency=low
+
+  * Added Debian menu-method for gnome-panel.  Fixed Bug #24025
+    (Thanks to Ray Dassen for reporting the bug, and Riku Voipio
+     who wrote the menu method for Gnome 0.12)
+
+ -- Jim Pick <jim@jimpick.com>  Wed, 22 Jul 1998 20:22:00 -0700
+
+gnome-core (0.20-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jim Pick <jim@jimpick.com>  Mon,  8 Jun 1998 12:00:08 -0700
+
+gnome-core (0.13-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Jim Pick <jim@jimpick.com>  Mon, 16 Mar 1998 15:27:43 -0800
--- gnome-session-2.22.1.1.orig/debian/control
+++ gnome-session-2.22.1.1/debian/control
@@ -0,0 +1,55 @@
+Source: gnome-session
+Section: gnome
+Priority: optional
+Maintainer: OEM Custom Solutions Engineering Group <solutions-group@lists.canonical.com>
+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.41),
+               quilt,
+               liborbit2-dev (>= 2.10.2-1.1),
+               intltool (>= 0.35.0),
+               libgnomeui-dev (>= 2.10),
+               libgconf2-dev (>= 2.10.1-6),
+               libgnomecanvas2-dev (>= 2.10),
+               libgnomevfs2-dev (>= 2.10),
+               gnome-pkg-tools (>= 0.10),
+               debhelper (>= 5.0.13),
+               libx11-dev,
+               libxt-dev,
+               libice-dev,
+               libsm-dev,
+               libxrender-dev,
+               libxrandr-dev,
+               libxmu-dev,
+               libxau-dev,
+               libwrap0-dev,
+               libnotify-dev (>= 0.2.1),
+               libgnome-desktop-dev,
+               sharutils,
+               libdbus-glib-1-dev (>= 0.35),
+               libgnome-keyring-dev (>= 2.21.92),
+	       gnome-keyring,
+               gnome-settings-daemon-dev,
+               libglib2.0-dev (>= 2.13.0),
+               libgtk2.0-dev (>= 2.11.1)
+
+Package: gnome-session
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-settings-daemon,
+         gnome-power-manager
+Recommends: gnome-panel,
+            nautilus,
+            metacity | sawfish,
+            dbus,
+Conflicts: bug-buddy (<< 2.20)
+Provides: x-session-manager
+Suggests: gnome-user-guide | gnome2-user-guide,
+          desktop-base
+Description: The GNOME 2 Session Manager
+ This package contains an X11-compliant "session manager" (similar to xsm)
+ with GNOME extensions. When you log out, the session manager will save the
+ state of all your GNOME 2 apps. When you log back in, the session manager
+ will restore your session.
--- gnome-session-2.22.1.1.orig/debian/watch
+++ gnome-session-2.22.1.1/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://ftp.gnome.org/pub/gnome/sources/gnome-session/([\d\.]+)[02468]/gnome-session-([\d\.]+)\.tar\.gz
--- gnome-session-2.22.1.1.orig/debian/compat
+++ gnome-session-2.22.1.1/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-hibernate.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-hibernate.png.uue
@@ -0,0 +1,73 @@
+begin 644 hibernate.png.uue
+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
+)`$E%3D2N0F""
+`
+end
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-reboot.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-reboot.png.uue
@@ -0,0 +1,86 @@
+begin 644 reboot.png.uue
+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
+%1*Y"8((`
+`
+end
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-logout.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-logout.png.uue
@@ -0,0 +1,51 @@
+begin 644 gnome-session-logout.png
+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
+>\4&"GTHB`LQ_`0<_YY@((55Q`````$E%3D2N0F""
+`
+end
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-suspend.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-suspend.png.uue
@@ -0,0 +1,68 @@
+begin 644 suspend.png.uue
+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
+A^[UP/^(?\GQ)AY__!UX/`CNB+W]8`````$E%3D2N0F""
+`
+end
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-halt.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-halt.png.uue
@@ -0,0 +1,79 @@
+begin 644 halt.png.uue
+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
+LA6@*1P.>UG;8/?U?(LI#W(W)"1YBVO;_BHJKXTQ=GL4`````245.1*Y"8((`
+`
+end
--- gnome-session-2.22.1.1.orig/debian/pixmaps/gnome-session-switch.png.uue
+++ gnome-session-2.22.1.1/debian/pixmaps/gnome-session-switch.png.uue
@@ -0,0 +1,85 @@
+begin 644 gnome-session-switch.png
+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
+/K5?4`````$E%3D2N0F""
+`
+end
--- gnome-session-2.22.1.1.orig/debian/gnome-session.install
+++ gnome-session-2.22.1.1/debian/gnome-session.install
@@ -0,0 +1,5 @@
+#debian/gnome-wm usr/bin
+debian/default.session usr/share/gnome
+debian/gnome.desktop usr/share/xsessions
+debian/55gnome-session_gnomerc etc/X11/Xsession.d
+debian/gnome-debian-splash.png usr/share/pixmaps/splash
--- gnome-session-2.22.1.1.orig/debian/gnome-session-remove.1
+++ gnome-session-2.22.1.1/debian/gnome-session-remove.1
@@ -0,0 +1,45 @@
+.\" Copyright (C) 2006 Sven Arvidsson <sa@whiz.se>
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\"You should have received a copy of the GNU General Public License along
+.\"with this program; if not, write to the Free Software Foundation, Inc.,
+.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.TH gnome-session-remove 1 "2007\-05\-05" "GNOME"
+.SH NAME
+gnome-session-remove \- Remove or list applications in the current
+GNOME session
+.SH SYNOPSIS
+.B gnome-session-remove
+.RI [ OPTION... ] 
+.RI PROGRAM...
+.SH DESCRIPTION
+.B gnome-session-remove
+can be used to list registered applications in a GNOME session or remove them.
+.SH OPTIONS
+.TP
+.B \-\-list
+List registered clients, then exit
+.TP
+.B \-\-display=DISPLAY
+X display to use
+.P
+.B gnome-session-remove
+also accepts the standard GNOME and GTK options.
+.SH AUTHORS
+.B gnome-session-remove
+was written by Tom Tromey Mark McLoughlin <mark@skynet.ie> and others.
+.P
+This manual page was written by Sven Arvidsson <sa@whiz.se>,
+for the Debian project (but may be used by others).
+.SH SEE ALSO
+.BR "gtk-options" (7),
+.BR "gnome-options" (7)
--- gnome-session-2.22.1.1.orig/debian/control.in
+++ gnome-session-2.22.1.1/debian/control.in
@@ -0,0 +1,55 @@
+Source: gnome-session
+Section: gnome
+Priority: optional
+Maintainer: OEM Custom Solutions Engineering Group <solutions-group@lists.canonical.com>
+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.41),
+               quilt,
+               liborbit2-dev (>= 2.10.2-1.1),
+               intltool (>= 0.35.0),
+               libgnomeui-dev (>= 2.10),
+               libgconf2-dev (>= 2.10.1-6),
+               libgnomecanvas2-dev (>= 2.10),
+               libgnomevfs2-dev (>= 2.10),
+               gnome-pkg-tools (>= 0.10),
+               debhelper (>= 5.0.13),
+               libx11-dev,
+               libxt-dev,
+               libice-dev,
+               libsm-dev,
+               libxrender-dev,
+               libxrandr-dev,
+               libxmu-dev,
+               libxau-dev,
+               libwrap0-dev,
+               libnotify-dev (>= 0.2.1),
+               libgnome-desktop-dev,
+               sharutils,
+               libdbus-glib-1-dev (>= 0.35),
+               libgnome-keyring-dev (>= 2.21.92),
+	       gnome-keyring,
+               gnome-settings-daemon-dev,
+               libglib2.0-dev (>= 2.13.0),
+               libgtk2.0-dev (>= 2.11.1)
+
+Package: gnome-session
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-settings-daemon,
+         gnome-power-manager
+Recommends: gnome-panel,
+            nautilus,
+            metacity | sawfish,
+            dbus,
+Conflicts: bug-buddy (<< 2.20)
+Provides: x-session-manager
+Suggests: gnome-user-guide | gnome2-user-guide,
+          desktop-base
+Description: The GNOME 2 Session Manager
+ This package contains an X11-compliant "session manager" (similar to xsm)
+ with GNOME extensions. When you log out, the session manager will save the
+ state of all your GNOME 2 apps. When you log back in, the session manager
+ will restore your session.
--- gnome-session-2.22.1.1.orig/debian/gnome-session.manpages
+++ gnome-session-2.22.1.1/debian/gnome-session.manpages
@@ -0,0 +1 @@
+debian/gnome-session-remove.1
--- gnome-session-2.22.1.1.orig/debian/copyright
+++ gnome-session-2.22.1.1/debian/copyright
@@ -0,0 +1,31 @@
+This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar
+1998 20:12:23 -0800. Taken over by Raphael Hertzog
+<hertzog@debian.org> on Wed, 22 Sep 1999 13:24:34 +0200, and taken
+over again by James LewisMoss on October 26, 1999.
+
+It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/gnome-session/>.
+
+Upstream Authors and Copyright Holders:
+    Tom Tromey <tromey@cygnus.com>
+    Felix Bellaby <felix@pooh.u-net.com>
+    Ralph Mor, X Consortium
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- gnome-session-2.22.1.1.orig/debian/README.Debian
+++ gnome-session-2.22.1.1/debian/README.Debian
@@ -0,0 +1,70 @@
+gnome-session for DEBIAN
+--------------------------
+
+Splash screen
+-------------
+
+Displaying a splash screen implies a noticeable delay in login for most users,
+hence it's disabled by default.  You can enable the default splash screen by
+setting the splash_image GConf key to a relative path below /usr/share/pixmaps,
+the default splash of the gnome-session package is
+splash/gnome-debian-splash.png:
+    gconftool-2 -s /apps/gnome-session/options/splash_image \
+        --type string splash/gnome-debian-splash.png
+
+Some theme packages might provide other splash pixmaps, notably desktop-base.
+
+
+Using startx/xinit
+------------------
+
+To use the gnome-session manager with startx or xinit, you need to edit your
+.xinitrc file.
+
+The previous maintainers' .xinitrc file looked something like this:
+
+----------------------------------------------------------------------
+# This calls our default window-manager
+/usr/bin/x-window-manager&
+# You can replace the line above by seting a WINDOW_MANAGER environment
+# variable to set your preferred WM.
+export WINDOW_MANAGER=sawfish
+# This starts up GNOME
+exec /usr/bin/gnome-session
+----------------------------------------------------------------------
+
+Note:  If you don't have gnome-session set up at the end of your
+       .xinitrc where it does the "exec" (perhaps your window manager
+       is there) - you won't be able to use the session manager to
+       handle the logging out process (where it will save the state
+       of all your apps).
+
+Jim Pick <jim@jimpick.com>, & James LewisMoss <dres@debian.org>,
+                                 Mon, 16 Mar 1998 15:27:43 -0800
+
+
+Splash Screen
+-------------
+
+Debian's gnome-session uses a Debian-related splash screen instead of
+the original GNOME splash screen by default. You can change the the
+splash screen that should be used using the following gconf key:
+
+  /apps/gnome-session/options/splash_image
+
+This means that you can set your personal splash screen by using
+gconf-editor to edit the value of that key or you can issue the following 
+command:
+
+$ gconftool-2  --type string --set /apps/gnome-session/options/splash_image \
+/usr/share/pixmaps/splash/gnome-splash.png
+
+The last argument is GNOME's default splash screen. You can choose any
+image, of course. To set the system wide default do:
+
+# gconftool-2 --direct \
+--config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+--type string --set /apps/gnome-session/options/splash_image \
+/usr/share/pixmaps/splash/gnome-splash.png
+
+Gustavo Noronha Silva <kov@debian.org>, Sat, 19 Jun 2004 20:51:32 -0300
--- gnome-session-2.22.1.1.orig/debian/dirs
+++ gnome-session-2.22.1.1/debian/dirs
@@ -0,0 +1,2 @@
+/usr/share/images/desktop-base
+/var/lib/gnome-session
\ No newline at end of file
--- gnome-session-2.22.1.1.orig/debian/gconf-defaults
+++ gnome-session-2.22.1.1/debian/gconf-defaults
@@ -0,0 +1 @@
+/apps/gnome-session/options/show_splash_screen false
--- gnome-session-2.22.1.1.orig/debian/55gnome-session_gnomerc
+++ gnome-session-2.22.1.1/debian/55gnome-session_gnomerc
@@ -0,0 +1,12 @@
+# If we are running the GNOME session, source ~/.gnomerc
+
+BASESTARTUP=`basename "$STARTUP" | cut -d\  -f1`
+if [ "$BASESTARTUP" = gnome-session -o \
+	\( "$BASESTARTUP" = x-session-manager -a \
+	"`readlink /etc/alternatives/x-session-manager`" = \
+		/usr/bin/gnome-session \) ]; then
+  GNOMERC=$HOME/.gnomerc
+  if [ -r "$GNOMERC" ]; then
+    . "$GNOMERC"
+  fi
+fi
--- gnome-session-2.22.1.1.orig/debian/gnome-debian-splash.png.uue
+++ gnome-session-2.22.1.1/debian/gnome-debian-splash.png.uue
@@ -0,0 +1,1034 @@
+begin 644 debian/gnome-debian-splash.png
+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
+L'4/M-R?%0?)`8HA=3@\\=%%#S78*&O@_Q_*6F_+5?!\`````245.1*Y"8((`
+`
+end
--- gnome-session-2.22.1.1.orig/debian/rules
+++ gnome-session-2.22.1.1/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \
+	--with-window-manager=metacity \
+	--enable-ipv6 \
+	--with-at-spi-registryd-directory=/usr/lib/at-spi
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+%: %.uue
+	uudecode -o '$@' '$<'
+
+SPLASH := debian/gnome-debian-splash.png
+
+common-build-arch:: $(SPLASH)
+
+clean::
+	rm -vf $(SPLASH)
+
+clean::
+	rm -vf \
+		gnome-session/default.session \
+		gnome-session/default.wm \
+		gnome-session/session-properties.desktop \
+		gnome-session/gnome-session.schemas
+
+binary-post-install/gnome-session::
+	# fix bogus ${prefix} in manpages
+	cd debian/gnome-session/usr/share/man/ && \
+		sed \
+			-i \
+			's#\$${prefix}#/usr#g' \
+			man5/default.session.5 \
+			man1/gnome-session.1
+
+	mkdir -p debian/gnome-session/usr/share/icons/gnome/48x48/apps
+	for f in debian/pixmaps/*.uue; do \
+		uudecode $$f -o debian/gnome-session/usr/share/icons/gnome/48x48/apps/`basename $$f .uue`; \
+	done
--- gnome-session-2.22.1.1.orig/debian/postinst
+++ gnome-session-2.22.1.1/debian/postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ]; then
+  update-alternatives --install /usr/bin/x-session-manager \
+    x-session-manager /usr/bin/gnome-session 50 \
+    --slave /usr/share/man/man1/x-session-manager.1.gz \
+    x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
+  update-alternatives --install /usr/share/images/desktop-base/desktop-splash \
+    desktop-splash /usr/share/pixmaps/splash/gnome-splash.png 10
+  update-alternatives --install /usr/share/images/desktop-base/desktop-splash \
+    desktop-splash /usr/share/pixmaps/splash/gnome-debian-splash.png 10
+fi
+
+# leave a marker on dapper->hardy upgrades for gnome-wm 
+# to pick up
+if [ "$1" = configure ]; then
+    if dpkg --compare-versions "$2" lt-nl 2.16; then
+            touch /var/lib/gnome-session/dapper-upgrade
+    fi
+fi
+
+#DEBHELPER#
--- gnome-session-2.22.1.1.orig/debian/gnome-wm
+++ gnome-session-2.22.1.1/debian/gnome-wm
@@ -0,0 +1,118 @@
+#! /bin/sh
+
+# The user can specify his prefered WM by setting the WINDOW_MANAGER
+# environment variable or setting the
+# /desktop/gnome/applications/window_manager/default gconf key.
+#
+# This script has been heavily modified to support Debian's
+# alternatives system.
+
+# sm-client-id value
+SMID=
+# default-wm value
+DEFWM=
+
+#read in the arguments
+GET=
+for n in "$@" ; do
+  case "$GET" in
+    smid)
+      SMID=$n
+      GET=
+      ;;
+    defwm)
+      DEFWM=$n
+      GET=
+      ;;
+    *)
+      case "$n" in
+	--sm-client-id)
+	  GET=smid
+	  ;;
+	--default-wm)
+	  GET=defwm
+	  ;;
+      esac
+      ;;
+  esac
+done
+
+# Get previously set window manager in gconf
+if [ ! "$DEFWM" ]; then
+  DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null`
+fi
+
+if ! which "$WINDOW_MANAGER" > /dev/null; then
+  # Get --default-wm
+  if which "$DEFWM" > /dev/null; then
+    WINDOW_MANAGER=$DEFWM
+    if [ "$WINDOW_MANAGER" = x-window-manager ]; then
+      WINDOW_MANAGER=`readlink /etc/alternatives/x-window-manager 2>/dev/null`
+    fi
+  # if nothing is found, first use metacity
+  elif [ -x /usr/bin/metacity ]; then
+    WINDOW_MANAGER=/usr/bin/metacity
+  elif [ -x /usr/bin/compiz ]; then
+    WINDOW_MANAGER=/usr/bin/compiz
+  elif [ -x /usr/bin/sawfish ]; then
+    WINDOW_MANAGER=/usr/bin/sawfish
+  else
+    WINDOW_MANAGER=`readlink /etc/alternatives/x-window-manager 2>/dev/null`
+  fi
+fi
+
+# If no window manager can be found, we default to xterm
+if [ ! "$WINDOW_MANAGER" ]; then
+  echo "WARNING: No window manager can be found."
+  WINDOW_MANAGER=`readlink /etc/alternatives/x-terminal-emulator 2>/dev/null`
+fi
+
+# If there is no xterm, they're really screwed.
+if [ ! "$WINDOW_MANAGER" ]; then
+  echo "ERROR: No window manager and no xterm!"
+  exit 1
+fi
+
+# Now create options OPT1 and OPT2 based on the windowmanager used
+OPT1=
+OPT2=
+if [ ! -z "$SMID" ] ; then
+  case `basename "$WINDOW_MANAGER"` in
+    sawfish)
+      OPT1=--sm-client-id=$SMID
+      CURRENT=Sawfish
+      ;;
+    compiz)
+      OPT1=--sm-client-id
+      OPT2=$SMID
+      CURRENT=compiz
+      ;;
+    metacity)
+      OPT1=--sm-client-id=$SMID
+      CURRENT=metacity
+      ;;
+    enlightenment|twm)
+      OPT1=-clientId
+      OPT2=$SMID
+      CURRENT=Enlightenment
+      ;;
+    fvwm|fvwm2)
+      OPT1=--clientid
+      OPT2=$SMID
+      CURRENT=fvwm
+      ;;
+    openbox)
+      OPT1=--sm-client-id
+      OPT2=$SMID
+      CURRENT=openbox
+      ;;
+  esac
+fi
+
+# Store the selected WM with gconf
+gconftool-2 -t string -s /desktop/gnome/applications/window_manager/current "$WINDOW_MANAGER"
+
+exec "$WINDOW_MANAGER" $OPT1 $OPT2
+
+echo "ERROR: No window manager could run!"
+exit 1
--- gnome-session-2.22.1.1.orig/debian/gnome.desktop
+++ gnome-session-2.22.1.1/debian/gnome.desktop
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GNOME
+Name[az]=GNOME
+Name[be]=GNOME
+Name[ca]=GNOME
+Name[cs]=GNOME
+Name[cy]=GNOME
+Name[da]=Gnome
+Name[de]=GNOME
+Name[el]=GNOME
+Name[es]=GNOME
+Name[et]=GNOME
+Name[fi]=Gnome
+Name[fr]=GNOME
+Name[he]=GNOME
+Name[hi]=गनोम
+Name[hu]=GNOME
+Name[it]=GNOME
+Name[ja]=GNOME
+Name[ko]=그놈
+Name[lt]=GNOME
+Name[mn]=ГНОМЕ
+Name[ms]=GNOME
+Name[nl]=GNOME
+Name[nn]=GNOME
+Name[no]=GNOME
+Name[pl]=GNOME
+Name[pt]=GNOME
+Name[pt_BR]=GNOME
+Name[ro]=GNOME
+Name[ru]=GNOME
+Name[sk]=GNOME
+Name[sl]=GNOME
+Name[sq]=GNOME
+Name[sr]=Гном
+Name[sr@Latn]=Gnom
+Name[sv]=GNOME
+Name[tr]=GNOME
+Name[uk]=GNOME
+Name[vi]=GNOME
+Name[wa]=GNOME
+Name[zh_CN]=GNOME
+Name[zh_TW]=GNOME
+Comment=This session logs you into GNOME
+Comment[az]=Bu iclas sizi GNOME'a daxil edəcək
+Comment[be]=Гэтая сэсыя завядзе вас у GNOME
+Comment[ca]=Aquesta sessió entra en GNOME
+Comment[cs]=Toto sezení vás přihlásí do GNOME
+Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i GNOME
+Comment[da]=Denne session logger dig på Gnome
+Comment[de]=Diese Sitzung meldet Sie an GNOME an
+Comment[el]=Αυτή η συνεδρία σας εισάγει στο GNOME
+Comment[es]=Con esta sesión accede a GNOME
+Comment[fi]=Tämä istunto kirjaa sisään Gnomeen
+Comment[fr]=Cette session vous connectera dans GNOME
+Comment[he]=תצורת הפעלה זו מחברת אותך ל GNOME
+Comment[hi]=यह सत्र गनोम में लॉगिन होगा
+Comment[hu]=Ez a környezet a GNOME-ba jelentkeztet be
+Comment[it]=Sessione di lavoro con GNOME
+Comment[ja]=GNOME セッションにログインします
+Comment[ko]=GNOME세션으로 로그인합니다
+Comment[lt]=Ši sesija prijungia Jus į GNOME
+Comment[mn]=Энэ суултаар та ГНОМЕ руу нэвтрэнэ.
+Comment[ms]=Sesi ini akan log anda  ke GNOME
+Comment[nl]=Deze sessie meldt u aan bij GNOME
+Comment[nn]=Denne økta loggar på GNOME
+Comment[no]=Denne sesjonen logger deg inn til GNOME
+Comment[pl]=Sesja logowania do GNOME
+Comment[pt]=Esta sessão inicia-o no GNOME
+Comment[pt_BR]=Logar no ambiente GNOME
+Comment[ro]=Această sesiune vă va loga în GNOME
+Comment[ru]=Начать сеанс GNOME
+Comment[sk]=Toto sedenie vás prihlási do prostredia GNOME
+Comment[sl]=Ta seja vas prijavi v GNOMe
+Comment[sq]=Kjo seancë do t'ju fusë në GNOME
+Comment[sr]=Ова сесија вас пријављује на Гнома
+Comment[sr@Latn]=Ova sesija vas prijavljuje na Gnoma
+Comment[sv]=Denna session loggar in dig i GNOME
+Comment[tr]=Bu oturum ile GNOME'a giriş yaparsınız
+Comment[uk]=Сеанс роботи в середовищі GNOME
+Comment[vi]=Session này cho bạn đăng nhập vào GNOME
+Comment[zh_CN]=此会话使您登录到 GNOME
+Comment[zh_TW]=選取這個作業階段後會進入 GNOME 環境
+Exec=/usr/bin/gnome-session
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
--- gnome-session-2.22.1.1.orig/debian/patches/series
+++ gnome-session-2.22.1.1/debian/patches/series
@@ -0,0 +1,16 @@
+01_ignore-gdm-lang.patch
+02_gsd-spawn.patch
+02_no_warning_crash.patch
+03_powermanagement.patch
+08_ubuntu_use_apport_on_crash.patch
+09_splash_hide.patch
+10_update_notifier.patch
+11_session_dialog.patch
+19_gnome-wm-tweaking.patch
+20_dont_fade_on_ltsp_client.patch
+21_autostart_nodisplay.patch
+70_autoreconf.patch
+22_fix_hang_on_time_setting_main.c.patch
+22_disable_time_setting_main.c.patch
+22_dennis_logout.patch
+23_no_gsd_error.patch
--- gnome-session-2.22.1.1.orig/debian/patches/70_autoreconf.patch
+++ gnome-session-2.22.1.1/debian/patches/70_autoreconf.patch
@@ -0,0 +1,19516 @@
+Index: gnome-session-2.21.93/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/Makefile.in	2008-03-08 15:09:56.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -98,6 +98,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -164,6 +165,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -181,6 +183,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -404,8 +407,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -430,8 +433,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -441,13 +444,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+@@ -517,6 +519,10 @@
+ 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ 	$(am__remove_distdir)
+ 
++dist-lzma: distdir
++	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++	$(am__remove_distdir)
++
+ dist-tarZ: distdir
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ 	$(am__remove_distdir)
+@@ -543,6 +549,8 @@
+ 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+ 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.lzma*) \
++	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.Z*) \
+ 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ 	*.shar.gz*) \
+@@ -695,8 +703,8 @@
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am am--refresh check check-am clean clean-generic \
+ 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+-	distclean-generic distclean-hdr distclean-libtool \
++	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++	distclean distclean-generic distclean-hdr distclean-libtool \
+ 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-data install-data-am install-dvi install-dvi-am \
+Index: gnome-session-2.21.93/aclocal.m4
+===================================================================
+--- gnome-session-2.21.93.orig/aclocal.m4	2008-03-06 15:46:17.000000000 +0100
++++ gnome-session-2.21.93/aclocal.m4	2008-03-08 15:09:50.000000000 +0100
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,6199 +11,5506 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-m4_if(m4_PACKAGE_VERSION, [2.61],,
+-[m4_fatal([this file was generated for autoconf 2.61.
+-You have another version of autoconf.  If you want to use that,
+-you should regenerate the build system entirely.], [63])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf.  It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
+ 
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-# (This private macro should not be called outside this file.)
+-AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
+-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+-dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.10], [],
+-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+-])
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
+ 
+-# _AM_AUTOCONF_VERSION(VERSION)
+-# -----------------------------
+-# aclocal traces this macro to find the Autoconf version.
+-# This is a private macro too.  Using m4_define simplifies
+-# the logic in aclocal, which can simply ignore this definition.
+-m4_define([_AM_AUTOCONF_VERSION], [])
++  AC_ARG_WITH(gconf-source, 
++  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+ 
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10])dnl
+-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+ 
+-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
+ 
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++  AC_ARG_WITH(gconf-schema-file-dir, 
++  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+ 
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++     [  --disable-schemas-install	Disable the schemas installation],
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
++
++# Copyright (C) 1995-2002 Free Software Foundation, Inc.
++# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+ #
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory.  The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run.  This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
++# This file is free software, distributed under the terms of the GNU
++# General Public License.  As a special exception to the GNU General
++# Public License, this file may be distributed as part of a program
++# that contains a configuration script generated by Autoconf, under
++# the same distribution terms as the rest of that program.
+ #
+-# $ac_aux_dir/missing
+-#    fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-#    fails if $ac_aux_dir is absolute,
+-#    fails when called from a subdirectory in a VPATH build with
+-#          a relative $ac_aux_dir
++# This file can be copied and used freely without restrictions.  It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
+ #
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir.  In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
++# Macro to add for using GNU gettext.
++# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+ #
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-#   MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
++# Modified to never use included libintl. 
++# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+ #
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH.  The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
+-
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
+-])
+-
+-# AM_CONDITIONAL                                            -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+-# Free Software Foundation, Inc.
++# Major rework to remove unused code
++# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+ #
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Added better handling of ALL_LINGUAS from GNU gettext version 
++# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
++#
++# Modified to require ngettext
++# Matthias Clasen <mclasen@redhat.com> 08/06/2004
++#
++# We need this here as well, since someone might use autoconf-2.5x
++# to configure GLib then an older version to configure a package
++# using AM_GLIB_GNU_GETTEXT
++AC_PREREQ(2.53)
+ 
+-# serial 8
++dnl
++dnl We go to great lengths to make sure that aclocal won't 
++dnl try to pull in the installed version of these macros
++dnl when running aclocal in the glib directory.
++dnl
++m4_copy([AC_DEFUN],[glib_DEFUN])
++m4_copy([AC_REQUIRE],[glib_REQUIRE])
++dnl
++dnl At the end, if we're not within glib, we'll define the public
++dnl definitions in terms of our private definitions.
++dnl
+ 
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])dnl
+-AC_SUBST([$1_FALSE])dnl
+-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+-if $2; then
+-  $1_TRUE=
+-  $1_FALSE='#'
++# GLIB_LC_MESSAGES
++#--------------------
++glib_DEFUN([GLIB_LC_MESSAGES],
++  [AC_CHECK_HEADERS([locale.h])
++    if test $ac_cv_header_locale_h = yes; then
++    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++    if test $am_cv_val_LC_MESSAGES = yes; then
++      AC_DEFINE(HAVE_LC_MESSAGES, 1,
++        [Define if your <locale.h> file defines LC_MESSAGES.])
++    fi
++  fi])
++
++# GLIB_PATH_PROG_WITH_TEST
++#----------------------------
++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++  /*)
++  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  for ac_dir in ifelse([$5], , $PATH, [$5]); do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if [$3]; then
++	ac_cv_path_$1="$ac_dir/$ac_word"
++	break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++  ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++  AC_MSG_RESULT([$]$1)
+ else
+-  $1_TRUE='#'
+-  $1_FALSE=
++  AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+-  AC_MSG_ERROR([[conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.]])
+-fi])])
++AC_SUBST($1)dnl
++])
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# GLIB_WITH_NLS
++#-----------------
++glib_DEFUN([GLIB_WITH_NLS],
++  dnl NLS is obligatory
++  [USE_NLS=yes
++    AC_SUBST(USE_NLS)
+ 
+-# serial 9
++    gt_cv_have_gettext=no
+ 
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery.  Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++    CATOBJEXT=NONE
++    XGETTEXT=:
++    INTLLIBS=
+ 
++    AC_CHECK_HEADER(libintl.h,
++     [gt_cv_func_dgettext_libintl="no"
++      libintl_extra_libs=""
+ 
+-# _AM_DEPENDENCIES(NAME)
+-# ----------------------
+-# See how the compiler implements dependency checking.
+-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+-# We try a few techniques and use that to set a single cache variable.
+-#
+-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+-# dependency, and given that the user is not expected to run this macro,
+-# just rely on AC_PROG_CC.
+-AC_DEFUN([_AM_DEPENDENCIES],
+-[AC_REQUIRE([AM_SET_DEPDIR])dnl
+-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+-AC_REQUIRE([AM_DEP_TRACK])dnl
++      #
++      # First check in libc
++      #
++      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++        [AC_TRY_LINK([
++#include <libintl.h>
++],
++         [return !ngettext ("","", 1)],
++	  gt_cv_func_ngettext_libc=yes,
++          gt_cv_func_ngettext_libc=no)
++        ])
++  
++      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++        	[AC_TRY_LINK([
++#include <libintl.h>
++],
++	          [return !dgettext ("","")],
++		  gt_cv_func_dgettext_libc=yes,
++	          gt_cv_func_dgettext_libc=no)
++        	])
++      fi
++  
++      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++        AC_CHECK_FUNCS(bind_textdomain_codeset)
++      fi
+ 
+-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+-                   [depcc="$$1"   am_compiler_list=])
++      #
++      # If we don't have everything we want, check in libintl
++      #
++      if test "$gt_cv_func_dgettext_libc" != "yes" \
++	 || test "$gt_cv_func_ngettext_libc" != "yes" \
++         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++        
++        AC_CHECK_LIB(intl, bindtextdomain,
++	    [AC_CHECK_LIB(intl, ngettext,
++		    [AC_CHECK_LIB(intl, dgettext,
++			          gt_cv_func_dgettext_libintl=yes)])])
+ 
+-AC_CACHE_CHECK([dependency style of $depcc],
+-               [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+-  # We make a subdir and do the tests there.  Otherwise we can end up
+-  # making bogus files that we don't know about and never remove.  For
+-  # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named `D' -- because `-MD' means `put the output
+-  # in D'.
+-  mkdir conftest.dir
+-  # Copy depcomp to subdir because otherwise we won't find it if we're
+-  # using a relative directory.
+-  cp "$am_depcomp" conftest.dir
+-  cd conftest.dir
+-  # We will build objects and dependencies in a subdirectory because
+-  # it helps to detect inapplicable dependency modes.  For instance
+-  # both Tru64's cc and ICC support -MD to output dependencies as a
+-  # side effect of compilation, but ICC will put the dependencies in
+-  # the current directory while Tru64 will put them in the object
+-  # directory.
+-  mkdir sub
++	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
++	  AC_MSG_RESULT([])
++  	  AC_CHECK_LIB(intl, ngettext,
++          	[AC_CHECK_LIB(intl, dcgettext,
++		       [gt_cv_func_dgettext_libintl=yes
++			libintl_extra_libs=-liconv],
++			:,-liconv)],
++		:,-liconv)
++        fi
+ 
+-  am_cv_$1_dependencies_compiler_type=none
+-  if test "$am_compiler_list" = ""; then
+-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+-  fi
+-  for depmode in $am_compiler_list; do
+-    # Setup a source with many dependencies, because some compilers
+-    # like to wrap large dependency lists on column 80 (with \), and
+-    # we should not choose a depcomp mode which is confused by this.
+-    #
+-    # We need to recreate these files for each test, as the compiler may
+-    # overwrite some of them when testing with obscure command lines.
+-    # This happens at least with the AIX C compiler.
+-    : > sub/conftest.c
+-    for i in 1 2 3 4 5 6; do
+-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+-      # Solaris 8's {/usr,}/bin/sh.
+-      touch sub/conftst$i.h
+-    done
+-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++        #
++        # If we found libintl, then check in it for bind_textdomain_codeset();
++        # we'll prefer libc if neither have bind_textdomain_codeset(),
++        # and both have dgettext and ngettext
++        #
++        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++          glib_save_LIBS="$LIBS"
++          LIBS="$LIBS -lintl $libintl_extra_libs"
++          unset ac_cv_func_bind_textdomain_codeset
++          AC_CHECK_FUNCS(bind_textdomain_codeset)
++          LIBS="$glib_save_LIBS"
+ 
+-    case $depmode in
+-    nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
+-      if test "x$enable_dependency_tracking" = xyes; then
+-	continue
+-      else
+-	break
++          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++            gt_cv_func_dgettext_libc=no
++          else
++            if test "$gt_cv_func_dgettext_libc" = "yes" \
++		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
++              gt_cv_func_dgettext_libintl=no
++            fi
++          fi
++        fi
+       fi
+-      ;;
+-    none) break ;;
+-    esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+-    if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+-         >/dev/null 2>conftest.err &&
+-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+-      # icc doesn't choke on unknown options, it will just issue warnings
+-      # or remarks (even with -Werror).  So we grep stderr for any message
+-      # that says an option was ignored or not supported.
+-      # When given -MP, icc 7.0 and 7.1 complain thusly:
+-      #   icc: Command line warning: ignoring option '-M'; no argument required
+-      # The diagnosis changed in icc 8.0:
+-      #   icc: Command line remark: option '-MP' not supported
+-      if (grep 'ignoring option' conftest.err ||
+-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+-        am_cv_$1_dependencies_compiler_type=$depmode
+-        break
++
++      if test "$gt_cv_func_dgettext_libc" = "yes" \
++	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
++        gt_cv_have_gettext=yes
++      fi
++  
++      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++        INTLLIBS="-lintl $libintl_extra_libs"
++      fi
++  
++      if test "$gt_cv_have_gettext" = "yes"; then
++	AC_DEFINE(HAVE_GETTEXT,1,
++	  [Define if the GNU gettext() function is already present or preinstalled.])
++	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++	if test "$MSGFMT" != "no"; then
++          glib_save_LIBS="$LIBS"
++          LIBS="$LIBS $INTLLIBS"
++	  AC_CHECK_FUNCS(dcgettext)
++	  MSGFMT_OPTS=
++	  AC_MSG_CHECKING([if msgfmt accepts -c])
++	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo@bar.xx>\n"
++"Language-Team: C <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
++	  AC_SUBST(MSGFMT_OPTS)
++	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++			 return _nl_msg_cat_cntr],
++	    [CATOBJEXT=.gmo 
++             DATADIRNAME=share],
++	    [case $host in
++	    *-*-solaris*)
++	    dnl On Solaris, if bind_textdomain_codeset is in libc,
++	    dnl GNU format message catalog is always supported,
++            dnl since both are added to the libc all together.
++	    dnl Hence, we'd like to go with DATADIRNAME=share and
++	    dnl and CATOBJEXT=.gmo in this case.
++            AC_CHECK_FUNC(bind_textdomain_codeset,
++	      [CATOBJEXT=.gmo 
++               DATADIRNAME=share],
++	      [CATOBJEXT=.mo
++               DATADIRNAME=lib])
++	    ;;
++	    *)
++	    CATOBJEXT=.mo
++            DATADIRNAME=lib
++	    ;;
++	    esac])
++          LIBS="$glib_save_LIBS"
++	  INSTOBJEXT=.mo
++	else
++	  gt_cv_have_gettext=no
++	fi
+       fi
++    ])
++
++    if test "$gt_cv_have_gettext" = "yes" ; then
++      AC_DEFINE(ENABLE_NLS, 1,
++        [always defined to indicate that i18n is enabled])
+     fi
+-  done
+ 
+-  cd ..
+-  rm -rf conftest.dir
+-else
+-  am_cv_$1_dependencies_compiler_type=none
+-fi
+-])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+-  test "x$enable_dependency_tracking" != xno \
+-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+-])
++    dnl Test whether we really found GNU xgettext.
++    if test "$XGETTEXT" != ":"; then
++      dnl If it is not GNU xgettext we define it as : so that the
++      dnl Makefiles still can work.
++      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++        : ;
++      else
++        AC_MSG_RESULT(
++	  [found xgettext program is not GNU xgettext; ignore it])
++        XGETTEXT=":"
++      fi
++    fi
+ 
++    # We need to process the po/ directory.
++    POSUB=po
+ 
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
++    AC_OUTPUT_COMMANDS(
++      [case "$CONFIG_FILES" in *po/Makefile.in*)
++        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++      esac])
+ 
++    dnl These rules are solely for the distribution goal.  While doing this
++    dnl we only have to keep exactly one list of the available catalogs
++    dnl in configure.in.
++    for lang in $ALL_LINGUAS; do
++      GMOFILES="$GMOFILES $lang.gmo"
++      POFILES="$POFILES $lang.po"
++    done
+ 
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[  --disable-dependency-tracking  speeds up one-time build
+-  --enable-dependency-tracking   do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+-  am_depcomp="$ac_aux_dir/depcomp"
+-  AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
++    dnl Make all variables we use known to autoconf.
++    AC_SUBST(CATALOGS)
++    AC_SUBST(CATOBJEXT)
++    AC_SUBST(DATADIRNAME)
++    AC_SUBST(GMOFILES)
++    AC_SUBST(INSTOBJEXT)
++    AC_SUBST(INTLLIBS)
++    AC_SUBST(PO_IN_DATADIR_TRUE)
++    AC_SUBST(PO_IN_DATADIR_FALSE)
++    AC_SUBST(POFILES)
++    AC_SUBST(POSUB)
++  ])
+ 
+-# Generate code to set up dependency tracking.              -*- Autoconf -*-
++# AM_GLIB_GNU_GETTEXT
++# -------------------
++# Do checks necessary for use of gettext. If a suitable implementation 
++# of gettext is found in either in libintl or in the C library,
++# it will set INTLLIBS to the libraries needed for use of gettext
++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
++# on various variables needed by the Makefile.in.in installed by 
++# glib-gettextize.
++dnl
++glib_DEFUN([GLIB_GNU_GETTEXT],
++  [AC_REQUIRE([AC_PROG_CC])dnl
++   AC_REQUIRE([AC_HEADER_STDC])dnl
++   
++   GLIB_LC_MESSAGES
++   GLIB_WITH_NLS
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++   if test "$gt_cv_have_gettext" = "yes"; then
++     if test "x$ALL_LINGUAS" = "x"; then
++       LINGUAS=
++     else
++       AC_MSG_CHECKING(for catalogs to be installed)
++       NEW_LINGUAS=
++       for presentlang in $ALL_LINGUAS; do
++         useit=no
++         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
++           desiredlanguages="$LINGUAS"
++         else
++           desiredlanguages="$ALL_LINGUAS"
++         fi
++         for desiredlang in $desiredlanguages; do
++ 	   # Use the presentlang catalog if desiredlang is
++           #   a. equal to presentlang, or
++           #   b. a variant of presentlang (because in this case,
++           #      presentlang can be used as a fallback for messages
++           #      which are not translated in the desiredlang catalog).
++           case "$desiredlang" in
++             "$presentlang"*) useit=yes;;
++           esac
++         done
++         if test $useit = yes; then
++           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++         fi
++       done
++       LINGUAS=$NEW_LINGUAS
++       AC_MSG_RESULT($LINGUAS)
++     fi
+ 
+-#serial 3
++     dnl Construct list of names of catalog files to be constructed.
++     if test -n "$LINGUAS"; then
++       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++     fi
++   fi
+ 
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+-  # Strip MF so we end up with the name of the file.
+-  mf=`echo "$mf" | sed -e 's/:.*$//'`
+-  # Check whether this is an Automake generated Makefile or not.
+-  # We used to match only the files named `Makefile.in', but
+-  # some people rename them; so instead we look at the file content.
+-  # Grep'ing the first line is not enough: some people post-process
+-  # each Makefile.in and add a new line on top of each file to say so.
+-  # Grep'ing the whole file is not good either: AIX grep has a line
+-  # limit of 2048, but all sed's we know have understand at least 4000.
+-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+-    dirpart=`AS_DIRNAME("$mf")`
+-  else
+-    continue
+-  fi
+-  # Extract the definition of DEPDIR, am__include, and am__quote
+-  # from the Makefile without running `make'.
+-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+-  test -z "$DEPDIR" && continue
+-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-  test -z "am__include" && continue
+-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-  # When using ansi2knr, U may be empty or an underscore; expand it
+-  U=`sed -n 's/^U = //p' < "$mf"`
+-  # Find all dependency output files, they are included files with
+-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-  # simplest approach to changing $(DEPDIR) to its actual value in the
+-  # expansion.
+-  for file in `sed -n "
+-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+-    # Make sure the directory exists.
+-    test -f "$dirpart/$file" && continue
+-    fdir=`AS_DIRNAME(["$file"])`
+-    AS_MKDIR_P([$dirpart/$fdir])
+-    # echo "creating $dirpart/$file"
+-    echo '# dummy' > "$dirpart/$file"
+-  done
+-done
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++   dnl Try to locate is.
++   MKINSTALLDIRS=
++   if test -n "$ac_aux_dir"; then
++     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++   fi
++   if test -z "$MKINSTALLDIRS"; then
++     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++   fi
++   AC_SUBST(MKINSTALLDIRS)
+ 
++   dnl Generate list of files to be processed by xgettext which will
++   dnl be included in po/Makefile.
++   test -d po || mkdir po
++   if test "x$srcdir" != "x."; then
++     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++       posrcprefix="$srcdir/"
++     else
++       posrcprefix="../$srcdir/"
++     fi
++   else
++     posrcprefix="../"
++   fi
++   rm -f po/POTFILES
++   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++	< $srcdir/po/POTFILES.in > po/POTFILES
++  ])
+ 
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled.  FIXME.  This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++  localedir=`eval echo "${libdir}/locale"`
++else
++  localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++  [Define the location where the catalogs will be installed])
+ ])
+ 
+-# Do all the work for Automake.                             -*- Autoconf -*-
++dnl
++dnl Now the definitions that aclocal will find
++dnl
++ifdef(glib_configure_in,[],[
++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
++])dnl
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++# 
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++  m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
+ 
+-# serial 12
+ 
+-# This macro actually does too much.  Some checks are only needed if
+-# your package does certain things.  But this isn't really a big deal.
++# gnome-common.m4
++# 
+ 
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition.  After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
+-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+-  # is not polluted with repeated "-I."
+-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+-  # test to see if srcdir already configured
+-  if test -f $srcdir/config.status; then
+-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-  fi
+-fi
+-
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+-  if (cygpath --version) >/dev/null 2>/dev/null; then
+-    CYGPATH_W='cygpath -w'
+-  else
+-    CYGPATH_W=echo
+-  fi
+-fi
+-AC_SUBST([CYGPATH_W])
++dnl GNOME_COMMON_INIT
+ 
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++  dnl this macro should come after AC_CONFIG_MACRO_DIR
++  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+ 
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++  dnl ensure that when the Automake generated makefile calls aclocal,
++  dnl it honours the $ACLOCAL_FLAGS environment variable
++  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
++  if test -n "$ac_macro_dir"; then
++    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
++  fi
+ 
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target.  The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+-	      		     [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+-                  [_AM_DEPENDENCIES(CC)],
+-                  [define([AC_PROG_CC],
+-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-                  [_AM_DEPENDENCIES(CXX)],
+-                  [define([AC_PROG_CXX],
+-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+-                  [_AM_DEPENDENCIES(OBJC)],
+-                  [define([AC_PROG_OBJC],
+-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
++  AC_SUBST([ACLOCAL_AMFLAGS])
+ ])
+ 
++AC_DEFUN([GNOME_DEBUG_CHECK],
++[
++	AC_ARG_ENABLE([debug],
++                      AC_HELP_STRING([--enable-debug],
++                                     [turn on debugging]),,
++                      [enable_debug=no])
+ 
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated.  The stamp files are numbered to have different names.
++	if test x$enable_debug = xyes ; then
++	    AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++		[Enable additional debugging at the expense of performance and size])
++	fi
++])
+ 
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+-  case $_am_header in
+-    $1 | $1:* )
+-      break ;;
+-    * )
+-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+-  esac
+-done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++dnl GNOME_MAINTAINER_MODE_DEFINES ()
++dnl define DISABLE_DEPRECATED
++dnl
++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
++[
++	AC_REQUIRE([AM_MAINTAINER_MODE])
+ 
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++	if test $USE_MAINTAINER_MODE = yes; then
++		DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
++	else
++		DISABLE_DEPRECATED=""
++	fi
++	AC_SUBST(DISABLE_DEPRECATED)
++])
+ 
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++    dnl ******************************
++    dnl More compiler warnings
++    dnl ******************************
+ 
+-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++    AC_ARG_ENABLE(compile-warnings, 
++                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++                                 [Turn on compiler warnings]),,
++                  [enable_compile_warnings="m4_default([$1],[yes])"])
+ 
+-# serial 2
++    warnCFLAGS=
++    if test "x$GCC" != xyes; then
++	enable_compile_warnings=no
++    fi
+ 
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot.  For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+-  am__leading_dot=.
+-else
+-  am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
++    warning_flags=
++    realsave_CFLAGS="$CFLAGS"
+ 
+-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+-# From Jim Meyering
++    case "$enable_compile_warnings" in
++    no)
++	warning_flags=
++	;;
++    minimum)
++	warning_flags="-Wall"
++	;;
++    yes)
++	warning_flags="-Wall -Wmissing-prototypes"
++	;;
++    maximum|error)
++	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++	CFLAGS="$warning_flags $CFLAGS"
++	for option in -Wno-sign-compare; do
++		SAVE_CFLAGS="$CFLAGS"
++		CFLAGS="$CFLAGS $option"
++		AC_MSG_CHECKING([whether gcc understands $option])
++		AC_TRY_COMPILE([], [],
++			has_option=yes,
++			has_option=no,)
++		CFLAGS="$SAVE_CFLAGS"
++		AC_MSG_RESULT($has_option)
++		if test $has_option = yes; then
++		  warning_flags="$warning_flags $option"
++		fi
++		unset has_option
++		unset SAVE_CFLAGS
++	done
++	unset option
++	if test "$enable_compile_warnings" = "error" ; then
++	    warning_flags="$warning_flags -Werror"
++	fi
++	;;
++    *)
++	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++	;;
++    esac
++    CFLAGS="$realsave_CFLAGS"
++    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++    AC_MSG_RESULT($warning_flags)
+ 
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++    AC_ARG_ENABLE(iso-c,
++                  AC_HELP_STRING([--enable-iso-c],
++                                 [Try to warn if code is not ISO C ]),,
++                  [enable_iso_c=no])
+ 
+-# serial 4
++    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++    complCFLAGS=
++    if test "x$enable_iso_c" != "xno"; then
++	if test "x$GCC" = "xyes"; then
++	case " $CFLAGS " in
++	    *[\ \	]-ansi[\ \	]*) ;;
++	    *) complCFLAGS="$complCFLAGS -ansi" ;;
++	esac
++	case " $CFLAGS " in
++	    *[\ \	]-pedantic[\ \	]*) ;;
++	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
++	esac
++	fi
++    fi
++    AC_MSG_RESULT($complCFLAGS)
+ 
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+-  dnl maintainer-mode is disabled by default
+-  AC_ARG_ENABLE(maintainer-mode,
+-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+-			  (and sometimes confusing) to the casual installer],
+-      USE_MAINTAINER_MODE=$enableval,
+-      USE_MAINTAINER_MODE=no)
+-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+-  MAINT=$MAINTAINER_MODE_TRUE
+-  AC_SUBST(MAINT)dnl
+-]
+-)
++    WARN_CFLAGS="$warning_flags $complCFLAGS"
++    AC_SUBST(WARN_CFLAGS)
++])
+ 
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++dnl For C++, do basically the same thing.
+ 
+-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++  AC_ARG_ENABLE(cxx-warnings,
++                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++                               [Turn on compiler warnings.]),,
++                [enable_cxx_warnings="m4_default([$1],[minimum])"])
+ 
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 3
+-
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+-	@echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+-   echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
+-])
+-
+-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
++  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++  warnCXXFLAGS=
++  if test "x$GXX" != xyes; then
++    enable_cxx_warnings=no
++  fi
++  if test "x$enable_cxx_warnings" != "xno"; then
++    if test "x$GXX" = "xyes"; then
++      case " $CXXFLAGS " in
++      *[\ \	]-Wall[\ \	]*) ;;
++      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++      esac
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++      ## -W is not all that useful.  And it cannot be controlled
++      ## with individual -Wno-xxx flags, unlike -Wall
++      if test "x$enable_cxx_warnings" = "xyes"; then
++	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++      fi
++    fi
++  fi
++  AC_MSG_RESULT($warnCXXFLAGS)
+ 
+-# serial 5
++   AC_ARG_ENABLE(iso-cxx,
++                 AC_HELP_STRING([--enable-iso-cxx],
++                                [Try to warn if code is not ISO C++ ]),,
++                 [enable_iso_cxx=no])
+ 
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++   complCXXFLAGS=
++   if test "x$enable_iso_cxx" != "xno"; then
++     if test "x$GXX" = "xyes"; then
++      case " $CXXFLAGS " in
++      *[\ \	]-ansi[\ \	]*) ;;
++      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++      esac
+ 
++      case " $CXXFLAGS " in
++      *[\ \	]-pedantic[\ \	]*) ;;
++      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++      esac
++     fi
++   fi
++  AC_MSG_RESULT($complCXXFLAGS)
+ 
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
+-else
+-  am_missing_run=
+-  AC_MSG_WARN([`missing' script is too old or missing])
+-fi
++  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++  AC_SUBST(WARN_CXXFLAGS)
+ ])
+ 
+-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ 
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+-  [[\\/$]]* | ?:[[\\/]]*) ;;
+-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-])
++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
++# serial 36 IT_PROG_INTLTOOL
++AC_DEFUN([IT_PROG_INTLTOOL],
++[AC_PREREQ([2.50])dnl
+ 
+-# Helper functions for option handling.                     -*- Autoconf -*-
++case "$am__api_version" in
++    1.[01234])
++	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
++    ;;
++    *)
++    ;;
++esac
+ 
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++if test -n "$1"; then
++    AC_MSG_CHECKING([for intltool >= $1])
+ 
+-# serial 3
++    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
++    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++    ]
++    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
++    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
++	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
++fi
+ 
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++  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 $< [$]@' 
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $< [$]@' 
++     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++     INTLTOOL_PROP_RULE='%.prop:      %.prop.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 $< [$]@' 
++      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
++     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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 $< [$]@' 
++       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
++      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_CAVES_RULE='%.caves:     %.caves.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 $< [$]@' 
++  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_THEME_RULE='%.theme:     %.theme.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 $< [$]@' 
++    INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< [$]@'
++   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ 
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME.  Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++AC_SUBST(INTLTOOL_DESKTOP_RULE)
++AC_SUBST(INTLTOOL_DIRECTORY_RULE)
++AC_SUBST(INTLTOOL_KEYS_RULE)
++AC_SUBST(INTLTOOL_PROP_RULE)
++AC_SUBST(INTLTOOL_OAF_RULE)
++AC_SUBST(INTLTOOL_PONG_RULE)
++AC_SUBST(INTLTOOL_SERVER_RULE)
++AC_SUBST(INTLTOOL_SHEET_RULE)
++AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
++AC_SUBST(INTLTOOL_UI_RULE)
++AC_SUBST(INTLTOOL_XAM_RULE)
++AC_SUBST(INTLTOOL_KBD_RULE)
++AC_SUBST(INTLTOOL_XML_RULE)
++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
++AC_SUBST(INTLTOOL_CAVES_RULE)
++AC_SUBST(INTLTOOL_SCHEMAS_RULE)
++AC_SUBST(INTLTOOL_THEME_RULE)
++AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+ 
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
+ 
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++# Use the tools built into the package, not the ones that are installed.
++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+ 
+-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
++AC_PATH_PROG(INTLTOOL_PERL, perl)
++if test -z "$INTLTOOL_PERL"; then
++   AC_MSG_ERROR([perl not found; required for intltool])
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++   AC_MSG_ERROR([perl 5.x required for intltool])
++fi
++if test "x$2" != "xno-xml"; then
++   AC_MSG_CHECKING([for XML::Parser])
++   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++       AC_MSG_RESULT([ok])
++   else
++       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++   fi
++fi
+ 
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++AC_SUBST(ALL_LINGUAS)
+ 
+-# serial 4
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++  AC_LINK_IFELSE(
++    [AC_LANG_PROGRAM([[]],
++                     [[extern int _nl_msg_cat_cntr;
++                       return _nl_msg_cat_cntr]])],
++    [DATADIRNAME=share],
++    [case $host in
++    *-*-solaris*)
++    dnl On Solaris, if bind_textdomain_codeset is in libc,
++    dnl GNU format message catalog is always supported,
++    dnl since both are added to the libc all together.
++    dnl Hence, we'd like to go with DATADIRNAME=share
++    dnl in this case.
++    AC_CHECK_FUNC(bind_textdomain_codeset,
++      [DATADIRNAME=share], [DATADIRNAME=lib])
++    ;;
++    *)
++    [DATADIRNAME=lib]
++    ;;
++    esac])
++fi
++AC_SUBST(DATADIRNAME)
+ 
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+-   if test "$[*]" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
+-   fi
+-   rm -f conftest.file
+-   if test "$[*]" != "X $srcdir/configure conftest.file" \
+-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++IT_PO_SUBDIR([po])
+ 
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment])
+-   fi
++dnl The following is very similar to
++dnl
++dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
++dnl
++dnl with the following slight differences:
++dnl  - the *.in files are in ac_aux_dir,
++dnl  - if the file haven't changed upon reconfigure, it's not touched,
++dnl  - the evaluation of the third parameter enables a hack which computes
++dnl    the actual value of $libdir,
++dnl  - the user sees "executing intltool commands", instead of
++dnl    "creating intltool-extract" and such.
++dnl
++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
++dnl a reason for it.
+ 
+-   test "$[2]" = conftest.file
+-   )
+-then
+-   # Ok.
+-   :
+-else
+-   AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
++AC_CONFIG_COMMANDS([intltool], [
+ 
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++for file in intltool-extract intltool-merge intltool-update; do
++  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
++      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
++      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
++	< ${ac_aux_dir}/${file}.in > ${file}.out
++  if cmp -s ${file} ${file}.out 2>/dev/null; then
++    rm -f ${file}.out
++  else
++    mv -f ${file}.out ${file}
++  fi
++  chmod ugo+x ${file}
++  chmod u+w ${file}
++done
+ 
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries.  This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+-  AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++],
++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
+ 
+-# Copyright (C) 2006  Free Software Foundation, Inc.
++])
++
++
++# IT_PO_SUBDIR(DIRNAME)
++# ---------------------
++# All po subdirs have to be declared with this macro; the subdir "po" is
++# declared by IT_PROG_INTLTOOL.
+ #
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([IT_PO_SUBDIR],
++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
++dnl
++dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl of config.status.
++AC_CONFIG_COMMANDS_PRE([
++  AC_CONFIG_COMMANDS([$1/stamp-it], [
++    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
++    >"$1/stamp-it.tmp"
++    [sed '/^#/d
++	 s/^[[].*] *//
++	 /^[ 	]*$/d
++	'"s|^|	$ac_top_srcdir/|" \
++      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
++    ]
++    if test ! -f "$1/Makefile"; then
++      AC_MSG_ERROR([$1/Makefile is not ready.])
++    fi
++    mv "$1/Makefile" "$1/Makefile.tmp"
++    [sed '/^POTFILES =/,/[^\\]$/ {
++		/^POTFILES =/!d
++		r $1/POTFILES
++	  }
++	 ' "$1/Makefile.tmp" >"$1/Makefile"]
++    rm -f "$1/Makefile.tmp"
++    mv "$1/stamp-it.tmp" "$1/stamp-it"
++  ])
++])dnl
++])
+ 
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
+ 
+-# Check how to create a tarball.                            -*- Autoconf -*-
++# deprecated macros
++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
++# A hint is needed for aclocal from Automake <= 1.9.4:
++# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+ 
+-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-#     tardir=directory && $(am__tar) > result.tar
+-#
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-#     $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+-     [m4_case([$1], [ustar],, [pax],,
+-              [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+-  case $_am_tool in
+-  gnutar)
+-    for _am_tar in tar gnutar gtar;
+-    do
+-      AM_RUN_LOG([$_am_tar --version]) && break
+-    done
+-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+-    am__untar="$_am_tar -xf -"
+-    ;;
+-  plaintar)
+-    # Must skip GNU tar: if it does not support --format= it doesn't create
+-    # ustar tarball either.
+-    (tar --version) >/dev/null 2>&1 && continue
+-    am__tar='tar chf - "$$tardir"'
+-    am__tar_='tar chf - "$tardir"'
+-    am__untar='tar xf -'
+-    ;;
+-  pax)
+-    am__tar='pax -L -x $1 -w "$$tardir"'
+-    am__tar_='pax -L -x $1 -w "$tardir"'
+-    am__untar='pax -r'
+-    ;;
+-  cpio)
+-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+-    am__untar='cpio -i -H $1 -d'
+-    ;;
+-  none)
+-    am__tar=false
+-    am__tar_=false
+-    am__untar=false
+-    ;;
+-  esac
++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+ 
+-  # If the value was cached, stop now.  We just wanted to have am__tar
+-  # and am__untar set.
+-  test -n "${am_cv_prog_tar_$1}" && break
+ 
+-  # tar/untar a dummy directory, and stop if the command works
+-  rm -rf conftest.dir
+-  mkdir conftest.dir
+-  echo GrepMe > conftest.dir/file
+-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+-  rm -rf conftest.dir
+-  if test -s conftest.tar; then
+-    AM_RUN_LOG([$am__untar <conftest.tar])
+-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+-  fi
+-done
+-rm -rf conftest.dir
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++         [],
++         [m4_define([AC_PROVIDE_IFELSE],
++	         [m4_ifdef([AC_PROVIDE_$1],
++		           [$2], [$3])])])
+ 
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
+ 
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl  (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+-dnl  you should install foo.schemas files
+-dnl
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
+ 
+-AC_DEFUN([AM_GCONF_SOURCE_2],
+-[
+-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+-  else
+-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+-  fi
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
+ 
+-  AC_ARG_WITH(gconf-source, 
+-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+ 
+-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+-  fi
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-  AC_ARG_WITH(gconf-schema-file-dir, 
+-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
+ 
+-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
+ 
+-  AC_ARG_ENABLE(schemas-install,
+-     [  --disable-schemas-install	Disable the schemas installation],
+-     [case ${enableval} in
+-       yes|no) ;;
+-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
+-      esac])
+-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+-])
+ 
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License.  As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions.  It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl. 
+-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version 
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+-#
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
+ 
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-dnl We go to great lengths to make sure that aclocal won't 
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
+ 
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+-  [AC_CHECK_HEADERS([locale.h])
+-    if test $ac_cv_header_locale_h = yes; then
+-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+-    if test $am_cv_val_LC_MESSAGES = yes; then
+-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+-        [Define if your <locale.h> file defines LC_MESSAGES.])
+-    fi
+-  fi])
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
+ 
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+-  /*)
+-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      if [$3]; then
+-	ac_cv_path_$1="$ac_dir/$ac_word"
+-	break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
+   ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+-  AC_MSG_RESULT([$]$1)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
++esac
+ 
+-# GLIB_WITH_NLS
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+-  dnl NLS is obligatory
+-  [USE_NLS=yes
+-    AC_SUBST(USE_NLS)
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+-    gt_cv_have_gettext=no
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+ 
+-    CATOBJEXT=NONE
+-    XGETTEXT=:
+-    INTLLIBS=
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-    AC_CHECK_HEADER(libintl.h,
+-     [gt_cv_func_dgettext_libintl="no"
+-      libintl_extra_libs=""
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-      #
+-      # First check in libc
+-      #
+-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+-        [AC_TRY_LINK([
+-#include <libintl.h>
+-],
+-         [return !ngettext ("","", 1)],
+-	  gt_cv_func_ngettext_libc=yes,
+-          gt_cv_func_ngettext_libc=no)
+-        ])
+-  
+-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+-        	[AC_TRY_LINK([
+-#include <libintl.h>
+-],
+-	          [return !dgettext ("","")],
+-		  gt_cv_func_dgettext_libc=yes,
+-	          gt_cv_func_dgettext_libc=no)
+-        	])
+-      fi
+-  
+-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-        AC_CHECK_FUNCS(bind_textdomain_codeset)
+-      fi
++# Constants:
++rm="rm -f"
+ 
+-      #
+-      # If we don't have everything we want, check in libintl
+-      #
+-      if test "$gt_cv_func_dgettext_libc" != "yes" \
+-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+-        
+-        AC_CHECK_LIB(intl, bindtextdomain,
+-	    [AC_CHECK_LIB(intl, ngettext,
+-		    [AC_CHECK_LIB(intl, dgettext,
+-			          gt_cv_func_dgettext_libintl=yes)])])
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+ 
+-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+-	  AC_MSG_RESULT([])
+-  	  AC_CHECK_LIB(intl, ngettext,
+-          	[AC_CHECK_LIB(intl, dcgettext,
+-		       [gt_cv_func_dgettext_libintl=yes
+-			libintl_extra_libs=-liconv],
+-			:,-liconv)],
+-		:,-liconv)
+-        fi
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-        #
+-        # If we found libintl, then check in it for bind_textdomain_codeset();
+-        # we'll prefer libc if neither have bind_textdomain_codeset(),
+-        # and both have dgettext and ngettext
+-        #
+-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+-          glib_save_LIBS="$LIBS"
+-          LIBS="$LIBS -lintl $libintl_extra_libs"
+-          unset ac_cv_func_bind_textdomain_codeset
+-          AC_CHECK_FUNCS(bind_textdomain_codeset)
+-          LIBS="$glib_save_LIBS"
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+ 
+-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+-            gt_cv_func_dgettext_libc=no
+-          else
+-            if test "$gt_cv_func_dgettext_libc" = "yes" \
+-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+-              gt_cv_func_dgettext_libintl=no
+-            fi
+-          fi
+-        fi
+-      fi
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-      if test "$gt_cv_func_dgettext_libc" = "yes" \
+-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+-        gt_cv_have_gettext=yes
+-      fi
+-  
+-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+-        INTLLIBS="-lintl $libintl_extra_libs"
+-      fi
+-  
+-      if test "$gt_cv_have_gettext" = "yes"; then
+-	AC_DEFINE(HAVE_GETTEXT,1,
+-	  [Define if the GNU gettext() function is already present or preinstalled.])
+-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+-	if test "$MSGFMT" != "no"; then
+-          glib_save_LIBS="$LIBS"
+-          LIBS="$LIBS $INTLLIBS"
+-	  AC_CHECK_FUNCS(dcgettext)
+-	  MSGFMT_OPTS=
+-	  AC_MSG_CHECKING([if msgfmt accepts -c])
+-	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+-msgid ""
+-msgstr ""
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Project-Id-Version: test 1.0\n"
+-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+-"Last-Translator: test <foo@bar.xx>\n"
+-"Language-Team: C <LL@li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+-	  AC_SUBST(MSGFMT_OPTS)
+-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+-			 return _nl_msg_cat_cntr],
+-	    [CATOBJEXT=.gmo 
+-             DATADIRNAME=share],
+-	    [case $host in
+-	    *-*-solaris*)
+-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-	    dnl GNU format message catalog is always supported,
+-            dnl since both are added to the libc all together.
+-	    dnl Hence, we'd like to go with DATADIRNAME=share and
+-	    dnl and CATOBJEXT=.gmo in this case.
+-            AC_CHECK_FUNC(bind_textdomain_codeset,
+-	      [CATOBJEXT=.gmo 
+-               DATADIRNAME=share],
+-	      [CATOBJEXT=.mo
+-               DATADIRNAME=lib])
+-	    ;;
+-	    *)
+-	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
+-	    ;;
+-	    esac])
+-          LIBS="$glib_save_LIBS"
+-	  INSTOBJEXT=.mo
+-	else
+-	  gt_cv_have_gettext=no
+-	fi
+-      fi
+-    ])
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+ 
+-    if test "$gt_cv_have_gettext" = "yes" ; then
+-      AC_DEFINE(ENABLE_NLS, 1,
+-        [always defined to indicate that i18n is enabled])
+-    fi
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-    dnl Test whether we really found GNU xgettext.
+-    if test "$XGETTEXT" != ":"; then
+-      dnl If it is not GNU xgettext we define it as : so that the
+-      dnl Makefiles still can work.
+-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+-        : ;
+-      else
+-        AC_MSG_RESULT(
+-	  [found xgettext program is not GNU xgettext; ignore it])
+-        XGETTEXT=":"
+-      fi
+-    fi
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
+ 
+-    # We need to process the po/ directory.
+-    POSUB=po
++_LT_CC_BASENAME([$compiler])
+ 
+-    AC_OUTPUT_COMMANDS(
+-      [case "$CONFIG_FILES" in *po/Makefile.in*)
+-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+-      esac])
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
+ 
+-    dnl These rules are solely for the distribution goal.  While doing this
+-    dnl we only have to keep exactly one list of the available catalogs
+-    dnl in configure.in.
+-    for lang in $ALL_LINGUAS; do
+-      GMOFILES="$GMOFILES $lang.gmo"
+-      POFILES="$POFILES $lang.po"
+-    done
++_LT_REQUIRED_DARWIN_CHECKS
+ 
+-    dnl Make all variables we use known to autoconf.
+-    AC_SUBST(CATALOGS)
+-    AC_SUBST(CATOBJEXT)
+-    AC_SUBST(DATADIRNAME)
+-    AC_SUBST(GMOFILES)
+-    AC_SUBST(INSTOBJEXT)
+-    AC_SUBST(INTLLIBS)
+-    AC_SUBST(PO_IN_DATADIR_TRUE)
+-    AC_SUBST(PO_IN_DATADIR_FALSE)
+-    AC_SUBST(POFILES)
+-    AC_SUBST(POSUB)
+-  ])
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
+ 
+-# AM_GLIB_GNU_GETTEXT
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation 
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by 
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+-  [AC_REQUIRE([AC_PROG_CC])dnl
+-   AC_REQUIRE([AC_HEADER_STDC])dnl
+-   
+-   GLIB_LC_MESSAGES
+-   GLIB_WITH_NLS
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-   if test "$gt_cv_have_gettext" = "yes"; then
+-     if test "x$ALL_LINGUAS" = "x"; then
+-       LINGUAS=
+-     else
+-       AC_MSG_CHECKING(for catalogs to be installed)
+-       NEW_LINGUAS=
+-       for presentlang in $ALL_LINGUAS; do
+-         useit=no
+-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+-           desiredlanguages="$LINGUAS"
+-         else
+-           desiredlanguages="$ALL_LINGUAS"
+-         fi
+-         for desiredlang in $desiredlanguages; do
+- 	   # Use the presentlang catalog if desiredlang is
+-           #   a. equal to presentlang, or
+-           #   b. a variant of presentlang (because in this case,
+-           #      presentlang can be used as a fallback for messages
+-           #      which are not translated in the desiredlang catalog).
+-           case "$desiredlang" in
+-             "$presentlang"*) useit=yes;;
+-           esac
+-         done
+-         if test $useit = yes; then
+-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+-         fi
+-       done
+-       LINGUAS=$NEW_LINGUAS
+-       AC_MSG_RESULT($LINGUAS)
+-     fi
+-
+-     dnl Construct list of names of catalog files to be constructed.
+-     if test -n "$LINGUAS"; then
+-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+-     fi
+-   fi
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
+ 
+-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+-   dnl Try to locate is.
+-   MKINSTALLDIRS=
+-   if test -n "$ac_aux_dir"; then
+-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+-   fi
+-   if test -z "$MKINSTALLDIRS"; then
+-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+-   fi
+-   AC_SUBST(MKINSTALLDIRS)
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
+ 
+-   dnl Generate list of files to be processed by xgettext which will
+-   dnl be included in po/Makefile.
+-   test -d po || mkdir po
+-   if test "x$srcdir" != "x."; then
+-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+-       posrcprefix="$srcdir/"
+-     else
+-       posrcprefix="../$srcdir/"
+-     fi
+-   else
+-     posrcprefix="../"
+-   fi
+-   rm -f po/POTFILES
+-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+-	< $srcdir/po/POTFILES.in > po/POTFILES
+-  ])
+ 
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+-  localedir=`eval echo "${libdir}/locale"`
+-else
+-  localedir=`eval echo "${datadir}/locale"`
+-fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+-  [Define the location where the catalogs will be installed])
+-])
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_in,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-# 
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+-  m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
+ 
+-# gnome-common.m4
+-# 
+ 
+-dnl GNOME_COMMON_INIT
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
+ 
+-AC_DEFUN([GNOME_COMMON_INIT],
+-[
+-  dnl this macro should come after AC_CONFIG_MACRO_DIR
+-  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+ 
+-  dnl ensure that when the Automake generated makefile calls aclocal,
+-  dnl it honours the $ACLOCAL_FLAGS environment variable
+-  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+-  if test -n "$ac_macro_dir"; then
+-    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+-  fi
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
+ 
+-  AC_SUBST([ACLOCAL_AMFLAGS])
+-])
+ 
+-AC_DEFUN([GNOME_DEBUG_CHECK],
+-[
+-	AC_ARG_ENABLE([debug],
+-                      AC_HELP_STRING([--enable-debug],
+-                                     [turn on debugging]),,
+-                      [enable_debug=no])
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm -r conftest*
++])# _LT_LINKER_BOILERPLATE
+ 
+-	if test x$enable_debug = xyes ; then
+-	    AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+-		[Enable additional debugging at the expense of performance and size])
+-	fi
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++   # By default we will add the -single_module flag. You can override
++   # by either setting the environment variable LT_MULTI_MODULE
++   # non-empty at configure time, or by adding -multi_module to the
++   # link flags.
++   echo "int foo(void){return 1;}" > conftest.c
++   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++     -dynamiclib ${wl}-single_module conftest.c
++   if test -f libconftest.dylib; then
++     lt_cv_apple_cc_single_mod=yes
++     rm -rf libconftest.dylib*
++   fi
++   rm conftest.c
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++   [lt_cv_ld_exported_symbols_list=yes],
++   [lt_cv_ld_exported_symbols_list=no])
++   LDFLAGS="$save_LDFLAGS"
++    ])
++    case $host_os in
++    rhapsody* | darwin1.[[0123]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*)
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++   10.[[012]]*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++   10.*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil="~$DSYMUTIL \$lib || :"
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
+ ])
+ 
+-dnl GNOME_MAINTAINER_MODE_DEFINES ()
+-dnl define DISABLE_DEPRECATED
+-dnl
+-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+-[
+-	AC_REQUIRE([AM_MAINTAINER_MODE])
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
+ 
+-	if test $USE_MAINTAINER_MODE = yes; then
+-		DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+-	else
+-		DISABLE_DEPRECATED=""
+-	fi
+-	AC_SUBST(DISABLE_DEPRECATED)
+-])
+ 
+-dnl GNOME_COMPILE_WARNINGS
+-dnl Turn on many useful compiler warnings
+-dnl For now, only works on GCC
+-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+-    dnl ******************************
+-    dnl More compiler warnings
+-    dnl ******************************
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
+ 
+-    AC_ARG_ENABLE(compile-warnings, 
+-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+-                                 [Turn on compiler warnings]),,
+-                  [enable_compile_warnings="m4_default([$1],[yes])"])
+ 
+-    warnCFLAGS=
+-    if test "x$GCC" != xyes; then
+-	enable_compile_warnings=no
+-    fi
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-    warning_flags=
+-    realsave_CFLAGS="$CFLAGS"
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
+ 
+-    case "$enable_compile_warnings" in
+-    no)
+-	warning_flags=
+-	;;
+-    minimum)
+-	warning_flags="-Wall"
+-	;;
+-    yes)
+-	warning_flags="-Wall -Wmissing-prototypes"
+-	;;
+-    maximum|error)
+-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+-	CFLAGS="$warning_flags $CFLAGS"
+-	for option in -Wno-sign-compare; do
+-		SAVE_CFLAGS="$CFLAGS"
+-		CFLAGS="$CFLAGS $option"
+-		AC_MSG_CHECKING([whether gcc understands $option])
+-		AC_TRY_COMPILE([], [],
+-			has_option=yes,
+-			has_option=no,)
+-		CFLAGS="$SAVE_CFLAGS"
+-		AC_MSG_RESULT($has_option)
+-		if test $has_option = yes; then
+-		  warning_flags="$warning_flags $option"
+-		fi
+-		unset has_option
+-		unset SAVE_CFLAGS
+-	done
+-	unset option
+-	if test "$enable_compile_warnings" = "error" ; then
+-	    warning_flags="$warning_flags -Werror"
+-	fi
+-	;;
+-    *)
+-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+-	;;
+-    esac
+-    CFLAGS="$realsave_CFLAGS"
+-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+-    AC_MSG_RESULT($warning_flags)
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
+ 
+-    AC_ARG_ENABLE(iso-c,
+-                  AC_HELP_STRING([--enable-iso-c],
+-                                 [Try to warn if code is not ISO C ]),,
+-                  [enable_iso_c=no])
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++[$]*
++EOF
++  exit 0
++fi
+ 
+-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+-    complCFLAGS=
+-    if test "x$enable_iso_c" != "xno"; then
+-	if test "x$GCC" = "xyes"; then
+-	case " $CFLAGS " in
+-	    *[\ \	]-ansi[\ \	]*) ;;
+-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
+-	esac
+-	case " $CFLAGS " in
+-	    *[\ \	]-pedantic[\ \	]*) ;;
+-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+-	esac
+-	fi
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
+     fi
+-    AC_MSG_RESULT($complCFLAGS)
++  done
++fi
+ 
+-    WARN_CFLAGS="$warning_flags $complCFLAGS"
+-    AC_SUBST(WARN_CFLAGS)
+-])
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
+ 
+-dnl For C++, do basically the same thing.
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
+ 
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+-  AC_ARG_ENABLE(cxx-warnings,
+-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+-                               [Turn on compiler warnings.]),,
+-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
+ 
+-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+-  warnCXXFLAGS=
+-  if test "x$GXX" != xyes; then
+-    enable_cxx_warnings=no
+-  fi
+-  if test "x$enable_cxx_warnings" != "xno"; then
+-    if test "x$GXX" = "xyes"; then
+-      case " $CXXFLAGS " in
+-      *[\ \	]-Wall[\ \	]*) ;;
+-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+-      esac
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
+ 
+-      ## -W is not all that useful.  And it cannot be controlled
+-      ## with individual -Wno-xxx flags, unlike -Wall
+-      if test "x$enable_cxx_warnings" = "xyes"; then
+-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
+       fi
+     fi
+   fi
+-  AC_MSG_RESULT($warnCXXFLAGS)
+-
+-   AC_ARG_ENABLE(iso-cxx,
+-                 AC_HELP_STRING([--enable-iso-cxx],
+-                                [Try to warn if code is not ISO C++ ]),,
+-                 [enable_iso_cxx=no])
+-
+-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+-   complCXXFLAGS=
+-   if test "x$enable_iso_cxx" != "xno"; then
+-     if test "x$GXX" = "xyes"; then
+-      case " $CXXFLAGS " in
+-      *[\ \	]-ansi[\ \	]*) ;;
+-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+-      esac
+-
+-      case " $CXXFLAGS " in
+-      *[\ \	]-pedantic[\ \	]*) ;;
+-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+-      esac
+-     fi
+-   fi
+-  AC_MSG_RESULT($complCXXFLAGS)
+-
+-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+-  AC_SUBST(WARN_CXXFLAGS)
+-])
++fi
++fi
+ 
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+ 
+-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+-# serial 36 IT_PROG_INTLTOOL
+-AC_DEFUN([IT_PROG_INTLTOOL],
+-[AC_PREREQ([2.50])dnl
++AC_SUBST(ECHO)
++])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
+-case "$am__api_version" in
+-    1.[01234])
+-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+-    ;;
+-    *)
+-    ;;
+-esac
+ 
+-if test -n "$1"; then
+-    AC_MSG_CHECKING([for intltool >= $1])
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+-    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+-    ]
+-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+-fi
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
+ 
+-  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 $< [$]@' 
+-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $< [$]@' 
+-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-     INTLTOOL_PROP_RULE='%.prop:      %.prop.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 $< [$]@' 
+-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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 $< [$]@' 
+-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.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 $< [$]@' 
+-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+-    INTLTOOL_THEME_RULE='%.theme:     %.theme.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 $< [$]@' 
+-    INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< [$]@'
+-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *32-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
+ 
+-AC_SUBST(INTLTOOL_DESKTOP_RULE)
+-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+-AC_SUBST(INTLTOOL_KEYS_RULE)
+-AC_SUBST(INTLTOOL_PROP_RULE)
+-AC_SUBST(INTLTOOL_OAF_RULE)
+-AC_SUBST(INTLTOOL_PONG_RULE)
+-AC_SUBST(INTLTOOL_SERVER_RULE)
+-AC_SUBST(INTLTOOL_SHEET_RULE)
+-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+-AC_SUBST(INTLTOOL_UI_RULE)
+-AC_SUBST(INTLTOOL_XAM_RULE)
+-AC_SUBST(INTLTOOL_KBD_RULE)
+-AC_SUBST(INTLTOOL_XML_RULE)
+-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+-AC_SUBST(INTLTOOL_CAVES_RULE)
+-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+-AC_SUBST(INTLTOOL_THEME_RULE)
+-AC_SUBST(INTLTOOL_SERVICE_RULE)
+-AC_SUBST(INTLTOOL_POLICY_RULE)
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
+ 
+-# Check the gettext tools to make sure they are GNU
+-AC_PATH_PROG(XGETTEXT, xgettext)
+-AC_PATH_PROG(MSGMERGE, msgmerge)
+-AC_PATH_PROG(MSGFMT, msgfmt)
+-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+-fi
+-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+-fi
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++  ])
++esac
+ 
+-# Use the tools built into the package, not the ones that are installed.
+-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
++need_locks="$enable_libtool_lock"
+ 
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
+-if test -z "$INTLTOOL_PERL"; then
+-   AC_MSG_ERROR([perl not found; required for intltool])
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-   AC_MSG_ERROR([perl 5.x required for intltool])
+-fi
+-if test "x$2" != "xno-xml"; then
+-   AC_MSG_CHECKING([for XML::Parser])
+-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       AC_MSG_RESULT([ok])
+-   else
+-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++])# _LT_AC_LOCK
++
++
++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   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.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
+    fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
+ fi
++])# AC_LIBTOOL_COMPILER_OPTION
+ 
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
+-AC_SUBST(ALL_LINGUAS)
+ 
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+-  AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[]],
+-                     [[extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr]])],
+-    [DATADIRNAME=share],
+-    [case $host in
+-    *-*-solaris*)
+-    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-    dnl GNU format message catalog is always supported,
+-    dnl since both are added to the libc all together.
+-    dnl Hence, we'd like to go with DATADIRNAME=share
+-    dnl in this case.
+-    AC_CHECK_FUNC(bind_textdomain_codeset,
+-      [DATADIRNAME=share], [DATADIRNAME=lib])
+-    ;;
+-    *)
+-    [DATADIRNAME=lib]
+-    ;;
+-    esac])
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                          [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $rm -r conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
++else
++    ifelse([$5], , :, [$5])
+ fi
+-AC_SUBST(DATADIRNAME)
++])# AC_LIBTOOL_LINKER_OPTION
+ 
+-IT_PO_SUBDIR([po])
+ 
+-dnl The following is very similar to
+-dnl
+-dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+-dnl
+-dnl with the following slight differences:
+-dnl  - the *.in files are in ac_aux_dir,
+-dnl  - if the file haven't changed upon reconfigure, it's not touched,
+-dnl  - the evaluation of the third parameter enables a hack which computes
+-dnl    the actual value of $libdir,
+-dnl  - the user sees "executing intltool commands", instead of
+-dnl    "creating intltool-extract" and such.
+-dnl
+-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+-dnl a reason for it.
++# AC_LIBTOOL_SYS_MAX_CMD_LEN
++# --------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
++[# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
+ 
+-AC_CONFIG_COMMANDS([intltool], [
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
+ 
+-for file in intltool-extract intltool-merge intltool-update; do
+-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+-      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+-      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+-	< ${ac_aux_dir}/${file}.in > ${file}.out
+-  if cmp -s ${file} ${file}.out 2>/dev/null; then
+-    rm -f ${file}.out
+-  else
+-    mv -f ${file}.out ${file}
+-  fi
+-  chmod ugo+x ${file}
+-  chmod u+w ${file}
+-done
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
+ 
+-],
+-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-])
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
+ 
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
+ 
+-# IT_PO_SUBDIR(DIRNAME)
+-# ---------------------
+-# All po subdirs have to be declared with this macro; the subdir "po" is
+-# declared by IT_PROG_INTLTOOL.
+-#
+-AC_DEFUN([IT_PO_SUBDIR],
+-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+-dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
+-dnl of config.status.
+-AC_CONFIG_COMMANDS_PRE([
+-  AC_CONFIG_COMMANDS([$1/stamp-it], [
+-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+-    >"$1/stamp-it.tmp"
+-    [sed '/^#/d
+-	 s/^[[].*] *//
+-	 /^[ 	]*$/d
+-	'"s|^|	$ac_top_srcdir/|" \
+-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+-    ]
+-    if test ! -f "$1/Makefile"; then
+-      AC_MSG_ERROR([$1/Makefile is not ready.])
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
+     fi
+-    mv "$1/Makefile" "$1/Makefile.tmp"
+-    [sed '/^POTFILES =/,/[^\\]$/ {
+-		/^POTFILES =/!d
+-		r $1/POTFILES
+-	  }
+-	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+-    rm -f "$1/Makefile.tmp"
+-    mv "$1/stamp-it.tmp" "$1/stamp-it"
+-  ])
+-])dnl
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
++    ;;
++  esac
+ ])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
+ 
+-# deprecated macros
+-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+-# A hint is needed for aclocal from Automake <= 1.9.4:
+-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+-
++# _LT_AC_CHECK_DLFCN
++# ------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)dnl
++])# _LT_AC_CHECK_DLFCN
+ 
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 48 AC_PROG_LIBTOOL
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ---------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+ 
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
++#include <stdio.h>
+ 
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
+ 
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+-    [AC_LIBTOOL_GCJ],
+-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+-      [AC_LIBTOOL_GCJ],
+-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+-	[AC_LIBTOOL_GCJ],
+-      [ifdef([AC_PROG_GCJ],
+-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([A][M_PROG_GCJ],
+-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([LT_AC_PROG_GCJ],
+-	     [define([LT_AC_PROG_GCJ],
+-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
+ 
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_dlunknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+ 
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++# AC_LIBTOOL_DLOPEN_SELF
++# ----------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
+ 
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
+ 
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
+ 
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-dnl
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
+ 
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++   ;;
+ 
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
+ 
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
+   fi
+-  ;;
+-esac
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
+ 
+-# Constants:
+-rm="rm -f"
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
+ 
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
+ 
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++])
++])# AC_LIBTOOL_PROG_CC_C_O
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+-    ;;
+-  *)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+ 
+-_LT_CC_BASENAME([$compiler])
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
++# Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
+   fi
+-  ;;
+-esac
+-
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
+-
+-AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+-
+-AC_ARG_WITH([pic],
+-    [AC_HELP_STRING([--with-pic],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+-
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
+-
++else
++  need_locks=no
++fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
++# Check hardcoding attributes.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
++  # We can hardcode non-existant directories.
++  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_AC_TAGVAR(hardcode_action, $1)=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+-  case $cc_temp in
+-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-])
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+ 
+ 
+-# _LT_COMPILER_BOILERPLATE
++# AC_LIBTOOL_SYS_LIB_STRIP
+ # ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_COMPILER_BOILERPLATE
+-
+-
+-# _LT_LINKER_BOILERPLATE
+-# ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_LINKER_BOILERPLATE
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
++         AC_MSG_RESULT([yes])
++       else
++  AC_MSG_RESULT([no])
++fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
++    ;;
++  esac
++fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+ 
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+ }'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
+-
+-
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-	 [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
+-
+-
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+-  ;;
+-esac
+-
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X[$]1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+-  # Restart under the correct shell.
+-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
+-
+-if test "X[$]1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-[$]*
+-EOF
+-  exit 0
+-fi
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+-       echo_test_string=`eval $cmd` &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ 	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+       else
+-	# maybe with a smaller string...
+-	prev=:
+-
+-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
+-
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
++	can_build_shared=no
+       fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
++    shlibpath_var=LIBPATH
+   fi
+-fi
+-fi
+-
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
++  ;;
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
+ 
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
+-      ;;
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
++bsdi[[45]]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
+   ;;
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -melf64bmip"
+-      ;;
+-    esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
+       ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+-   fi
+-  fi
+-  rm -rf conftest*
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_POP])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+-sparc*-*solaris*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *64-bit*)
+-      case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
+-      esac
+-      ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
+     esac
+   fi
+-  rm -rf conftest*
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  esac
+   ;;
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
+   ;;
+-  ])
+-esac
+ 
+-need_locks="$enable_libtool_lock"
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
+ 
+-])# _LT_AC_LOCK
++interix[[3-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$3"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   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.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-])
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
+-else
+-    ifelse([$6], , :, [$6])
+-fi
+-])# AC_LIBTOOL_COMPILER_OPTION
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         $2=yes
+-       fi
+-     else
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-])
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
+-else
+-    ifelse([$5], , :, [$5])
+-fi
+-])# AC_LIBTOOL_LINKER_OPTION
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
+ 
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+-  i=0
+-  teststring="ABCD"
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-  amigaos*)
+-    # On AmigaOS with pdksh, this test takes hours, literally.
+-    # So we just punt and use a minimum line length of 8192.
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+-    # This has been around since 386BSD, at least.  Likely further.
+-    if test -x /sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+-    elif test -x /usr/sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+-    else
+-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+-    fi
+-    # And add a safety zone
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+-    ;;
++rdos*)
++  dynamic_linker=no
++  ;;
+ 
+-  interix*)
+-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+-    lt_cv_sys_max_cmd_len=196608
+-    ;;
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-  osf*)
+-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+-    # nice to cause kernel panics so lets avoid the loop below.
+-    # First set a reasonable default.
+-    lt_cv_sys_max_cmd_len=16384
+-    #
+-    if test -x /sbin/sysconfig; then
+-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+-      esac
+-    fi
+-    ;;
+-  sco3.2v5*)
+-    lt_cv_sys_max_cmd_len=102400
+-    ;;
+-  sysv5* | sco5v6* | sysv4.2uw2*)
+-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+-    if test -n "$kargmax"; then
+-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+-    else
+-      lt_cv_sys_max_cmd_len=32768
+-    fi
+-    ;;
+-  *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+-	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+-    ;;
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
+   esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+-  AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++  ;;
+ 
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+-  [$4]
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ 
+-#include <stdio.h>
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
++    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++        [include additional configurations @<:@automatic@:>@])],
++    [tagnames="$withval"])
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
++    else
++      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
++    fi
++  fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-  else
+-    puts (dlerror ());
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+ 
+-    exit (status);
+-}]
+-EOF
+-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) $1 ;;
+-      x$lt_dlneed_uscore) $2 ;;
+-      x$lt_dlunknown|x*) $3 ;;
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++    "") ;;
++    *)  AC_MSG_ERROR([invalid tag name: $tagname])
++	;;
+     esac
+-  else :
+-    # compilation failed
+-    $3
+-  fi
+-fi
+-rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
+ 
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      AC_MSG_ERROR([tag name \"$tagname\" already exists])
++    fi
+ 
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
++	  AC_LIBTOOL_LANG_CXX_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  AC_LIBTOOL_LANG_F77_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  AC_LIBTOOL_LANG_GCJ_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ])
+-   ;;
++      RC)
++	AC_LIBTOOL_LANG_RC_CONFIG
++	;;
+ 
+-  *)
+-    AC_CHECK_FUNC([shl_load],
+-	  [lt_cv_dlopen="shl_load"],
+-      [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+-	[AC_CHECK_FUNC([dlopen],
+-	      [lt_cv_dlopen="dlopen"],
+-	  [AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+-	    [AC_CHECK_LIB([svld], [dlopen],
+-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+-	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+-	      ])
+-	    ])
+-	  ])
+-	])
+-      ])
+-    ;;
+-  esac
++      *)
++	AC_MSG_ERROR([Unsupported tag name: $tagname])
++	;;
++      esac
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
+   else
+-    enable_dlopen=no
++    rm -f "${ofile}T"
++    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+   fi
++fi
++])# _LT_AC_TAGCONFIG
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
+ 
+-    AC_CACHE_CHECK([whether a program can dlopen itself],
+-	  lt_cv_dlopen_self, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+-    ])
+ 
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+-      ])
+-    fi
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 DLLs
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
+ 
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_DLOPEN_SELF
+ 
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
+ 
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+-   then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-     fi
+-   fi
+-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+-   $rm conftest*
+-   # SGI C++ compiler will create directory out/ii_files/ for
+-   # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-])
+-])# AC_LIBTOOL_PROG_CC_C_O
+ 
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
+ 
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
+-# Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+-hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  AC_MSG_CHECKING([if we can lock with hard links])
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  AC_MSG_RESULT([$hard_links])
+-  if test "$hard_links" = no; then
+-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
+ 
+ 
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+-[rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  lt_cv_objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  lt_cv_objdir=_libs
+-fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
+ 
+ 
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
+-# Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+-[AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+ 
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  AC_MSG_RESULT([yes])
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
+-    ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
+ 
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-# -----------------------------
+-# PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext_cmds=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+-
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+-
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
+-
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[[01]] | aix4.[[01]].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
+       fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
++      break
+     fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
+-
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+-  ;;
+-
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
+ 
+-bsdi[[45]]*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext_cmds=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# AC_PATH_MAGIC
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++    [AC_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
+       ;;
+-    esac
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
+     ;;
+-
+   *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
+   ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
++
++
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix[[4-9]]*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
++beos*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
+   else
+-    case $host_os in
+-    freebsd[[123]]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
+   fi
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
+   ;;
+ 
+ gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
+   case $host_cpu in
+   ia64*)
+-    shrext_cmds='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext_cmds='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext_cmds='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
+-
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+   ;;
+ 
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+   ;;
+ 
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+-
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-    if AC_TRY_EVAL(ac_compile); then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
+   esac
+-
+-  # Append ld.so.conf contents to the search path
+-  if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+-  fi
+-
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-knetbsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
++netbsd* | netbsdelf*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+   ;;
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+ nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
++  lt_cv_deplibs_check_method=unknown
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
+-  need_lib_prefix=no
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[[89]] | openbsd2.[[89]].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    shlibpath_overrides_runpath=yes
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext_cmds=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+ osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sysv4 | sysv4.3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
+-
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+-  else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
++  lt_cv_deplibs_check_method=pass_all
+   ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+ 
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
++
++
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
+ *)
+-  dynamic_linker=no
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
+ esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++])# AC_CHECK_LIBM
+ 
+ 
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
+ 
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
+ 
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
+-  if test -z "$LTCFLAGS"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
+   fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
+ 
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+ 
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
+ 
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+-    fi
+ 
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
+ 
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
+ 
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+ 
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+-
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
+ 
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+ 
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
+-fi
+-])# _LT_AC_TAGCONFIG
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
+ 
+ 
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
+ 
+ 
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
+ 
+ 
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+ 
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
++_LT_AC_SYS_COMPILER
+ 
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
++# Report which library types will actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
+ 
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
+ 
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
+ 
++aix[[4-9]]*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++AC_MSG_RESULT([$enable_shared])
+ 
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
+ 
++AC_LIBTOOL_CONFIG($1)
+ 
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_C_CONFIG
+ 
+ 
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] |  ?:[\\/]*])
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++# AC_LIBTOOL_LANG_CXX_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-])# AC_PATH_TOOL_PREFIX
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+ 
++# Source file extension for C++ test sources.
++ac_ext=cpp
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+-  else
+-    MAGIC_CMD=:
+-  fi
+-fi
+-])# AC_PATH_MAGIC
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-# AC_PROG_LD
+-# ----------
+-# find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_HELP_STRING([--with-gnu-ld],
+-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+-    [test "$withval" = no || with_gnu_ld=yes],
+-    [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by $CC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | ?:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  AC_MSG_CHECKING([for non-GNU ld])
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some variants of GNU ld only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
++  $as_unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+-  AC_MSG_RESULT(no)
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
+ 
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
+-  ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
++  AC_PROG_LD
+ 
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
+-# find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files],
+-  lt_cv_ld_reload_flag,
+-  [lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+-  darwin*)
+-    if test "$GCC" = yes; then
+-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+     else
+-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+-    ;;
+-esac
+-])# AC_PROG_LD_RELOAD_FLAG
++  else
++    with_gnu_ld=no
++    wlarc=
+ 
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
+ 
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  aix[[4-9]]*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
+ 
+-bsdi[[45]]*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
+ 
+-cygwin*)
+-  # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='func_win32_libid'
+-  ;;
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
+ 
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  :
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++	;;
++      esac
++      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
+ 
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case $host_cpu in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
+     ;;
+-  hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
+     ;;
+-  *)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
+     ;;
+-  esac
+-  ;;
+ 
+-interix3*)
+-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+-  ;;
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-netbsd*)
+-  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
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+-  fi
+-  ;;
+-
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+-  ;;
+-
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
+-
+-openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+-  fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
+   ;;
++      darwin* | rhapsody*)
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++      if test "$GXX" = yes ; then
++      output_verbose_link_cmd='echo'
++      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++      fi
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
++  dgux*)
++    case $cc_basename in
++      ec++*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx*)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
+     ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++  freebsd[[12]]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
++  freebsd* | dragonfly*)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
++  gnu*)
+     ;;
+-  esac
+-  ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
++    case $cc_basename in
++    CC*)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
++      *)
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case $host_cpu in
++    hppa*64*|ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
+ 
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
+-else
+-  lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+-    lt_nm_to_check="$lt_nm_to_check nm"
+-  fi
+-  for lt_tmp_nm in $lt_nm_to_check; do
+-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+-      IFS="$lt_save_ifs"
+-      test -z "$ac_dir" && ac_dir=.
+-      tmp_nm="$ac_dir/$lt_tmp_nm"
+-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-	# Check to see if the nm accepts a BSD-compat flag.
+-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-	#   nm: unknown option "B" ignored
+-	# Tru64's nm complains that /dev/null is an invalid object file
+-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null* | *'Invalid file or object type'*)
+-	  lt_cv_path_NM="$tmp_nm -B"
+-	  break
++    case $cc_basename in
++      CC*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	  */dev/null*)
+-	    lt_cv_path_NM="$tmp_nm -p"
+-	    break
+-	    ;;
+-	  *)
+-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	    continue # so that we can try to find one that supports BSD flags
+-	    ;;
+-	  esac
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+-      fi
+-    done
+-    IFS="$lt_save_ifs"
+-  done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+-
+-
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+-  # These system don't have libm, or don't need it
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+-  ;;
+-esac
+-])# AC_CHECK_LIBM
+-
+-
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!).  If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+-
+-
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
+-
+-
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
+-
+-
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
+-
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  interix[[3-9]]*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_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'
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC*)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux* | k*bsd*-gnu)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc*)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      pgCC* | pgcpp*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ 
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+-
+-
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    if test -f /usr/libexec/ld.so; then
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-# Source file extension for C test sources.
+-ac_ext=c
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 
+-_LT_AC_SYS_COMPILER
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-    ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
++	  $rm $lib.exp'
+ 
+-AC_LIBTOOL_CONFIG($1)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+-
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc*)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++	output_verbose_link_cmd='echo'
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx*)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  $as_unset lt_cv_prog_gnu_ld
+-fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  $as_unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
+ 
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-fi
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
++	fi
++	;;
++    esac
++    ;;
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
+ 
+-  AC_PROG_LD
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC*)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ 
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
++AC_LIBTOOL_CONFIG($1)
+ 
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-  fi
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
+ 
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
+ 
++  # Clean up.
++  rm -f a.out a.exe
+ else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
++  echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
++$rm -f confest.$objext
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-	;;
+-      esac
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+     fi
++    ;;
++  esac
++  ;;
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
+ 
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+-    if test "$GXX" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-	;;
+-      esac
+-      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
+-      fi
+-    fi
++# AC_LIBTOOL_LANG_F77_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
+ 
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds its shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
++# Source file extension for f77 test sources.
++ac_ext=f
+ 
+-  beos*)
+-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-    ;;
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++# Code to be used in simple link tests
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-  ;;
+-      darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
+-      output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
+-      fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-      fi
+-        ;;
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-  dgux*)
+-    case $cc_basename in
+-      ec++*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx*)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  freebsd[[12]]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+-    case $cc_basename in
+-    CC*)
+-      # FIXME: insert proper C++ library support
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    aCC*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-        # FIXME: insert proper C++ library support
+-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
+ 
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
+-      *)
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
+-      esac
+-    fi
+-    case $host_cpu in
+-    hppa*64*|ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+-    esac
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
+ 
+-    case $cc_basename in
+-      CC*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      aCC*)
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case $host_cpu in
+-	    hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    ia64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  interix3*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-    # Instead, shared libraries are loaded at an image base (0x10000000 by
+-    # default) and relocated if they conflict, which is a slow very memory
+-    # consuming and fragmenting process.  To avoid this, we pick a random,
+-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    _LT_AC_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'
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC*)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix[[4-9]]*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    ;;
+-  linux*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc*)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	# version 8.0 and above of icpc choke on multiply defined symbols
+-	# if we add $predep_objects and $postdep_objects, however 7.1 and
+-	# earlier do not add the objects themselves.
+-	case `$CC -V 2>&1` in
+-	*"Version 7."*)
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	*)  # Version 8.0 or newer
+-	  tmp_idyn=
+-	  case $host_cpu in
+-	    ia64*) tmp_idyn=' -i_dynamic';;
+-	  esac
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      pgCC*)
+-        # Portland Group C++ compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++AC_LIBTOOL_CONFIG($1)
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-        ;;
+-      cxx*)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
+ 
+-	runpath_var=LD_RUN_PATH
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-    esac
+-    ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  openbsd2*)
+-    # C++ shared libraries are fairly broken
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    fi
+-    output_verbose_link_cmd='echo'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++# AC_LIBTOOL_LANG_GCJ_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
++[AC_LANG_SAVE
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
+ 
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++AC_LIBTOOL_CONFIG($1)
+ 
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+-	  $rm $lib.exp'
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++# AC_LIBTOOL_LANG_RC_CONFIG
++# -------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# Source file extension for RC test sources.
++ac_ext=rc
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc*)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+-	    ;;
+-	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+-	output_verbose_link_cmd='echo'
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx*)
+-	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-	# The C++ compiler must be used to create the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	# GNU C++ compiler with Solaris linker
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++AC_LIBTOOL_CONFIG($1)
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    runpath_var='LD_RUN_PATH'
+ 
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  sysv5* | sco3.2v5* | sco5v6*)
+-    # Note: We can NOT use -z defs as we might desire, because we do not
+-    # link with -lc, and that would cause any symbols used from libc to
+-    # always be unresolved, which means just about no library would
+-    # ever link correctly.  If we're not using GNU ld we use -z text
+-    # though, which does catch some bad symbols but isn't as heavy-handed
+-    # as -z defs.
+-    # For security reasons, it is highly recommended that you always
+-    # use absolute paths for naming shared libraries, and exclude the
+-    # DT_RUNPATH tag from executables and libraries.  But doing so
+-    # requires that you compile everything twice, which is a pain.
+-    # So that behaviour is only enabled if SCOABSPATH is set to a
+-    # non-empty value in the environment.  Most likely only useful for
+-    # creating official distributions of packages.
+-    # This is a hack until libtool officially supports absolute path
+-    # names for shared libraries.
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-    runpath_var='LD_RUN_PATH'
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars.  Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC*)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
++    case $var in
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
+     esac
++  done
++
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+     ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++  esac
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
+ 
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
+ 
+-AC_LIBTOOL_CONFIG($1)
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+ 
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
++# A sed program that does not truncate output.
++SED=$lt_SED
+ 
+-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library.  It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e 1s/^X//"
+ 
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++# The names of the tagged configurations supported by this script.
++available_tags=
+ 
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ 
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+ 
+-    *.$objext)
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
+-    *) ;; # Ignore the rest.
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+ 
+-    esac
+-  done
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ 
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-$rm -f confest.$objext
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
+ 
+-# PORTME: override above test on systems where it is broken
+-ifelse([$1],[CXX],
+-[case $host_os in
+-interix3*)
+-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+-  # hack all around it, let's just trust "g++" to DTRT.
+-  _LT_AC_TAGVAR(predep_objects,$1)=
+-  _LT_AC_TAGVAR(postdep_objects,$1)=
+-  _LT_AC_TAGVAR(postdeps,$1)=
+-  ;;
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+ 
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+ 
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
++# A C compiler.
++LTCC=$lt_LTCC
+ 
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++# Is the compiler the GNU C compiler?
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++# The linker used to build libraries.
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++# A symbol stripping program
++STRIP=$lt_STRIP
+ 
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+ 
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+ 
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
+-AC_LIBTOOL_CONFIG($1)
++# How to pass a linker flag through the compiler.
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ 
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+ 
+-# Source file extension for Java test sources.
+-ac_ext=java
++# Executable file suffix (normally "").
++exeext="$exeext"
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++# Additional compiler flags for building library objects.
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++pic_mode=$pic_mode
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++# Do we need a version for libraries?
++need_version=$need_version
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
+-AC_LIBTOOL_CONFIG($1)
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ 
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ 
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# -------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ 
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++# Library versioning type.
++version_type=$version_type
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ 
+-AC_LIBTOOL_CONFIG($1)
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+ 
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars.  Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+ 
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+-    ;;
+-  esac
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+ 
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# A sed program that does not truncate output.
+-SED=$lt_SED
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e 1s/^X//"
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
+-
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
+-
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+-
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+ 
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -6293,7 +5600,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -6376,6 +5683,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -6412,7 +5720,7 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   if test "$host_cpu" = ia64; then
+     symcode='[[ABCDGIRSTW]]'
+     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -6553,7 +5861,7 @@
+     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+     cat conftest.$ac_ext >&5
+   fi
+-  rm -f conftest* conftst*
++  rm -rf conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+@@ -6602,13 +5910,16 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+       ;;
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+@@ -6619,7 +5930,7 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+-    interix3*)
++    interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -6645,7 +5956,7 @@
+     esac
+   else
+     case $host_os in
+-      aix4* | aix5*)
++      aix[[4-9]]*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+@@ -6685,7 +5996,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -6728,7 +6039,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -6741,7 +6052,7 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 	    ;;
+-	  pgCC*)
++	  pgCC* | pgcpp*)
+ 	    # Portland Group C++ compiler.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -6755,6 +6066,14 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -6771,7 +6090,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -6852,1467 +6171,2412 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ 	;;
+     esac
+-  fi
+-],
+-[
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++])
++
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix[[4-9]]*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_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'
++  ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
++  *)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
++  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[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 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[[3-9]]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    interix[[3-9]]*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_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'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
+ 
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
+     case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
++
++    aix[[4-9]]*)
+       if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	  ;;
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  :
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
+       fi
+       ;;
+ 
+     amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    bsdi[[45]]*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
+       ;;
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
+       ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+       fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++    newsos6)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-         ;;
+-       esac
+-       ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++    os2*)
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	# Both c and cxx compiler support -rpath directly
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    linux*)
+-      case $cc_basename in
+-      icc* | ecc*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-        ;;
+-      ccc*)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-        ;;
++    solaris*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	wlarc=''
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    osf3* | osf4* | osf5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # All OSF/1 code is PIC.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
+       esac
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    sysv4.3*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+       ;;
+ 
+     sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+       fi
+       ;;
+ 
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+-    unicos*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     esac
+   fi
+ ])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ #
+-# Check to make sure the PIC flag actually works.
++# Do we need to explicitly link libc?
+ #
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+-     "" | " "*) ;;
+-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+-     esac],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+-fi
+-case $host_os in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-    ;;
+-  *)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+-    ;;
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_AC_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # 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.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $rm conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
+ esac
++])# AC_LIBTOOL_PROG_LD_SHLIBS
++
+ 
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
+ #
+-# Check to make sure the static flag actually works.
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
+ #
+-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $lt_tmp_static_flag,
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++])# _LT_AC_FILE_LTDLL_C
++
++
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++
++
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
++
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++  AC_SUBST(GCJFLAGS)
+ ])
+ 
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
+ 
+-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # If we're using GNU nm, then we don't want the "-C" option.
+-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    else
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    fi
+-    ;;
+-  pw32*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
+-    _LT_AC_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'
+-  ;;
+-  *)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  esac
+-],[
+-  runpath_var=
+-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  _LT_AC_TAGVAR(archive_cmds, $1)=
+-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-  _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  _LT_AC_TAGVAR(include_expsyms, $1)=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  _LT_CC_BASENAME([$compiler])
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+-
+-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+ 
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [[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 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
+ 
+-EOF
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+-      ;;
++    done
++  done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && continue
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# 
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+ 
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=m4_default([$1], [0.9.0])
++	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		PKG_CONFIG=""
++	fi
++		
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists.  Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++  m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++  $3])dnl
++fi])
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++    if test -n "$$1"; then
++        pkg_cv_[]$1="$$1"
++    else
++        PKG_CHECK_EXISTS([$3],
++                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++			 [pkg_failed=yes])
++    fi
++else
++	pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
+ 
+-    interix3*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      _LT_AC_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'
+-      ;;
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
+ 
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+-	if test $supports_anon_versioning = yes; then
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
+ 
+-    solaris*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++if test $pkg_failed = yes; then
++        _PKG_SHORT_ERRORS_SUPPORTED
++        if test $_pkg_short_errors_supported = yes; then
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++        else 
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ 
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<_LT_EOF 1>&2
++	ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+ 
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++$$1_PKG_ERRORS
+ 
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	  fi
+-	;;
+-      esac
+-      ;;
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++_PKG_TEXT
++])],
++		[AC_MSG_RESULT([no])
++                $4])
++elif test $pkg_failed = untried; then
++	ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
++_PKG_TEXT
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+-      runpath_var=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-      fi
+-      ;;
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++		[$4])
++else
++	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++        AC_MSG_RESULT([yes])
++	ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+ 
+-    aix4* | aix5*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	fi
+-	aix_use_runtimelinking=no
++# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	  for ld_flag in $LDFLAGS; do
+-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
+-  	    break
+-  	  fi
+-	  done
+-	  ;;
+-	esac
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version.  Point them to the right macro.
++m4_if([$1], [1.10.1], [],
++      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
+ 
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too.  Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)=''
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  else
+-  	  # We have old collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  fi
+-	  ;;
+-	esac
+-	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-	  if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-	  fi
+-	fi
+-      fi
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       _LT_AC_SYS_LIBPATH_AIX
+-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 _LT_AC_SYS_LIBPATH_AIX
+-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory.  The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run.  This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++#    fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++#    fails if $ac_aux_dir is absolute,
++#    fails when called from a subdirectory in a VPATH build with
++#          a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir.  In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
++#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++#   MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH.  The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      # see comment about different semantics on the GNU ld section
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
+ 
+-    bsdi[[45]]*)
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+-      ;;
++# AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      ;;
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-    darwin* | rhapsody*)
+-      case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-      esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-    fi
+-      ;;
++# serial 8
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
+ 
+-    dgux*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-    freebsd1*)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++# serial 9
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery.  Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
++       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
++       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
++       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      ;;
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
+ 
+-    hpux10*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	break
+       fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
+ 
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
+ 
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      fi
+-      ;;
+ 
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++])
++
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++#serial 3
+ 
+-	case $host_cpu in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-    openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++# serial 13
+ 
+-    os2*)
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++# This macro actually does too much.  Some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out.  PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition.  After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.60])dnl
++dnl Autoconf wants to disallow AM_ names.  We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++  fi
++fi
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	wlarc=''
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      case $host_os in
+-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
+-      esac
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++                  [_AM_DEPENDENCIES(OBJC)],
++                  [define([AC_PROG_OBJC],
++                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++])
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-        ;;
+-	motorola)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    sysv4.3*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+-      ;;
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  The stamp files are numbered to have different names.
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-      fi
+-      ;;
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_arg=$1
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $_am_arg | $_am_arg:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      runpath_var='LD_RUN_PATH'
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
+ 
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var='LD_RUN_PATH'
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# serial 2
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Check whether the underlying file-system supports filenames
++# with a leading dot.  For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+ 
+-    *)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
+ 
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+ #
+-# Do we need to explicitly link libc?
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+ #
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+-  # Assume -lc should be added
+-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # 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.
+-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++# serial 3
+ 
+-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-        then
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-        else
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-        fi
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
+ 
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# _LT_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+ #
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
+-
+-
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# serial 5
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+ 
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  AC_MSG_WARN([`missing' script is too old or missing])
++fi
+ ])
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+-])
++# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# NOTE: This macro has been submitted for inclusion into   #
+-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+-#  a released version of Autoconf we should remove this    #
+-#  macro and use it instead.                               #
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
+-[AC_MSG_CHECKING([for a sed that does not truncate output])
+-AC_CACHE_VAL(lt_cv_path_SED,
+-[# Loop through the user's path and test for sed and gsed.
+-# Then use that list of sed's as ones to test for truncation.
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for lt_ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+-      fi
+-    done
+-  done
+-done
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && continue
+-  cat /dev/null > conftest.in
+-  lt_ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+-  # Check for GNU sed and select it if it is found.
+-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+-    lt_cv_path_SED=$lt_ac_sed
+-    break
+-  fi
+-  while true; do
+-    cat conftest.in conftest.in >conftest.tmp
+-    mv conftest.tmp conftest.in
+-    cp conftest.in conftest.nl
+-    echo >>conftest.nl
+-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+-    cmp -s conftest.out conftest.nl || break
+-    # 10000 chars as input seems more than enough
+-    test $lt_ac_count -gt 10 && break
+-    lt_ac_count=`expr $lt_ac_count + 1`
+-    if test $lt_ac_count -gt $lt_ac_max; then
+-      lt_ac_max=$lt_ac_count
+-      lt_cv_path_SED=$lt_ac_sed
+-    fi
+-  done
+-done
+-])
+-SED=$lt_cv_path_SED
+-AC_MSG_RESULT([$SED])
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+ ])
+ 
+-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+-# 
+-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Helper functions for option handling.                     -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# serial 3
++
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME.  Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
+ # ----------------------------------
+-AC_DEFUN([PKG_PROG_PKG_CONFIG],
+-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+-fi
+-if test -n "$PKG_CONFIG"; then
+-	_pkg_min_version=m4_default([$1], [0.9.0])
+-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		AC_MSG_RESULT([yes])
+-	else
+-		AC_MSG_RESULT([no])
+-		PKG_CONFIG=""
+-	fi
+-		
+-fi[]dnl
+-])# PKG_PROG_PKG_CONFIG
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+ 
+-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-#
+-# Check to see whether a particular set of modules exists.  Similar
+-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+-#
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
+ #
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-if test -n "$PKG_CONFIG" && \
+-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+-  m4_ifval([$2], [$2], [:])
+-m4_ifvaln([$3], [else
+-  $3])dnl
+-fi])
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# serial 4
+ 
+-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+-# ---------------------------------------------
+-m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+-    if test -n "$$1"; then
+-        pkg_cv_[]$1="$$1"
+-    else
+-        PKG_CHECK_EXISTS([$3],
+-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+-			 [pkg_failed=yes])
+-    fi
+-else
+-	pkg_failed=untried
+-fi[]dnl
+-])# _PKG_CONFIG
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ 
+-# _PKG_SHORT_ERRORS_SUPPORTED
+-# -----------------------------
+-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi[]dnl
+-])# _PKG_SHORT_ERRORS_SUPPORTED
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
+ 
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
+ 
+-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+-# [ACTION-IF-NOT-FOUND])
+-#
+-#
+-# Note that if there is a possibility the first call to
+-# PKG_CHECK_MODULES might not happen, you should be sure to include an
+-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+-#
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+ #
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_MODULES],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-pkg_failed=no
+-AC_MSG_CHECKING([for $1])
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries.  This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++  AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++# Copyright (C) 2006  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+-and $1[]_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.])
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
+ 
+-if test $pkg_failed = yes; then
+-        _PKG_SHORT_ERRORS_SUPPORTED
+-        if test $_pkg_short_errors_supported = yes; then
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+-        else 
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++# Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-	ifelse([$4], , [AC_MSG_ERROR(dnl
+-[Package requirements ($2) were not met:
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-$$1_PKG_ERRORS
++# serial 2
+ 
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
++  esac
+ 
+-_PKG_TEXT
+-])],
+-		[AC_MSG_RESULT([no])
+-                $4])
+-elif test $pkg_failed = untried; then
+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+-[The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
+ 
+-_PKG_TEXT
++  # tar/untar a dummy directory, and stop if the command works
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  echo GrepMe > conftest.dir/file
++  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++  rm -rf conftest.dir
++  if test -s conftest.tar; then
++    AM_RUN_LOG([$am__untar <conftest.tar])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++  fi
++done
++rm -rf conftest.dir
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+-		[$4])
+-else
+-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+-        AC_MSG_RESULT([yes])
+-	ifelse([$3], , :, [$3])
+-fi[]dnl
+-])# PKG_CHECK_MODULES
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
+ 
+Index: gnome-session-2.21.93/config.h.in
+===================================================================
+--- gnome-session-2.21.93.orig/config.h.in	2008-03-06 15:46:20.000000000 +0100
++++ gnome-session-2.21.93/config.h.in	2008-03-08 15:09:55.000000000 +0100
+@@ -105,6 +105,9 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
++/* Defines the path to the gnome-settings-daemon binary */
++#undef SETTINGS_DAEMON_PATH
++
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
+Index: gnome-session-2.21.93/configure
+===================================================================
+--- gnome-session-2.21.93.orig/configure	2008-03-06 15:46:20.000000000 +0100
++++ gnome-session-2.21.93/configure	2008-03-08 15:09:53.000000000 +0100
+@@ -887,10 +887,13 @@
+ host_cpu
+ host_vendor
+ host_os
++SED
+ LN_S
+ ECHO
+ AR
+ RANLIB
++DSYMUTIL
++NMEDIT
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -1591,6 +1594,8 @@
+                           Specify default window manager
+   --with-rsh-command=COMMAND
+                           Specify the command for executing a remote shell
++  --with-settings-daemon=PATH
++                          Specify the path to gnome-settings-daemon
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -5707,12 +5712,13 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -5747,6 +5753,7 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+ 
+@@ -5946,8 +5953,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5966,7 +5973,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -5988,16 +5995,22 @@
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -6035,7 +6048,7 @@
+   esac
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+   ;;
+@@ -6051,11 +6064,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -6085,6 +6098,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -6171,7 +6188,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 6174 "configure"' > conftest.$ac_ext
++  echo '#line 6191 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6206,7 +6223,8 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -6217,6 +6235,9 @@
+     case `/usr/bin/file conftest.o` in
+     *32-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -6233,6 +6254,9 @@
+       ;;
+     *64-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -6336,7 +6360,11 @@
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+       yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
++      *)
++        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
+       esac
+       ;;
+     esac
+@@ -7533,7 +7561,6 @@
+ 
+ 
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -7620,24 +7647,27 @@
+     fi
+     ;;
+   *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ 	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ 
+@@ -7654,6 +7684,7 @@
+ 
+ 
+ 
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7691,7 +7722,7 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   if test "$host_cpu" = ia64; then
+     symcode='[ABCDGIRSTW]'
+     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -7844,7 +7875,7 @@
+     echo "$progname: failed program was:" >&5
+     cat conftest.$ac_ext >&5
+   fi
+-  rm -f conftest* conftst*
++  rm -rf conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+@@ -8242,7 +8273,7 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+@@ -8404,6 +8435,318 @@
+   ;;
+ esac
+ 
++
++  case $host_os in
++    rhapsody* | darwin*)
++    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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$DSYMUTIL"; then
++  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_DSYMUTIL"; then
++  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++  if test "x$ac_ct_DSYMUTIL" = x; then
++    DSYMUTIL=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    DSYMUTIL=$ac_ct_DSYMUTIL
++  fi
++else
++  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NMEDIT"; then
++  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_NMEDIT"; then
++  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_NMEDIT="nmedit"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++  if test "x$ac_ct_NMEDIT" = x; then
++    NMEDIT=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    NMEDIT=$ac_ct_NMEDIT
++  fi
++else
++  NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++   # By default we will add the -single_module flag. You can override
++   # by either setting the environment variable LT_MULTI_MODULE
++   # non-empty at configure time, or by adding -multi_module to the
++   # link flags.
++   echo "int foo(void){return 1;}" > conftest.c
++   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++     -dynamiclib ${wl}-single_module conftest.c
++   if test -f libconftest.dylib; then
++     lt_cv_apple_cc_single_mod=yes
++     rm -rf libconftest.dylib*
++   fi
++   rm conftest.c
++      fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  lt_cv_ld_exported_symbols_list=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++    case $host_os in
++    rhapsody* | darwin1.[0123])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*)
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++   10.[012]*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++   10.*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil="~$DSYMUTIL \$lib || :"
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++
++
+ enable_dlopen=no
+ enable_win32_dll=no
+ 
+@@ -8442,10 +8785,10 @@
+ objext=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ 
+ # If no C compiler was specified, use CC.
+@@ -8460,16 +8803,16 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ 
+@@ -8486,7 +8829,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8497,11 +8840,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8500: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8843: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8504: \$? = $ac_status" >&5
++   echo "$as_me:8847: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8552,13 +8895,15 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
+ 
+@@ -8568,7 +8913,7 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -8626,7 +8971,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -8659,7 +9004,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+@@ -8678,6 +9023,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -8687,6 +9048,10 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
+@@ -8749,12 +9114,12 @@
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works=no
++  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8765,27 +9130,27 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8768: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9133: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8772: \$? = $ac_status" >&5
++   echo "$as_me:9137: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works=yes
++       lt_cv_prog_compiler_pic_works=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -8812,13 +9177,13 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works=no
++  lt_cv_prog_compiler_static_works=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -8828,20 +9193,20 @@
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works=yes
++         lt_cv_prog_compiler_static_works=yes
+        fi
+      else
+-       lt_prog_compiler_static_works=yes
++       lt_cv_prog_compiler_static_works=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+     :
+ else
+     lt_prog_compiler_static=
+@@ -8858,7 +9223,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -8869,11 +9234,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8872: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9237: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8876: \$? = $ac_status" >&5
++   echo "$as_me:9241: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8953,12 +9318,13 @@
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -9017,7 +9383,7 @@
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs=no
+@@ -9065,7 +9431,7 @@
+       allow_undefined_flag=unsupported
+       always_export_symbols=no
+       enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -9083,7 +9449,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -9098,7 +9464,7 @@
+       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'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -9116,20 +9482,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -9227,7 +9603,7 @@
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -9247,7 +9623,7 @@
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -9281,7 +9657,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct=unsupported
+@@ -9355,11 +9731,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9414,11 +9797,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9472,7 +9862,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes=yes
+       ;;
+@@ -9505,19 +9895,18 @@
+       link_all_deplibs=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -9557,7 +9946,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+@@ -9659,7 +10048,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -9679,24 +10068,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs=no
+       fi
+       ;;
+ 
+@@ -9755,17 +10148,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -9822,7 +10214,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag='${wl}-z,text'
+       archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+@@ -9899,7 +10291,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -9957,17 +10349,55 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9988,7 +10418,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -10127,12 +10557,8 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -10149,18 +10575,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -10198,7 +10612,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -10261,7 +10675,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -10316,7 +10730,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -10330,31 +10744,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 10337 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10366,7 +10759,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -10375,7 +10768,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -10459,6 +10852,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -10555,6 +10952,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -10612,6 +11024,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+        else
+@@ -10873,7 +11286,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+   { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -11149,7 +11562,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+ 
+@@ -11198,7 +11611,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11201 "configure"
++#line 11614 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11298,7 +11711,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11301 "configure"
++#line 11714 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11425,7 +11838,7 @@
+   fi
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -11481,6 +11894,7 @@
+     predeps \
+     postdeps \
+     compiler_lib_search_path \
++    compiler_lib_search_dirs \
+     archive_cmds \
+     archive_expsym_cmds \
+     postinstall_cmds \
+@@ -11496,6 +11910,7 @@
+     module_cmds \
+     module_expsym_cmds \
+     lt_cv_prog_compiler_c_o \
++    fix_srcfile_path \
+     exclude_expsyms \
+     include_expsyms; do
+ 
+@@ -11540,7 +11955,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11776,6 +12191,10 @@
+ # shared library.
+ postdeps=$lt_postdeps
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -11864,7 +12283,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -12024,6 +12443,7 @@
+ predeps_CXX=
+ postdeps_CXX=
+ compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -12033,10 +12453,10 @@
+ objext_CXX=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -12052,16 +12472,16 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -12268,7 +12688,7 @@
+     # FIXME: insert proper C++ library support
+     ld_shlibs_CXX=no
+     ;;
+-  aix4* | aix5*)
++  aix[4-9]*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+@@ -12281,7 +12701,7 @@
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+@@ -12317,7 +12737,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  hardcode_direct_CXX=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  hardcode_direct_CXX=unsupported
+@@ -12391,11 +12811,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12451,11 +12878,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12525,59 +12959,31 @@
+     fi
+   ;;
+       darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+       archive_cmds_need_lc_CXX=no
+       hardcode_direct_CXX=no
+       hardcode_automatic_CXX=yes
+       hardcode_shlibpath_var_CXX=unsupported
+       whole_archive_flag_spec_CXX=''
+       link_all_deplibs_CXX=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
++      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++      if test "$GXX" = yes ; then
+       output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
++      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+       fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -12611,7 +13017,7 @@
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -12660,9 +13066,7 @@
+       hardcode_libdir_separator_CXX=:
+ 
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-        ;;
++      hppa*64*|ia64*) ;;
+       *)
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
+@@ -12730,7 +13134,7 @@
+ 	;;
+     esac
+     ;;
+-  interix3*)
++  interix[3-9]*)
+     hardcode_direct_CXX=no
+     hardcode_shlibpath_var_CXX=no
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -12770,7 +13174,7 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+       KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -12822,7 +13226,7 @@
+ 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      pgCC*)
++      pgCC* | pgcpp*)
+         # Portland Group C++ compiler
+ 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -12850,6 +13254,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  no_undefined_flag_CXX=' -zdefs'
++	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -12872,7 +13299,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -12888,16 +13315,20 @@
+     ld_shlibs_CXX=no
+     ;;
+   openbsd*)
+-    hardcode_direct_CXX=yes
+-    hardcode_shlibpath_var_CXX=no
+-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      export_dynamic_flag_spec_CXX='${wl}-E'
+-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      ld_shlibs_CXX=no
+     fi
+-    output_verbose_link_cmd='echo'
+     ;;
+   osf3*)
+     case $cc_basename in
+@@ -13059,15 +13490,10 @@
+ 	case $host_os in
+ 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+@@ -13114,6 +13540,12 @@
+ 	  fi
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+@@ -13201,7 +13633,6 @@
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+ 
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -13303,9 +13734,14 @@
+ 
+ $rm -f confest.$objext
+ 
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+   # Interix 3.5 installs completely hosed .la files for C++, so rather than
+   # hack all around it, let's just trust "g++" to DTRT.
+   predep_objects_CXX=
+@@ -13313,19 +13749,51 @@
+   postdeps_CXX=
+   ;;
+ 
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
+ solaris*)
+   case $cc_basename in
+   CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
+     # Adding this requires a known-good setup of shared libraries for
+     # Sun compiler versions before 5.6, else PIC objects from an old
+     # archive will be linked into the output, leading to subtle bugs.
+-    postdeps_CXX='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
+     ;;
+   esac
+   ;;
+ esac
+ 
+-
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13356,12 +13824,14 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -13373,7 +13843,7 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -13399,7 +13869,7 @@
+     esac
+   else
+     case $host_os in
+-      aix4* | aix5*)
++      aix[4-9]*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+@@ -13439,7 +13909,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -13482,7 +13952,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -13495,7 +13965,7 @@
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  pgCC*)
++	  pgCC* | pgcpp*)
+ 	    # Portland Group C++ compiler.
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fpic'
+@@ -13509,6 +13979,14 @@
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -13525,7 +14003,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -13618,12 +14096,12 @@
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_CXX=no
++  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -13634,27 +14112,27 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13637: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14115: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13641: \$? = $ac_status" >&5
++   echo "$as_me:14119: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works_CXX=yes
++       lt_cv_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -13681,13 +14159,13 @@
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_CXX=no
++  lt_cv_prog_compiler_static_works_CXX=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -13697,20 +14175,20 @@
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_CXX=yes
++         lt_cv_prog_compiler_static_works_CXX=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_CXX=yes
++       lt_cv_prog_compiler_static_works_CXX=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_CXX=
+@@ -13727,7 +14205,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -13738,11 +14216,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13741: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14219: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13745: \$? = $ac_status" >&5
++   echo "$as_me:14223: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -13795,7 +14273,7 @@
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+-  aix4* | aix5*)
++  aix[4-9]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -13808,12 +14286,16 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
+   ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
++  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ 
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -13839,7 +14321,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -13897,20 +14379,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -13928,7 +14397,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14067,12 +14536,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -14089,18 +14553,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -14138,7 +14590,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -14201,7 +14653,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14256,7 +14708,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14270,31 +14722,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 14277 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14306,7 +14737,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14315,7 +14746,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -14399,6 +14830,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -14495,6 +14930,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -14578,6 +15028,7 @@
+     predeps_CXX \
+     postdeps_CXX \
+     compiler_lib_search_path_CXX \
++    compiler_lib_search_dirs_CXX \
+     archive_cmds_CXX \
+     archive_expsym_cmds_CXX \
+     postinstall_cmds_CXX \
+@@ -14593,6 +15044,7 @@
+     module_cmds_CXX \
+     module_expsym_cmds_CXX \
+     lt_cv_prog_compiler_c_o_CXX \
++    fix_srcfile_path_CXX \
+     exclude_expsyms_CXX \
+     include_expsyms_CXX; do
+ 
+@@ -14825,6 +15277,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -14913,7 +15369,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -15004,10 +15460,17 @@
+ objext_F77=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -15023,16 +15486,16 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -15070,7 +15533,7 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4* | aix5*)
++aix[4-9]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -15116,13 +15579,15 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+       ;;
+ 
+@@ -15132,7 +15597,7 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -15190,7 +15655,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -15223,7 +15688,7 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+@@ -15242,6 +15707,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_F77='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -15251,6 +15732,10 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -15313,12 +15798,12 @@
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_F77=no
++  lt_cv_prog_compiler_pic_works_F77=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_F77"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -15329,27 +15814,27 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15332: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15817: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15336: \$? = $ac_status" >&5
++   echo "$as_me:15821: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works_F77=yes
++       lt_cv_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -15376,13 +15861,13 @@
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_F77=no
++  lt_cv_prog_compiler_static_works_F77=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -15392,20 +15877,20 @@
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_F77=yes
++         lt_cv_prog_compiler_static_works_F77=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_F77=yes
++       lt_cv_prog_compiler_static_works_F77=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_F77=
+@@ -15422,7 +15907,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -15433,11 +15918,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15436: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15921: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15440: \$? = $ac_status" >&5
++   echo "$as_me:15925: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15517,12 +16002,13 @@
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -15581,7 +16067,7 @@
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs_F77=no
+@@ -15629,7 +16115,7 @@
+       allow_undefined_flag_F77=unsupported
+       always_export_symbols_F77=no
+       enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -15647,7 +16133,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_F77=no
+       hardcode_shlibpath_var_F77=no
+       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -15662,7 +16148,7 @@
+       archive_expsym_cmds_F77='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'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -15680,20 +16166,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_F77=no
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -15791,7 +16287,7 @@
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -15811,7 +16307,7 @@
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -15845,7 +16341,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_F77=unsupported
+@@ -15909,11 +16405,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15958,11 +16461,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16016,7 +16526,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_F77='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+@@ -16049,19 +16559,18 @@
+       link_all_deplibs_F77=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -16101,7 +16610,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+@@ -16203,7 +16712,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -16223,24 +16732,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_F77='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+@@ -16299,17 +16812,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -16366,7 +16878,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_F77='${wl}-z,text'
+       archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
+@@ -16443,7 +16955,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -16501,20 +17013,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -16532,7 +17031,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16671,12 +17170,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -16693,18 +17187,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -16742,7 +17224,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -16805,7 +17287,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16860,7 +17342,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16874,31 +17356,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 16881 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16910,7 +17371,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16919,7 +17380,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -17003,6 +17464,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -17099,6 +17564,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -17182,6 +17662,7 @@
+     predeps_F77 \
+     postdeps_F77 \
+     compiler_lib_search_path_F77 \
++    compiler_lib_search_dirs_F77 \
+     archive_cmds_F77 \
+     archive_expsym_cmds_F77 \
+     postinstall_cmds_F77 \
+@@ -17197,6 +17678,7 @@
+     module_cmds_F77 \
+     module_expsym_cmds_F77 \
+     lt_cv_prog_compiler_c_o_F77 \
++    fix_srcfile_path_F77 \
+     exclude_expsyms_F77 \
+     include_expsyms_F77; do
+ 
+@@ -17429,6 +17911,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -17517,7 +18003,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -17575,10 +18061,10 @@
+ objext_GCJ=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -17594,16 +18080,16 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -17641,7 +18127,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17652,11 +18138,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17655: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18141: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17659: \$? = $ac_status" >&5
++   echo "$as_me:18145: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17707,14 +18193,16 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++
+       ;;
+ 
+     darwin* | rhapsody*)
+@@ -17723,7 +18211,7 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -17781,10 +18269,10 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+       ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+@@ -17814,7 +18302,7 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -17833,6 +18321,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_GCJ='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -17842,6 +18346,10 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -17904,12 +18412,12 @@
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_GCJ=no
++  lt_cv_prog_compiler_pic_works_GCJ=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17920,27 +18428,27 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17923: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18431: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17927: \$? = $ac_status" >&5
++   echo "$as_me:18435: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       lt_prog_compiler_pic_works_GCJ=yes
++       lt_cv_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -17967,13 +18475,13 @@
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_GCJ=no
++  lt_cv_prog_compiler_static_works_GCJ=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -17983,20 +18491,20 @@
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_GCJ=yes
++         lt_cv_prog_compiler_static_works_GCJ=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_GCJ=yes
++       lt_cv_prog_compiler_static_works_GCJ=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_GCJ=
+@@ -18013,7 +18521,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -18024,11 +18532,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18027: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18535: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18031: \$? = $ac_status" >&5
++   echo "$as_me:18539: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18108,12 +18616,13 @@
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -18172,7 +18681,7 @@
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs_GCJ=no
+@@ -18220,7 +18729,7 @@
+       allow_undefined_flag_GCJ=unsupported
+       always_export_symbols_GCJ=no
+       enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -18238,7 +18747,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -18253,7 +18762,7 @@
+       archive_expsym_cmds_GCJ='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'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -18271,20 +18780,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_GCJ=no
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -18382,7 +18901,7 @@
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -18402,7 +18921,7 @@
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -18436,7 +18955,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_GCJ=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_GCJ=unsupported
+@@ -18510,11 +19029,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18569,11 +19095,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18627,7 +19160,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_GCJ='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+@@ -18660,19 +19193,18 @@
+       link_all_deplibs_GCJ=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -18712,7 +19244,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+@@ -18814,7 +19346,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -18834,24 +19366,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+@@ -18910,17 +19446,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -18977,7 +19512,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_GCJ='${wl}-z,text'
+       archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+@@ -19054,7 +19589,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -19112,20 +19647,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19143,7 +19665,7 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19282,12 +19804,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -19304,18 +19821,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -19353,7 +19858,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -19416,7 +19921,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19471,7 +19976,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19485,31 +19990,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 19492 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19521,7 +20005,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19530,7 +20014,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -19614,6 +20098,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -19710,6 +20198,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -19793,6 +20296,7 @@
+     predeps_GCJ \
+     postdeps_GCJ \
+     compiler_lib_search_path_GCJ \
++    compiler_lib_search_dirs_GCJ \
+     archive_cmds_GCJ \
+     archive_expsym_cmds_GCJ \
+     postinstall_cmds_GCJ \
+@@ -19808,6 +20312,7 @@
+     module_cmds_GCJ \
+     module_expsym_cmds_GCJ \
+     lt_cv_prog_compiler_c_o_GCJ \
++    fix_srcfile_path_GCJ \
+     exclude_expsyms_GCJ \
+     include_expsyms_GCJ; do
+ 
+@@ -20040,6 +20545,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -20128,7 +20637,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -20185,7 +20694,7 @@
+ objext_RC=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -20204,16 +20713,16 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -20273,6 +20782,7 @@
+     predeps_RC \
+     postdeps_RC \
+     compiler_lib_search_path_RC \
++    compiler_lib_search_dirs_RC \
+     archive_cmds_RC \
+     archive_expsym_cmds_RC \
+     postinstall_cmds_RC \
+@@ -20288,6 +20798,7 @@
+     module_cmds_RC \
+     module_expsym_cmds_RC \
+     lt_cv_prog_compiler_c_o_RC \
++    fix_srcfile_path_RC \
+     exclude_expsyms_RC \
+     include_expsyms_RC; do
+ 
+@@ -20520,6 +21031,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -20608,7 +21123,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -21151,7 +21666,7 @@
+ and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -21161,7 +21676,7 @@
+ and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+@@ -25585,6 +26100,30 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking for gnome-settings-daemon" >&5
++echo $ECHO_N "checking for gnome-settings-daemon... $ECHO_C" >&6; }
++
++# Check whether --with-settings-daemon was given.
++if test "${with_settings_daemon+set}" = set; then
++  withval=$with_settings_daemon; SETTINGS_DAEMON_PATH="$with_settings_daemon"
++else
++  SETTINGS_DAEMON_PATH=`pkg-config --variable=binary gnome-settings-daemon`
++     if test x$SETTINGS_DAEMON_PATH = x ; then
++         { { echo "$as_me:$LINENO: error: No path found to gnome-settings-daemon." >&5
++echo "$as_me: error: No path found to gnome-settings-daemon." >&2;}
++   { (exit 1); exit 1; }; }
++     fi
++
++fi
++
++{ echo "$as_me:$LINENO: result: $SETTINGS_DAEMON_PATH" >&5
++echo "${ECHO_T}$SETTINGS_DAEMON_PATH" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define SETTINGS_DAEMON_PATH "$SETTINGS_DAEMON_PATH"
++_ACEOF
++
++
+ 
+ GNOME_SESSION_TARBALL=`date +%e`
+ 
+@@ -26470,10 +27009,13 @@
+ host_cpu!$host_cpu$ac_delim
+ host_vendor!$host_vendor$ac_delim
+ host_os!$host_os$ac_delim
++SED!$SED$ac_delim
+ LN_S!$LN_S$ac_delim
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+@@ -26533,7 +27075,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -26934,21 +27476,22 @@
+   fi
+   rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $ac_file | $ac_file:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X$ac_file : 'X\(//\)[^/]' \| \
+-	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$_am_arg" : 'X\(//\)[^/]' \| \
++	 X"$_am_arg" : 'X\(//\)$' \| \
++	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -26985,7 +27528,7 @@
+   # each Makefile.in and add a new line on top of each file to say so.
+   # Grep'ing the whole file is not good either: AIX grep has a line
+   # limit of 2048, but all sed's we know have understand at least 4000.
+-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+Index: gnome-session-2.21.93/data/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/Makefile.in	2008-03-06 15:46:21.000000000 +0100
++++ gnome-session-2.21.93/data/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -100,6 +100,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -166,6 +167,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -183,6 +185,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -477,8 +480,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -503,8 +506,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -514,13 +517,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+Index: gnome-session-2.21.93/data/icons/16x16/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/16x16/Makefile.in	2008-03-06 15:46:21.000000000 +0100
++++ gnome-session-2.21.93/data/icons/16x16/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -80,6 +80,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +165,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+Index: gnome-session-2.21.93/data/icons/22x22/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/22x22/Makefile.in	2008-03-06 15:46:21.000000000 +0100
++++ gnome-session-2.21.93/data/icons/22x22/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -80,6 +80,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +165,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+Index: gnome-session-2.21.93/data/icons/24x24/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/24x24/Makefile.in	2008-03-06 15:46:21.000000000 +0100
++++ gnome-session-2.21.93/data/icons/24x24/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -80,6 +80,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +165,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+Index: gnome-session-2.21.93/data/icons/32x32/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/32x32/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/data/icons/32x32/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -80,6 +80,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +165,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+Index: gnome-session-2.21.93/data/icons/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/data/icons/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -82,6 +82,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -148,6 +149,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -165,6 +167,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -345,8 +348,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -371,8 +374,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -382,13 +385,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+Index: gnome-session-2.21.93/data/icons/scalable/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/data/icons/scalable/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/data/icons/scalable/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -80,6 +80,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -146,6 +147,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +165,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+Index: gnome-session-2.21.93/gnome-session/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/gnome-session/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/gnome-session/Makefile.in	2008-03-08 15:09:55.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -92,7 +92,7 @@
+ splash_test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -141,6 +141,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -207,6 +208,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -224,6 +226,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -478,8 +481,8 @@
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -614,8 +617,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -627,8 +630,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -638,13 +641,12 @@
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+Index: gnome-session-2.21.93/man/Makefile.in
+===================================================================
+--- gnome-session-2.21.93.orig/man/Makefile.in	2008-03-06 15:46:22.000000000 +0100
++++ gnome-session-2.21.93/man/Makefile.in	2008-03-08 15:09:56.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -76,6 +76,7 @@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -142,6 +143,7 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+ MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -159,6 +161,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ RSH_COMMAND = @RSH_COMMAND@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
--- gnome-session-2.22.1.1.orig/debian/patches/09_splash_hide.patch
+++ gnome-session-2.22.1.1/debian/patches/09_splash_hide.patch
@@ -0,0 +1,32 @@
+--- a/gnome-session/manager.c	2008-02-11 19:54:46.000000000 +0100
++++ b/gnome-session/manager.c	2008-02-14 11:33:24.000000000 +0100
+@@ -1368,6 +1368,7 @@
+ 	      start_client (client);
+ 	    }
+ 	  if (pending_list)
++	    splash_hide ();
+ 	    goto out;
+ 	}
+       save_state = MANAGER_IDLE;
+--- a/gnome-session/splash-widget.c	2008-02-11 19:54:46.000000000 +0100
++++ b/gnome-session/splash-widget.c	2008-02-14 11:33:24.000000000 +0100
+@@ -728,3 +728,10 @@
+ 	}
+ }
+ 
++void
++splash_hide (void)
++{
++	if (global_splash) {
++	gtk_widget_hide (GTK_WIDGET (global_splash));
++	}
++}
+--- a/gnome-session/splash-widget.h	2008-02-11 19:54:46.000000000 +0100
++++ b/gnome-session/splash-widget.h	2008-02-14 11:33:24.000000000 +0100
+@@ -80,5 +80,6 @@
+ void splash_start  (void);
+ void splash_update (const gchar *text);
+ void splash_stop   (void);
++void splash_hide   (void);
+ 
+ #endif /* SPLASH_WIDGET_H */
--- gnome-session-2.22.1.1.orig/debian/patches/01_ignore-gdm-lang.patch
+++ gnome-session-2.22.1.1/debian/patches/01_ignore-gdm-lang.patch
@@ -0,0 +1,43 @@
+--- a/gnome-session/main.c	2008-02-11 19:54:47.000000000 +0100
++++ b/gnome-session/main.c	2008-02-14 11:33:03.000000000 +0100
+@@ -110,32 +110,6 @@
+   sigaction (sig, &act, NULL);
+ }
+ 
+-/* Set language environment variables based on what GDM is setting
+- */
+-static void
+-set_lang (void)
+-{
+-  const char *gdm_lang;
+-  char       *short_lang;
+-  char       *p;
+-
+-  gdm_lang = g_getenv("GDM_LANG");
+-  if (gdm_lang)
+-    {
+-      short_lang = g_strdup (gdm_lang);
+-      p = strchr(short_lang, '_');
+-      if (p)
+-	*p = '\0';
+-
+-      g_setenv ("LANG", gdm_lang, TRUE);
+-
+-      /* g_setenv ("LANGUAGE", short_lang, TRUE); */
+-      /* g_setenv ("LC_ALL", gdm_lang, TRUE); */
+-
+-      g_free (short_lang);
+-    }
+-}
+-
+ /* Point GTK_RC_FILES at a separate file that we change in
+  * in gnome-settings-daemon.
+  */
+@@ -632,7 +606,6 @@
+     }
+   g_strfreev (versions);
+       
+-  set_lang();
+   set_gtk1_theme_rcfile ();
+ 
+   /* Initialize the i18n stuff */
--- gnome-session-2.22.1.1.orig/debian/patches/10_update_notifier.patch
+++ gnome-session-2.22.1.1/debian/patches/10_update_notifier.patch
@@ -0,0 +1,12 @@
+--- gnome-session-2.20.2.orig/gnome-session/splash-widget.c	2007-11-27 13:28:17.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/splash-widget.c	2007-11-27 13:28:20.000000000 +0100
+@@ -46,7 +46,8 @@
+ 	{ N_("Window Manager"),          "gnome-wm",              "gnome-window-manager" },
+ 	{ N_("The Panel"),               "gnome-panel",           "gnome-panel" },
+ 	{ N_("Nautilus"),                "nautilus",              "gnome-fs-desktop" },
+-	{ N_("Desktop Settings"),        "gnome-settings-daemon", "gnome-settings" }
++	{ N_("Desktop Settings"),        "gnome-settings-daemon", "gnome-settings" },
++	{ N_("Update Notifier"),         "update-notifier",       "update-notifier" }
+ };
+ 
+ static const SplashApp *
--- gnome-session-2.22.1.1.orig/debian/patches/11_session_dialog.patch
+++ gnome-session-2.22.1.1/debian/patches/11_session_dialog.patch
@@ -0,0 +1,1010 @@
+Index: gnome-session-2.21.91/gnome-session/logout.c
+===================================================================
+--- gnome-session-2.21.91.orig/gnome-session/logout.c	2008-02-22 14:43:03.000000000 +0000
++++ gnome-session-2.21.91/gnome-session/logout.c	2008-02-22 14:53:39.000000000 +0000
+@@ -17,7 +17,13 @@
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-   02111-1307, USA.  */
++   02111-1307, USA.  
++
++   Authors:
++        Owen Taylor <otaylor@redhat.com>
++        Manu Cornet <lmanul@ubuntu.com>
++*/
++
+ #include <config.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -27,6 +33,7 @@
+ #include <gtk/gtk.h>
+ #include <gtk/gtkinvisible.h>
+ #include <gdk/gdkx.h>
++#include <dbus/dbus-glib.h>
+ 
+ #include <gconf/gconf-client.h>
+ 
+@@ -39,21 +46,6 @@
+ #include "gdm-logout-action.h"
+ #include "gsm-multiscreen.h"
+ 
+-enum
+-{
+-  OPTION_LOGOUT,
+-  OPTION_HALT,
+-  OPTION_REBOOT
+-};
+-
+-static GConfEnumStringPair logout_options_lookup_table[] =
+-{
+-  { OPTION_LOGOUT, "logout"   },
+-  { OPTION_HALT,   "shutdown" },
+-  { OPTION_REBOOT, "restart"  },
+-  { 0, NULL }
+-};
+-
+ typedef struct {
+   GdkScreen    *screen;
+   int           monitor;
+@@ -68,12 +60,36 @@
+   gboolean      composited;
+ } FadeoutData;
+ 
++typedef struct {
++  GtkWidget *dialog;
++  GtkWidget *status_notebook;
++  gboolean   retval;
++} LogoutDialog;
++
++enum {
++  RESPONSE_LOGOUT,
++  RESPONSE_SWITCH,
++  RESPONSE_LOCK,
++  RESPONSE_REBOOT,
++  RESPONSE_SUSPEND,
++  RESPONSE_HIBERNATE,
++  RESPONSE_HALT,
++  RESPONSE_NONE,
++  N_RESPONSES
++};
++
++/* Globals */
+ static GList *fadeout_windows = NULL;
++LogoutDialog *dialog;
+ 
+ /* Go for five seconds */
+ #define FADE_DURATION 1500.0
+ #define SATURATION_TARGET 0.5
+ 
++#define	GPM_DBUS_SERVICE		"org.freedesktop.PowerManagement"
++#define	GPM_DBUS_PATH			"/org/freedesktop/PowerManagement"
++#define	GPM_DBUS_INTERFACE		"org.freedesktop.PowerManagement"
++
+ static void
+ get_current_frame (FadeoutData *fadeout,
+ 		   double    sat)
+@@ -251,88 +267,181 @@
+   fadeout_windows = NULL;
+ }
+ 
+-static GtkWidget *
+-make_title_label (const char *text)
++static void
++logout (LogoutDialog *dialog)
+ {
+-  GtkWidget *label;
+-  char *full;
+-
+-  full = g_strdup_printf ("<span weight=\"bold\">%s</span>", text);
+-  label = gtk_label_new (full);
+-  g_free (full);
+-
+-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+-  gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+-
+-  return label;
++  dialog->retval = TRUE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_LOGOUT);  
+ }
+-
+-static int
+-get_default_option (void)
++  
++static void
++switch_user (LogoutDialog *dialog)
+ {
+-  GConfClient *gconf_client;
+-  char        *str;
+-  int          option;
+-
+-  gconf_client = gsm_get_conf_client ();
+-  str = gconf_client_get_string (gconf_client, LOGOUT_OPTION_KEY, NULL);
+-
+-  if (str == NULL || !gconf_string_to_enum (logout_options_lookup_table, str, &option))
+-    option = OPTION_LOGOUT;
+-
+-  g_free (str);
+-  return option;
++  dialog->retval = FALSE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_SWITCH);
++}
++  
++static void
++lock (LogoutDialog *dialog)
++{
++  dialog->retval = FALSE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_LOCK);
+ }
+ 
+ static void
+-set_default_option (int option)
++reboot (LogoutDialog *dialog)
++{
++  dialog->retval = TRUE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_REBOOT);
++}
++  
++static void
++suspend (LogoutDialog *dialog)
++{
++  dialog->retval = FALSE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_SUSPEND);
++}
++  
++static void
++hibernate (LogoutDialog *dialog)
++{
++  dialog->retval = FALSE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_HIBERNATE);
++}
++  
++static void
++halt (LogoutDialog *dialog)
+ {
+-  GConfClient *gconf_client;
+-  const char  *str;
++  dialog->retval = TRUE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), RESPONSE_HALT);
++}
++  
++  static void
++cancel (LogoutDialog *dialog)
++{
++  dialog->retval = FALSE;
++  gtk_dialog_response (GTK_DIALOG (dialog->dialog), GTK_RESPONSE_CANCEL);
++}
+ 
+-  gconf_client = gsm_get_conf_client ();
++static gboolean
++update_status_label (gpointer data) {
++  int response;
+ 
+-  str = gconf_enum_to_string (logout_options_lookup_table, option);
+-  g_assert (str != NULL);
++  response = GPOINTER_TO_INT (data);
++  gtk_notebook_set_current_page (GTK_NOTEBOOK (dialog->status_notebook), response);
++  return FALSE;
++}
+ 
+-  gconf_client_set_string (gconf_client, LOGOUT_OPTION_KEY, str, NULL);
++static gboolean
++gpm_dbus_interaction (const char *method)
++{
++  DBusGConnection *connection;
++  DBusGProxy      *proxy;
++  GError	  *error;
++  gboolean	   value;
++  
++  value = FALSE;
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
++  if (connection == NULL) {
++    if (error) {
++      g_warning ("Couldn't connect to PowerManager %s", error->message);
++      g_error_free (error);
++    }
++    return FALSE;
++}
++  
++  proxy = dbus_g_proxy_new_for_name (connection,
++				     GPM_DBUS_SERVICE,
++				     GPM_DBUS_PATH,
++				     GPM_DBUS_INTERFACE);
++  
++  if (!strcmp (method, "CanSuspend") ||
++      !strcmp (method, "CanHibernate")) {
++    
++    if (! dbus_g_proxy_call (proxy,
++			     method,
++			     &error,
++			     G_TYPE_INVALID,
++			     G_TYPE_BOOLEAN, &value,
++			     G_TYPE_INVALID)) {
++      if (error) {
++	g_warning ("Couldn't connect to PowerManager %s", error->message);
++	g_error_free (error);
++      }
++      value = FALSE;
++    }
++  }
++  
++  if (!strcmp (method, "Suspend") ||
++      !strcmp (method, "Hibernate") ||
++      !strcmp (method, "Shutdown")) {
++    
++    if (! dbus_g_proxy_call (proxy,
++			     method,
++			     &error,
++			     G_TYPE_INVALID,
++			     G_TYPE_INVALID)) {
++      if (error) {
++	g_warning ("Couldn't connect to PowerManager %s", error->message);
++	g_error_free (error);
++      }
++    }
++  }
++  
++  g_object_unref (proxy);
++  
++  return value;
+ }
+ 
+ static gboolean
+ display_gui (void)
+ {
+-  GtkWidget *box;
+-  GtkWidget *title;
+-  GtkWidget *hbox;
+-  GtkWidget *vbox;
+-  GtkWidget *image;
+-  GtkWidget *toggle_button = NULL;
+-  gint response;
+-  GtkWidget *halt = NULL;
+-  GtkWidget *reboot = NULL;
+-  GtkWidget *suspend = NULL;
+-  GtkWidget *hibernate = NULL;
+-  GtkWidget *invisible;
++  GtkWidget    *vbox;
++  GtkWidget    *cancel_button;
++  GtkWidget    *cancel_button_vbox;
++  GtkWidget    *empty_label;
++  GtkWidget    *current_page;
++  GtkWidget    *invisible;
++  gint         response;
++  gint         runvalue = 0;
++  gchar        *cmd_stderr;
++
++  GError     *error = NULL;  
++  
++  gboolean grab_xserver;
++  gboolean iris_effect_enabled;
+   gboolean halt_supported = FALSE;
+   gboolean reboot_supported = FALSE;
+   gboolean suspend_supported = FALSE;
+   gboolean hibernate_supported = FALSE;
+-  gboolean retval = FALSE;
+-  gboolean save_active = FALSE;
+-  gboolean halt_active = FALSE;
+-  gboolean reboot_active = FALSE;
+-  gboolean suspend_active = FALSE;
+-  gboolean hibernate_active = FALSE;
+-  GdmLogoutAction logout_action = GDM_LOGOUT_ACTION_NONE;
+-  gboolean iris_effect_enabled;
+-  gboolean grab_xserver;
+-  GError *error = NULL;
++  gboolean xscreensaver_supported = FALSE;
++  gboolean gnomescreensaver_supported = FALSE;
++  gboolean disable_lock_screen = FALSE;
++  gboolean disable_user_switching = FALSE;
++  gboolean retval;
++
++  GtkWidget *action_box, *action_icon, *action_label, *action_button;
++  GdkPixbuf *icon_name;
++
++  GtkWidget *top_hbox;
++  GtkWidget *middle_separator;
++  GtkWidget *bottom_hbox, *status_hbox;
++
++  gchar **labels;
++
+   GdkScreen *screen;
+-  int monitor;
+-  int selected_option;
++  int monitor, i;
++
++  GConfClient *client;
+ 
+   gsm_verbose ("display_gui: showing logout dialog\n");
+ 
++  // Tooltips don't work (background doesn't get redrawn)
++  // Using a "status label" instead.
++  dialog = g_new (LogoutDialog, 1);
++  dialog->retval = FALSE;
++
+   /* It's really bad here if someone else has the pointer
+    * grabbed, so we first grab the pointer and keyboard
+    * to an offscreen window, and then once we have the
+@@ -368,130 +477,374 @@
+ 	  sleep (1);
+ 	}
+ 
+-      box = g_object_new (GTK_TYPE_DIALOG,
+-			  "type", GTK_WINDOW_POPUP,
+-			  NULL);
+-    }
+-  else
+-    {
+-      box = gtk_dialog_new ();
+-      atk_object_set_role (gtk_widget_get_accessible (box), ATK_ROLE_ALERT);
+-      gtk_window_set_decorated (GTK_WINDOW (box), FALSE);
++      dialog->dialog = g_object_new (GTK_TYPE_DIALOG,
++				     "type", GTK_WINDOW_POPUP,
++				     NULL);
++    } else {
++      dialog->dialog = gtk_dialog_new ();
++      atk_object_set_role (gtk_widget_get_accessible (dialog->dialog), ATK_ROLE_ALERT);
++      gtk_window_set_decorated (GTK_WINDOW (dialog->dialog), FALSE);
+     }
+ 
+-  gtk_dialog_set_has_separator (GTK_DIALOG (box), FALSE);
++  gtk_window_set_title (GTK_WINDOW (dialog->dialog), _("Exit"));
+ 
+-  vbox = gtk_vbox_new (FALSE, 12);
+-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (box)->vbox), vbox, FALSE, FALSE, 0);
+-  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (box)->vbox), 2);
+-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
++  gtk_window_set_position (GTK_WINDOW (dialog->dialog), GTK_WIN_POS_CENTER_ALWAYS);
++
++  gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
++  
++  vbox = gtk_vbox_new (FALSE, 15);
++  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), vbox, FALSE, FALSE, 0);
++  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), 2);
+   gtk_widget_show (vbox);
+   
+-  hbox = gtk_hbox_new (FALSE, 12);
+-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+-  gtk_widget_show (hbox);
+-
+-  image = gtk_image_new_from_stock ("gtk-dialog-question", GTK_ICON_SIZE_DIALOG);
+-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+-  gtk_widget_show (image);
+-	
+-  title = make_title_label (_("Are you sure you want to log out?")); 
+-  gtk_box_pack_start (GTK_BOX (hbox), title, FALSE, FALSE, 0);
+-  gtk_misc_set_alignment (GTK_MISC (title), 0, 0.5);
+-  gtk_widget_show (title);
+-  
+-  gtk_dialog_add_button (GTK_DIALOG (box), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
+-  gtk_dialog_add_button (GTK_DIALOG (box), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+-  gtk_dialog_add_button (GTK_DIALOG (box), GTK_STOCK_OK, GTK_RESPONSE_OK);
+-
+-  gtk_dialog_set_default_response (GTK_DIALOG (box), GTK_RESPONSE_OK);
+-  gtk_window_set_screen (GTK_WINDOW (box), screen);
+-  gtk_window_set_resizable (GTK_WINDOW (box), FALSE);
+-
+-  gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+-
+-  if (!autosave)
+-    {
+-      toggle_button = gtk_check_button_new_with_mnemonic (_("Remember running applications"));
+-      gtk_widget_show (toggle_button);
+-      gtk_box_pack_start (GTK_BOX (vbox),
+-			  toggle_button,
+-			  FALSE, TRUE, 0);
+-    }
+-
+-  halt_supported   = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+-  reboot_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
+-  suspend_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
+-  hibernate_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_HIBERNATE);
+-
+-  if (halt_supported || reboot_supported || suspend_supported || hibernate_supported)
+-    {
+-      GtkWidget *title, *spacer;
+-      GtkWidget *action_vbox, *hbox;
+-      GtkWidget *category_vbox;
+-      GtkWidget *r;
+-
+-      selected_option = get_default_option ();
+-      
+-      category_vbox = gtk_vbox_new (FALSE, 6);
+-      gtk_box_pack_start (GTK_BOX (vbox), category_vbox, TRUE, TRUE, 0);
+-      gtk_widget_show (category_vbox);
+-	
+-      title = make_title_label (_("Action"));
+-      gtk_box_pack_start (GTK_BOX (category_vbox),
+-			  title, FALSE, FALSE, 0);
+-      gtk_widget_show (title);
+-  
+-      hbox = gtk_hbox_new (FALSE, 0);
+-      gtk_box_pack_start (GTK_BOX (category_vbox), hbox, TRUE, TRUE, 0);
+-      gtk_widget_show (hbox);
+-
+-      spacer = gtk_label_new ("    ");
+-      gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
+-      gtk_widget_show (spacer);
+-
+-      action_vbox = gtk_vbox_new (FALSE, 6);
+-      gtk_box_pack_start (GTK_BOX (hbox), action_vbox, TRUE, TRUE, 0);
+-      gtk_widget_show (action_vbox);
+-      
+-      r = gtk_radio_button_new_with_mnemonic (NULL, _("_Log out"));
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (r), (selected_option == OPTION_LOGOUT));
+-      gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+-      gtk_widget_show (r);
++  cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
++  g_signal_connect_swapped (G_OBJECT (cancel_button),
++			    "clicked",
++			    G_CALLBACK (cancel),
++			    dialog);
++  g_signal_connect (dialog->dialog,
++		    "close",
++		    G_CALLBACK (gtk_dialog_response),
++		    GINT_TO_POINTER (GTK_RESPONSE_CANCEL));
++
++  gtk_dialog_set_default_response (GTK_DIALOG (dialog->dialog), GTK_RESPONSE_CANCEL);
++  gtk_window_set_screen (GTK_WINDOW (dialog->dialog), screen);
++  gtk_window_set_policy (GTK_WINDOW (dialog->dialog), FALSE, FALSE, TRUE);
++
++  gtk_container_set_border_width (GTK_CONTAINER (dialog->dialog), 5);
++
++  top_hbox = gtk_hbox_new (TRUE, 60);
++
++  halt_supported      = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++  reboot_supported    = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++  suspend_supported   = gpm_dbus_interaction ("CanSuspend");
++  hibernate_supported = gpm_dbus_interaction ("CanHibernate");
++    
++  gnomescreensaver_supported = g_find_program_in_path ("gnome-screensaver-command") != NULL;
++  if (!gnomescreensaver_supported) 
++    xscreensaver_supported = g_find_program_in_path ("xscreensaver-command") != NULL;
++
++  client = gconf_client_get_default ();
++  disable_lock_screen = gconf_client_get_bool (client,
++					       "/desktop/gnome/lockdown/disable_lock_screen",
++					       NULL);
++  disable_user_switching = gconf_client_get_bool (client,
++						  "/desktop/gnome/lockdown/disable_user_switching",
++						  NULL);
++  g_object_unref (client);
+ 
+-      if (halt_supported)
++  /* The Log Out button */
++  
++  action_box = gtk_vbox_new (FALSE, 0);
++
++  icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++					"gnome-session-logout", 48, 0, NULL);
++  action_icon = gtk_image_new_from_pixbuf (icon_name); 
++  g_object_unref (icon_name);
++					 
++  action_label = gtk_label_new_with_mnemonic (_("_Log Out"));
++  action_button = gtk_button_new ();
++  
++  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++  
++  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++  gtk_container_add (GTK_CONTAINER (action_button), action_box);
++  gtk_box_pack_start (GTK_BOX (top_hbox), action_button, TRUE, TRUE, 0);
++
++  g_signal_connect_swapped (GTK_WIDGET (action_button),
++                            "grab-focus",
++                            G_CALLBACK (update_status_label),
++                            GINT_TO_POINTER (RESPONSE_LOGOUT));
++  g_signal_connect_swapped (GTK_WIDGET (action_button),
++			    "enter-notify-event",
++			    G_CALLBACK (update_status_label),
++			    GINT_TO_POINTER (RESPONSE_LOGOUT));
++  g_signal_connect_swapped (GTK_WIDGET (action_button),
++			    "leave-notify-event",
++			    G_CALLBACK (update_status_label),
++			    GINT_TO_POINTER (RESPONSE_NONE));
++  g_signal_connect_swapped (G_OBJECT (action_button),
++			    "clicked",
++			    G_CALLBACK (logout),
++			    dialog);
++  
++  /* The Lock Screen button */
++
++  if (!disable_lock_screen && (xscreensaver_supported || gnomescreensaver_supported)) 
++    {
++      action_box = gtk_vbox_new (FALSE, 0);
++      
++      icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++            				"gnome-lockscreen", 48, 0, NULL);
++      action_icon = gtk_image_new_from_pixbuf (icon_name); 
++      g_object_unref (icon_name);
++
++      action_label = gtk_label_new_with_mnemonic (_("L_ock Screen"));
++      action_button = gtk_button_new ();
++      
++      gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++      
++      gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++      gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++      gtk_container_add (GTK_CONTAINER (action_button), action_box);
++      gtk_box_pack_start (GTK_BOX (top_hbox), action_button, TRUE, TRUE, 0);
++
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++                              "grab-focus",
++                              G_CALLBACK (update_status_label),
++                              GINT_TO_POINTER (RESPONSE_LOCK));      
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++            		      "enter-notify-event",
++            		      G_CALLBACK (update_status_label),
++            		      GINT_TO_POINTER (RESPONSE_LOCK));
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++            		      "leave-notify-event",
++            		      G_CALLBACK (update_status_label),
++            		      GINT_TO_POINTER (RESPONSE_NONE));
++      g_signal_connect_swapped (G_OBJECT (action_button),
++          		      "clicked",
++          		      G_CALLBACK (lock),
++          		      dialog);
++    }
++
++  /* The Switch User button */
++  
++  if (!disable_user_switching)
++    {
++      action_box = gtk_vbox_new (FALSE, 0);
++      
++      icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++					    "gnome-session-switch", 48, 0, NULL);
++      action_icon = gtk_image_new_from_pixbuf (icon_name); 
++      g_object_unref (icon_name);
++      
++      action_label = gtk_label_new_with_mnemonic (_("S_witch User"));
++      action_button = gtk_button_new ();
++  
++      gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++      
++      gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++      gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++      gtk_container_add (GTK_CONTAINER (action_button), action_box);
++      gtk_box_pack_start (GTK_BOX (top_hbox), action_button, TRUE, TRUE, 0);
++      
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++				"grab-focus",
++				G_CALLBACK (update_status_label),
++				GINT_TO_POINTER (RESPONSE_SWITCH));
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++				"enter-notify-event",
++				G_CALLBACK (update_status_label),
++				GINT_TO_POINTER (RESPONSE_SWITCH));
++      g_signal_connect_swapped (GTK_WIDGET (action_button),
++				"leave-notify-event",
++				G_CALLBACK (update_status_label),
++				GINT_TO_POINTER (RESPONSE_NONE));
++      g_signal_connect_swapped (G_OBJECT (action_button),
++				"clicked",
++				G_CALLBACK (switch_user),
++				dialog);
++    }
++
++  gtk_box_pack_start (GTK_BOX (vbox), top_hbox, FALSE, FALSE, 0);
++  gtk_widget_show_all (top_hbox);
++
++  if (suspend_supported || hibernate_supported || reboot_supported || halt_supported)
++    {
++      middle_separator = gtk_hseparator_new ();
++      gtk_box_pack_start (GTK_BOX (vbox), middle_separator, FALSE, FALSE, 20);
++
++      bottom_hbox = gtk_hbox_new (TRUE, 60);
++
++      if (suspend_supported)
+ 	{
+-	  r = halt = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("Sh_ut down"));
+-	  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (r), (selected_option == OPTION_HALT));
+-	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+-	  gtk_widget_show (r);
++	  action_box = gtk_vbox_new (FALSE, 0);
++	  
++	  icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++						"gnome-session-suspend", 48, 0, NULL);
++	  action_icon = gtk_image_new_from_pixbuf (icon_name); 
++	  g_object_unref (icon_name);
++
++	  action_label = gtk_label_new_with_mnemonic (_("Sus_pend"));
++	  action_button = gtk_button_new ();
++	  
++	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++	  
++	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++	  gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++	  gtk_container_add (GTK_CONTAINER (action_button), action_box);
++	  gtk_box_pack_start (GTK_BOX (bottom_hbox), action_button, TRUE, TRUE, 0);
++	  
++          g_signal_connect_swapped (GTK_WIDGET (action_button),
++                            "grab-focus",
++                            G_CALLBACK (update_status_label),
++                            GINT_TO_POINTER (RESPONSE_SUSPEND));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++			    "enter-notify-event",
++			    G_CALLBACK (update_status_label),
++			    GINT_TO_POINTER (RESPONSE_SUSPEND));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "leave-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_NONE));
++	  g_signal_connect_swapped (G_OBJECT (action_button),
++				    "clicked",
++				    G_CALLBACK (suspend),
++				    dialog);
+ 	}
++      
++      if (hibernate_supported)
++	{
++	  action_box = gtk_vbox_new (FALSE, 0);
+ 
++	  icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++						"gnome-session-hibernate", 48, 0, NULL);
++	  action_icon = gtk_image_new_from_pixbuf (icon_name); 
++	  g_object_unref (icon_name);
++
++	  action_label = gtk_label_new_with_mnemonic (_("_Hibernate"));
++	  action_button = gtk_button_new ();
++	  
++	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++	  
++	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++	  gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++	  gtk_container_add (GTK_CONTAINER (action_button), action_box);
++	  gtk_box_pack_start (GTK_BOX (bottom_hbox), action_button, TRUE, TRUE, 0);
++
++          g_signal_connect_swapped (GTK_WIDGET (action_button),
++                                    "grab-focus",
++                                    G_CALLBACK (update_status_label),
++                                    GINT_TO_POINTER (RESPONSE_HIBERNATE));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "enter-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_HIBERNATE));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "leave-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_NONE));
++	  g_signal_connect_swapped (G_OBJECT (action_button),
++				    "clicked",
++				    G_CALLBACK (hibernate),
++				    dialog);
++	}
++      
+       if (reboot_supported)
+ 	{
+-	  r = reboot = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("_Restart the computer"));
+-	  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (r), (selected_option == OPTION_REBOOT));
+-	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+-	  gtk_widget_show (r);
++	  action_box = gtk_vbox_new (FALSE, 0);
++	  
++	  icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++						"gnome-session-reboot", 48, 0, NULL);
++	  action_icon = gtk_image_new_from_pixbuf (icon_name); 
++	  g_object_unref (icon_name);
++	  
++	  action_label = gtk_label_new_with_mnemonic (_("_Restart"));
++	  action_button = gtk_button_new ();
++	  
++	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++	  
++	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++	  gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++	  gtk_container_add (GTK_CONTAINER (action_button), action_box);
++	  gtk_box_pack_start (GTK_BOX (bottom_hbox), action_button, TRUE, TRUE, 0);
++	  
++          g_signal_connect_swapped (GTK_WIDGET (action_button),
++                                    "grab-focus",
++                                    G_CALLBACK (update_status_label),
++                                    GINT_TO_POINTER (RESPONSE_REBOOT));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "enter-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_REBOOT));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "leave-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_NONE));
++	  g_signal_connect_swapped (G_OBJECT (action_button),
++				    "clicked",
++				    G_CALLBACK (reboot),
++				    dialog);
+ 	}
+-
+-      if (suspend_supported)
++      
++      if (halt_supported)
+ 	{
+-	  r = suspend = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("_Suspend the computer"));
+-	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+-	  gtk_widget_show (r);
+-	}
++	  action_box = gtk_vbox_new (FALSE, 0);
+ 
+-      if (hibernate_supported)
+-	{
+-	  r = hibernate = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("_Hibernate the computer"));
+-	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+-	  gtk_widget_show (r);
++	  icon_name = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
++						"gnome-session-halt", 48, 0, NULL);
++	  action_icon = gtk_image_new_from_pixbuf (icon_name); 
++	  g_object_unref (icon_name);
++
++	  action_label = gtk_label_new_with_mnemonic (_("_Shut Down"));
++	  action_button = gtk_button_new ();
++	  
++	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
++	  gtk_label_set_line_wrap (GTK_LABEL (action_label), TRUE);
++
++	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
++	  gtk_box_pack_start (GTK_BOX (action_box), action_label, FALSE, FALSE, 0);
++	  gtk_container_add (GTK_CONTAINER (action_button), action_box);
++	  gtk_box_pack_start (GTK_BOX (bottom_hbox), action_button, TRUE, TRUE, 0);
++
++          g_signal_connect_swapped (GTK_WIDGET (action_button),
++                                    "grab-focus",
++                                    G_CALLBACK (update_status_label),
++                                    GINT_TO_POINTER (RESPONSE_HALT));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "enter-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_HALT));
++	  g_signal_connect_swapped (GTK_WIDGET (action_button),
++				    "leave-notify-event",
++				    G_CALLBACK (update_status_label),
++				    GINT_TO_POINTER (RESPONSE_NONE));
++	  g_signal_connect_swapped (G_OBJECT (action_button),
++				    "clicked",
++				    G_CALLBACK (halt),
++				    dialog);
+ 	}
++      
++      gtk_box_pack_start (GTK_BOX (vbox), bottom_hbox, FALSE, FALSE, 0);
++      gtk_widget_show_all (bottom_hbox);
++    } 
++
++  status_hbox = gtk_hbox_new (FALSE, 10);
++  dialog->status_notebook = gtk_notebook_new ();
++  cancel_button_vbox = gtk_vbox_new (FALSE, 0);
++  empty_label = gtk_label_new ("");
++
++  labels = (gchar**) malloc (N_RESPONSES * sizeof (char*));
++  labels[RESPONSE_LOGOUT]    = g_strdup_printf (_("Close your session and return to the login screen."));
++  labels[RESPONSE_SWITCH]    = g_strdup_printf (_("Leave your session open and password protected, but let other users log in as well."));
++  labels[RESPONSE_LOCK]      = g_strdup_printf (_("Launch the screensaver and password protect your session."));
++  labels[RESPONSE_REBOOT]    = g_strdup_printf (_("Restart the computer."));
++  labels[RESPONSE_SUSPEND]   = g_strdup_printf (_("Power saving mode. Depending on your computer, you can wake the computer up by pressing a key, the power button, or opening the laptop lid."));
++  labels[RESPONSE_HIBERNATE] = g_strdup_printf (_("While hibernating, your computer won't need any power. When started again, all open applications will be restored."));
++  labels[RESPONSE_HALT]      = g_strdup_printf (_("Completely turn off the computer."));
++  labels[RESPONSE_NONE]      = "";
++
++  for (i = 0; i < N_RESPONSES; i++) {
++    current_page = gtk_label_new (labels[i]);
++    gtk_label_set_line_wrap (GTK_LABEL (current_page), TRUE);
++    gtk_notebook_append_page (GTK_NOTEBOOK (dialog->status_notebook),
++			      current_page,
++			      NULL);
++  }
++  gtk_notebook_set_show_tabs   (GTK_NOTEBOOK (dialog->status_notebook), FALSE);
++  gtk_notebook_set_show_border (GTK_NOTEBOOK (dialog->status_notebook), FALSE);
++
++  gtk_box_pack_start (GTK_BOX (status_hbox), dialog->status_notebook, TRUE, TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (cancel_button_vbox), empty_label, TRUE, TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (cancel_button_vbox), cancel_button, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (status_hbox), cancel_button_vbox, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (vbox), status_hbox, FALSE, FALSE, 0);
+ 
+-    }
++  gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
++  gtk_widget_grab_focus (cancel_button);
+ 
+-  gsm_center_window_on_screen (GTK_WINDOW (box), screen, monitor);
++  gsm_center_window_on_screen (GTK_WINDOW (dialog->dialog), screen, monitor); 
+ 
+   /* Grabbing the Xserver when accessibility is enabled will cause
+    * a hang. See #93103 for details.
+@@ -505,45 +858,27 @@
+       gsm_foreach_screen (fadeout_screen);
+     }
+ 
+-  gtk_widget_show_all (box);
++gtk_widget_show_all (dialog->dialog); 
+ 
+-  if (iris_effect_enabled)
++if (iris_effect_enabled)
+     {
+       /* Move the grabs to our message box */
+-      gdk_pointer_grab (box->window, TRUE, 0,
+-			NULL, NULL, GDK_CURRENT_TIME);
+-      gdk_keyboard_grab (box->window, FALSE, GDK_CURRENT_TIME);
++      gdk_pointer_grab (dialog->dialog->window, TRUE, 0, 
++  			NULL, NULL, GDK_CURRENT_TIME);
++      gdk_keyboard_grab (dialog->dialog->window, FALSE, GDK_CURRENT_TIME); 
++    
++
+       XSetInputFocus (GDK_DISPLAY (),
+-		      GDK_WINDOW_XWINDOW (box->window),
++                      GDK_WINDOW_XWINDOW (dialog->dialog->window), 
+ 		      RevertToParent,
+ 		      CurrentTime);
+     }
+ 
+-  response = gtk_dialog_run (GTK_DIALOG (box));
+-
+-  if (halt)
+-    halt_active = GTK_TOGGLE_BUTTON (halt)->active;
+-
+-  if (reboot)
+-    reboot_active = GTK_TOGGLE_BUTTON (reboot)->active;
+-
+-  if (suspend)
+-    suspend_active = GTK_TOGGLE_BUTTON (suspend)->active;
+-
+-  if (hibernate)
+-    hibernate_active = GTK_TOGGLE_BUTTON (hibernate)->active;
+-
+-  if (toggle_button)
+-    save_active = GTK_TOGGLE_BUTTON (toggle_button)->active;
+-
+-  if (reboot_active)
+-    selected_option = OPTION_REBOOT;
+-  else if (halt_active)
+-    selected_option = OPTION_HALT;
+-  else
+-    selected_option = OPTION_LOGOUT;
+-
+-  gtk_widget_destroy (box);
++  gtk_notebook_set_current_page (GTK_NOTEBOOK (dialog->status_notebook), RESPONSE_NONE);
++  
++  response = gtk_dialog_run (GTK_DIALOG (dialog->dialog)); 
++  
++  gtk_widget_destroy (dialog->dialog); 
+   gtk_widget_destroy (invisible);
+ 
+   if (iris_effect_enabled)
+@@ -562,67 +897,69 @@
+     }
+ 
+   switch (response) {
+-    case GTK_RESPONSE_OK:
+-      /* We want to know if we should trash changes (and lose forever)
+-       * or save them */
+-      if(save_active)
+-	save_selected = save_active;
+-      if (halt_active)
+-	logout_action = GDM_LOGOUT_ACTION_SHUTDOWN;
+-      else if (reboot_active)
+-	logout_action = GDM_LOGOUT_ACTION_REBOOT;
+-      else if (suspend_active) {
+-	logout_action = GDM_LOGOUT_ACTION_SUSPEND;
+-	retval = FALSE;
+-	break; 
+-      }
+-      else if (hibernate_active) {
+-	logout_action = GDM_LOGOUT_ACTION_HIBERNATE;
+-	retval = FALSE;
+-	break;
+-      }
+-      set_default_option (selected_option);
+-      retval = TRUE;
+-      break;
+-    default:
+-    case GTK_RESPONSE_CANCEL:
+-      retval = FALSE;
+-      break;
+-    case GTK_RESPONSE_HELP:
+-      gnome_help_display_desktop_on_screen (NULL, "user-guide",
+-					    "user-guide.xml",
+-					    "gosgetstarted-73",
+-					    screen,
+-					    &error);
++   case RESPONSE_LOGOUT:
++     gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++     break;
++   case RESPONSE_SWITCH:
++     g_spawn_command_line_sync ("gdmflexiserver --startnew", NULL, &cmd_stderr, &runvalue, &error);
++     break;
++   case RESPONSE_LOCK:
++     if (gnomescreensaver_supported) {
++       g_spawn_command_line_sync ("gnome-screensaver-command --lock", NULL, &cmd_stderr, &runvalue, &error);
++     } else {
++       g_spawn_command_line_sync ("xscreensaver-command --lock", NULL, &cmd_stderr, &runvalue, &error);
++     }
++     break;
++   default:
++   case RESPONSE_REBOOT:
++     /* It seems gpm doesn't support rebooting, doing it with gdm */
++     gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++     break;
++   case RESPONSE_SUSPEND:
++     gpm_dbus_interaction ("Suspend");
++     break;
++   case RESPONSE_HIBERNATE:
++     gpm_dbus_interaction ("Hibernate");
++     break;
++   case RESPONSE_HALT:
++     gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++     break;
++   case GTK_RESPONSE_CANCEL:
++     dialog->retval = FALSE;
++     break;
++  }
+ 
+-      if (error) 
+-        {
+-          GtkWidget *dialog;
+-
+-          dialog = gtk_message_dialog_new (NULL,
+-        				   GTK_DIALOG_DESTROY_WITH_PARENT,
+-        				   GTK_MESSAGE_ERROR,
+-        				   GTK_BUTTONS_CLOSE,
+-        				   ("There was an error displaying help: \n%s"),
+-        				   error->message);
+-
+-          g_signal_connect (G_OBJECT (dialog), "response",
+-	   		    G_CALLBACK (gtk_widget_destroy),
+-			    NULL);
+-
+-	  gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+-
+-          gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+-          gtk_widget_show (dialog);
+-          g_error_free (error);
+-        }
+-   
+-      retval = FALSE;
+-      break;
+-    }
+-
+-  gdm_set_logout_action (logout_action);
++  if (error) {
++    GtkWidget *dialog;
++    
++    dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
++				     GTK_BUTTONS_OK, _("Could not run command"));
++    if (error->message != NULL)
++      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++						error->message);
++
++    response = gtk_dialog_run (GTK_DIALOG (dialog));
++    gtk_widget_destroy (dialog);
++
++    g_error_free (error);
++  }
++  else if (runvalue) {
++    GtkWidget *dialog;
++    
++    dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
++				     GTK_BUTTONS_OK, _("Error while running command"));
++    if (cmd_stderr != NULL)
++      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++						cmd_stderr);
++    
++    response = gtk_dialog_run (GTK_DIALOG (dialog));
++    gtk_widget_destroy (dialog);
+ 
++    g_free (cmd_stderr);
++  }
++  
++  retval = dialog->retval;
++  g_free (dialog);
+   return retval;
+ }
+ 
+Index: gnome-session-2.21.91/gnome-session/logout-test.c
+===================================================================
+--- gnome-session-2.21.91.orig/gnome-session/logout-test.c	2008-02-11 18:54:47.000000000 +0000
++++ gnome-session-2.21.91/gnome-session/logout-test.c	2008-02-22 14:43:03.000000000 +0000
+@@ -8,8 +8,6 @@
+ #define ice_thawed()
+ 
+ #define COMMAND_H
+-static gboolean autosave = FALSE;
+-static gboolean save_selected = FALSE;
+ static gboolean logout_prompt = TRUE;
+ 
+ #include "logout.c"
--- gnome-session-2.22.1.1.orig/debian/patches/08_ubuntu_use_apport_on_crash.patch
+++ gnome-session-2.22.1.1/debian/patches/08_ubuntu_use_apport_on_crash.patch
@@ -0,0 +1,39 @@
+--- a/data/gnome-session.schemas.in	2008-02-11 19:54:47.000000000 +0100
++++ b/data/gnome-session.schemas.in	2008-02-14 11:52:06.000000000 +0100
+@@ -67,5 +67,16 @@
+             <long>This is the option that will be selected in the logout dialog, valid values are "logout" for logging out, "shutdown" for halting the system and "restart" for restarting the system.</long>
+          </locale>
+       </schema>
++    <schema>
++      <key>/schemas/apps/bug-buddy/run_on_crash</key>
++      <applyto>/apps/bug-buddy/run_on_crash</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Run bug-buddy on crash</short>
++        <long>Whether to run bug-buddy on crash or let apport-gtk been used</long>
++      </locale>
++    </schema>
+    </schemalist>
+ </gconfschemafile>
+--- a/gnome-session/main.c	2008-02-14 11:52:01.000000000 +0100
++++ b/gnome-session/main.c	2008-02-14 11:52:06.000000000 +0100
+@@ -163,12 +163,17 @@
+   gchar *path;
+   const gchar *old_env;
+   gchar *new_env;
++  GConfClient *gconf_client;
+ 
+   path = g_find_program_in_path ("bug-buddy");
+   if (!path)
+     return;
+ 
+   g_free (path);
++  
++  gconf_client = gsm_get_conf_client ();
++  if (!gconf_client_get_bool (gconf_client, "/apps/bug-buddy/run_on_crash", NULL))
++    return;
+ 
+   old_env = g_getenv ("GTK_MODULES");
+   if (old_env)
--- gnome-session-2.22.1.1.orig/debian/patches/22_dennis_logout.patch
+++ gnome-session-2.22.1.1/debian/patches/22_dennis_logout.patch
@@ -0,0 +1,151 @@
+Index: gnome-session-2.22.1.1/gnome-session/logout.c
+===================================================================
+--- gnome-session-2.22.1.1.orig/gnome-session/logout.c	2008-10-28 16:22:51.000000000 -0400
++++ gnome-session-2.22.1.1/gnome-session/logout.c	2008-10-28 16:24:20.000000000 -0400
+@@ -395,6 +395,34 @@
+ }
+ 
+ static gboolean
++on_button_expose (GtkWidget *widget, GdkEventExpose *event)
++{
++  GtkWidget *child;
++  cairo_t *cr;
++
++  cr = gdk_cairo_create (widget->window);
++
++  if (!cr)
++  {
++    g_debug ("Unable to create cairo  context");
++    return FALSE;
++  }
++
++  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
++  cairo_fill (cr);
++  cairo_destroy (cr);
++
++  child = gtk_bin_get_child (GTK_BIN (widget));
++  if (child)
++    gtk_container_propagate_expose (GTK_CONTAINER (widget),
++                                    child,
++                                    event);
++  return TRUE;
++}
++
++
++
++static gboolean
+ display_gui (void)
+ {
+   GtkWidget    *vbox;
+@@ -480,12 +508,14 @@
+       dialog->dialog = g_object_new (GTK_TYPE_DIALOG,
+ 				     "type", GTK_WINDOW_POPUP,
+ 				     NULL);
++
+     } else {
+       dialog->dialog = gtk_dialog_new ();
+       atk_object_set_role (gtk_widget_get_accessible (dialog->dialog), ATK_ROLE_ALERT);
+       gtk_window_set_decorated (GTK_WINDOW (dialog->dialog), FALSE);
+     }
+ 
++  gtk_widget_set_name (GTK_WIDGET (dialog->dialog), "harbour_logout_window");
+   gtk_window_set_title (GTK_WINDOW (dialog->dialog), _("Exit"));
+ 
+   gtk_window_set_position (GTK_WINDOW (dialog->dialog), GTK_WIN_POS_CENTER_ALWAYS);
+@@ -498,6 +528,7 @@
+   gtk_widget_show (vbox);
+   
+   cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
++
+   g_signal_connect_swapped (G_OBJECT (cancel_button),
+ 			    "clicked",
+ 			    G_CALLBACK (cancel),
+@@ -544,7 +575,10 @@
+ 					 
+   action_label = gtk_label_new_with_mnemonic (_("_Log Out"));
+   action_button = gtk_button_new ();
+-  
++  gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++  g_signal_connect (action_button, "expose-event",
++		    G_CALLBACK (on_button_expose), NULL);
++
+   gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+   
+   gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
+@@ -582,6 +616,9 @@
+ 
+       action_label = gtk_label_new_with_mnemonic (_("L_ock Screen"));
+       action_button = gtk_button_new ();
++      gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++      g_signal_connect (action_button, "expose-event",
++			G_CALLBACK (on_button_expose), NULL);
+       
+       gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+       
+@@ -621,7 +658,10 @@
+       
+       action_label = gtk_label_new_with_mnemonic (_("S_witch User"));
+       action_button = gtk_button_new ();
+-  
++      gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++      g_signal_connect (action_button, "expose-event",
++			G_CALLBACK (on_button_expose), NULL);
++
+       gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+       
+       gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
+@@ -652,8 +692,8 @@
+ 
+   if (suspend_supported || hibernate_supported || reboot_supported || halt_supported)
+     {
+-      middle_separator = gtk_hseparator_new ();
+-      gtk_box_pack_start (GTK_BOX (vbox), middle_separator, FALSE, FALSE, 20);
++      //middle_separator = gtk_hseparator_new ();
++      //gtk_box_pack_start (GTK_BOX (vbox), middle_separator, FALSE, FALSE, 20);
+ 
+       bottom_hbox = gtk_hbox_new (TRUE, 60);
+ 
+@@ -668,6 +708,9 @@
+ 
+ 	  action_label = gtk_label_new_with_mnemonic (_("Sus_pend"));
+ 	  action_button = gtk_button_new ();
++	  gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++	  g_signal_connect (action_button, "expose-event",
++			    G_CALLBACK (on_button_expose), NULL);
+ 	  
+ 	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+ 	  
+@@ -705,7 +748,10 @@
+ 
+ 	  action_label = gtk_label_new_with_mnemonic (_("_Hibernate"));
+ 	  action_button = gtk_button_new ();
+-	  
++  	  gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++	  g_signal_connect (action_button, "expose-event",
++			    G_CALLBACK (on_button_expose), NULL);
++
+ 	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+ 	  
+ 	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
+@@ -742,7 +788,10 @@
+ 	  
+ 	  action_label = gtk_label_new_with_mnemonic (_("_Restart"));
+ 	  action_button = gtk_button_new ();
+-	  
++  	  gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++	  g_signal_connect (action_button, "expose-event",
++			    G_CALLBACK (on_button_expose), NULL);
++
+ 	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+ 	  
+ 	  gtk_box_pack_start (GTK_BOX (action_box), action_icon, FALSE, FALSE, 0);
+@@ -779,6 +828,9 @@
+ 
+ 	  action_label = gtk_label_new_with_mnemonic (_("_Shut Down"));
+ 	  action_button = gtk_button_new ();
++	  gtk_widget_set_app_paintable (GTK_WIDGET (action_button), TRUE);
++	  g_signal_connect (action_button, "expose-event",
++			    G_CALLBACK (on_button_expose), NULL);
+ 	  
+ 	  gtk_button_set_relief (GTK_BUTTON (action_button), GTK_RELIEF_NONE);
+ 	  gtk_label_set_line_wrap (GTK_LABEL (action_label), TRUE);
--- gnome-session-2.22.1.1.orig/debian/patches/22_disable_time_setting_main.c.patch
+++ gnome-session-2.22.1.1/debian/patches/22_disable_time_setting_main.c.patch
@@ -0,0 +1,13 @@
+Index: gnome-session-2.22.1.1/gnome-session/main.c
+===================================================================
+--- gnome-session-2.22.1.1.orig/gnome-session/main.c	2008-11-27 07:58:38.083476297 +0000
++++ gnome-session-2.22.1.1/gnome-session/main.c	2008-11-27 07:59:38.251476698 +0000
+@@ -388,7 +388,7 @@
+                                          _("The computer clock appears to be wrong"));
+   gsm_check_clock_set_label (check.dialog);
+ 
+-  if (check.argv_tool)
++  if (0 && check.argv_tool)
+     {
+       /* FIXME: would be nice to have a icons for the buttons */
+       gtk_dialog_add_buttons (GTK_DIALOG (check.dialog),
--- gnome-session-2.22.1.1.orig/debian/patches/21_autostart_nodisplay.patch
+++ gnome-session-2.22.1.1/debian/patches/21_autostart_nodisplay.patch
@@ -0,0 +1,33 @@
+Index: gnome-session-2.22.1.1/gnome-session/startup-programs.c
+===================================================================
+--- gnome-session-2.22.1.1.orig/gnome-session/startup-programs.c	2008-09-24 11:51:05.000000000 -0400
++++ gnome-session-2.22.1.1/gnome-session/startup-programs.c	2008-09-24 11:53:16.000000000 -0400
+@@ -40,6 +40,7 @@
+ {
+   char     *desktop_file;
+   gboolean  enabled;
++  gboolean  display;
+   char     *name;
+   char     *command;
+   char     *comment;
+@@ -122,6 +123,7 @@
+   client->enabled = gsm_key_file_get_boolean (keyfile,
+                                               "X-GNOME-Autostart-enabled",
+                                               TRUE);
++  client->display = !gsm_key_file_get_boolean (keyfile, "NoDisplay", FALSE);
+ 
+   return client;
+ }
+@@ -337,6 +339,12 @@
+       const char   *description;
+       ManualClient *client = tmp_list->data;
+ 
++      if (!client->display)
++        {
++          tmp_list = tmp_list->next;
++          continue;
++        }
++
+       if (client->name && client->name[0] != '\0')
+         name = client->name;
+       else
--- gnome-session-2.22.1.1.orig/debian/patches/02_gsd-spawn.patch
+++ gnome-session-2.22.1.1/debian/patches/02_gsd-spawn.patch
@@ -0,0 +1,245 @@
+Index: gnome-session-2.21.93/configure.in
+===================================================================
+--- gnome-session-2.21.93.orig/configure.in	2008-03-06 15:40:13.000000000 +0100
++++ gnome-session-2.21.93/configure.in	2008-03-08 15:12:52.000000000 +0100
+@@ -393,6 +393,20 @@
+ ])
+ AC_SUBST(RSH_COMMAND)
+ 
++AC_MSG_CHECKING([for gnome-settings-daemon])
++AC_ARG_WITH(settings-daemon,
++    AC_HELP_STRING([--with-settings-daemon=PATH],
++                   [Specify the path to gnome-settings-daemon]),
++    [SETTINGS_DAEMON_PATH="$with_settings_daemon"],
++    [SETTINGS_DAEMON_PATH=`pkg-config --variable=binary gnome-settings-daemon`
++     if test x$SETTINGS_DAEMON_PATH = x ; then
++         AC_MSG_ERROR([No path found to gnome-settings-daemon.])
++     fi
++])
++AC_MSG_RESULT($SETTINGS_DAEMON_PATH)
++AC_DEFINE_UNQUOTED(SETTINGS_DAEMON_PATH, "$SETTINGS_DAEMON_PATH",
++                  [Defines the path to the gnome-settings-daemon binary])
++
+ 
+ GNOME_SESSION_TARBALL=`date +%e`
+ AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_DAY, $GNOME_SESSION_TARBALL,
+Index: gnome-session-2.21.93/gnome-session/gsm-gsd.c
+===================================================================
+--- gnome-session-2.21.93.orig/gnome-session/gsm-gsd.c	2008-03-06 15:40:08.000000000 +0100
++++ gnome-session-2.21.93/gnome-session/gsm-gsd.c	2008-03-08 15:13:12.000000000 +0100
+@@ -10,12 +10,13 @@
+ 
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+-#include <gtk/gtkmessagedialog.h>
++#include <gtk/gtk.h>
+ 
+ #include <gnome-settings-daemon/gnome-settings-client.h>
+ 
+ typedef struct {
+-  DBusGProxy       *dbus_proxy;
++  DBusGProxy  *dbus_proxy;
++  GPid         pid;
+   gboolean     activating;
+   time_t       start_time;
+   guint        attempts;
+@@ -80,6 +81,8 @@
+   gtk_widget_show (dialog);
+ }
+ 
++static void gsd_spawn (gboolean wait_activated);
++
+ static void
+ name_owner_changed (DBusGProxy *proxy,
+                     const char *name,
+@@ -102,7 +105,7 @@
+ 
+               gsd->dbus_proxy = NULL;
+ 
+-              gsm_gsd_start ();
++              gsd_spawn (FALSE);
+             }
+ 	}
+       else
+@@ -114,6 +117,18 @@
+ }
+ 
+ static void
++gsd_died_cb (GPid pid, gint status, GnomeSettingsData *gsd)
++{
++  gsd->pid = 0;
++  /* gsd terminated before registering to dbus */
++  if (gsd->activating)
++    {
++      gsd->activating = FALSE;
++      gsd_spawn (FALSE);
++    }
++}
++
++static void
+ plugin_activated (DBusGProxy *proxy,
+ 		  const char *name,
+ 		  GnomeSettingsData *gsd)
+@@ -128,15 +143,17 @@
+ 				 G_CALLBACK(plugin_activated), gsd);
+ }
+ 
+-void
+-gsm_gsd_start (void)
++static void
++gsd_spawn (gboolean wait_activated)
+ {
+   static GnomeSettingsData gsd = { NULL };
+   time_t now;
+   DBusGConnection *connection;
++  DBusGProxy *dbusService;
+   GError *error = NULL;
++  const gchar *const argv[] = { SETTINGS_DAEMON_PATH, "gnome-settings-daemon", NULL };
+ 
+-  gsm_verbose ("gsm_gsd_start(): starting\n");
++  gsm_verbose ("gsd_spawn(): starting\n");
+ 
+   if (gsd.activating)
+     return;
+@@ -171,67 +188,88 @@
+       gsd_set_error (&gsd, error->message);
+       gsd_error_dialog (&gsd, NULL);
+       g_error_free (error);
++      return;
++    }
++
++  dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection),
++                                          FALSE);
++
++  gsd.dbus_proxy = dbus_g_proxy_new_for_name (connection,
++                                              "org.gnome.SettingsDaemon",
++                                              "/org/gnome/SettingsDaemon",
++                                              "org.gnome.SettingsDaemon");
++
++  if (gsd.dbus_proxy == NULL)
++    {
++      gsd_set_error (&gsd, "Could not obtain DBUS proxy");
++      gsd_error_dialog (&gsd, NULL);
++      return;
++    }
++
++  if (g_spawn_async (NULL, (gchar **) argv, NULL,
++                     G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_FILE_AND_ARGV_ZERO,
++                     NULL, NULL, &gsd.pid, &error))
++    {
++      g_child_watch_add (gsd.pid, (GChildWatchFunc) gsd_died_cb, &gsd);
+     }
+   else
+     {
+-      dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection),
+-                                              FALSE);
++      gsd_set_error (&gsd, error->message);
++      gsd_error_dialog (&gsd, NULL);
++      g_error_free (error);
++      return;
++    }
+ 
+-      gsd.dbus_proxy = dbus_g_proxy_new_for_name (connection,
+-                                                  "org.gnome.SettingsDaemon",
+-                                                  "/org/gnome/SettingsDaemon",
+-                                                  "org.gnome.SettingsDaemon");
++  dbusService = dbus_g_proxy_new_for_name (connection,
++                                           DBUS_SERVICE_DBUS,
++                                           DBUS_PATH_DBUS,
++                                           DBUS_INTERFACE_DBUS);
++  dbus_g_proxy_add_signal (dbusService,
++                           "NameOwnerChanged",
++                           G_TYPE_STRING,
++                           G_TYPE_STRING,
++                           G_TYPE_STRING,
++                           G_TYPE_INVALID);
++  dbus_g_proxy_connect_signal (dbusService,
++                               "NameOwnerChanged",
++                               G_CALLBACK (name_owner_changed),
++                               &gsd,
++                               NULL);
+ 
+-      if (gsd.dbus_proxy == NULL)
+-        {
+-          gsd_set_error (&gsd, "Could not obtain DBUS proxy");
+-          gsd_error_dialog (&gsd, NULL);
+-        } 
+-      else
++  if (wait_activated)
++    {
++      while (gsd.activating)
+         {
+-          /* Connect to the signal before we wake the settings daemon
+-           * up, otherwise, it might have the sound system ready before
+-           * we're actually listening */
+-	  dbus_g_proxy_add_signal (gsd.dbus_proxy,
+-				   "PluginActivated",
+-				   G_TYPE_STRING,
+-				   G_TYPE_INVALID);
+-
+-	  dbus_g_proxy_connect_signal (gsd.dbus_proxy,
+-				       "PluginActivated",
+-				       G_CALLBACK (plugin_activated),
+-				       &gsd,
+-				       NULL);
++          gtk_main_iteration ();
++        }
+ 
+-          if (!org_gnome_SettingsDaemon_awake(gsd.dbus_proxy, &error))
+-            {
+-              /* Method failed, the GError is set, let's warn everyone */
+-              gsd_set_error (&gsd, error->message);
+-              gsd_error_dialog (&gsd, NULL);
+-              g_error_free (error);
+-            }
+-          else
+-            {
+-              DBusGProxy *dbusService;
+-              dbusService = dbus_g_proxy_new_for_name (connection,
+-                                                       DBUS_SERVICE_DBUS,
+-                                                       DBUS_PATH_DBUS,
+-                                                       DBUS_INTERFACE_DBUS);
+-
+-              dbus_g_proxy_add_signal (dbusService,
+-                                       "NameOwnerChanged",
+-                                       G_TYPE_STRING,
+-                                       G_TYPE_STRING,
+-                                       G_TYPE_STRING,
+-                                       G_TYPE_INVALID);
+-
+-              dbus_g_proxy_connect_signal (dbusService,
+-                                           "NameOwnerChanged",
+-                                           G_CALLBACK (name_owner_changed),
+-                                           &gsd,
+-                                           NULL);
++      /* Connect to the signal before we wake the settings daemon
++       * up, otherwise, it might have the sound system ready before
++       * we're actually listening */
++      dbus_g_proxy_add_signal (gsd.dbus_proxy,
++			       "PluginActivated",
++			       G_TYPE_STRING,
++			       G_TYPE_INVALID);
++      
++      dbus_g_proxy_connect_signal (gsd.dbus_proxy,
++				   "PluginActivated",
++				   G_CALLBACK (plugin_activated),
++				   &gsd,
++				   NULL);
+ 
+-            }
++      /* if gsd.pid is 0, something broke havoc and the user has already been warned */
++      if (gsd.pid && !org_gnome_SettingsDaemon_awake(gsd.dbus_proxy, &error))
++        {
++          /* Method failed, the GError is set, let's warn everyone */
++          gsd_set_error (&gsd, error->message);
++          gsd_error_dialog (&gsd, NULL);
++          g_error_free (error);
+         }
+     }
+ }
++
++void
++gsm_gsd_start (void)
++{
++  gsd_spawn (TRUE);
++}
--- gnome-session-2.22.1.1.orig/debian/patches/02_no_warning_crash.patch
+++ gnome-session-2.22.1.1/debian/patches/02_no_warning_crash.patch
@@ -0,0 +1,20 @@
+diff -Nur -x '*.orig' -x '*~' gnome-session-2.20.1/gnome-session/main.c gnome-session-2.20.1.new/gnome-session/main.c
+--- gnome-session-2.20.1/gnome-session/main.c	2007-11-21 15:48:32.000000000 +0100
++++ gnome-session-2.20.1.new/gnome-session/main.c	2007-11-21 15:49:01.000000000 +0100
+@@ -593,6 +593,7 @@
+     gsm_set_verbose (TRUE);
+ 
+   /* Help eradicate the critical warnings in unstable releases of GNOME */
++  /*
+   versions = g_strsplit (VERSION, ".", 3);
+   if (versions && versions [0] && versions [1])
+     {
+@@ -605,7 +606,7 @@
+ 	}
+     }
+   g_strfreev (versions);
+-      
++  */
+   set_gtk1_theme_rcfile ();
+ 
+   /* Initialize the i18n stuff */
--- gnome-session-2.22.1.1.orig/debian/patches/23_no_gsd_error.patch
+++ gnome-session-2.22.1.1/debian/patches/23_no_gsd_error.patch
@@ -0,0 +1,17 @@
+Index: gnome-session-2.22.1.1/gnome-session/gsm-gsd.c
+===================================================================
+--- gnome-session-2.22.1.1.orig/gnome-session/gsm-gsd.c	2008-11-17 10:38:06.000000000 -0500
++++ gnome-session-2.22.1.1/gnome-session/gsm-gsd.c	2008-11-17 10:38:12.000000000 -0500
+@@ -36,6 +36,12 @@
+   static GtkWidget *dialog = NULL;
+   GString *msg;
+   
++  /* User doesn't want to see this dialog, and it sometimes pops up when
++     everything is still working fine (a race condition?).  As a band-aid over
++     the symptom of the problem, we're just early-exiting and never showing
++     this dialog. */
++  return;
++  
+   /*
+    * it would be nice to have a dialog which either:
+    *
--- gnome-session-2.22.1.1.orig/debian/patches/03_powermanagement.patch
+++ gnome-session-2.22.1.1/debian/patches/03_powermanagement.patch
@@ -0,0 +1,144 @@
+--- gnome-session-2.20.2.orig/gnome-session/gdm-logout-action.c	2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/gdm-logout-action.c	2007-11-27 13:28:13.000000000 +0100
+@@ -50,11 +50,14 @@
+ #define GDM_PROTOCOL_MSG_AUTHENTICATE "AUTH_LOCAL"
+ #define GDM_PROTOCOL_MSG_QUERY_ACTION "QUERY_LOGOUT_ACTION"
+ #define GDM_PROTOCOL_MSG_SET_ACTION   "SET_LOGOUT_ACTION"
++#define GDM_PROTOCOL_MSG_SET_SUSPEND    "SET_SUSPEND"
++#define GDM_PROTOCOL_MSG_SET_HIBERNATE "SET_HIBERNATE"
+ 
+ #define GDM_ACTION_STR_NONE     "NONE"
+ #define GDM_ACTION_STR_SHUTDOWN "HALT"
+ #define GDM_ACTION_STR_REBOOT   "REBOOT"
+ #define GDM_ACTION_STR_SUSPEND  "SUSPEND"
++#define GDM_ACTION_STR_HIBERNATE "HIBERNATE"
+ 
+ typedef struct {
+         int fd;
+@@ -312,6 +315,8 @@
+                         action = GDM_LOGOUT_ACTION_REBOOT;
+                 else if (!strcmp (str, GDM_ACTION_STR_SUSPEND))
+                         action = GDM_LOGOUT_ACTION_SUSPEND;
++                else if (!strcmp (str, GDM_ACTION_STR_HIBERNATE))
++                        action = GDM_LOGOUT_ACTION_HIBERNATE;
+ 
+                 data->available_actions |= action;
+                 if (selected)
+@@ -381,8 +386,17 @@
+                 action_str = GDM_ACTION_STR_REBOOT;
+                 break;
+         case GDM_LOGOUT_ACTION_SUSPEND:
+-                action_str = GDM_ACTION_STR_SUSPEND;
+-                break;
++		response = gdm_send_protocol_msg (&gdm_protocol_data, GDM_PROTOCOL_MSG_SET_SUSPEND);
++		g_free (response);
++		gdm_protocol_data.last_update = 0;
++		gdm_shutdown_protocol_connection (&gdm_protocol_data);
++		return;
++        case GDM_LOGOUT_ACTION_HIBERNATE:
++		response = gdm_send_protocol_msg (&gdm_protocol_data, GDM_PROTOCOL_MSG_SET_HIBERNATE);
++		g_free (response);
++		gdm_protocol_data.last_update = 0;
++		gdm_shutdown_protocol_connection (&gdm_protocol_data);
++		return;
+         }
+ 
+         msg = g_strdup_printf (GDM_PROTOCOL_MSG_SET_ACTION " %s", action_str);
+--- gnome-session-2.20.2.orig/gnome-session/gdm-logout-action.h	2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/gdm-logout-action.h	2007-11-27 13:28:13.000000000 +0100
+@@ -38,7 +38,8 @@
+         GDM_LOGOUT_ACTION_NONE     = 0,
+         GDM_LOGOUT_ACTION_SHUTDOWN = 1 << 0,
+         GDM_LOGOUT_ACTION_REBOOT   = 1 << 1,
+-        GDM_LOGOUT_ACTION_SUSPEND  = 1 << 2
++        GDM_LOGOUT_ACTION_SUSPEND  = 1 << 2,
++        GDM_LOGOUT_ACTION_HIBERNATE  = 1 << 3
+ } GdmLogoutAction;
+ 
+ gboolean gdm_supports_logout_action (GdmLogoutAction action);
+--- gnome-session-2.20.2.orig/gnome-session/logout.c	2007-11-27 01:03:13.000000000 +0100
++++ gnome-session-2.20.2/gnome-session/logout.c	2007-11-27 13:28:13.000000000 +0100
+@@ -310,13 +310,19 @@
+   gint response;
+   GtkWidget *halt = NULL;
+   GtkWidget *reboot = NULL;
++  GtkWidget *suspend = NULL;
++  GtkWidget *hibernate = NULL;
+   GtkWidget *invisible;
+   gboolean halt_supported = FALSE;
+   gboolean reboot_supported = FALSE;
++  gboolean suspend_supported = FALSE;
++  gboolean hibernate_supported = FALSE;
+   gboolean retval = FALSE;
+   gboolean save_active = FALSE;
+   gboolean halt_active = FALSE;
+   gboolean reboot_active = FALSE;
++  gboolean suspend_active = FALSE;
++  gboolean hibernate_active = FALSE;
+   GdmLogoutAction logout_action = GDM_LOGOUT_ACTION_NONE;
+   gboolean iris_effect_enabled;
+   gboolean grab_xserver;
+@@ -415,8 +421,10 @@
+ 
+   halt_supported   = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+   reboot_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++  suspend_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
++  hibernate_supported = gdm_supports_logout_action (GDM_LOGOUT_ACTION_HIBERNATE);
+ 
+-  if (halt_supported || reboot_supported)
++  if (halt_supported || reboot_supported || suspend_supported || hibernate_supported)
+     {
+       GtkWidget *title, *spacer;
+       GtkWidget *action_vbox, *hbox;
+@@ -466,6 +474,21 @@
+ 	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
+ 	  gtk_widget_show (r);
+ 	}
++
++      if (suspend_supported)
++	{
++	  r = suspend = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("_Suspend the computer"));
++	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
++	  gtk_widget_show (r);
++	}
++
++      if (hibernate_supported)
++	{
++	  r = hibernate = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (r), _("_Hibernate the computer"));
++	  gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
++	  gtk_widget_show (r);
++	}
++
+     }
+ 
+   gsm_center_window_on_screen (GTK_WINDOW (box), screen, monitor);
+@@ -504,6 +527,12 @@
+   if (reboot)
+     reboot_active = GTK_TOGGLE_BUTTON (reboot)->active;
+ 
++  if (suspend)
++    suspend_active = GTK_TOGGLE_BUTTON (suspend)->active;
++
++  if (hibernate)
++    hibernate_active = GTK_TOGGLE_BUTTON (hibernate)->active;
++
+   if (toggle_button)
+     save_active = GTK_TOGGLE_BUTTON (toggle_button)->active;
+ 
+@@ -542,6 +571,16 @@
+ 	logout_action = GDM_LOGOUT_ACTION_SHUTDOWN;
+       else if (reboot_active)
+ 	logout_action = GDM_LOGOUT_ACTION_REBOOT;
++      else if (suspend_active) {
++	logout_action = GDM_LOGOUT_ACTION_SUSPEND;
++	retval = FALSE;
++	break; 
++      }
++      else if (hibernate_active) {
++	logout_action = GDM_LOGOUT_ACTION_HIBERNATE;
++	retval = FALSE;
++	break;
++      }
+       set_default_option (selected_option);
+       retval = TRUE;
+       break;
--- gnome-session-2.22.1.1.orig/debian/patches/22_fix_hang_on_time_setting_main.c.patch
+++ gnome-session-2.22.1.1/debian/patches/22_fix_hang_on_time_setting_main.c.patch
@@ -0,0 +1,13 @@
+Index: gnome-session-2.22.1.1/gnome-session/main.c
+===================================================================
+--- gnome-session-2.22.1.1.orig/gnome-session/main.c	2008-11-27 07:45:02.615477176 +0000
++++ gnome-session-2.22.1.1/gnome-session/main.c	2008-11-27 07:45:24.583682517 +0000
+@@ -313,6 +313,8 @@
+ {
+   if (gsm_check_time ())
+     gsm_check_clock_main_quit ((struct check_clock *) data);
++  else
++    gsm_check_clock_main_quit ((struct check_clock *) data);
+ 
+   g_spawn_close_pid (pid);
+ }
--- gnome-session-2.22.1.1.orig/debian/patches/20_dont_fade_on_ltsp_client.patch
+++ gnome-session-2.22.1.1/debian/patches/20_dont_fade_on_ltsp_client.patch
@@ -0,0 +1,38 @@
+--- a/gnome-session/logout.c	2008-02-14 11:54:33.000000000 +0100
++++ b/gnome-session/logout.c	2008-02-14 11:54:34.000000000 +0100
+@@ -462,7 +462,7 @@
+   grab_xserver = !gdk_screen_is_composited (screen);
+ 
+   /* Only create a managed window if a11y is enabled */
+-  if (iris_effect_enabled)
++  if (iris_effect_enabled && !getenv("LTSP_CLIENT"))
+     {
+       while (1)
+ 	{
+@@ -847,7 +847,7 @@
+   /* Grabbing the Xserver when accessibility is enabled will cause
+    * a hang. See #93103 for details.
+    */
+-  if (iris_effect_enabled)
++  if (iris_effect_enabled && !getenv("LTSP_CLIENT"))
+     {
+       if (grab_xserver)
+         {
+@@ -858,7 +858,7 @@
+ 
+ gtk_widget_show_all (dialog->dialog); 
+ 
+-if (iris_effect_enabled)
++if (iris_effect_enabled && !getenv("LTSP_CLIENT"))
+     {
+       /* Move the grabs to our message box */
+       gdk_pointer_grab (dialog->dialog->window, TRUE, 0, 
+@@ -879,7 +879,7 @@
+   gtk_widget_destroy (dialog->dialog); 
+   gtk_widget_destroy (invisible);
+ 
+-  if (iris_effect_enabled)
++  if (iris_effect_enabled && !getenv("LTSP_CLIENT"))
+     {
+       hide_fadeout_windows ();
+ 
--- gnome-session-2.22.1.1.orig/debian/patches/19_gnome-wm-tweaking.patch
+++ gnome-session-2.22.1.1/debian/patches/19_gnome-wm-tweaking.patch
@@ -0,0 +1,75 @@
+Index: gnome-session-2.22.1/gnome-session/gnome-wm
+===================================================================
+--- gnome-session-2.22.1.orig/gnome-session/gnome-wm	2008-04-09 12:11:25.000000000 +0200
++++ gnome-session-2.22.1/gnome-session/gnome-wm	2008-04-09 12:12:42.000000000 +0200
+@@ -1,7 +1,8 @@
+ #!/bin/sh
+ 
+ # The user can specify his prefered WM by setting the WINDOW_MANAGER
+-# environment variable.
++# environment variable or setting the
++# /desktop/gnome/applications/window_manager/default gconf key.
+ #
+ # If this is not set, we search a list of known windowmanagers and use
+ # the first one that is found in the users's PATH
+@@ -37,6 +38,30 @@
+   esac
+ done
+ 
++# Get previously set window manager in gconf
++if [ ! "$DEFWM" ]; then
++  DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null`
++fi
++
++# special case handling for dapper upgrades (this runs only once after the upgrade)
++if [ -z "$DEFWM" ] && [ -f /var/lib/gnome-session/dapper-upgrade ]; then
++    gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string
++    DEFWM=/usr/bin/metacity
++fi
++
++# If not exist, set to compiz (if available) 
++if [ ! -x "$DEFWM" ]; then
++    if [ -x "/usr/bin/compiz" ]; then
++	gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/compiz --type string
++	DEFWM=/usr/bin/compiz
++    elif [ -x "/usr/bin/metacity" ]; then
++	gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string
++	DEFWM=/usr/bin/metacity
++    else
++	unset DEFWM
++    fi
++fi
++
+ # WINDOW_MANAGER overrides all
+ 
+ if [ -z "$WINDOW_MANAGER" ] ; then
+@@ -75,7 +100,7 @@
+ 
+ if [ -z "$WINDOW_MANAGER" ] ; then
+   echo "WARNING: No window manager can be found."
+-  WINDOW_MANAGER=xterm
++  WINDOW_MANAGER=`readlink /etc/alternatives/x-terminal-emulator 2>/dev/null`
+ fi
+ 
+ # Now create options OPT1, OPT2 and OPT3 based on the windowmanager used
+@@ -117,17 +142,14 @@
+ fi
+ 
+ case `basename $WINDOW_MANAGER` in
+-  compiz)
+-    export LIBGL_ALWAYS_INDIRECT=1
+-    gtk-window-decorator &
+-    OPT3=glib
+-    OPT4=gconf
+-    ;;
+   beryl)
+     emerald &
+     ;;
+ esac
+ 
++# Store the selected WM with gconf
++gconftool-2 -t string -s /desktop/gnome/applications/window_manager/current "$WINDOW_MANAGER"
++
+ exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
+ 
+ echo "ERROR: No window manager could run!"
--- gnome-session-2.22.1.1.orig/gnome-session/gsm-marshal.h
+++ gnome-session-2.22.1.1/gnome-session/gsm-marshal.h
@@ -0,0 +1,30 @@
+
+#ifndef __gsm_marshal_MARSHAL_H__
+#define __gsm_marshal_MARSHAL_H__
+
+#include	<glib-object.h>
+
+G_BEGIN_DECLS
+
+/* NONE:INT,POINTER (./gsm-marshal.list:1) */
+extern void gsm_marshal_VOID__INT_POINTER (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+#define gsm_marshal_NONE__INT_POINTER	gsm_marshal_VOID__INT_POINTER
+
+/* NONE:INT,INT (./gsm-marshal.list:2) */
+extern void gsm_marshal_VOID__INT_INT (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
+#define gsm_marshal_NONE__INT_INT	gsm_marshal_VOID__INT_INT
+
+G_END_DECLS
+
+#endif /* __gsm_marshal_MARSHAL_H__ */
+
--- gnome-session-2.22.1.1.orig/gnome-session/stamp-gsm-marshal.h
+++ gnome-session-2.22.1.1/gnome-session/stamp-gsm-marshal.h
@@ -0,0 +1 @@
+timestamp
--- gnome-session-2.22.1.1.orig/gnome-session/stamp-gsm-typebuiltins.h
+++ gnome-session-2.22.1.1/gnome-session/stamp-gsm-typebuiltins.h
@@ -0,0 +1 @@
+timestamp
--- gnome-session-2.22.1.1.orig/gnome-session/gsm-marshal.c
+++ gnome-session-2.22.1.1/gnome-session/gsm-marshal.c
@@ -0,0 +1,123 @@
+
+#include	<glib-object.h>
+
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* NONE:INT,POINTER (./gsm-marshal.list:1) */
+void
+gsm_marshal_VOID__INT_POINTER (GClosure     *closure,
+                               GValue       *return_value G_GNUC_UNUSED,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint G_GNUC_UNUSED,
+                               gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer     data1,
+                                                  gint         arg_1,
+                                                  gpointer     arg_2,
+                                                  gpointer     data2);
+  register GMarshalFunc_VOID__INT_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_pointer (param_values + 2),
+            data2);
+}
+
+/* NONE:INT,INT (./gsm-marshal.list:2) */
+void
+gsm_marshal_VOID__INT_INT (GClosure     *closure,
+                           GValue       *return_value G_GNUC_UNUSED,
+                           guint         n_param_values,
+                           const GValue *param_values,
+                           gpointer      invocation_hint G_GNUC_UNUSED,
+                           gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer     data1,
+                                              gint         arg_1,
+                                              gint         arg_2,
+                                              gpointer     data2);
+  register GMarshalFunc_VOID__INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
