Changeset 2290

Timestamp:

10/22/07 14:00:12 (6 years ago)

Author:

alanbach-guest

Message:

gdm updates, 2.20.1, Sync'd with Debian

Location:

pkg/main/gdm/trunk/debian

Files:

• README.Debian (modified) (4 diffs)
• Xsession (modified) (3 diffs)
• changelog (modified) (3 diffs)
• compat (added)
• control (modified) (2 diffs)
• control.in (modified) (2 diffs)
• copyright (modified) (1 diff)
• debian-moreblue.shar (modified) (10 diffs)
• docs (modified) (1 diff)
• extract-locales (modified) (1 diff)
• gdm-autologin.pam (modified) (1 diff)
• gdm.8.pod (added)
• gdm.config (added)
• gdm.dirs (added)
• gdm.init (added)
• gdm.install (added)
• gdm.manpages (added)
• gdm.menu (added)
• gdm.pam (modified) (1 diff)
• gdm.postinst (added)
• gdm.postrm (added)
• gdm.prerm (added)
• gdm.templates (added)
• gdmXnestWrapper (added)
• gdmchooser.8.pod (added)
• gdmflexiserver.1.pod (added)
• gdmlogin.8.pod (added)
• init (modified) (1 diff)
• patches/01_parsix_gdmsetup_desktop.patch (modified) (1 diff)
• patches/70_mandatory-relibtoolize.patch (modified) (180 diffs)
• patches/series (added)
• watch (modified) (1 diff)

pkg/main/gdm/trunk/debian/README.Debian

@@ -1 @@
-gdm for Debian
---------------
+GDM for Debian
+==============
+
+"I get ugly fonts"
+------------------
+
+In the past, as a quick workaround, GDM imposed a 96 DPI settings by
+passing "-dpi 96" to the X server on startup.  This is a bad idea has
+there's no reason to override standard DPI detection mechanisms for all
+screens which might or might not be 96 DPI screens.
+
+DPI should be computed automatically based on the information on your
+screen that Xorg gets; ideally, Xorg would get the DPI right, but you
+can help Xorg by configuring it with your exact screen properties.
+  If it's too complicated, you may still get the old behavior by
+setting:
+    [server-Standard]
+    command=/usr/bin/X -dpi 96 -audit 0
+in your gdm.conf.  See the defaults.conf file to see how it's configured
+by default.
+
+
+Face Browser
+------------
 
 If you enable the face browser in /etc/gdm/gdm.conf, gdm will look
@@ -10 +32 @@
 /etc/gdm/gdm.conf
 
+
+Screen Saver
+------------
+
 If you want a screensaver running with the greeter, you should use the
 BackgroundProgram option in /etc/gdm/gdm.conf, or make sure if you start
 a gtk program in the PreSession script, that it is started with the gdm
 userid, and not root
+
+
+Secure System Menu
+------------------
 
 Debian versions 2.4.1.6-1 through 2.8.0.6-2 featured a
@@ -29 +59 @@
 into all the parts of the GNOME desktop that it would now impact.
 
+
+Translation of the Debconf templates
+------------------------------------
+
 A note to translators about the debconf templates -- translations
 should be sent to the xdm package.  I don't use gettext-based
@@ -34 +68 @@
 package, and don't have any that are not shared.
 
- -- Ryan Murray <rmurray@debian.org>, Wed Apr 26 01:32:22 PDT 2006

pkg/main/gdm/trunk/debian/Xsession

@@ -140 +140 @@
 freetemp=`which freetemp 2>/dev/null`
 if [ -n "$freetemp" ] ; then
-        "$freetemp"
+        "$freetemp"
 fi
 
@@ -163 +163 @@
 if [ -n "$GDM_LANG" ]; then
     if [ -n "$LANGUAGE" ]; then
-        if echo "$LANGUAGE" | grep -q -- "^$GDM_LANG"; then
-           :
-        else
-           unset LANGUAGE
-        fi
+        if echo "$LANGUAGE" | grep -q -- "^$GDM_LANG"; then
+           :
+        else
+           unset LANGUAGE
+        fi
     fi
 fi
@@ -192 +192 @@
 
 if [ -n "$zenity" ] ; then
-        "$zenity" --info --text "`gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`"
+        "$zenity" --info --text "`gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`"
 fi
 

pkg/main/gdm/trunk/debian/changelog

@@ -1 @@
-gdm (2.20.0-parsix2) unstable; urgency=low
-
-  * More patches from Ubuntu and Debian 
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 21 Sep 2007 10:39:52 +0000
-
-gdm (2.20.0-parsix1) unstable; urgency=low
+gdm (2.20.1-parsix1) unstable; urgency=low
 
   * New upstream stable release
-  * Regenerated 01_parsix_gdmsetup_desktop.patch
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 21 Sep 2007 06:51:42 +0000
-
-gdm (2.18.4-parsix1) barry; urgency=low
-
-  * New upstream release, No API change
-
- -- Alan Baghumian <alan@technotux.org>  Tue, 31 Jul 2007 20:05:41 +0330
-
-gdm (2.18.3-parsix1) barry; urgency=low
-
-  * New upstream release
-  * Updated 01_parsix_gdmsetup_desktop.patch
-
- -- Alan Baghumian <alan@technotux.org>  Thu, 05 Jul 2007 09:18:46 +0330
-
-gdm (2.18.2-parsix2) barry; urgency=low
-
-  * Updated 01_parsix_gdmsetup_desktop.patch, #29 
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 01 Jun 2007 11:00:54 +0330
-
-gdm (2.18.2-parsix1) barry; urgency=low
-
-  * New upstream release
-
- -- Alan Baghumian <alan@technotux.org>  Tue, 29 May 2007 10:51:16 +0330
-
-gdm (2.18.1-parsix4) barry; urgency=low
-
-  * Reverted Debian patches
-
- -- Alan Baghumian <alan@technotux.org>  Thu, 17 May 2007 18:17:40 +0330
-
-gdm (2.18.1-parsix3) barry; urgency=low
-
-  * Removed broken gdm patch 
-
- -- Alan Baghumian <alan@technotux.org>  Wed, 16 May 2007 10:30:44 +0330
-
-gdm (2.18.1-parsix2) barry; urgency=low
-
-  * Patches sync'd with Debian
-  * Added a nasty hack to fix #25
-
- -- Alan Baghumian <alan@technotux.org>  Tue, 15 May 2007 08:05:57 +0330
-
-gdm (2.18.1-parsix1) barry; urgency=low
-
-  * New upstream release
-
- -- Alan Baghumian <alan@technotux.org>  Mon,  9 Apr 2007 09:25:44 +0330
-
-gdm (2.18.0-parsix1) barry; urgency=low
-
-  * New upstream release 
-
- -- Alan Baghumian <alan@technotux.org>  Fri,  6 Apr 2007 11:49:42 +0330
-
-gdm (2.16.5-parsix3) unstable; urgency=low
-
-  * Updated debian/watch file. 
-
- -- Alan Baghumian <alan@technotux.org>  Fri, 30 Mar 2007 11:37:59 +0330
-
-gdm (2.16.5-parsix2) unstable; urgency=low
-
-  * Fixed running gdmsetup within the GNOME desktop. Bug #10.
-
- -- Alan Baghumian <alan@technotux.org>  Thu,  01 Mar 2007 18:16:43 +0330
-
-gdm (2.16.5-parsix1) unstable; urgency=low
-
+  * Refreshed 70_mandatory-relibtoolize.patch and
+    01_parsix_gdmsetup_desktop.patch
+
+ -- Alan Baghumian <alan@technotux.org>  Mon, 22 Oct 2007 15:19:10 +0330
+
+gdm (2.20.0-2) unstable; urgency=high
+
+  * Re-add bug ids and references to patch 64_vt-auto-allocation-fix.
+  * Clean whitespace in control.
+  * Conflict with fast-user-switch-applet (<< 2.17.4), gnome-session (<<
+    2.19.2), gnome-screensaver (<< 2.17.7) for the GDM socket path transition.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 06 Oct 2007 20:02:06 +0200
+
+gdm (2.20.0-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Pass --system to delgroup and deluser; thanks Vincent Bernat.
+  * Recommend xserver-xorg; closes: #436665.
+
+  [ Josselin Mouette ]
   * New upstream release.
-
- -- Alan Baghumian <alan@technotux.org>  Wed,  31 Jan 2007 08:27:11 +0330
+  * Update build-dependencies.
+  * Refresh patches.
+  * 35_gdm.conf.patch:
+    + Use s2ram as suspend command; suggest uswsusp.
+    + Set UseCirclesInEntry.
+  * 41_config-files.patch: the OLD_CONF part is obsolete.
+  * Drop patches integrated upstream:
+    - 42_timed-login.patch
+    - 48_random-greeter-theme.patch
+    - 51_misc-env-var-fixes.patch
+    - 57_gdm-is-local.patch
+    - 59_standard-x-server-detection.patch
+    - 60_logname-is-log-name-in-PostLogin.patch
+    - 61_gdm-manpage-section.patch
+    - 67_C-locale-fallback.patch
+    - 69_misc-config-typos.patch
+    - 90_from_svn_fix_gdm_restart.patch
+  * 64_vt-auto-allocation-fix.patch: deactivated for now, it seems to
+    "fix" only part of the binaries, and I don't really know why.
+  * Enable secure remote connection; build-depend on zenity.
+  * gdm.install:
+    + Install desktop files in /usr/share/applications.
+    + Install the remote SSH session.
+  * gdm.8.pod, gdmlogin.8.pod: fix encoding.
+  * rules: don't pass ${prefix} to --libexecdir, it keeps as is in some
+    substitutions.
+  * gdm.menu: update to the latest menu policy.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 06 Oct 2007 18:39:23 +0200
+
+gdm (2.18.4-1) unstable; urgency=high
+
+  [ Josselin Mouette ]
+  * 43_gdmphotosetup.desktop.patch: set NoDisplay=true for
+    gdmphotosetup, which duplicates gnome-about-me's functionality.
+
+  [ Loic Minier ]
+  * Stop imposing the DPI settings; this was a quick fix that users may opt to
+    do, but the correct thing to do is to fix the Xorg configuration on these
+    systems or fix the generation of this config; document this in
+    README.Debian; closes: #278026, #339707, #364545.
+
+  [ Kilian Krause ]
+  * Add get-orig-source target.
+
+  [ Loic Minier ]
+  * New upstream stable release.
+    - SECURITY: Fixes denial of service attack where the user can crash the
+      GDM daemon with a carefuly crafted GDM socket command and cause GDM to
+      stop managing future displays; CVE-2007-3381.
+    - Drop patch 91_from-svn_gdm-init-hints-and-af-family-in-..., merged
+      upstream.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 31 Jul 2007 18:34:07 +0200
+
+gdm (2.18.3-4) unstable; urgency=high
+
+  * Update
+    91_from-svn_gdm-init-hints-and-af-family-in-gdm_peek_local_address_list to
+    not set AF_INET6; thanks Ely Levy; GNOME #455190; closes: #432227.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 12 Jul 2007 17:43:04 +0200
+
+gdm (2.18.3-3) unstable; urgency=high
+
+  * New patch,
+    91_from-svn_gdm-init-hints-and-af-family-in-gdm_peek_local_address_list,
+    fixes crash when using IPv6; thanks Ely Levy; GNOME #455190; from
+    SVN r5044; closes: #432227.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 10 Jul 2007 15:48:01 +0200
+
+gdm (2.18.3-2) unstable; urgency=medium
+
+  * Cleanups.
+  * Fix permissions of gdmXnestWrapper; closes: #432153.
+  * Drop dep on debconf which is already added by ${misc:Depends}; thanks
+    Michael Biebl; closes: #431698.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 04 Jul 2007 14:30:53 +0200
+
+gdm (2.18.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gdmXnestWrapper: provide a wrapper script for both nested X servers.
+    + gdm.install: install it.
+    + 56_xnest-wrapper.patch: force its use in configure.ac.
+    + 70_mandatory-relibtoolize.patch: refresh configure.
+    + Stop build-depending on xserver-xephyr.
+  * 35_gdm.conf.patch: set Clearlooks as the default GTK+ theme.
+
+  [ Loic Minier ]
+  * Fix tabs versus spaces in gdm.install.
+
+  [ Josselin Mouette ]
+  * Move the nested servers to Recommends.
+  * Suggest hibernate instead of apmd.
+  * 35_gdm.conf.patch: use hibernate as the default suspend command.
+
+  [ Loic Minier ]
+  * New upstream stable release; bug fix and translation.
+    - Drop patch 58_is-local-check-null, a more complete fix was added
+      upstream; closes: #422483.
+    - Update autotools patch, 70_mandatory-relibtoolize, and update patch
+      header to use automake and aclocal 1.10 instead of 1.9.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 03 Jul 2007 22:06:34 +0200
+
+gdm (2.18.2-1) unstable; urgency=low
+
+  [ Sam Morris ]
+  * Add support for DEB_BUILD_OPTIONS noopt option; closes: #347421.
+
+  [ Loic Minier ]
+  * Pass -Wall to CFLAGS too.
+  * Build-depend on xserver-xephyr; thanks Sven Arvidsson; closes: #422287.
+  * Rework 30_hardcode-standard-x-server and rename to
+    59_standard-x-server-detection; update 70_mandatory-relibtoolize.
+  * Drop patch 43_clearenv-no-lang as it seems useless -- it only removes a
+    function, not calls to this function.
+  * New patch, 58_is-local-check-null, checks for NULL ia in
+    gdm_is_local_addr6() and gdm_is_local_addr()
+  * Drop patch 53_remove-ok-and-cancel-from-included-themes, not needed
+    anymore as the buttons work fine.
+  * Update patch 58_is-local-check-null with an upstream patch from
+    GNOME #436725.
+
+  [ Josselin Mouette ]
+  * 35_gdm.conf.patch: add /etc/dm/Sessions/ to the list of directories
+    to search for X sessions.
+
+  [ Loic Minier ]
+  * New upstream stable release.
+    - Refresh patches 42_timed-login, 50_close-fds, 51_misc-env-var-fixes,
+      61_gdm-manpage-section, 90_from_svn_fix_gdm_restart to apply cleanly.
+    - Drop patches 63_buf-decl, 65_french-translation-typo,
+      68_pam-authinfo-unavail, merged upstream.
+    - Update relibtoolizing patch, 70_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 29 May 2007 10:47:11 +0200
+
+gdm (2.18.1-2) unstable; urgency=low
+
+  * Fix a packaging mistake introduced while refactoring the install which
+    overwrote Debian's /etc/gdm/Xsession with upstream's.
+  * Set GNOME Team as Maintainer.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 03 May 2007 14:42:24 +0200
+
+gdm (2.18.1-1) unstable; urgency=low
+
+  * Adopt package; set myself as Maintainer; thanks Ryan Murray for your
+    maintenance until now!
+  * Ack Porter NMU by Aurélien Jarno; thanks!
+  * GNOME Team uploads.
+    - Use a control.in.
+    - Build-depend on gnome-pkg-tools and include uploaders.mk.
+  * Use the quilt patch system instead of keeping changes in the .diff.gz.
+    - Apply / unapply patches in rules; "patch" is PHONY.
+    - Split the current .diff.gz into 20 patches.
+    - Create a series file with all patches.
+    - Build-depend on quilt.
+    - "make distclean" before unpatching.
+  * New patch, 68_doc-build-add-revnumber, fixes build with newer
+    gnome-doc-utils.
+  * Use full path to gdmsetup in menu file.
+  * Fix "closes:" in 2.2.5.2-1 and 2.13.0.10-1.
+  * Version the debhelper build-dep to >= 4 and set Debhelper compatibility
+    level via debian/compat to 4 instead of via DH_COMPAT in rules.
+  * Depend on "debconf (>= 0.5) | debconf-2.0" instead of the only virtual
+    "debconf-2.0".
+  * Wrap build-deps and deps.
+  * Update copyright file.
+    - Use full download URL.
+    - Include full GPL blob.
+    - List GNOME Team as new maintainer.
+  * Include AUTHORS in docs.
+  * Compute DEB_VERSION, DEB_NOEPOCH_VERSION, and DEB_UPSTREAM_VERSION
+    similarly to CDBS and finally compute MAJOR_MINOR for the GNOME version
+    included in the footer of man pages.
+  * Update watch file to track all stable releases.
+  * Misc cleanups.
+  * Bump up Debhelper compatibility level to 5.
+  * Rework the install / binary-arch targets completely to me more
+    debhelper-ish.
+    - Stop shipping *.a and *.la files for Gtk modules.
+  * Pass --disable-scrollkeeper to configure.
+  * Factorize manpages generation.
+  * Rename various debian/* files to debian/gdm.*.
+  * Add ${misc:Depends}.
+  * Misc updates to debian-moreblue.
+    - Cleanup indentation of this file.
+    - Merge patch by Michael Biebl to properly display wrapped login text;
+      closes: #408043.
+  * Apply update to templates; thanks Christian Perrier; closes: #417981.
+  * Drop postinst upgrade snippet for version <= 2.0-0.beta4.6; upgrades of
+    version before sarge don't have to be supported.
+  * Check for the usability of deluser and delgroup before running these in
+    gdm.postrm.
+  * Start gdm in S30 instead of S21; thanks Sjoerd Simons; closes: #419392.
+  * Rework gdm.postinst to only run version-specific upgrade code during
+    upgrades from these versions and to always run update-rc.d in these cases.
+  * Suggest xserver-xephyr | xnest; closes: #416238.
+  * New patch, 69_misc-config-typos, fixes misc typos in gdm.conf; thanks
+    J S Bygott; closes: #361436.
+  * Configure with --enable-ipv6=yes; GNOME #385451; Ubuntu #75254;
+    closes: #409428.
+  * New upstream releases.
+    - Build-dep on libdbus-glib-1-dev (>= 0.30) for ConsoleKit support.
+    - Refresh patches 30_hardcode-standard-x-server, 41_config-files,
+      42_pam-and-timed-login, 48_random-greeter-theme,
+      53_remove-ok-and-cancel-from-included-themes, 57_gdm-is-local,
+      62_reference-manual-docbook-entity-reference, 64_vt-auto-allocation-fix,
+      67_C-locale-fallback, 68_doc-build-add-revnumber, 69_misc-config-typos.
+    - Drop patches:
+      . 55_hurd-no-pipe-buf, merged upstream.
+      . 68_doc-build-add-revnumber: merged upstream.
+    - Update patches:
+      . 35_gdm.conf: Update reference to System Configuration file.
+      . 45_use-gksu-for-gdmsetup: Update to use the full path to gdmsetup.
+      . 50_close-fds: Update to match upstream changes which closed even more
+        fds than in the past; convert some Debian specific closes to use
+        VE_IGNORE_EINTR() too; leave the upstream code in the source.
+      . 65_french-translation-typo: Update to upstream rewording of this
+        string.
+      . 70_mandatory-relibtoolize: Relibtoolize.
+    - Works with sites using automounting since 2.17.0; GNOME #356869;
+      closes: #365606.
+    - Fixes typo in German translation with 2.18.1; GNOME #421661;
+      closes: #414387.
+    - Fixes incomprehensible Czech translation with 2.18.1; GNOME #421664;
+      closes: #415274.
+    - Fixed language selection issues since 2.17.5; GNOME #384603;
+      closes: #403928.
+  * Drop "--with-tags=" from configure args; libtool should autodetect this
+    properly.
+  * Build-dep on x11proto-core-dev for XDMCP.
+  * Configure with "--with-prefetch=yes"; PreFetchProgram is empty by default
+    in Debian though.
+  * New patch, 90_from_svn_fix_gdm_restart, fixed restarting of gdm when
+    Ctrl-Alt-Backspace is pressed; from SVN; found in the Ubuntu package.
+  * New patch, 37_manpage-binaries, removes mentions of various executables
+    not present in the Debian package; closes: #357988.
+  * New patch, 66_socket-in-var-run-for-fhs, use /var/run for the gdm_socket
+    file to comply with the FHS and to avoid issues with bootclean;
+    Ubuntu #79620; found in the Ubuntu package.
+  * New patch, 55_use-theme-gtkrc, look for gtk-2.0/gtkrc in the theme
+    directory and use it; found in the Ubuntu package.
+  * New patch, 46_kde-substitude-uid, add X-KDE-SubstituteUID=true to the
+    gdmsetup desktop file to hide the entry for non-admin users in KDE.
+  * Disabling patch 66_socket-in-var-run-for-fhs for now as it requires
+    changes in gnome-session, gnome-panel, and fast-switch-user-applet at the
+    same time; thanks Sébastien Bacher.
+  * Split patches:
+    . 42_pam-and-timed-login into 42_timed-login and 68_pam-authinfo-unavail.
+    . 43_clearenv-no-lang-and-buf-decl into 43_clearenv-no-lang and
+      63_buf-decl.
+    . 50_close-fds into 50_close-fds and 51_misc-env-var-fixes.
+  * Add GNOME bug to 66_socket-in-var-run-for-fhs.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 02 May 2007 18:50:19 +0200
+
+gdm (2.16.4-1.1) unstable; urgency=low
+
+  * Porter NMU.
+  * Disable SELinux on non-Linux architectures (Hurd, GNU/kFreeBSD).
+    Fix gui/gdmchoosed.c wrt to PIPE_BUF (patch from upstream) to 
+    support Hurd. (closes: #313008).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 26 Feb 2007 11:51:48 +0100
 
 gdm (2.16.4-1) unstable; urgency=high
@@ -172 +381 @@
     that looks for $HOME/xorg.conf before other files in /etc to look
     at our configfile, and not one that might be in root's homedir.
-    (closes #250438)
+    (closes: #250438)
   * Confirmed that the new version correctly works with utf-8 locales
     (closes: #277953)
@@ -447 +656 @@
   * Only do the password stuff if the gdm user doesn't exist (closes: #119385)
   * add pam_limits to the installed pam file (closes: #118335)
-  * Correct debconf for selection of display managers (closes : #115776)
+  * Correct debconf for selection of display managers (closes: #115776)
   * Add -xkb option to Xnest startup (closes: #111783)
 

pkg/main/gdm/trunk/debian/control

@@ -5 +5 @@
 Uploaders: Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>
 Build-Depends: libpam0g-dev,
-               quilt,
                libdbus-glib-1-dev (>= 0.30),
                libglib2.0-dev (>= 2.8.0),
@@ -26 +25 @@
                libxt-dev,
                libxdmcp-dev,
-               libxcomposite-dev,
-               libxdamage-dev,
                libxinerama-dev,
                libdmx-dev,

pkg/main/gdm/trunk/debian/control.in

@@ -5 +5 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: libpam0g-dev,
-               quilt,
                libdbus-glib-1-dev (>= 0.30),
                libglib2.0-dev (>= 2.8.0),
@@ -27 +26 @@
                libxdmcp-dev,
                libxinerama-dev,
-               libxcomposite-dev,
-               libxdamage-dev,
-               libdmx-dev,
+               libdmx-dev,
                gnome-doc-utils,
                sharutils,

pkg/main/gdm/trunk/debian/copyright

@@ -1 +1 @@
 This package originally Debianised by Steve Haslam <steve@arise.demon.co.uk>,
-10th March 1999. It was maintained by Raphaël Hertzog <hertzog@debian.org>
-until December 1999.  It is now maintained by
-Ryan Murray <rmurray@debian.org>.
+10th March 1999.  It was maintained by Raphaël Hertzog <hertzog@debian.org>
+until December 1999.  It was maintained by Ryan Murray <rmurray@debian.org>
+until May 2007.   It is now maintained by the GNOME Team.
 
 Copyright (C) 1998, 1999 Martin Kasper Petersen <mkp@SunSITE.auc.dk>
 
-Originally obtained from GNOME: ftp.gnome.org
+It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/gdm/>
 
-License: GPL
+License:
 
-On Debian systems, the full text of the GPL can be found at
-/usr/share/common-licenses/GPL
+    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'.

pkg/main/gdm/trunk/debian/debian-moreblue.shar

@@ -4 +4 @@
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 2006-12-14 22:07 PST by <rmurray@ninsei>.
-# Source directory was `/usr/src/debian/gdm/gdm-2.16.4'.
+# Made on 2007-05-01 15:25 CEST by <lool@bee>.
+# Source directory was `/home/lool/svn/debian/pkg-gnome/desktop/unstable/gdm'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -16 +16 @@
 #  90821 -rw-r--r-- debian/debian-moreblue/background.svg
 #  17856 -rw-r--r-- debian/debian-moreblue/boundingbox.png
-#   7254 -rw-r--r-- debian/debian-moreblue/debian-moreblue.xml
+#   7869 -rw-r--r-- debian/debian-moreblue/debian-moreblue.xml
 #  13786 -rw-r--r-- debian/debian-moreblue/screenshot.png
 #   1112 -rw-r--r-- debian/debian-moreblue/userentry.png
@@ -72 +72 @@
 rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
 #
-if mkdir _sh06648; then
+if mkdir _sh09333; then
   $echo 'x -' 'creating lock directory'
 else
@@ -2988 +2988 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
-<!--
-X       Debian MoreBlue GDM Theme
-X       ====================
-X       version 0.5 Dez 2006
-X               
-X       (c) 2006 by Andre Luiz Rodrigues Ferreira
-X       Published under the terms of the GNU General Public License, version 2
+<!-- 
+X    Debian MoreBlue GDM Theme
+X    ====================
+X    version 0.6 may 2006
 X
-X       ChangeLog:
-X       0.5 (Dez/2006)
-X         - Added the icons, fixed the pam-message and moved up the clock.
-X       0.4 (Dez/2006)
-X         - Fixed the pam-message and the pam-error
-X       0.3 (Dez/2006):
-X         - Changed options buttons for use the GDM original strings. Thanks to Sven Arvidsson
-X       0.2 (Dez/2006):
-X         - Fixed Debian Logo and added the clock. Patch by Valessio Brito.
-X       0.1 (Out/2006):
-X        - Initial version
-X                               
--->
+X    (c) 2006 by Andre Luiz Rodrigues Ferreira
+X    Published under the terms of the GNU General Public License, version 2
+X
+X    ChangeLog:
+X    0.6 (May/2007)
+X      - Debian #408043; merge patch by Michael Biebl to properly display
+X        wrapped login text
+X      - Cleanup indentation of this file
+X    0.5 (Dec/2006)
+X      - Added the icons, fixed the pam-message and moved up the clock.
+X    0.4 (Dec/2006)
+X      - Fixed the pam-message and the pam-error
+X    0.3 (Dec/2006):
+X      - Changed options buttons for use the GDM original strings. Thanks to
+X        Sven Arvidsson
+X    0.2 (Dec/2006):
+X      - Fixed Debian Logo and added the clock. Patch by Valessio Brito.
+X    0.1 (Oct/2006):
+X     - Initial version
+X -->
 <greeter>
 X    <!-- background -->
@@ -3031 +3035 @@
 X    <item type="pixmap">
 X        <normal file="boundingbox.png"/>
-X               <pos x="50%" y="50%" width="400" height="282" anchor="c"/>
-X    </item> 
+X        <pos x="50%" y="50%" width="400" height="282" anchor="c"/>
+X    </item>
 X  <item type="rect">
 X    <normal/>
@@ -3043 +3047 @@
 X          <item type="rect" id="language_button" button="true">
 X            <normal />
-X           <pos y="50%" anchor="w" width="box" height="box"/>
+X        <pos y="50%" anchor="w" width="box" height="box"/>
 X            <box orientation="horizontal" spacing="10" xpadding="10">
-X             <item type="pixmap">
-X               <normal file="icon-language.png" tint="#dddddd"/>
-X               <prelight file="icon-language.png"/>
-X               <active file="icon-language.png" tint="#bbbbbb" />
-X               <pos y="50%" anchor="w"/>
-X             </item>
-X             <item type="label">
-X               <normal color="#FFFFFF" font="Sans Bold 12"/>
-X               <prelight color="#BBBBBB" font="Sans Bold 12"/>
-X               <active color="#bbbbbb" font="Sans Bold 12"/>
-X               <pos y="50%" anchor="w"/>       
-X               <stock type="language" />
-X             </item>
+X          <item type="pixmap">
+X            <normal file="icon-language.png" tint="#dddddd"/>
+X            <prelight file="icon-language.png"/>
+X            <active file="icon-language.png" tint="#bbbbbb" />
+X            <pos y="50%" anchor="w"/>
+X          </item>
+X          <item type="label">
+X            <normal color="#FFFFFF" font="Sans Bold 12"/>
+X        <prelight color="#BBBBBB" font="Sans Bold 12"/>
+X        <active color="#bbbbbb" font="Sans Bold 12"/>
+X            <pos y="50%" anchor="w"/>
+X        <stock type="language" />
+X          </item>
 X            </box>
 X          </item>
 X          <item type="rect" id="session_button" button="true">
 X            <normal />
-X           <pos y="50%" anchor="w" width="box" height="box"/>
+X        <pos y="50%" anchor="w" width="box" height="box"/>
 X            <box orientation="horizontal" spacing="10" xpadding="10">
-X             <item type="pixmap">
-X               <normal file="icon-session.png" tint="#dddddd"/>
-X               <prelight file="icon-session.png"/>
-X               <active file="icon-session.png" tint="#bbbbbb"/>
-X               <pos y="50%" anchor="w"/>
-X             </item>
-X             <item type="label">
-X               <normal color="#FFFFFF" font="Sans Bold 12"/>
-X               <prelight color="#BBBBBB" font="Sans Bold 12"/>
-X               <active color="#bbbbbb" font="Sans Bold 12"/>
-X               <pos y="50%" anchor="w"/>
-X               <stock type="session" />
-X             </item>
+X          <item type="pixmap">
+X            <normal file="icon-session.png" tint="#dddddd"/>
+X            <prelight file="icon-session.png"/>
+X            <active file="icon-session.png" tint="#bbbbbb"/>
+X            <pos y="50%" anchor="w"/>
+X          </item>
+X          <item type="label">
+X            <normal color="#FFFFFF" font="Sans Bold 12"/>
+X        <prelight color="#BBBBBB" font="Sans Bold 12"/>
+X        <active color="#bbbbbb" font="Sans Bold 12"/>
+X            <pos y="50%" anchor="w"/>
+X        <stock type="session" />
+X          </item>
 X            </box>
 X          </item>
 X          <item type="rect" id="system_button" button="true">
 X            <normal />
-X           <show modes="console" type="system"/>
-X           <pos y="50%" anchor="w" width="box" height="box"/>
+X        <show modes="console" type="system"/>
+X        <pos y="50%" anchor="w" width="box" height="box"/>
 X            <box orientation="horizontal" spacing="10" xpadding="10">
-X             <item type="pixmap">
-X               <normal file="icon-reboot.png" tint="#dddddd"/>
-X               <prelight file="icon-reboot.png"/>
-X               <active file="icon-reboot.png" tint="#bbbbbb"/>
-X               <pos y="50%" anchor="w"/>
-X             </item>
-X             <item type="label">
-X               <normal color="#FFFFFF" font="Sans Bold 12"/>
-X               <prelight color="#BBBBBB" font="Sans Bold 12"/>
-X               <active color="#bbbbbb" font="Sans Bold 12"/>
-X               <pos y="50%" anchor="w"/>
-X               <stock type="system"/>
-X             </item>
+X          <item type="pixmap">
+X            <normal file="icon-reboot.png" tint="#dddddd"/>
+X            <prelight file="icon-reboot.png"/>
+X            <active file="icon-reboot.png" tint="#bbbbbb"/>
+X            <pos y="50%" anchor="w"/>
+X          </item>
+X          <item type="label">
+X            <normal color="#FFFFFF" font="Sans Bold 12"/>
+X        <prelight color="#BBBBBB" font="Sans Bold 12"/>
+X        <active color="#bbbbbb" font="Sans Bold 12"/>
+X            <pos y="50%" anchor="w"/>
+X        <stock type="system"/>
+X          </item>
 X            </box>
 X          </item>
 X          <item type="rect" id="disconnect_button" button="true">
 X            <normal />
-X           <show modes="flexi,remote"/>
-X           <pos y="50%" anchor="w" width="box" height="box"/>
+X        <show modes="flexi,remote"/>
+X        <pos y="50%" anchor="w" width="box" height="box"/>
 X            <box orientation="horizontal" spacing="10" xpadding="10">
-X             <item type="pixmap">
-X               <normal file="icon-shutdown.png" tint="#dddddd"/>
-X               <prelight file="icon-shutdown.png"/>
-X               <active file="icon-shutdown.png" tint="#bbbbbb"/>
-X               <pos y="50%" anchor="w"/>
-X             </item>
-X             <item type="label">
-X               <normal color="#FFFFFF" font="Sans Bold 12"/>
-X               <prelight color="#666666" font="Sans Bold 12"/>
-X               <active color="#bbbbbb" font="Sans Bold 12"/>
-X               <pos y="50%" anchor="w"/>
-X               <stock type="disconnect"/>
-X               <show modes="remote"/>
-X             </item>
-X             <item type="label">
-X               <normal color="#FFFFFF" font="Sans Bold 12"/>
-X               <prelight color="#BBBBBB" font="Sans Bold 12"/>
-X               <active color="#bbbbbb" font="Sans Bold 12"/>
-X               <pos y="50%" anchor="w"/>
-X               <stock type="quit"/>
-X               <show modes="flexi"/>
-X             </item>
+X          <item type="pixmap">
+X            <normal file="icon-shutdown.png" tint="#dddddd"/>
+X            <prelight file="icon-shutdown.png"/>
+X            <active file="icon-shutdown.png" tint="#bbbbbb"/>
+X            <pos y="50%" anchor="w"/>
+X          </item>
+X          <item type="label">
+X            <normal color="#FFFFFF" font="Sans Bold 12"/>
+X        <prelight color="#666666" font="Sans Bold 12"/>
+X        <active color="#bbbbbb" font="Sans Bold 12"/>
+X            <pos y="50%" anchor="w"/>
+X            <stock type="disconnect"/>
+X        <show modes="remote"/>
+X          </item>
+X          <item type="label">
+X            <normal color="#FFFFFF" font="Sans Bold 12"/>
+X        <prelight color="#BBBBBB" font="Sans Bold 12"/>
+X        <active color="#bbbbbb" font="Sans Bold 12"/>
+X            <pos y="50%" anchor="w"/>
+X            <stock type="quit"/>
+X        <show modes="flexi"/>
+X          </item>
 X            </box>
 X          </item>
@@ -3151 +3155 @@
 X                <stock type="username-label"/>
 X            </item>
-X          <item type="label" id="pam-message">
+X       <item type="label" id="pam-message">
 X            <pos anchor="c" x="50%" y="130"/>
-X                   <normal color="#000000" font="Sans 12"/>
-X                   <text></text>
-X           </item>
-X                                 
+X                <normal color="#000000" font="Sans 11"/>
+X                <text></text>
+X        </item>
+X
 X            <!-- user-pw-entry background pixmap -->
 X            <item type="pixmap">
-X                <pos x="90" y="125" width="300" height="40"/>
+X                <pos x="90" y="135" width="300" height="40"/>
 X                <normal file="userentry.png"/>
 X            </item>
-X            
+X
 X            <!-- user-pw-entry -->
 X            <item type="entry" id="user-pw-entry">
-X                <pos x="100" y="95" width="280" height="20"/>
+X                <pos x="100" y="105" width="280" height="20"/>
 X                <normal font="Sans 12" color="#444444"/>
 X            </item>
@@ -3171 +3175 @@
 X    </item>
 X
-X       <!-- caps-lock-warning -->
-X       <item type="rect" id="caps-lock-warning">
-X               <normal color="#ffffff" alpha="0.2"/>
-X               <pos x="0" y="0" width="100%" height="box" anchor="nw"/>
-X               <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
-X                       <item type="label">
-X                               <normal color="#000000" font="Sans 12"/>
-X                               <pos x="50%" y="50%" anchor="c"/>
-X                               <stock type="caps-lock-warning"/>
-X                       </item>
-X               </box>
+X    <!-- caps-lock-warning -->
+X    <item type="rect" id="caps-lock-warning">
+X        <normal color="#ffffff" alpha="0.2"/>
+X        <pos x="0" y="0" width="100%" height="box" anchor="nw"/>
+X        <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
+X            <item type="label">
+X                <normal color="#000000" font="Sans 12"/>
+X                <pos x="50%" y="50%" anchor="c"/>
+X                <stock type="caps-lock-warning"/>
+X            </item>
+X        </box>
 X    </item>
 X
-X       <!-- pam-error (login failure etc.) -->
-X       <item type="rect" id="pam-error">
-X               <pos x="0" y="90%" width="100%" height="box" anchor="sw"/>
-X               <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
-X                       <item type="label" id="pam-error">
-X                               <normal color="#FFFFFF" font="Sans 12"/>
-X                               <pos x="50%" y="50%" anchor="c"/>
-X                       <text></text>
-X                       </item>
-X               </box>
+X    <!-- pam-error (login failure etc.) -->
+X    <item type="rect" id="pam-error">
+X        <pos x="0" y="90%" width="100%" height="box" anchor="sw"/>
+X        <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
+X            <item type="label" id="pam-error">
+X                <normal color="#FFFFFF" font="Sans 12"/>
+X                <pos x="50%" y="50%" anchor="c"/>
+X            <text></text>
+X            </item>
+X        </box>
 X    </item>
 X
 </greeter>
 SHAR_EOF
-  (set 20 06 12 11 11 00 18 'debian/debian-moreblue/debian-moreblue.xml'; eval "$shar_touch") &&
+  (set 20 07 05 01 15 25 18 'debian/debian-moreblue/debian-moreblue.xml'; eval "$shar_touch") &&
   chmod 0644 'debian/debian-moreblue/debian-moreblue.xml' ||
   $echo 'restore of' 'debian/debian-moreblue/debian-moreblue.xml' 'failed'
@@ -3205 +3209 @@
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'debian/debian-moreblue/debian-moreblue.xml:' 'MD5 check failed'
-18462d026c5c18c64d4c5d19478aac67  debian/debian-moreblue/debian-moreblue.xml
+a598bb4f9b5e926e6c8956a9ce10afa1  debian/debian-moreblue/debian-moreblue.xml
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'debian/debian-moreblue/debian-moreblue.xml'`"
-    test 7254 -eq "$shar_count" ||
-    $echo 'debian/debian-moreblue/debian-moreblue.xml:' 'original size' '7254,' 'current size' "$shar_count!"
+    test 7869 -eq "$shar_count" ||
+    $echo 'debian/debian-moreblue/debian-moreblue.xml:' 'original size' '7869,' 'current size' "$shar_count!"
   fi
 fi
@@ -3776 +3780 @@
   fi
 fi
-rm -fr _sh06648
+rm -fr _sh09333
 exit 0

pkg/main/gdm/trunk/debian/docs

@@ +1 @@
+AUTHORS
 NEWS
 README

pkg/main/gdm/trunk/debian/extract-locales

@@ -11 +11 @@
 chdir("/usr/share/i18n/locales") or die "can't find /usr/share/i18n/locales";
 while (<>) {
-        my $language;
-        my $territory;
-        chomp;
-        @line = split / /;
-        ($file = $line[0]) =~ s/\..*$//;
-        open F, $file or die "can't open $file\n";
-        while (<F>) {
-                chomp;
-                $title = $1 if /^title\s+"(.*)"/;
-                $language = $1 if /^language\s+"(.*)"/;
-                $territory = $1 if /^territory\s+"(.*)"/;
-                last if /^END LC_IDENTIFICATION/;
-        }
-        close F;
+        my $language;
+        my $territory;
+        chomp;
+        @line = split / /;
+        ($file = $line[0]) =~ s/\..*$//;
+        open F, $file or die "can't open $file\n";
+        while (<F>) {
+                chomp;
+                $title = $1 if /^title\s+"(.*)"/;
+                $language = $1 if /^language\s+"(.*)"/;
+                $territory = $1 if /^territory\s+"(.*)"/;
+                last if /^END LC_IDENTIFICATION/;
+        }
+        close F;
 
-        if ($always_charset and $line[1] and $line[0] =~ s/(\@.*)$//) {
-                my $suffix = $1;
-                $line[1] =~ s/$/$suffix/;
-        }
+        if ($always_charset and $line[1] and $line[0] =~ s/(\@.*)$//) {
+                my $suffix = $1;
+                $line[1] =~ s/$/$suffix/;
+        }
 
-        $language =~ s/ /_/g;
-        $territory =~ s/ /_/g;
-        if (!$always_charset or $line[0] =~ /\./) {
-                print "$language($territory)\t$line[0]\n";
-        } else {
-                print "$language($territory)\t$line[0].$line[1]\n";
-        }
+        $language =~ s/ /_/g;
+        $territory =~ s/ /_/g;
+        if (!$always_charset or $line[0] =~ /\./) {
+                print "$language($territory)\t$line[0]\n";
+        } else {
+                print "$language($territory)\t$line[0].$line[1]\n";
+        }
 }

pkg/main/gdm/trunk/debian/gdm-autologin.pam

@@ -1 +1 @@
 #%PAM-1.0
-auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
-auth    required        pam_permit.so
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+auth    required        pam_permit.so
 @include common-account
-session required        pam_limits.so
+session required        pam_limits.so
 @include common-session
 @include common-password

pkg/main/gdm/trunk/debian/gdm.pam

@@ -1 +1 @@
 #%PAM-1.0
-auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
 @include common-account
-session required        pam_limits.so
+session required        pam_limits.so
 @include common-session
 @include common-password

pkg/main/gdm/trunk/debian/init

@@ -35 +35 @@
 case "$1" in
   start)
-        exec /usr/bin/esd -nobeeps &
         if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)" != "$DEBCONF_DAEMON" ]; then
                 log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"

pkg/main/gdm/trunk/debian/patches/01_parsix_gdmsetup_desktop.patch

@@ -1 @@
-diff -urpN gdm-2.20.0/gui/gdmsetup.desktop gdm-2.20.0.new/gui/gdmsetup.desktop
---- gdm-2.20.0/gui/gdmsetup.desktop     2007-09-17 14:56:35.000000000 +0000
-+++ gdm-2.20.0.new/gui/gdmsetup.desktop 2007-09-21 06:50:26.000000000 +0000
-@@ -107,8 +107,8 @@ Comment[th]=àž›àž£àž±àžšà¹àž•à¹ˆàž‡àž£à
- Comment[uk]=НалаштПвуваММя зПвМішМьПгП вОгляЎу та пПвеЎіМкО екраМу вÑ
-ПЎу у сОстеЌу GDM
+diff -urpN gdm-2.20.1/gui/gdmsetup.desktop gdm-2.20.1.new/gui/gdmsetup.desktop
+--- gdm-2.20.1/gui/gdmsetup.desktop     2007-10-16 01:27:56.000000000 +0330
++++ gdm-2.20.1.new/gui/gdmsetup.desktop 2007-10-22 14:50:49.000000000 +0330
+@@ -110,7 +110,7 @@ Comment[uk]=НалаштПвуваММя
  Comment[vi]=Cấu hình diện mạo và ứng xử của cửa sổ đăng nhập GDM
  Comment[zh_CN]=é
 çœ® GDM 登圕窗口的倖观和行䞺
--TryExec=/usr/local/sbin/gdmsetup
--Exec=/usr/local/sbin/gdmsetup
-+TryExec=/usr/sbin/gdmsetup
+ TryExec=/usr/sbin/gdmsetup
+-Exec=/usr/sbin/gdmsetup
 +Exec=gksu "sudo /usr/sbin/gdmsetup"
  Icon=gdm-setup
  StartupNotify=true
  Terminal=false
-diff -urpN gdm-2.20.0/gui/gdmsetup.desktop.in.in gdm-2.20.0.new/gui/gdmsetup.desktop.in.in
---- gdm-2.20.0/gui/gdmsetup.desktop.in.in       2007-09-17 14:45:38.000000000 +0000
-+++ gdm-2.20.0.new/gui/gdmsetup.desktop.in.in   2007-09-21 06:50:41.000000000 +0000
+diff -urpN gdm-2.20.1/gui/gdmsetup.desktop.in.in gdm-2.20.1.new/gui/gdmsetup.desktop.in.in
+--- gdm-2.20.1/gui/gdmsetup.desktop.in.in       2007-10-16 01:12:40.000000000 +0330
++++ gdm-2.20.1.new/gui/gdmsetup.desktop.in.in   2007-10-22 14:51:02.000000000 +0330
 @@ -2,8 +2,8 @@
  Encoding=UTF-8

pkg/main/gdm/trunk/debian/patches/70_mandatory-relibtoolize.patch

@@ -1 @@
-Typical relibtoolizing; mandatory due to changes in configure.ac and some
-Makefile.am.
-
-libtoolize --force --copy
-aclocal-1.10 -I m4
-autoconf
-automake-1.10
-rm -rf autom4te.cache
-
-diff -Nur gdm-2.20.0/aclocal.m4 gdm-2.20.0.new/aclocal.m4
---- gdm-2.20.0/aclocal.m4       2007-09-17 16:47:58.000000000 +0200
-+++ gdm-2.20.0.new/aclocal.m4   2007-09-18 21:31:22.000000000 +0200
-@@ -16,1907 +16,2534 @@
+diff -urpN gdm-2.20.1/aclocal.m4 gdm-2.20.1.new/aclocal.m4
+--- gdm-2.20.1/aclocal.m4       2007-10-16 01:25:30.000000000 +0330
++++ gdm-2.20.1.new/aclocal.m4   2007-10-22 15:07:37.000000000 +0330
+@@ -16,184 +16,618 @@ m4_if(m4_PACKAGE_VERSION, [2.61],,
  You have another version of autoconf.  If you want to use that,
  you should regenerate the build system entirely.], [63])])
@@ -553 +544 @@
 -    ;;
 -  esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 +# -------------------------------
@@ -570 +560 @@
 +else
 +  localedir=`eval echo "${datadir}/locale"`
- fi
++fi
 +prefix="$glib_save_prefix"
 +exec_prefix="$glib_save_exec_prefix"
@@ -577 +567 @@
 +  [Define the location where the catalogs will be installed])
 +])
- 
--_LT_CC_BASENAME([$compiler])
++
 +dnl
 +dnl Now the definitions that aclocal will find
@@ -586 +575 @@
 +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 +])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
--  fi
--  ;;
--esac
++
 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
 +# 
@@ -610 +591 @@
 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 +fi])
- 
--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
-+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 ******************************
- 
--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
-+    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])"])
- 
--# Use C for the default configuration in the libtool script
--tagname=
--AC_LIBTOOL_LANG_C_CONFIG
--_LT_AC_TAGCONFIG
--])# AC_LIBTOOL_SETUP
-+    warnCFLAGS=
-+    if test "x$GCC" != xyes; then
-+       enable_compile_warnings=no
-+    fi
- 
-+    warning_flags=
-+    realsave_CFLAGS="$CFLAGS"
- 
--# _LT_AC_SYS_COMPILER
--# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
-+    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)
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+    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 no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+    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)
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_AC_SYS_COMPILER
-+    WARN_CFLAGS="$warning_flags $complCFLAGS"
-+    AC_SUBST(WARN_CFLAGS)
-+])
- 
-+dnl For C++, do basically the same thing.
- 
--# _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_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])"])
- 
-+  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
- 
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# 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
-+      ## -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)
- 
-+   AC_ARG_ENABLE(iso-cxx,
-+                 AC_HELP_STRING([--enable-iso-cxx],
-+                                [Try to warn if code is not ISO C++ ]),,
-+                 [enable_iso_cxx=no])
- 
--# _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_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)
- 
--# _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; }
--}'`
--# 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
-+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+  AC_SUBST(WARN_CXXFLAGS)
-+])
- 
++
++
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# _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
-+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
- 
- 
--# _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}
++
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++
++
 +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 +# -----------------------------------------------------------
@@ -866 +606 @@
 +                [m4_ifdef([AC_PROVIDE_$1],
 +                          [$2], [$3])])])
- 
--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!
--  :
--else
--  # Restart under the correct shell.
--  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
++
++
 +# AC_PROG_LIBTOOL
 +# ---------------
@@ -903 +623 @@
 +    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
 +])])
- 
--if test "X[$]1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<EOF
--[$]*
--EOF
--  exit 0
--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
@@ -929 +641 @@
 +               defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
 +])])# AC_PROG_LIBTOOL
- 
--# 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
--  done
--fi
++
++
 +# _AC_PROG_LIBTOOL
 +# ----------------
@@ -954 +650 @@
 +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
 +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
- 
--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.
++
 +# This can be used to rebuild libtool when needed
 +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--  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"
++
 +# Always use our own libtool.
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +AC_SUBST(LIBTOOL)dnl
- 
--  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=:
++
 +# Prevent multiple expansion
 +define([AC_PROG_LIBTOOL], [])
 +])# _AC_PROG_LIBTOOL
- 
--       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
--      fi
--    fi
--  fi
--fi
--fi
++
++
 +# AC_LIBTOOL_SETUP
 +# ----------------
@@ -1062 +676 @@
 +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 +AC_REQUIRE([AC_PROG_NM])dnl
- 
--# 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_REQUIRE([AC_PROG_LN_S])dnl
 +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
@@ -1075 +683 @@
 +AC_REQUIRE([AC_EXEEXT])dnl
 +dnl
- 
--AC_SUBST(ECHO)
--])])# _LT_AC_PROG_ECHO_BACKSLASH
++
 +AC_LIBTOOL_SYS_MAX_CMD_LEN
 +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 +AC_LIBTOOL_OBJDIR
- 
++
 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 +_LT_AC_PROG_ECHO_BACKSLASH
- 
--# _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
++
 +case $host_os in
 +aix3*)
@@ -1103 +702 @@
 +  ;;
 +esac
- 
--# 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*
--  ;;
++
 +# 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']
- 
--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*
--  ;;
++
 +# Same as above, but do not quote variable references.
 +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
- 
--*-*-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" ;;
--      *)    LD="${LD-ld} -64" ;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
++
 +# Sed substitution to delay expansion of an escaped shell variable in a
 +# double_quote_subst'ed string.
 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
--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
++
 +# Sed substitution to avoid accidental globbing in evaled expressions
 +no_glob_subst='s/\*/\\\*/g'
- 
--need_locks="$enable_libtool_lock"
++
 +# Constants:
 +rm="rm -f"
- 
--])# _LT_AC_LOCK
++
 +# Global variables:
 +default_ofile=libtool
 +can_build_shared=yes
- 
++
 +# All known linkers require a `.a' archive for static linking (except MSVC,
 +# which needs '.lib').
@@ -1261 +731 @@
 +ofile="$default_ofile"
 +with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
--# 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*
--])
++
 +AC_CHECK_TOOL(AR, ar, false)
 +AC_CHECK_TOOL(RANLIB, ranlib, :)
 +AC_CHECK_TOOL(STRIP, strip, :)
- 
--if test x"[$]$2" = xyes; then
--    ifelse([$5], , :, [$5])
--else
--    ifelse([$6], , :, [$6])
--fi
--])# AC_LIBTOOL_COMPILER_OPTION
++
 +old_CC="$CC"
 +old_CFLAGS="$CFLAGS"
- 
++
 +# Set sane defaults for various variables
 +test -z "$AR" && AR=ar
@@ -1328 +756 @@
 +test -z "$STRIP" && STRIP=:
 +test -z "$ac_objext" && ac_objext=o
- 
--# 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"
--])
++
 +# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
 +old_postinstall_cmds='chmod 644 $oldlib'
 +old_postuninstall_cmds=
- 
--if test x"[$]$2" = xyes; then
--    ifelse([$4], , :, [$4])
--else
--    ifelse([$5], , :, [$5])
++
 +if test -n "$RANLIB"; then
 +  case $host_os in
@@ -1375 +771 @@
 +    ;;
 +  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
--])# AC_LIBTOOL_LINKER_OPTION
- 
-+_LT_CC_BASENAME([$compiler])
- 
--# 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"
-+# 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
- 
--  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
--    ;;
-+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)
- 
--  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;
--    ;;
-+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
- 
--  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;
--    ;;
-+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
- 
--  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;
--    ;;
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
- 
--  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
--    ;;
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
- 
--  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`
--    ;;
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# 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
-+
-+
-+# _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 -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
- 
- 
--# _LT_AC_CHECK_DLFCN
--# ------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)dnl
--])# _LT_AC_CHECK_DLFCN
-+# _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
- 
- 
--# _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"
-+# _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 conftest*
-+])# _LT_LINKER_BOILERPLATE
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
- 
--#include <stdio.h>
-+# _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
- 
--#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_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
- 
--#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;
-+# _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}
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
--  else
--    puts (dlerror ());
-+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
- 
--    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
--
--
--# 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
-+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
--  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
--    ;;
--
--  mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
--
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--   ;;
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+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
--    ])
--   ;;
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+[$]*
-+EOF
-+  exit 0
-+fi
- 
--  *)
--    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
-+# 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 "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
-+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
- 
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+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.
- 
--    save_LDFLAGS="$LDFLAGS"
--    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+  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"
- 
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
-+  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_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)
--    ])
-+       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 "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)
--      ])
-+       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
-+fi
-+fi
- 
--    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
--
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
-+# 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_LIBTOOL_DLOPEN_SELF
- 
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
- 
--# 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"
-+# _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*
-+  ;;
-+*-*-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*
-+  ;;
-+
-+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*
-+  ;;
-+
-+*-*-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" ;;
-+      *)    LD="${LD-ld} -64" ;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+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
-+
-+need_locks="$enable_libtool_lock"
-+
-+])# _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>out/conftest.err)
-+   (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
--   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   cat 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
-+   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
--     $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
-+     # 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
--   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_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
-+if test x"[$]$2" = xyes; then
-+    ifelse([$5], , :, [$5])
- else
--  need_locks=no
-+    ifelse([$6], , :, [$6])
- fi
--])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+])# AC_LIBTOOL_COMPILER_OPTION
- 
- 
--# 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
-+# 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 conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$4], , :, [$4])
- else
--  # MS-DOS does not allow filenames that begin with a dot.
--  lt_cv_objdir=_libs
-+    ifelse([$5], , :, [$5])
- fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--])# AC_LIBTOOL_OBJDIR
-+])# AC_LIBTOOL_LINKER_OPTION
- 
- 
--# 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_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"
- 
--  # 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)])
-+  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
-+    ;;
- 
--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
-+  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;
-+    ;;
- 
-+  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;
-+    ;;
- 
--# 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])
-+  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;
-     ;;
--  esac
--fi
--])# AC_LIBTOOL_SYS_LIB_STRIP
- 
-+  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`
-+    ;;
- 
--# 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
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  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
-+    ;;
-+  *)
-+    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
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+  AC_MSG_RESULT(none)
- fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
-+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
- 
--# 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
-+# _LT_AC_CHECK_DLFCN
-+# ------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)dnl
-+])# _LT_AC_CHECK_DLFCN
- 
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
- 
--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
--      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
--  ;;
-+# _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"
- 
--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'
--  ;;
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
-+#include <stdio.h>
- 
--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
--  ;;
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL          RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL                DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL                0
-+#  endif
-+#endif
- 
--cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
-+/* 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
- 
--  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
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
- 
--    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}'
--      ;;
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+    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
-+
-+
-+# 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
-     ;;
- 
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  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
-+    ])
-+   ;;
-+
-   *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    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
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
- 
--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"`
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-   else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+    enable_dlopen=no
-   fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
- 
--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
--  ;;
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+@@ -1402,18 +1836,6 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
  
 -kfreebsd*-gnu)
@@ -2811 +789 @@
 -  dynamic_linker='GNU ld.so'
 -  ;;
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--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
--  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
--    ;;
--  freebsd*) # from 4.6 on
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--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
--  ;;
-+    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)
-+    ])
- 
--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"
-+    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
--    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'
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-     ;;
-   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=
--    ;;
--  *)
--    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
--    ;;
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-   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
--  ;;
-+  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
- 
--# This must be Linux ELF.
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -1569,7 +1991,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # 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
- 
--  # 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 /usr/lib $lt_ld_extra"
--  fi
-+# 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
- 
--  # 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_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
- 
--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'
--  ;;
- 
--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_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
- 
--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
--  ;;
-+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
- 
--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
--  ;;
- 
--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.
-+# 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_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)])
-+
-+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_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
--    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
--    *)                         need_version=no  ;;
-+   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
--  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
-+fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+# 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
--    shlibpath_overrides_runpath=yes
-+    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])
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
--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'
-+# 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
--  ;;
- 
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-   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"
-   ;;
- 
--solaris*)
-+aix4* | aix5*)
++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'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
-   hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--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
-+  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
-+      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
--  need_version=yes
+@@ -1598,7 +2020,7 @@ linux*)
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
--sysv4 | sysv4.3*)
--  version_type=linux
-+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
-+  ;;
-+
-+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
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_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
-+
-+  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"
-       ;;
--    siemens)
--      need_lib_prefix=no
-+    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
-       ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+    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
-+    ;;
-+
-+  *)
-+    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
-   ;;
- 
--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
-+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'
-   ;;
- 
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  version_type=freebsd-elf
-+dgux*)
-+  version_type=linux
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
    need_lib_prefix=no
    need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1607,7 +2029,7 @@ knetbsd*-gnu)
    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
-+  ;;
-+
-+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
--    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"
--       ;;
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-     esac
-   fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
-+  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
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
    ;;
  
--uts4*)
-+gnu*)
-   version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  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
-   ;;
- 
--*)
--  dynamic_linker=no
--  ;;
--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
--
--
--# _LT_AC_TAGCONFIG
--# ----------------
--AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
--    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
--        [include additional configurations @<:@automatic@:>@])],
--    [tagnames="$withval"])
--
--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])
-+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
--      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-     fi
--  fi
--  if test -z "$LTCFLAGS"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
--  fi
--
--  # 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'`
-+    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_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])
--       ;;
-+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
-+  ;;
- 
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
--    fi
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
-+# 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
- 
--      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
--       ;;
-+  # 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
- 
--      F77)
--       if test -n "$F77" && test "X$F77" != "Xno"; then
--         AC_LIBTOOL_LANG_F77_CONFIG
--       else
--         tagname=""
--       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'
-+  ;;
- 
--      GCJ)
--       if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--         AC_LIBTOOL_LANG_GCJ_CONFIG
--       else
--         tagname=""
--       fi
--       ;;
-+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'
-+  ;;
- 
--      RC)
--       AC_LIBTOOL_LANG_RC_CONFIG
--       ;;
-+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
-+  ;;
-+
-+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
-+  ;;
-+
-+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
-+  ;;
- 
-+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
-+       ;;
-       *)
--       AC_MSG_ERROR([Unsupported tag name: $tagname])
-+       shlibpath_overrides_runpath=yes
-        ;;
-       esac
--
--      # 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.])
-+    shlibpath_overrides_runpath=yes
-   fi
--fi
--])# _LT_AC_TAGCONFIG
-+  ;;
- 
-+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
-+  ;;
- 
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
-+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"
-+  ;;
- 
-+rdos*)
-+  dynamic_linker=no
-+  ;;
- 
--# 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
-+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'
-+  ;;
- 
-+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
-+  ;;
- 
--# AC_ENABLE_SHARED([DEFAULT])
--# ---------------------------
--# implement the --enable-shared flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `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
-+  ;;
-+
-+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'
-+  ;;
-+
-+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
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+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
-+
-+
-+# _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"])
-+
-+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='`"
-+  fi
-+
-+  # 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
-+
-+    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
-+
-+      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
-+       ;;
-+
-+      F77)
-+       if test -n "$F77" && test "X$F77" != "Xno"; then
-+         AC_LIBTOOL_LANG_F77_CONFIG
-+       else
-+         tagname=""
-+       fi
-+       ;;
-+
-+      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
-+
-+      # 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_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
-+
-+
-+# 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_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],
-@@ -2057,7 +2684,7 @@
- 
- # AC_PATH_TOOL_PREFIX
- # -------------------
--# find a file program which can recognise shared library
-+# 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])
-@@ -2120,7 +2747,7 @@
- 
- # AC_PATH_MAGIC
- # -------------
--# find a file program which can recognise a shared library
-+# 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
-@@ -2267,7 +2894,7 @@
- # 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],
-+[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=
-@@ -2306,16 +2933,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*)
+ netbsd*)
+@@ -2315,7 +2737,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
@@ -4250 +829 @@
      case $host_cpu in
      i*86 )
-@@ -2353,7 +2986,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)$'
-   ;;
-@@ -2369,11 +3002,11 @@
+@@ -2369,11 +2791,11 @@ irix5* | irix6* | nonstopux*)
    ;;
  
@@ -4273 +843 @@
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -2403,6 +3036,10 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- solaris*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-@@ -2455,7 +3092,7 @@
-   lt_cv_path_NM="$NM"
- else
-   lt_nm_to_check="${ac_tool_prefix}nm"
--  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
-+  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
-@@ -2671,10 +3308,10 @@
- _LT_AC_TAGVAR(objext, $1)=$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);}'
- 
- _LT_AC_SYS_COMPILER
- 
-@@ -2776,10 +3413,10 @@
- _LT_AC_TAGVAR(objext, $1)=$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.
- _LT_AC_SYS_COMPILER
-@@ -2925,7 +3562,7 @@
-           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
-@@ -3084,10 +3721,10 @@
-       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(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 $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _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}'
-           ;;
-        *)
-@@ -3121,7 +3758,7 @@
+@@ -3121,7 +3543,7 @@ case $host_os in
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -4350 +852 @@
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3170,9 +3807,7 @@
-       _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'
--        ;;
-+      hppa*64*|ia64*) ;;
-       *)
-        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-         ;;
-@@ -3240,7 +3875,7 @@
-        ;;
-     esac
-     ;;
--  interix3*)
-+  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'
-@@ -3280,7 +3915,7 @@
+@@ -3280,7 +3702,7 @@ case $host_os in
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -4379 +861 @@
        KCC*)
         # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -3360,6 +3995,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
-+         _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*)
-@@ -3382,7 +4040,7 @@
+@@ -3382,7 +3804,7 @@ case $host_os in
         ;;
      esac
@@ -4418 +870 @@
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -3398,16 +4056,20 @@
-     _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'
-+    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
--    output_verbose_link_cmd='echo'
-     ;;
-   osf3*)
-     case $cc_basename in
-@@ -3569,15 +4231,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'.
+@@ -3577,7 +3999,7 @@ case $host_os in
+            # 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'
-+           _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
         _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3624,6 +4281,12 @@
-          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
-@@ -3867,7 +4530,7 @@
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [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.
-   _LT_AC_TAGVAR(predep_objects,$1)=
-@@ -3875,13 +4538,46 @@
-   _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
-+  ;;
-+
- 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.
--    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-     ;;
-   esac
-   ;;
-@@ -3930,10 +4626,17 @@
- _LT_AC_TAGVAR(objext, $1)=$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.
- _LT_AC_SYS_COMPILER
-@@ -4012,10 +4715,10 @@
- _LT_AC_TAGVAR(objext, $1)=$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.
- _LT_AC_SYS_COMPILER
-@@ -4068,7 +4771,7 @@
- _LT_AC_TAGVAR(objext, $1)=$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"
-@@ -4157,6 +4860,7 @@
-     _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
- 
-@@ -4203,7 +4907,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
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -4528,7 +5232,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)
-@@ -4611,6 +5315,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.
-@@ -4647,7 +5352,7 @@
+@@ -4647,7 +5069,7 @@ hpux*) # Its linker distinguishes data f
    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'"
@@ -4622 +888 @@
      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'"
-@@ -4837,12 +5542,14 @@
-       # 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).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-       ;;
-     darwin* | rhapsody*)
-@@ -4854,7 +5561,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.
-       ;;
-@@ -4920,7 +5627,7 @@
+@@ -4920,7 +5342,7 @@ AC_MSG_CHECKING([for $compiler option to
             ;;
         esac
@@ -4657 +897 @@
         ;;
        hpux9* | hpux10* | hpux11*)
-@@ -4963,7 +5670,7 @@
+@@ -4963,7 +5385,7 @@ AC_MSG_CHECKING([for $compiler option to
             ;;
         esac
@@ -4666 +906 @@
           KCC*)
             # KAI C++ Compiler
-@@ -4990,6 +5697,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
-        ;;
-@@ -5006,7 +5721,7 @@
+@@ -5006,7 +5428,7 @@ AC_MSG_CHECKING([for $compiler option to
             ;;
         esac
@@ -4690 +915 @@
        osf3* | osf4* | osf5*)
         case $cc_basename in
-@@ -5110,13 +5825,15 @@
-       _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* | 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-       ;;
- 
-@@ -5126,7 +5843,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-       ;;
- 
--    interix3*)
-+    interix[[3-9]]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-       ;;
-@@ -5184,7 +5901,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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -5217,7 +5934,7 @@
+@@ -5217,7 +5639,7 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
@@ -4735 +924 @@
        icc* | ecc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5236,15 +5953,35 @@
-         # All Alpha code is PIC.
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-         ;;
--      esac
--      ;;
--
-+      *)
-+        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'
-@@ -5339,7 +6076,8 @@
- # ------------------------------------
- # 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])
-+[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
-@@ -5356,7 +6094,10 @@
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+@@ -5358,6 +5780,9 @@ ifelse([$1],[CXX],[
+   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'
    ;;
-   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 -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'
-@@ -5495,7 +6236,7 @@
-       _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'
-+      _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'
-@@ -5513,7 +6254,7 @@
-       fi
-       ;;
- 
--    interix3*)
-+    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'
-@@ -5528,7 +6269,7 @@
+   ;;
+@@ -5528,7 +5953,7 @@ EOF
        _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'
        ;;
  
 -    linux*)
-+    gnu* | linux* | k*bsd*-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
-@@ -5546,20 +6287,30 @@
-        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'
-+       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~
+@@ -5554,12 +5979,13 @@ EOF
    $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'
+          $CC -shared'"$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
@@ -4857 +958 @@
         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
         wlarc=
-@@ -5592,7 +6343,7 @@
- 
-     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-       case `$LD -v 2>&1` in
--        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-        cat <<_LT_EOF 1>&2
- 
-@@ -5711,7 +6462,7 @@
-           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
-@@ -5804,7 +6555,7 @@
-       # 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(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
-       ;;
-@@ -5846,10 +6597,10 @@
-       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(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 $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+         _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}'
-           ;;
-        *)
-@@ -5889,7 +6640,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+@@ -5876,2141 +6302,1565 @@ _LT_EOF
+     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
+-      ;;
+-
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 -    freebsd* | kfreebsd*-gnu | dragonfly*)
-+    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
-@@ -5991,7 +6742,7 @@
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
+-      _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
+-      ;;
+-
+-    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
+-
+-      # 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'
+-      ;;
+-
+-    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
+-      ;;
+-
+-    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
+-      ;;
+-
+-    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
+-      ;;
+-
 -    netbsd*)
-+    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
-@@ -6011,24 +6762,28 @@
-       ;;
- 
-     openbsd*)
+-      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
+-      ;;
+-
+-    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
+-      ;;
+-
+-    openbsd*)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4926 +1104 @@
 -       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 -       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      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
+-      else
 -       case $host_os in
 -        openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
@@ -4957 +1115 @@
 -          ;;
 -       esac
-+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
-@@ -6087,17 +6842,16 @@
-       case $host_os in
-       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-       *)
+-      fi
+-      ;;
+-
+-    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'
+-      ;;
+-
+-    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)=:
+-      ;;
+-
+-    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'
+-
+-       # 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)=:
+-      ;;
+-
+-    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.
-+       # 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?)
+-       # Supported since Solaris 2.6 (maybe 2.5.1?)
 -       case $wlarc in
 -       '')
@@ -4979 +1184 @@
 -         _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 ;;
-+       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
+-      ;;
+-
+-    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
+-      ;;
+-
+-    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'
+-      ;;
+-
+-    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
+-      ;;
+-
+-    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'
+-
+-      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
+-      ;;
+-
+-    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(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(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
+-
+-#
+-# Do we need to explicitly link libc?
+-#
+-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*
+-      printf "$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>
+-#
+-# #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;
+-#
+-# 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)
+-])
+-
+-# 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])
+-])
+-
+-# 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.
+-
+-# 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
+-])
+-
+-# _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], [])
+-
+-# 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)])
+-
+-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+-
+-# 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 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.
+-
+-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.
+-#
+-# 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 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.