r18004 - in /desktop/experimental/gnome-applets/debian: ./ patches/ po/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Dec 26 21:52:06 UTC 2008


Author: joss
Date: Fri Dec 26 21:52:06 2008
New Revision: 18004

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18004
Log:
* New upstream release.
* Update build-dependencies accordingly.
* Remove debconf stuff for the setuid program.
* gnome-applets.preinst: remove the statoverride before upgrade.
* Remove obsolete README.Debian.
* Replace libgnomevfs2-extra dependency by gvfs.
* 02_trashapplet_2.20.patch: removed.
* 09_modemlights_use_new_gst.patch: updated to the changes in 
  modemlights.
* 80_mixer_user_gstreamer_signals.patch: dropped, merged upstream.
* 01_distclean.patch: add reference.
* 98_autoreconf.patch: regenerated for the new version.
* Pass echo=/bin/echo to make to work around yet another libtool 
  bug from R’lyeh.

Added:
    desktop/experimental/gnome-applets/debian/gnome-applets.preinst   (contents, props changed)
      - copied, changed from r17995, desktop/experimental/gnome-applets/debian/gnome-applets.config
Removed:
    desktop/experimental/gnome-applets/debian/README.Debian
    desktop/experimental/gnome-applets/debian/gnome-applets.config
    desktop/experimental/gnome-applets/debian/gnome-applets.postinst
    desktop/experimental/gnome-applets/debian/gnome-applets.postrm
    desktop/experimental/gnome-applets/debian/gnome-applets.templates
    desktop/experimental/gnome-applets/debian/patches/02_trashapplet_2.20.patch
    desktop/experimental/gnome-applets/debian/patches/80_mixer_user_gstreamer_signals.patch
    desktop/experimental/gnome-applets/debian/po/
Modified:
    desktop/experimental/gnome-applets/debian/changelog
    desktop/experimental/gnome-applets/debian/control
    desktop/experimental/gnome-applets/debian/control.in
    desktop/experimental/gnome-applets/debian/patches/01_distclean.patch
    desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
    desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
    desktop/experimental/gnome-applets/debian/patches/series
    desktop/experimental/gnome-applets/debian/rules

Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog (original)
+++ desktop/experimental/gnome-applets/debian/changelog Fri Dec 26 21:52:06 2008
@@ -1,11 +1,25 @@
-gnome-applets (2.22.3-4) UNRELEASED; urgency=low
+gnome-applets (2.24.2-1) experimental; urgency=low
 
   * es.po: updated Spanish translation from Francisco Javier Cuadrado. 
     Closes: #502236.
   * Recommend cpufrequtils. Closes: #448833.
   * Remove suggests on useless frequency daemons.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 31 Oct 2008 17:13:18 +0100
+  * New upstream release.
+  * Update build-dependencies accordingly.
+  * Remove debconf stuff for the setuid program.
+  * gnome-applets.preinst: remove the statoverride before upgrade.
+  * Remove obsolete README.Debian.
+  * Replace libgnomevfs2-extra dependency by gvfs.
+  * 02_trashapplet_2.20.patch: removed.
+  * 09_modemlights_use_new_gst.patch: updated to the changes in 
+    modemlights.
+  * 80_mixer_user_gstreamer_signals.patch: dropped, merged upstream.
+  * 01_distclean.patch: add reference.
+  * 98_autoreconf.patch: regenerated for the new version.
+  * Pass echo=/bin/echo to make to work around yet another libtool 
+    bug from R’lyeh.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 26 Dec 2008 19:57:47 +0100
 
 gnome-applets (2.22.3-3) unstable; urgency=low
 

Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control (original)
+++ desktop/experimental/gnome-applets/debian/control Fri Dec 26 21:52:06 2008
@@ -10,51 +10,51 @@
                quilt,
                patchutils,
                type-handling,
-               libgtk2.0-dev (>= 2.11.0),
-               libglib2.0-dev (>= 2.15.3),
-               libgnomevfs2-dev (>= 1:2.15.4),
-               libbonobo2-dev (>= 2.15.0),
+               libgtk2.0-dev (>= 2.13.0),
+               libglib2.0-dev (>= 2.18.0),
                libgnome2-dev (>= 2.8.0),
                libgnomeui-dev (>= 2.16.0-2),
                libgconf2-dev (>= 2.8.0),
                scrollkeeper (>= 0.1.4) | rarian-compat,
                libpanel-applet2-dev (>= 2.13.4),
                libgtop2-dev (>= 2.11.92),
-               libglade2-dev (>= 1:2.5.1-1),
-               libgail-dev (>= 1.1.0),
+               libxklavier12-dev (>= 2.91),
                libwnck-dev (>= 2.9.3),
-               libgweather-dev (>= 2.22.1),
-               system-tools-backends-dev (>= 1.1.3),
                libgnome-desktop-dev (>= 2.11.1),
                libnotify-dev (>= 0.3.2),
                libhal-dev (>= 0.5.3) | not+linux-gnu,
-               libdbus-1-dev (>= 0.92),
-               libdbus-glib-1-dev (>= 0.34),
-               python-gtk2-dev (>= 2.10),
+               libdbus-1-dev (>= 1.1.2),
+               libdbus-glib-1-dev (>= 0.74),
+               python-gtk2-dev (>= 2.6),
+               python-gobject-dev (>= 2.6),
                python-gnome2-dev (>= 2.10),
-               librsvg2-common (>= 2.16.0-2),
                gnome-icon-theme (>= 2.15.91),
+               libxml2-dev (>= 2.5.0),
+               libgweather-dev (>= 2.22.1),
+               libgucharmap2-dev (>= 1:2.23.0),
+               libpolkit-dev (>= 0.7),
+               libpolkit-gnome-dev (>= 0.7),
                intltool (>= 0.35.0),
                python-dev (>= 2.4),
+               libxt-dev,
+               libx11-dev,
+               libgnomekbd-dev (>= 2.24),
                gnome-settings-daemon-dev,
-               libgucharmap-dev (>= 1:1.4.2-1),
                xsltproc,
                docbook-xsl,
                docbook-utils,
                gnome-doc-utils (>= 0.3.2),
                libapm-dev | not+linux-gnu,
                libgstreamer-plugins-base0.10-dev (>= 0.10.14),
-               libxkbfile-dev,
-               libcpufreq-dev,
+               x11proto-kb-dev,
+               system-tools-backends-dev (>= 1.1.3),
+               libcpufreq-dev,               
                python-gnome2-desktop-dev,
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
                sharutils,
-               libxres-dev,
                python-support (>= 0.4),
-               libgnomekbdui-dev (>= 2.21.4.1),
-               liboobs-1-dev,
-               po-debconf
+               liboobs-1-dev (>= 0.2.0)
 
 Package: gnome-applets-data
 Architecture: all
@@ -76,7 +76,7 @@
          gnome-icon-theme (>= 2.15.91),
          gstreamer0.10-alsa | gstreamer0.10-audiosink | hurd,
          ${python:Depends},
-         libgnomevfs2-extra
+         gvfs
 Conflicts: gnome-cpufreq-applet,
            trashapplet
 Replaces: gnome-cpufreq-applet,

Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in (original)
+++ desktop/experimental/gnome-applets/debian/control.in Fri Dec 26 21:52:06 2008
@@ -10,51 +10,51 @@
                quilt,
                patchutils,
                type-handling,
-               libgtk2.0-dev (>= 2.11.0),
-               libglib2.0-dev (>= 2.15.3),
-               libgnomevfs2-dev (>= 1:2.15.4),
-               libbonobo2-dev (>= 2.15.0),
+               libgtk2.0-dev (>= 2.13.0),
+               libglib2.0-dev (>= 2.18.0),
                libgnome2-dev (>= 2.8.0),
                libgnomeui-dev (>= 2.16.0-2),
                libgconf2-dev (>= 2.8.0),
                scrollkeeper (>= 0.1.4) | rarian-compat,
                libpanel-applet2-dev (>= 2.13.4),
                libgtop2-dev (>= 2.11.92),
-               libglade2-dev (>= 1:2.5.1-1),
-               libgail-dev (>= 1.1.0),
+               libxklavier12-dev (>= 2.91),
                libwnck-dev (>= 2.9.3),
-               libgweather-dev (>= 2.22.1),
-               system-tools-backends-dev (>= 1.1.3),
                libgnome-desktop-dev (>= 2.11.1),
                libnotify-dev (>= 0.3.2),
                libhal-dev (>= 0.5.3) | not+linux-gnu,
-               libdbus-1-dev (>= 0.92),
-               libdbus-glib-1-dev (>= 0.34),
-               python-gtk2-dev (>= 2.10),
+               libdbus-1-dev (>= 1.1.2),
+               libdbus-glib-1-dev (>= 0.74),
+               python-gtk2-dev (>= 2.6),
+               python-gobject-dev (>= 2.6),
                python-gnome2-dev (>= 2.10),
-               librsvg2-common (>= 2.16.0-2),
                gnome-icon-theme (>= 2.15.91),
+               libxml2-dev (>= 2.5.0),
+               libgweather-dev (>= 2.22.1),
+               libgucharmap2-dev (>= 1:2.23.0),
+               libpolkit-dev (>= 0.7),
+               libpolkit-gnome-dev (>= 0.7),
                intltool (>= 0.35.0),
                python-dev (>= 2.4),
+               libxt-dev,
+               libx11-dev,
+               libgnomekbd-dev (>= 2.24),
                gnome-settings-daemon-dev,
-               libgucharmap-dev (>= 1:1.4.2-1),
                xsltproc,
                docbook-xsl,
                docbook-utils,
                gnome-doc-utils (>= 0.3.2),
                libapm-dev | not+linux-gnu,
                libgstreamer-plugins-base0.10-dev (>= 0.10.14),
-               libxkbfile-dev,
-               libcpufreq-dev,
+               x11proto-kb-dev,
+               system-tools-backends-dev (>= 1.1.3),
+               libcpufreq-dev,               
                python-gnome2-desktop-dev,
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
                sharutils,
-               libxres-dev,
                python-support (>= 0.4),
-               libgnomekbdui-dev (>= 2.21.4.1),
-               liboobs-1-dev,
-               po-debconf
+               liboobs-1-dev (>= 0.2.0)
 
 Package: gnome-applets-data
 Architecture: all
@@ -76,7 +76,7 @@
          gnome-icon-theme (>= 2.15.91),
          gstreamer0.10-alsa | gstreamer0.10-audiosink | hurd,
          ${python:Depends},
-         libgnomevfs2-extra
+         gvfs
 Conflicts: gnome-cpufreq-applet,
            trashapplet
 Replaces: gnome-cpufreq-applet,

Copied: desktop/experimental/gnome-applets/debian/gnome-applets.preinst (from r17995, desktop/experimental/gnome-applets/debian/gnome-applets.config)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets.preinst?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets.config (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets.preinst Fri Dec 26 21:52:06 2008
@@ -1,34 +1,13 @@
 #!/bin/sh
+set -e
 
-# Debconf config script for gnome-applets
 prog=/usr/bin/cpufreq-selector
 
-test -e $prog || exit 0
-
-# Load Debconf
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# Set default value to match current state of file
-if [ -u $prog ]; then
-	db_set gnome-applets/cpufreq_SUID_bit true
-else 
-	db_set gnome-applets/cpufreq_SUID_bit false
-fi
-
-# Prompt for user input
-db_input low gnome-applets/cpufreq_SUID_bit || true
-db_go
-
-# Update statoverrides as necessary
-db_get gnome-applets/cpufreq_SUID_bit
-if [ "$RET" = "true" ]; then
-	if ! dpkg-statoverride --list $prog > /dev/null; then
-		dpkg-statoverride --add --update	\
-			root root 4755 $prog > /dev/null 2>&1
-	fi;
-else
+case "$1" in
+install|upgrade)
+    if dpkg --compare-versions "$2" lt "2.24"; then
 	if dpkg-statoverride --list $prog > /dev/null; then
 		dpkg-statoverride --remove $prog
 	fi;
-fi;
+    fi
+esac

Propchange: desktop/experimental/gnome-applets/debian/gnome-applets.preinst
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: desktop/experimental/gnome-applets/debian/patches/01_distclean.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/01_distclean.patch?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/01_distclean.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/01_distclean.patch Fri Dec 26 21:52:06 2008
@@ -1,3 +1,5 @@
+Debian #424337
+
 Index: gnome-applets-2.22.3/invest-applet/data/Makefile.am
 ===================================================================
 --- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.am	2008-07-15 11:24:07.958681051 +0200

Modified: desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch Fri Dec 26 21:52:06 2008
@@ -1,16 +1,16 @@
-Index: gnome-applets-2.22.3/configure.in
+Index: gnome-applets-2.24.2/configure.in
 ===================================================================
---- gnome-applets-2.22.3.orig/configure.in	2008-06-30 11:27:15.000000000 +0200
-+++ gnome-applets-2.22.3/configure.in	2008-07-15 11:22:58.350681152 +0200
-@@ -25,6 +25,7 @@
- LIBGAIL_REQUIRED=1.1.0
+--- gnome-applets-2.24.2.orig/configure.in	2008-12-26 21:58:29.607590699 +0100
++++ gnome-applets-2.24.2/configure.in	2008-12-26 21:58:31.343586964 +0100
+@@ -22,6 +22,7 @@ LIBPANEL_REQUIRED=2.13.4
+ LIBGTOP_REQUIRED=2.11.92
  LIBXKLAVIER_REQUIRED=2.91
  LIBWNCK_REQUIRED=2.9.3
 +LIBOOBS_REQUIRED=0.2.0
- SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
  LIBGNOME_DESKTOP_REQUIRED=2.11.1
  LIBNOTIFY_REQUIRED=0.3.2
-@@ -515,25 +516,21 @@
+ HAL_REQUIRED=0.5.3
+@@ -554,24 +555,21 @@ dnl ************************************
  dnl *** modemlights applet check                                            ***
  dnl ***************************************************************************
  
@@ -20,7 +20,6 @@
 -
 -AC_PATH_PROG(SU_TOOL, su)
 -AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
--AM_PATH_SYSTEM_TOOLS_BACKENDS($SYSTEM_TOOLS_BACKENDS_REQUIRED, P_MODEMLIGHTS=modemlights)
 -
 -if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
 -  MODEMLIGHTS_LIBS=" -lutil"
@@ -31,7 +30,7 @@
 +MODEMLIGHTS_CFLAGS=
 +
 +PKG_CHECK_MODULES(MODEMLIGHTS, liboobs-1 >= $LIBOOBS_REQUIRED,
-+			   HAVE_LIBOOBS=yes, HAVE_LIBOOBS=no)
++                          HAVE_LIBOOBS=yes, HAVE_LIBOOBS=no)
 +
 +if test "x$HAVE_LIBOOBS" = "xyes" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
    BUILD_MODEM_LIGHTS=yes
@@ -45,25 +44,22 @@
  AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
  
  dnl ***************************************************************************
-Index: gnome-applets-2.22.3/modemlights/Makefile.am
+Index: gnome-applets-2.24.2/modemlights/Makefile.am
 ===================================================================
---- gnome-applets-2.22.3.orig/modemlights/Makefile.am	2008-05-27 13:39:34.000000000 +0200
-+++ gnome-applets-2.22.3/modemlights/Makefile.am	2008-07-15 11:22:58.350681152 +0200
-@@ -1,7 +1,8 @@
+--- gnome-applets-2.24.2.orig/modemlights/Makefile.am	2008-12-26 21:58:29.615588923 +0100
++++ gnome-applets-2.24.2/modemlights/Makefile.am	2008-12-26 21:58:31.343586964 +0100
+@@ -1,6 +1,7 @@
  #SUBDIRS = docs
  
--INCLUDES = -I. -I$(srcdir) 				\
--	$(GNOME_APPLETS_CFLAGS)				\
-+INCLUDES = -I. -I$(srcdir) 	\
-+	$(GNOME_APPLETS_CFLAGS)	\
-+	$(MODEMLIGHTS_CFLAGS)	\
- 	$(LIBGLADE_CFLAGS)
+ INCLUDES = -I. -I$(srcdir) 				\
++	$(MODEMLIGHTS_CFLAGS)				\
+ 	$(GNOME_APPLETS_CFLAGS)	
  
  libexec_PROGRAMS = modem_applet
-Index: gnome-applets-2.22.3/modemlights/modem-applet.c
+Index: gnome-applets-2.24.2/modemlights/modem-applet.c
 ===================================================================
---- gnome-applets-2.22.3.orig/modemlights/modem-applet.c	2008-05-27 13:39:34.000000000 +0200
-+++ gnome-applets-2.22.3/modemlights/modem-applet.c	2008-07-15 11:22:58.350681152 +0200
+--- gnome-applets-2.24.2.orig/modemlights/modem-applet.c	2008-12-26 21:58:29.627586257 +0100
++++ gnome-applets-2.24.2/modemlights/modem-applet.c	2008-12-26 22:04:18.684097070 +0100
 @@ -1,5 +1,5 @@
 -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
 -/* Copyright (C) 2004 Carlos Garnacho
@@ -72,7 +68,7 @@
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as
-@@ -23,31 +23,13 @@
+@@ -23,30 +23,12 @@
  #endif
  
  #include <panel-applet.h>
@@ -84,8 +80,6 @@
 -#include <sys/types.h>
 -#include <sys/wait.h>
 -#include <libxml/tree.h>
-+#include <oobs/oobs.h>
- #include <glade/glade.h>
 -
 -#ifdef __FreeBSD__
 -#include <sys/ioctl.h>
@@ -93,6 +87,7 @@
 -#include <libutil.h>
 -#endif
 -
++#include <oobs/oobs.h>
  #include "modem-applet.h"
  
  #define MODEM_APPLET_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MODEM_APPLET, ModemAppletPrivate))
@@ -105,7 +100,7 @@
  typedef struct _ModemAppletPrivate ModemAppletPrivate;
  
  struct _ModemAppletPrivate
-@@ -58,47 +40,18 @@
+@@ -57,47 +39,18 @@ struct _ModemAppletPrivate
    GdkPixbuf    *icon;
    GtkWidget    *image;
  
@@ -159,16 +154,31 @@
  };
  
  static void modem_applet_class_init (ModemAppletClass *class);
-@@ -138,8 +91,6 @@
- 					   gboolean     backend_alive,
- 					   gboolean     already_waiting);
- 
+@@ -105,8 +58,6 @@ static void modem_applet_init       (Mod
+ static void modem_applet_finalize   (GObject          *object);
+ 
+ static gboolean update_tooltip      (ModemApplet *applet);
+-static gboolean dispatch_directives (ModemApplet *applet);
+-static gboolean update_info         (ModemApplet *applet);
+ 
+ static void modem_applet_change_size (PanelApplet *applet, guint size);
+ 
+@@ -131,14 +82,6 @@ static void on_modem_applet_help_clicked
+ 					   ModemApplet       *applet,
+ 					   const char        *verb);
+ 
+-static void launch_backend                (ModemApplet      *applet,
+-					   gboolean          root_auth);
+-static void shutdown_backend              (ModemApplet *applet,
+-					   gboolean     backend_alive,
+-					   gboolean     already_waiting);
+-
 -static gpointer parent_class;
 -
  static const BonoboUIVerb menu_verbs[] = {
    BONOBO_UI_UNSAFE_VERB ("Activate",   on_modem_applet_activate),
    BONOBO_UI_UNSAFE_VERB ("Deactivate", on_modem_applet_deactivate),
-@@ -159,7 +110,6 @@
+@@ -158,7 +101,6 @@ modem_applet_class_init (ModemAppletClas
  
    object_class = G_OBJECT_CLASS (class);
    applet_class = PANEL_APPLET_CLASS (class);
@@ -176,7 +186,7 @@
  
    object_class->finalize    = modem_applet_finalize;
    applet_class->change_size = modem_applet_change_size;
-@@ -168,6 +118,43 @@
+@@ -167,6 +109,43 @@ modem_applet_class_init (ModemAppletClas
    g_type_class_add_private (object_class, sizeof (ModemAppletPrivate));
  }
  
@@ -220,20 +230,20 @@
  static void
  modem_applet_init (ModemApplet *applet)
  {
-@@ -183,9 +170,9 @@
+@@ -183,9 +162,9 @@ modem_applet_init (ModemApplet *applet)
    priv->icon_theme = gtk_icon_theme_get_default ();
    priv->image = gtk_image_new ();
  
--  priv->auth_dialog       = glade_xml_get_widget (priv->xml, "auth_dialog");
--  priv->auth_dialog_label = glade_xml_get_widget (priv->xml, "auth_dialog_label");
--  priv->auth_dialog_entry = glade_xml_get_widget (priv->xml, "auth_dialog_entry");
+-  priv->auth_dialog       = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog"));
+-  priv->auth_dialog_label = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_label"));
+-  priv->auth_dialog_entry = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_entry"));
 +  priv->config = oobs_ifaces_config_get ();
 +  priv->iface = get_modem_iface (OOBS_IFACES_CONFIG (priv->config));
 +  priv->lock_file = get_lock_file (priv->iface);
  
-   priv->report_window          = glade_xml_get_widget (priv->xml, "report_window");
-   priv->report_window_image    = glade_xml_get_widget (priv->xml, "report_window_image");
-@@ -197,20 +184,8 @@
+   priv->report_window          = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window"));
+   priv->report_window_image    = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window_image"));
+@@ -197,20 +176,8 @@ modem_applet_init (ModemApplet *applet)
    pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
    gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
    gdk_pixbuf_unref (pixbuf);
@@ -255,7 +265,7 @@
    gtk_container_add (GTK_CONTAINER (applet), priv->image);
  }
  
-@@ -221,18 +196,25 @@
+@@ -221,18 +188,24 @@ modem_applet_finalize (GObject *object)
  
    if (priv)
      {
@@ -263,7 +273,6 @@
 -
 -      gtk_widget_destroy (priv->auth_dialog);
 -      gtk_widget_destroy (priv->report_window);
-+      g_object_unref (priv->xml);
        g_object_unref (priv->icon);
 +      gtk_widget_destroy (priv->image);
 +
@@ -289,7 +298,7 @@
  }
  
  static void
-@@ -287,401 +269,26 @@
+@@ -287,401 +260,26 @@ modem_applet_change_background (PanelApp
      }
  }
  
@@ -695,7 +704,7 @@
  static gint
  get_connection_time (const gchar *lock_file)
  {
-@@ -700,30 +307,30 @@
+@@ -700,30 +298,30 @@ update_tooltip (ModemApplet *applet)
    gchar *text;
    gint   t, t1, t2;
  
@@ -746,7 +755,7 @@
  
    gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text);
    g_free (text);
-@@ -731,165 +338,8 @@
+@@ -731,165 +329,8 @@ update_tooltip (ModemApplet *applet)
    return TRUE;
  }
  
@@ -913,7 +922,7 @@
  {
    gchar    *argv[4], *application;
    gboolean  ret;
-@@ -900,8 +350,8 @@
+@@ -900,8 +341,8 @@ launch_config_tool (GdkScreen *screen, g
      return FALSE;
  
    argv[0] = application;
@@ -924,7 +933,7 @@
    argv[3] = NULL;
  
    ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0,
-@@ -910,52 +360,48 @@
+@@ -910,52 +351,48 @@ launch_config_tool (GdkScreen *screen, g
    return ret;
  }
  
@@ -1006,7 +1015,7 @@
  }
  
  static void
-@@ -963,7 +409,14 @@
+@@ -963,7 +400,14 @@ on_modem_applet_activate (BonoboUICompon
  			  ModemApplet       *applet,
  			  const gchar       *verb)
  {
@@ -1022,7 +1031,7 @@
  }
  
  static void
-@@ -971,7 +424,12 @@
+@@ -971,7 +415,12 @@ on_modem_applet_deactivate (BonoboUIComp
  			    ModemApplet       *applet,
  			    const gchar       *verb)
  {
@@ -1036,7 +1045,7 @@
  }
  
  static void
-@@ -985,7 +443,7 @@
+@@ -985,7 +434,7 @@ on_modem_applet_properties_clicked (Bono
  
    screen = gtk_widget_get_screen (GTK_WIDGET (applet));
  
@@ -1045,239 +1054,227 @@
      {
        dialog = gtk_message_dialog_new (NULL,
  				       GTK_DIALOG_DESTROY_WITH_PARENT,
-Index: gnome-applets-2.22.3/modemlights/modemlights.glade
+Index: gnome-applets-2.24.2/modemlights/modemlights.ui
 ===================================================================
---- gnome-applets-2.22.3.orig/modemlights/modemlights.glade	2008-05-27 13:39:34.000000000 +0200
-+++ gnome-applets-2.22.3/modemlights/modemlights.glade	2008-07-15 11:22:58.350681152 +0200
-@@ -2,222 +2,6 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
--
--<widget class="GtkDialog" id="auth_dialog">
--  <property name="title" translatable="yes">Enter password</property>
--  <property name="type">GTK_WINDOW_TOPLEVEL</property>
--  <property name="window_position">GTK_WIN_POS_CENTER</property>
--  <property name="modal">True</property>
--  <property name="resizable">False</property>
--  <property name="destroy_with_parent">False</property>
--  <property name="decorated">True</property>
--  <property name="skip_taskbar_hint">False</property>
--  <property name="skip_pager_hint">False</property>
--  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
--  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
--  <property name="has_separator">False</property>
--
--  <child internal-child="vbox">
--    <widget class="GtkVBox" id="dialog-vbox1">
--      <property name="visible">True</property>
--      <property name="homogeneous">False</property>
--      <property name="spacing">0</property>
--
--      <child internal-child="action_area">
--	<widget class="GtkHButtonBox" id="dialog-action_area1">
--	  <property name="visible">True</property>
--	  <property name="layout_style">GTK_BUTTONBOX_END</property>
--
--	  <child>
--	    <widget class="GtkButton" id="cancelbutton1">
--	      <property name="visible">True</property>
--	      <property name="can_default">True</property>
--	      <property name="can_focus">True</property>
--	      <property name="label">gtk-cancel</property>
--	      <property name="use_stock">True</property>
--	      <property name="relief">GTK_RELIEF_NORMAL</property>
--	      <property name="focus_on_click">True</property>
--	      <property name="response_id">-6</property>
--	    </widget>
--	  </child>
--
--	  <child>
--	    <widget class="GtkButton" id="okbutton1">
--	      <property name="visible">True</property>
--	      <property name="can_default">True</property>
--	      <property name="has_default">True</property>
--	      <property name="can_focus">True</property>
--	      <property name="label">gtk-ok</property>
--	      <property name="use_stock">True</property>
--	      <property name="relief">GTK_RELIEF_NORMAL</property>
--	      <property name="focus_on_click">True</property>
--	      <property name="response_id">-5</property>
--	    </widget>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">True</property>
--	  <property name="pack_type">GTK_PACK_END</property>
--	</packing>
--      </child>
--
--      <child>
--	<widget class="GtkHBox" id="hbox1">
--	  <property name="border_width">7</property>
--	  <property name="visible">True</property>
--	  <property name="homogeneous">False</property>
--	  <property name="spacing">12</property>
--
--	  <child>
--	    <widget class="GtkImage" id="image1">
--	      <property name="visible">True</property>
--	      <property name="stock">gnome-stock-authentication</property>
--	      <property name="icon_size">6</property>
--	      <property name="xalign">0</property>
--	      <property name="yalign">0</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	    </widget>
--	    <packing>
--	      <property name="padding">0</property>
--	      <property name="expand">False</property>
--	      <property name="fill">False</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox1">
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">6</property>
--
--	      <child>
--		<widget class="GtkLabel" id="label1">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;larger&quot;&gt;Root password required&lt;/span&gt;</property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">True</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">False</property>
--		  <property name="selectable">False</property>
--		  <property name="xalign">0</property>
--		  <property name="yalign">0.5</property>
--		  <property name="xpad">0</property>
--		  <property name="ypad">0</property>
--		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		  <property name="width_chars">-1</property>
--		  <property name="single_line_mode">False</property>
--		  <property name="angle">0</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkLabel" id="auth_dialog_label">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="label" translatable="yes"></property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">False</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">True</property>
--		  <property name="selectable">True</property>
--		  <property name="xalign">0</property>
--		  <property name="yalign">0.5</property>
--		  <property name="xpad">0</property>
--		  <property name="ypad">0</property>
--		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		  <property name="width_chars">-1</property>
--		  <property name="single_line_mode">False</property>
--		  <property name="angle">0</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkHBox" id="hbox2">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">12</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label3">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Password:</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">False</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkEntry" id="auth_dialog_entry">
--		      <property name="visible">True</property>
--		      <property name="can_focus">True</property>
--		      <property name="editable">True</property>
--		      <property name="visibility">False</property>
--		      <property name="max_length">0</property>
--		      <property name="text" translatable="yes"></property>
--		      <property name="has_frame">True</property>
--		      <property name="invisible_char">*</property>
--		      <property name="activates_default">True</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="padding">0</property>
--	      <property name="expand">True</property>
--	      <property name="fill">True</property>
--	    </packing>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">False</property>
--	</packing>
--      </child>
--    </widget>
--  </child>
--</widget>
- 
- <widget class="GtkWindow" id="report_window">
-   <property name="title" translatable="yes"></property>
-@@ -231,6 +15,8 @@
-   <property name="skip_pager_hint">False</property>
-   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+  <property name="focus_on_map">True</property>
-+  <property name="urgency_hint">False</property>
- 
-   <child>
-     <widget class="GtkHBox" id="hbox3">
+--- gnome-applets-2.24.2.orig/modemlights/modemlights.ui	2008-12-26 21:58:29.647590127 +0100
++++ gnome-applets-2.24.2/modemlights/modemlights.ui	2008-12-26 21:58:31.343586964 +0100
+@@ -1,210 +1,6 @@
+ <?xml version="1.0"?>
+ <!--*- mode: xml -*-->
+ <interface>
+-  <object class="GtkDialog" id="auth_dialog">
+-    <property name="title" translatable="yes">Enter password</property>
+-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+-    <property name="modal">True</property>
+-    <property name="resizable">False</property>
+-    <property name="destroy_with_parent">False</property>
+-    <property name="decorated">True</property>
+-    <property name="skip_taskbar_hint">False</property>
+-    <property name="skip_pager_hint">False</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-    <property name="has_separator">False</property>
+-    <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox1">
+-        <property name="visible">True</property>
+-        <property name="homogeneous">False</property>
+-        <property name="spacing">0</property>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area1">
+-            <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+-            <child>
+-              <object class="GtkButton" id="cancelbutton1">
+-                <property name="visible">True</property>
+-                <property name="can_default">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="label">gtk-cancel</property>
+-                <property name="use_stock">True</property>
+-                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                <property name="focus_on_click">True</property>
+-              </object>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="okbutton1">
+-                <property name="visible">True</property>
+-                <property name="can_default">True</property>
+-                <property name="has_default">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="label">gtk-ok</property>
+-                <property name="use_stock">True</property>
+-                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                <property name="focus_on_click">True</property>
+-              </object>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="padding">0</property>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="pack_type">GTK_PACK_END</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <object class="GtkHBox" id="hbox1">
+-            <property name="border_width">7</property>
+-            <property name="visible">True</property>
+-            <property name="homogeneous">False</property>
+-            <property name="spacing">12</property>
+-            <child>
+-              <object class="GtkImage" id="image1">
+-                <property name="visible">True</property>
+-                <property name="stock">gnome-stock-authentication</property>
+-                <property name="icon_size">6</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-              </object>
+-              <packing>
+-                <property name="padding">0</property>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkVBox" id="vbox1">
+-                <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+-                <property name="spacing">6</property>
+-                <child>
+-                  <object class="GtkLabel" id="label1">
+-                    <property name="visible">True</property>
+-                    <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Root password required&lt;/span&gt;</property>
+-                    <property name="use_underline">False</property>
+-                    <property name="use_markup">True</property>
+-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                    <property name="wrap">False</property>
+-                    <property name="selectable">False</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0.5</property>
+-                    <property name="xpad">0</property>
+-                    <property name="ypad">0</property>
+-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                    <property name="width_chars">-1</property>
+-                    <property name="single_line_mode">False</property>
+-                    <property name="angle">0</property>
+-                  </object>
+-                  <packing>
+-                    <property name="padding">0</property>
+-                    <property name="expand">False</property>
+-                    <property name="fill">False</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <object class="GtkLabel" id="auth_dialog_label">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">True</property>
+-                    <property name="label" translatable="yes"/>
+-                    <property name="use_underline">False</property>
+-                    <property name="use_markup">False</property>
+-                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                    <property name="wrap">True</property>
+-                    <property name="selectable">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0.5</property>
+-                    <property name="xpad">0</property>
+-                    <property name="ypad">0</property>
+-                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                    <property name="width_chars">-1</property>
+-                    <property name="single_line_mode">False</property>
+-                    <property name="angle">0</property>
+-                  </object>
+-                  <packing>
+-                    <property name="padding">0</property>
+-                    <property name="expand">False</property>
+-                    <property name="fill">False</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <object class="GtkHBox" id="hbox2">
+-                    <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+-                    <property name="spacing">12</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label3">
+-                        <property name="visible">True</property>
+-                        <property name="label" translatable="yes">Password:</property>
+-                        <property name="use_underline">False</property>
+-                        <property name="use_markup">False</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+-                      </object>
+-                      <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkEntry" id="auth_dialog_entry">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
+-                        <property name="editable">True</property>
+-                        <property name="visibility">False</property>
+-                        <property name="max_length">0</property>
+-                        <property name="text" translatable="yes"/>
+-                        <property name="has_frame">True</property>
+-                        <property name="invisible_char">*</property>
+-                        <property name="activates_default">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
+-                      </packing>
+-                    </child>
+-                  </object>
+-                  <packing>
+-                    <property name="padding">0</property>
+-                    <property name="expand">False</property>
+-                    <property name="fill">False</property>
+-                  </packing>
+-                </child>
+-              </object>
+-              <packing>
+-                <property name="padding">0</property>
+-                <property name="expand">True</property>
+-                <property name="fill">True</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="padding">0</property>
+-            <property name="expand">False</property>
+-            <property name="fill">False</property>
+-          </packing>
+-        </child>
+-      </object>
+-    </child>
+-    <action-widgets>
+-      <action-widget response="-6">cancelbutton1</action-widget>
+-      <action-widget response="-5">okbutton1</action-widget>
+-    </action-widgets>
+-  </object>
+   <object class="GtkWindow" id="report_window">
+     <property name="title" translatable="yes"/>
+     <property name="type">GTK_WINDOW_TOPLEVEL</property>
+@@ -217,6 +13,8 @@
+     <property name="skip_pager_hint">False</property>
+     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++    <property name="focus_on_map">True</property>
++    <property name="urgency_hint">False</property>
+     <child>
+       <object class="GtkHBox" id="hbox3">
+         <property name="border_width">12</property>

Modified: desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch Fri Dec 26 21:52:06 2008
@@ -1,21 +1,7 @@
-libtoolize --force --copy
-aclocal-1.10 -I m4
-automake-1.10 -acf
-autoconf
-
-Index: gnome-applets-2.22.3/accessx-status/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/docs/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in	2008-08-29 10:51:32.031484938 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/accessx-status/docs/Makefile.in gnome-applets-2.24.2/accessx-status/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/accessx-status/docs/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/accessx-status/docs/Makefile.in	2008-12-26 21:30:31.887587388 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -23,29 +9,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/accessx-status/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/Makefile.in	2008-08-29 10:51:31.707987608 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -233,6 +232,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/accessx-status/Makefile.in gnome-applets-2.24.2/accessx-status/Makefile.in
+--- gnome-applets-2.24.2.orig/accessx-status/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/accessx-status/Makefile.in	2008-12-26 21:30:31.736086080 +0100
+@@ -225,6 +225,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -53,29 +28,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -269,9 +269,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -269,7 +270,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/pixmaps/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in	2008-08-29 10:51:32.147984731 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -199,6 +198,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/accessx-status/pixmaps/Makefile.in gnome-applets-2.24.2/accessx-status/pixmaps/Makefile.in
+--- gnome-applets-2.24.2.orig/accessx-status/pixmaps/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/accessx-status/pixmaps/Makefile.in	2008-12-26 21:30:31.995586379 +0100
+@@ -191,6 +191,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -83,47 +47,6680 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -235,9 +235,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -235,7 +236,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/aclocal.m4
-===================================================================
---- gnome-applets-2.22.3.orig/aclocal.m4	2008-06-30 11:29:33.000000000 +0200
-+++ gnome-applets-2.22.3/aclocal.m4	2008-08-29 10:51:28.335989002 +0200
-@@ -636,7 +636,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+diff -pruN gnome-applets-2.24.2.orig/aclocal.m4 gnome-applets-2.24.2/aclocal.m4
+--- gnome-applets-2.24.2.orig/aclocal.m4	2008-11-25 00:57:22.000000000 +0100
++++ gnome-applets-2.24.2/aclocal.m4	2008-12-26 21:30:24.004089765 +0100
+@@ -638,6 +638,6658 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
+   AC_SUBST(WARN_CXXFLAGS)
+ ])
+ 
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++
 +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -8518,4 +8518,3 @@ m4_include([m4/acinclude.m4])
- m4_include([m4/gnome-doc-utils.m4])
- m4_include([m4/intltool.m4])
- m4_include([m4/python.m4])
--m4_include([m4/system-tools-backends.m4])
-Index: gnome-applets-2.22.3/battstat/apmlib/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/battstat/apmlib/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in	2008-08-29 10:51:32.451985169 +0200
-@@ -44,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -214,6 +213,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
++
++
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++         [],
++         [m4_define([AC_PROVIDE_IFELSE],
++	         [m4_ifdef([AC_PROVIDE_$1],
++		           [$2], [$3])])])
++
++
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
++
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
++
++
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
++
++
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++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
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# 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']
++
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++_LT_CC_BASENAME([$compiler])
++
++# 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
++
++_LT_REQUIRED_DARWIN_CHECKS
++
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
++
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
++
++
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# 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-%%"`
++])
++
++
++# _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_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm -r conftest*
++])# _LT_LINKER_BOILERPLATE
++
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++   # By default we will add the -single_module flag. You can override
++   # by either setting the environment variable LT_MULTI_MODULE
++   # non-empty at configure time, or by adding -multi_module to the
++   # link flags.
++   echo "int foo(void){return 1;}" > conftest.c
++   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++     -dynamiclib ${wl}-single_module conftest.c
++   if test -f libconftest.dylib; then
++     lt_cv_apple_cc_single_mod=yes
++     rm -rf libconftest.dylib*
++   fi
++   rm conftest.c
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++   [lt_cv_ld_exported_symbols_list=yes],
++   [lt_cv_ld_exported_symbols_list=no])
++   LDFLAGS="$save_LDFLAGS"
++    ])
++    case $host_os in
++    rhapsody* | darwin1.[[0123]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*)
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++   10.[[012]]*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++   10.*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil="~$DSYMUTIL \$lib || :"
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++])
++
++# _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
++
++
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
++
++
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++[$]*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++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
++
++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.
++
++  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"
++
++  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=:
++
++	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
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++])])# _LT_AC_PROG_ECHO_BACKSLASH
++
++
++# _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" ;;
++      *)
++        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++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>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
++fi
++])# AC_LIBTOOL_COMPILER_OPTION
++
++
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                          [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $rm -r conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
++else
++    ifelse([$5], , :, [$5])
++fi
++])# AC_LIBTOOL_LINKER_OPTION
++
++
++# 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"
++
++  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
++    ;;
++
++  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;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  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
++  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_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ---------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* 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
++
++#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;
++
++  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
++    ])
++   ;;
++
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    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
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
++
++
++# 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
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++])
++])# AC_LIBTOOL_PROG_CC_C_O
++
++
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
++# Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
++
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++
++
++# AC_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
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
++         AC_MSG_RESULT([yes])
++       else
++  AC_MSG_RESULT([no])
++fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
++    ;;
++  esac
++fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
++
++
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  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
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      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
++  ;;
++
++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
++  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"
++      ;;
++    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}'
++      ;;
++    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
++  ;;
++
++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'
++  ;;
++
++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
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
++  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
++  ;;
++
++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
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++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
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # 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'
++  ;;
++
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++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
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++rdos*)
++  dynamic_linker=no
++  ;;
++
++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
++  ;;
++
++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
++
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++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],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
++
++
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
++
++
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
++
++
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
++
++
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
++
++
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
++
++
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
++
++
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
++
++
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
++
++
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# AC_PATH_MAGIC
++
++
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++    [AC_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
++
++
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
++
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
++
++
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix[[4-9]]*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++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)$'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd* | netbsdelf*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.3*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
++
++
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
++
++
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++])# AC_CHECK_LIBM
++
++
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
++
++
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
++
++
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
++
++
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
++
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
++
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
++
++
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
++
++
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
++
++
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
++
++
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
++
++
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
++
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF
++
++# Report which library types will actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix[[4-9]]*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_C_CONFIG
++
++
++# AC_LIBTOOL_LANG_CXX_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++
++# Source file extension for C++ test sources.
++ac_ext=cpp
++
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  $as_unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  $as_unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++else
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++  AC_PROG_LD
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  aix[[4-9]]*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  :
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++	;;
++      esac
++      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++      if test "$GXX" = yes ; then
++      output_verbose_link_cmd='echo'
++      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++      fi
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx*)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  freebsd[[12]]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  freebsd* | dragonfly*)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC*)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
++      *)
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case $host_cpu in
++    hppa*64*|ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  interix[[3-9]]*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC*)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux* | k*bsd*-gnu)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc*)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      pgCC* | pgcpp*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    if test -f /usr/libexec/ld.so; then
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc*)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++	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'
++	;;
++      gcx*)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
++	fi
++	;;
++    esac
++    ;;
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC*)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])# AC_LIBTOOL_LANG_CXX_CONFIG
++
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
++fi
++
++$rm -f confest.$objext
++
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++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.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
++
++# AC_LIBTOOL_LANG_F77_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
++
++# Code to be used in simple link tests
++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
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix[[4-9]]*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
++
++
++# AC_LIBTOOL_LANG_GCJ_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++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) {}; }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
++
++
++# AC_LIBTOOL_LANG_RC_CONFIG
++# -------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++_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 }'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
++
++
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars.  Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
++
++    case $var in
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++    ;;
++  esac
++
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
++
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e 1s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++
++# Is the compiler the GNU C compiler?
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++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)
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++
++# Symbols that must always be exported.
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
++
++__EOF__
++
++ifelse([$1],[], [
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++])
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++])# AC_LIBTOOL_CONFIG
++
++
++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++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.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++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'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux* | k*bsd*-gnu)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    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'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -rf conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++
++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
++# ---------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | 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
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix[[4-9]]*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc* | ecpc*)
++	    # Intel C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  pgCC* | pgcpp*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _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
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd* | netbsdelf*-gnu)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _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 '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++])
++
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix[[4-9]]*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
++  *)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
++  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[[3-9]]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++
++      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    interix[[3-9]]*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
++
++    aix[[4-9]]*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	  ;;
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  :
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    bsdi[[45]]*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    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* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    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*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      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 and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    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* | sco3.2v5.0.[[024]]*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
++
++    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*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
++])# AC_LIBTOOL_PROG_LD_SHLIBS
++
++
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #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)
++])
++
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && continue
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])
++
+ # nls.m4 serial 3 (gettext-0.15)
+ dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+diff -pruN gnome-applets-2.24.2.orig/battstat/apmlib/Makefile.in gnome-applets-2.24.2/battstat/apmlib/Makefile.in
+--- gnome-applets-2.24.2.orig/battstat/apmlib/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/battstat/apmlib/Makefile.in	2008-12-26 21:30:32.263587480 +0100
+@@ -206,6 +206,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -131,29 +6728,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -250,9 +250,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -250,7 +251,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/battstat/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/battstat/docs/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/docs/Makefile.in	2008-08-29 10:51:32.615984923 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/battstat/docs/Makefile.in gnome-applets-2.24.2/battstat/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/battstat/docs/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/battstat/docs/Makefile.in	2008-12-26 21:30:32.427585767 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -161,29 +6747,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/battstat/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/battstat/Makefile.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/Makefile.in	2008-08-29 10:51:32.319985152 +0200
-@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -240,6 +239,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/battstat/Makefile.in gnome-applets-2.24.2/battstat/Makefile.in
+--- gnome-applets-2.24.2.orig/battstat/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/battstat/Makefile.in	2008-12-26 21:30:32.143588220 +0100
+@@ -232,6 +232,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -191,29 +6766,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -276,9 +276,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -276,7 +277,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/battstat/sounds/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/battstat/sounds/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/battstat/sounds/Makefile.in	2008-08-29 10:51:32.715986179 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/battstat/sounds/Makefile.in gnome-applets-2.24.2/battstat/sounds/Makefile.in
+--- gnome-applets-2.24.2.orig/battstat/sounds/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/battstat/sounds/Makefile.in	2008-12-26 21:30:32.531587114 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -221,29 +6785,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/charpick/help/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/charpick/help/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/charpick/help/Makefile.in	2008-08-29 10:51:33.031985908 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/charpick/help/Makefile.in gnome-applets-2.24.2/charpick/help/Makefile.in
+--- gnome-applets-2.24.2.orig/charpick/help/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/charpick/help/Makefile.in	2008-12-26 21:30:32.827586886 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -251,29 +6804,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/charpick/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/charpick/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/charpick/Makefile.in	2008-08-29 10:51:32.867485043 +0200
-@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -236,6 +235,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/charpick/Makefile.in gnome-applets-2.24.2/charpick/Makefile.in
+--- gnome-applets-2.24.2.orig/charpick/Makefile.in	2008-11-25 00:57:25.000000000 +0100
++++ gnome-applets-2.24.2/charpick/Makefile.in	2008-12-26 21:30:32.671585843 +0100
+@@ -225,6 +225,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -281,21 +6823,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -272,9 +272,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -269,7 +270,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/config.h.in
-===================================================================
---- gnome-applets-2.22.3.orig/config.h.in	2008-06-30 11:29:36.000000000 +0200
-+++ gnome-applets-2.22.3/config.h.in	2008-08-29 10:51:11.679987332 +0200
-@@ -135,15 +135,9 @@
+diff -pruN gnome-applets-2.24.2.orig/config.h.in gnome-applets-2.24.2/config.h.in
+--- gnome-applets-2.24.2.orig/config.h.in	2008-11-25 00:58:05.000000000 +0100
++++ gnome-applets-2.24.2/config.h.in	2008-12-26 21:30:41.816087938 +0100
+@@ -148,15 +148,9 @@
  /* install prefix */
  #undef PREFIX
  
@@ -311,41 +6850,19 @@
  /* sysconfdir */
  #undef SYSCONFDIR
  
-Index: gnome-applets-2.22.3/configure
-===================================================================
---- gnome-applets-2.22.3.orig/configure	2008-06-30 11:29:35.000000000 +0200
-+++ gnome-applets-2.22.3/configure	2008-08-29 10:51:39.787484234 +0200
-@@ -828,6 +828,9 @@ am__untar
- MAINTAINER_MODE_TRUE
- MAINTAINER_MODE_FALSE
- MAINT
-+INTLTOOL_UPDATE
-+INTLTOOL_MERGE
-+INTLTOOL_EXTRACT
- INTLTOOL_DESKTOP_RULE
- INTLTOOL_DIRECTORY_RULE
- INTLTOOL_KEYS_RULE
-@@ -850,9 +853,6 @@ INTLTOOL_POLICY_RULE
- XGETTEXT
- MSGMERGE
- MSGFMT
--INTLTOOL_EXTRACT
--INTLTOOL_MERGE
--INTLTOOL_UPDATE
- INTLTOOL_PERL
- ALL_LINGUAS
- CC
-@@ -1029,8 +1029,7 @@ HAVE_GST10_FALSE
+diff -pruN gnome-applets-2.24.2.orig/configure gnome-applets-2.24.2/configure
+--- gnome-applets-2.24.2.orig/configure	2008-11-25 00:57:35.000000000 +0100
++++ gnome-applets-2.24.2/configure	2008-12-26 21:30:44.959586203 +0100
+@@ -1026,7 +1026,7 @@ HAVE_GST10_FALSE
  HAVE_XKB
  APPLET_ACCESSX_TRUE
  APPLET_ACCESSX_FALSE
 -SU_TOOL
--STB_SCRIPTS_DIR
 +MODEMLIGHTS_CFLAGS
  MODEMLIGHTS_LIBS
  APPLET_MODEMLIGHTS_TRUE
  APPLET_MODEMLIGHTS_FALSE
-@@ -1120,7 +1119,9 @@ PYGTK_LIBS
+@@ -1110,7 +1110,9 @@ XML2_LIBS
  LIBGWEATHER_CFLAGS
  LIBGWEATHER_LIBS
  MIXER_CFLAGS
@@ -356,7 +6873,7 @@
  
  
  # Initialize some variables set by options.
-@@ -1839,6 +1840,10 @@ Some influential environment variables:
+@@ -1824,6 +1826,10 @@ Some influential environment variables:
    MIXER_CFLAGS
                C compiler flags for MIXER, overriding pkg-config
    MIXER_LIBS  linker flags for MIXER, overriding pkg-config
@@ -367,352 +6884,115 @@
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -2773,6 +2778,7 @@ LIBGLADE_REQUIRED=2.4.0
- LIBGAIL_REQUIRED=1.1.0
+@@ -2755,6 +2761,7 @@ LIBPANEL_REQUIRED=2.13.4
+ LIBGTOP_REQUIRED=2.11.92
  LIBXKLAVIER_REQUIRED=2.91
  LIBWNCK_REQUIRED=2.9.3
 +LIBOOBS_REQUIRED=0.2.0
- SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
  LIBGNOME_DESKTOP_REQUIRED=2.11.1
  LIBNOTIFY_REQUIRED=0.3.2
-@@ -3914,8 +3920,8 @@ if test -n "0.35.0"; then
- echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- 
-     { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
- echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-@@ -3925,6 +3931,132 @@ echo "$as_me: error: Your intltool is to
-    { (exit 1); exit 1; }; }
- fi
- 
-+# Extract the first word of "intltool-update", so it can be a program name with args.
-+set dummy intltool-update; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_UPDATE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-+if test -n "$INTLTOOL_UPDATE"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-merge", so it can be a program name with args.
-+set dummy intltool-merge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_MERGE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-+if test -n "$INTLTOOL_MERGE"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-extract", so it can be a program name with args.
-+set dummy intltool-extract; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_EXTRACT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-+if test -n "$INTLTOOL_EXTRACT"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+    { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4100,14 +4232,6 @@ echo "$as_me: error: GNU gettext tools n
-    { (exit 1); exit 1; }; }
- fi
- 
--# Use the tools built into the package, not the ones that are installed.
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
--
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
--
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -4320,10 +4444,6 @@ fi
- 
- 
- 
--ac_config_commands="$ac_config_commands intltool"
--
--
--
- 
- 
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -6524,7 +6644,7 @@ ia64-*-hpux*)
+ HAL_REQUIRED=0.5.3
+@@ -6633,13 +6640,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:6636: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6643: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6639: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6646: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6642: output\"" >&5)
++  (eval echo "\"\$as_me:6649: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -7749,7 +7756,7 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6527 "configure"' > conftest.$ac_ext
-+  echo '#line 6647 "configure"' > conftest.$ac_ext
+-  echo '#line 7752 "configure"' > conftest.$ac_ext
++  echo '#line 7759 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -9171,11 +9291,11 @@ else
+@@ -9195,11 +9202,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9174: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9198: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9178: \$? = $ac_status" >&5
-+   echo "$as_me:9298: \$? = $ac_status" >&5
+-   echo "$as_me:9202: \$? = $ac_status" >&5
++   echo "$as_me:9209: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9461,11 +9581,11 @@ else
+@@ -9519,11 +9526,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9464: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9584: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9522: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9529: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9468: \$? = $ac_status" >&5
-+   echo "$as_me:9588: \$? = $ac_status" >&5
+-   echo "$as_me:9526: \$? = $ac_status" >&5
++   echo "$as_me:9533: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9565,11 +9685,11 @@ else
+@@ -9624,11 +9631,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9568: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9688: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9627: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9634: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9572: \$? = $ac_status" >&5
-+   echo "$as_me:9692: \$? = $ac_status" >&5
+-   echo "$as_me:9631: \$? = $ac_status" >&5
++   echo "$as_me:9638: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -11942,7 +12062,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11945 "configure"
-+#line 12065 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12042,7 +12162,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 12045 "configure"
-+#line 12165 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -14443,11 +14563,11 @@ else
+@@ -9679,11 +9686,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14566: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14450: \$? = $ac_status" >&5
-+   echo "$as_me:14570: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14547,11 +14667,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14550: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14670: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9682: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9689: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14554: \$? = $ac_status" >&5
-+   echo "$as_me:14674: \$? = $ac_status" >&5
+-   echo "$as_me:9686: \$? = $ac_status" >&5
++   echo "$as_me:9693: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16145,11 +16265,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16268: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16152: \$? = $ac_status" >&5
-+   echo "$as_me:16272: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16249,11 +16369,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16256: \$? = $ac_status" >&5
-+   echo "$as_me:16376: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -18469,11 +18589,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18592: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18476: \$? = $ac_status" >&5
-+   echo "$as_me:18596: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -18759,11 +18879,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18762: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18882: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18766: \$? = $ac_status" >&5
-+   echo "$as_me:18886: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -18863,11 +18983,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18866: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18986: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18870: \$? = $ac_status" >&5
-+   echo "$as_me:18990: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -28405,198 +28525,82 @@ fi
+@@ -12440,7 +12447,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12443 "configure"
++#line 12450 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12540,7 +12547,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12543 "configure"
++#line 12550 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -19695,131 +19702,82 @@ fi
  CPPFLAGS=$savecppflags
  
  
@@ -756,17 +7036,34 @@
 -if test -n "$SU_TOOL"; then
 -  { echo "$as_me:$LINENO: result: $SU_TOOL" >&5
 -echo "${ECHO_T}$SU_TOOL" >&6; }
--else
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
++echo $ECHO_N "checking for MODEMLIGHTS... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$MODEMLIGHTS_CFLAGS"; then
++        pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
++  ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_MODEMLIGHTS_CFLAGS=`$PKG_CONFIG --cflags "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
+ else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
++  pkg_failed=yes
+ fi
 -
 -
 -{ echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5
 -echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_util_forkpty+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++    fi
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lutil  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -775,10 +7072,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
-+echo $ECHO_N "checking for MODEMLIGHTS... $ECHO_C" >&6; }
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -802,9 +7096,11 @@
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
++	pkg_failed=untried
++fi
 +if test -n "$PKG_CONFIG"; then
-+    if test -n "$MODEMLIGHTS_CFLAGS"; then
-+        pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
++    if test -n "$MODEMLIGHTS_LIBS"; then
++        pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
@@ -820,7 +7116,9 @@
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_util_forkpty=yes
--else
++  (exit $ac_status); }; then
++  pkg_cv_MODEMLIGHTS_LIBS=`$PKG_CONFIG --libs "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
+ else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -830,105 +7128,22 @@
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
--fi
++  pkg_failed=yes
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_forkpty" >&5
 -echo "${ECHO_T}$ac_cv_lib_util_forkpty" >&6; }
 -if test $ac_cv_lib_util_forkpty = yes; then
 -  HAVE_LIBUTIL=true
-+  (exit $ac_status); }; then
-+  pkg_cv_MODEMLIGHTS_CFLAGS=`$PKG_CONFIG --cflags "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
++    fi
  else
 -  HAVE_LIBUTIL=false
-+  pkg_failed=yes
- fi
--
--
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+    fi
- else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
 +	pkg_failed=untried
  fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+    if test -n "$MODEMLIGHTS_LIBS"; then
-+        pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_MODEMLIGHTS_LIBS=`$PKG_CONFIG --libs "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  pkg_failed=yes
- fi
--
--
--  stb="system-tools-backends"
--
--  if test x$PKG_CONFIG != xno ; then
--    if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
--      min_version=$SYSTEM_TOOLS_BACKENDS_REQUIRED
--      { echo "$as_me:$LINENO: checking for $stb >= $min_version" >&5
--echo $ECHO_N "checking for $stb >= $min_version... $ECHO_C" >&6; }
--
--      if $PKG_CONFIG --atleast-version $min_version $stb ; then
--        STB_SCRIPTS_DIR=`$PKG_CONFIG --variable=backenddir $stb`
--	   { echo "$as_me:$LINENO: result: yes ($STB_SCRIPTS_DIR)" >&5
--echo "${ECHO_T}yes ($STB_SCRIPTS_DIR)" >&6; }
--        P_MODEMLIGHTS=modemlights
--      else
--	   { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--        :
--      fi
--    else
--      echo "*** pkg-config too old; version 0.12 or better required."
-     fi
--  fi
--
--
--
-+else
-+	pkg_failed=untried
-+fi
+ 
  
 -if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
 -  MODEMLIGHTS_LIBS=" -lutil"
- 
+-
  
 -cat >>confdefs.h <<_ACEOF
 -#define STB_SCRIPTS_DIR "$STB_SCRIPTS_DIR"
@@ -968,7 +7183,7 @@
    BUILD_MODEM_LIGHTS=yes
  else
    { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
-@@ -28604,6 +28608,8 @@ echo "$as_me: WARNING: *** modemlights a
+@@ -19827,6 +19785,8 @@ echo "$as_me: WARNING: *** modemlights a
    BUILD_MODEM_LIGHTS=no
  fi
  
@@ -977,114 +7192,19 @@
   if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
    APPLET_MODEMLIGHTS_TRUE=
    APPLET_MODEMLIGHTS_FALSE='#'
-@@ -30301,9 +30307,6 @@ cat >>$CONFIG_STATUS <<_ACEOF
- # INIT-COMMANDS
- #
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
--INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
- 
- 
- _ACEOF
-@@ -30316,7 +30319,6 @@ do
-   case $ac_config_target in
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--    "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
-     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-     "gnome-applets.spec") CONFIG_FILES="$CONFIG_FILES gnome-applets.spec" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -30494,6 +30496,9 @@ am__untar!$am__untar$ac_delim
- MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
- MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
- MAINT!$MAINT$ac_delim
-+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
- INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
- INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
- INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-@@ -30516,9 +30521,6 @@ INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RU
- XGETTEXT!$XGETTEXT$ac_delim
- MSGMERGE!$MSGMERGE$ac_delim
- MSGFMT!$MSGFMT$ac_delim
--INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
--INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
--INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
- INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
- ALL_LINGUAS!$ALL_LINGUAS$ac_delim
- CC!$CC$ac_delim
-@@ -30777,8 +30779,7 @@ HAVE_GST10_FALSE!$HAVE_GST10_FALSE$ac_de
+@@ -22264,7 +22224,7 @@ HAVE_GST10_FALSE!$HAVE_GST10_FALSE$ac_de
  HAVE_XKB!$HAVE_XKB$ac_delim
  APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim
  APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim
 -SU_TOOL!$SU_TOOL$ac_delim
--STB_SCRIPTS_DIR!$STB_SCRIPTS_DIR$ac_delim
 +MODEMLIGHTS_CFLAGS!$MODEMLIGHTS_CFLAGS$ac_delim
  MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim
  APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim
  APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim
-@@ -30805,6 +30806,7 @@ DATADIR!$DATADIR$ac_delim
- SYSCONFDIR!$SYSCONFDIR$ac_delim
- LIBDIR!$LIBDIR$ac_delim
- PREFIX!$PREFIX$ac_delim
-+PYTHONDIR!$PYTHONDIR$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -30846,13 +30848,12 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
--PYTHONDIR!$PYTHONDIR$ac_delim
- GLADEDIR!$GLADEDIR$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -31419,23 +31420,6 @@ echo "$as_me: error: cannot create direc
-   done
- done
-  ;;
--    "intltool":C)
--
--for file in intltool-extract intltool-merge intltool-update; do
--  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
--      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
--      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
--	< ${ac_aux_dir}/${file}.in > ${file}.out
--  if cmp -s ${file} ${file}.out 2>/dev/null; then
--    rm -f ${file}.out
--  else
--    mv -f ${file}.out ${file}
--  fi
--  chmod ugo+x ${file}
--  chmod u+w ${file}
--done
--
-- ;;
-     "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
-         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-       esac ;;
-Index: gnome-applets-2.22.3/cpufreq/help/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/help/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/help/Makefile.in	2008-08-29 10:51:33.343985060 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/cpufreq/help/Makefile.in gnome-applets-2.24.2/cpufreq/help/Makefile.in
+--- gnome-applets-2.24.2.orig/cpufreq/help/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/cpufreq/help/Makefile.in	2008-12-26 21:30:33.103585721 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1092,29 +7212,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/cpufreq/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/Makefile.in	2008-08-29 10:51:33.159985347 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -214,6 +213,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/cpufreq/Makefile.in gnome-applets-2.24.2/cpufreq/Makefile.in
+--- gnome-applets-2.24.2.orig/cpufreq/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/cpufreq/Makefile.in	2008-12-26 21:30:32.947585657 +0100
+@@ -206,6 +206,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1122,29 +7231,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -250,9 +250,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -250,7 +251,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/pixmaps/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in	2008-08-29 10:51:33.447985918 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/cpufreq/pixmaps/Makefile.in gnome-applets-2.24.2/cpufreq/pixmaps/Makefile.in
+--- gnome-applets-2.24.2.orig/cpufreq/pixmaps/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/cpufreq/pixmaps/Makefile.in	2008-12-26 21:30:33.207586090 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1152,29 +7250,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/src/cpufreq-selector/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in	2008-08-29 10:51:33.719485019 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -224,6 +223,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.24.2/cpufreq/src/cpufreq-selector/Makefile.in
+--- gnome-applets-2.24.2.orig/cpufreq/src/cpufreq-selector/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/cpufreq/src/cpufreq-selector/Makefile.in	2008-12-26 21:30:33.507585949 +0100
+@@ -244,6 +244,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1182,29 +7269,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -260,9 +260,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -288,7 +289,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/cpufreq/src/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/src/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/Makefile.in	2008-08-29 10:51:33.587985624 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -238,6 +237,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/cpufreq/src/Makefile.in gnome-applets-2.24.2/cpufreq/src/Makefile.in
+--- gnome-applets-2.24.2.orig/cpufreq/src/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/cpufreq/src/Makefile.in	2008-12-26 21:30:33.355586463 +0100
+@@ -234,6 +234,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1212,29 +7288,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -274,9 +274,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -278,7 +279,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/drivemount/help/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/drivemount/help/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/drivemount/help/Makefile.in	2008-08-29 10:51:34.023487413 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/drivemount/help/Makefile.in gnome-applets-2.24.2/drivemount/help/Makefile.in
+--- gnome-applets-2.24.2.orig/drivemount/help/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/drivemount/help/Makefile.in	2008-12-26 21:30:33.815585988 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1242,29 +7307,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/drivemount/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/drivemount/Makefile.in	2008-06-30 11:29:37.000000000 +0200
-+++ gnome-applets-2.22.3/drivemount/Makefile.in	2008-08-29 10:51:33.867985038 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -234,6 +233,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/drivemount/Makefile.in gnome-applets-2.24.2/drivemount/Makefile.in
+--- gnome-applets-2.24.2.orig/drivemount/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/drivemount/Makefile.in	2008-12-26 21:30:33.651585745 +0100
+@@ -226,6 +226,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1272,29 +7326,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -270,9 +270,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -270,7 +271,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/geyes/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/geyes/docs/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/docs/Makefile.in	2008-08-29 10:51:34.339985809 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/geyes/docs/Makefile.in gnome-applets-2.24.2/geyes/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/geyes/docs/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/geyes/docs/Makefile.in	2008-12-26 21:30:34.111585759 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1302,29 +7345,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/geyes/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/geyes/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/Makefile.in	2008-08-29 10:51:34.167985875 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -233,6 +232,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/geyes/Makefile.in gnome-applets-2.24.2/geyes/Makefile.in
+--- gnome-applets-2.24.2.orig/geyes/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/geyes/Makefile.in	2008-12-26 21:30:33.959586273 +0100
+@@ -225,6 +225,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1332,29 +7364,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -269,9 +269,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -269,7 +270,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/geyes/themes/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/geyes/themes/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/geyes/themes/Makefile.in	2008-08-29 10:51:34.459985068 +0200
-@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -208,6 +207,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/geyes/themes/Makefile.in gnome-applets-2.24.2/geyes/themes/Makefile.in
+--- gnome-applets-2.24.2.orig/geyes/themes/Makefile.in	2008-11-25 00:57:26.000000000 +0100
++++ gnome-applets-2.24.2/geyes/themes/Makefile.in	2008-12-26 21:30:34.231585997 +0100
+@@ -200,6 +200,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1362,29 +7383,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -244,9 +244,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -244,7 +245,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gkb-new/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/Makefile.in	2008-08-29 10:51:34.575987172 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -200,6 +199,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gkb-new/Makefile.in gnome-applets-2.24.2/gkb-new/Makefile.in
+--- gnome-applets-2.24.2.orig/gkb-new/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gkb-new/Makefile.in	2008-12-26 21:30:34.335587833 +0100
+@@ -192,6 +192,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1392,29 +7402,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -236,9 +236,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -236,7 +237,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/xmodmap/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in	2008-08-29 10:51:34.791985155 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gkb-new/xmodmap/Makefile.in gnome-applets-2.24.2/gkb-new/xmodmap/Makefile.in
+--- gnome-applets-2.24.2.orig/gkb-new/xmodmap/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gkb-new/xmodmap/Makefile.in	2008-12-26 21:30:34.559587461 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1422,29 +7421,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/xmodmap.sun/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in	2008-08-29 10:51:34.679985585 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.24.2/gkb-new/xmodmap.sun/Makefile.in
+--- gnome-applets-2.24.2.orig/gkb-new/xmodmap.sun/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gkb-new/xmodmap.sun/Makefile.in	2008-12-26 21:30:34.439589179 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1452,29 +7440,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gswitchit/help/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gswitchit/help/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gswitchit/help/Makefile.in	2008-08-29 10:51:35.107985373 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gswitchit/help/Makefile.in gnome-applets-2.24.2/gswitchit/help/Makefile.in
+--- gnome-applets-2.24.2.orig/gswitchit/help/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gswitchit/help/Makefile.in	2008-12-26 21:30:34.887595280 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1482,29 +7459,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gswitchit/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gswitchit/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gswitchit/Makefile.in	2008-08-29 10:51:34.955985398 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -252,6 +251,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gswitchit/Makefile.in gnome-applets-2.24.2/gswitchit/Makefile.in
+--- gnome-applets-2.24.2.orig/gswitchit/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gswitchit/Makefile.in	2008-12-26 21:30:34.723585749 +0100
+@@ -241,6 +241,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1512,29 +7478,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -288,9 +288,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -285,7 +286,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gweather/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gweather/docs/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/gweather/docs/Makefile.in	2008-08-29 10:51:35.419485368 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gweather/docs/Makefile.in gnome-applets-2.24.2/gweather/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/gweather/docs/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gweather/docs/Makefile.in	2008-12-26 21:30:35.179587139 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1542,29 +7497,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/gweather/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/gweather/Makefile.in	2008-06-30 11:29:38.000000000 +0200
-+++ gnome-applets-2.22.3/gweather/Makefile.in	2008-08-29 10:51:35.259485215 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -236,6 +235,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/gweather/Makefile.in gnome-applets-2.24.2/gweather/Makefile.in
+--- gnome-applets-2.24.2.orig/gweather/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/gweather/Makefile.in	2008-12-26 21:30:35.023586097 +0100
+@@ -227,6 +227,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1572,29 +7516,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -272,9 +272,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -271,7 +272,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/invest-applet/data/art/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/data/art/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in	2008-08-29 10:51:35.755485055 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -198,6 +197,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/invest-applet/data/art/Makefile.in gnome-applets-2.24.2/invest-applet/data/art/Makefile.in
+--- gnome-applets-2.24.2.orig/invest-applet/data/art/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/invest-applet/data/art/Makefile.in	2008-12-26 21:30:35.507585670 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1602,29 +7535,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -234,9 +234,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/invest-applet/data/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/Makefile.in	2008-08-29 10:51:35.651484686 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/invest-applet/data/Makefile.in gnome-applets-2.24.2/invest-applet/data/Makefile.in
+--- gnome-applets-2.24.2.orig/invest-applet/data/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/invest-applet/data/Makefile.in	2008-12-26 21:30:35.399588634 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1632,17 +7554,15 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -361,8 +359,8 @@ investbindir = $(libdir)/invest-applet
+@@ -361,8 +361,8 @@ investbindir = $(libdir)/invest-applet
  #		$(GCONFTOOL) --makefile-install-rule $(schema_DATA)
  #endif
  DISTCLEANFILES = \
@@ -1653,19 +7573,10 @@
  
  EXTRA_DIST = \
  	Invest_Applet.server.in.in \
-Index: gnome-applets-2.22.3/invest-applet/invest/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/invest/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in	2008-08-29 10:51:35.915986320 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -202,6 +201,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/invest-applet/docs/Makefile.in gnome-applets-2.24.2/invest-applet/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/invest-applet/docs/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/invest-applet/docs/Makefile.in	2008-12-26 21:30:35.667587290 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1673,29 +7584,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -238,9 +238,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/invest-applet/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/invest-applet/Makefile.in	2008-08-29 10:51:35.527984982 +0200
-@@ -37,7 +37,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -199,6 +198,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/invest-applet/invest/Makefile.in gnome-applets-2.24.2/invest-applet/invest/Makefile.in
+--- gnome-applets-2.24.2.orig/invest-applet/invest/Makefile.in	2008-11-25 00:57:28.000000000 +0100
++++ gnome-applets-2.24.2/invest-applet/invest/Makefile.in	2008-12-26 21:30:35.815587665 +0100
+@@ -194,6 +194,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1703,136 +7603,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -235,9 +235,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -238,7 +239,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/ltmain.sh
-===================================================================
---- gnome-applets-2.22.3.orig/ltmain.sh	2008-02-08 01:57:47.000000000 +0100
-+++ gnome-applets-2.22.3/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
-@@ -43,7 +43,7 @@ EXIT_FAILURE=1
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
-+VERSION="1.5.26 Debian 1.5.26-4"
- TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
- 
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-Index: gnome-applets-2.22.3/m4/intltool.m4
-===================================================================
---- gnome-applets-2.22.3.orig/m4/intltool.m4	2008-06-30 11:29:31.000000000 +0200
-+++ gnome-applets-2.22.3/m4/intltool.m4	2008-08-29 10:51:11.939486164 +0200
-@@ -23,7 +23,7 @@
- ## the same distribution terms that you use for the rest of that program.
- 
- dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 36 IT_PROG_INTLTOOL
-+# serial 40 IT_PROG_INTLTOOL
- AC_DEFUN([IT_PROG_INTLTOOL],
- [AC_PREREQ([2.50])dnl
- 
-@@ -39,14 +39,21 @@ if test -n "$1"; then
-     AC_MSG_CHECKING([for intltool >= $1])
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-     ]
-     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
- fi
- 
-+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-+fi
-+
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-@@ -101,12 +108,7 @@ if test -z "$xgversion" -o -z "$mmversio
-     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
- 
--# Use the tools built into the package, not the ones that are installed.
--AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
--AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
--AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
--
--AC_PATH_PROG(INTLTOOL_PERL, perl)
-+AC_PATH_PROG(INTLTOOL_PERL, [perl])
- if test -z "$INTLTOOL_PERL"; then
-    AC_MSG_ERROR([perl not found; required for intltool])
- fi
-@@ -152,42 +154,6 @@ AC_SUBST(DATADIRNAME)
- 
- IT_PO_SUBDIR([po])
- 
--dnl The following is very similar to
--dnl
--dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
--dnl
--dnl with the following slight differences:
--dnl  - the *.in files are in ac_aux_dir,
--dnl  - if the file haven't changed upon reconfigure, it's not touched,
--dnl  - the evaluation of the third parameter enables a hack which computes
--dnl    the actual value of $libdir,
--dnl  - the user sees "executing intltool commands", instead of
--dnl    "creating intltool-extract" and such.
--dnl
--dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
--dnl a reason for it.
--
--AC_CONFIG_COMMANDS([intltool], [
--
--for file in intltool-extract intltool-merge intltool-update; do
--  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
--      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
--      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
--	< ${ac_aux_dir}/${file}.in > ${file}.out
--  if cmp -s ${file} ${file}.out 2>/dev/null; then
--    rm -f ${file}.out
--  else
--    mv -f ${file}.out ${file}
--  fi
--  chmod ugo+x ${file}
--  chmod u+w ${file}
--done
--
--],
--[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
--
- ])
- 
- 
-Index: gnome-applets-2.22.3/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/Makefile.in	2008-08-29 10:51:38.595486438 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -215,6 +214,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/invest-applet/Makefile.in gnome-applets-2.24.2/invest-applet/Makefile.in
+--- gnome-applets-2.24.2.orig/invest-applet/Makefile.in	2008-11-25 00:57:27.000000000 +0100
++++ gnome-applets-2.24.2/invest-applet/Makefile.in	2008-12-26 21:30:35.283586041 +0100
+@@ -191,6 +191,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1840,45 +7622,13717 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -251,9 +251,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -235,7 +236,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -328,6 +326,7 @@ gtop_applets = multiload
- @BUILD_GTOP_APPLETS_TRUE at gtop_SUBDIRS = $(gtop_applets)
- vfs_applets = \
- 	drivemount	\
-+	trashapplet	\
- 	gweather
- 
- @BUILD_GNOME_VFS_APPLETS_TRUE at vfs_SUBDIRS = $(vfs_applets)
-@@ -350,7 +349,6 @@ always_built_SUBDIRS = \
- 	mini-commander	\
- 	gkb-new		\
- 	stickynotes	\
--	trashapplet	\
- 	null_applet
- 
- SUBDIRS = \
-Index: gnome-applets-2.22.3/man/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/man/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/man/Makefile.in	2008-08-29 10:51:36.047987803 +0200
-@@ -37,7 +37,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -191,6 +190,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/ltmain.sh gnome-applets-2.24.2/ltmain.sh
+--- gnome-applets-2.24.2.orig/ltmain.sh	2008-09-26 01:51:31.000000000 +0200
++++ gnome-applets-2.24.2/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
+@@ -1,83 +1,52 @@
+-# Generated from ltmain.m4sh.
+-
+-# ltmain.sh (GNU libtool) 2.2.4
+-# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+-# This is free software; see the source for copying conditions.  There is NO
+-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
++# ltmain.sh - Provide generalized library-building support services.
++# NOTE: Changing this file will not affect anything until you rerun configure.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008  Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+-# As a special exception to the GNU General Public License,
+-# if you distribute this file as part of a program or library that
+-# is built using GNU Libtool, you may include this file under the
+-# same distribution terms that you use for the rest of that program.
+-#
+-# GNU Libtool is distributed in the hope that it will be useful, but
++# This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with GNU Libtool; see the file COPYING.  If not, a copy
+-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+-# or obtained by writing to the Free Software Foundation, Inc.,
+-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-# Usage: $progname [OPTION]... [MODE-ARG]...
+-#
+-# Provide generalized library-building support services.
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+-#     --config             show all configuration variables
+-#     --debug              enable verbose shell tracing
+-# -n, --dry-run            display commands without modifying any files
+-#     --features           display basic configuration information and exit
+-#     --mode=MODE          use operation mode MODE
+-#     --preserve-dup-deps  don't remove duplicate dependency libraries
+-#     --quiet, --silent    don't print informational messages
+-#     --tag=TAG            use configuration variables from tag TAG
+-# -v, --verbose            print informational messages (default)
+-#     --version            print version information
+-# -h, --help               print short or long help message
+-#
+-# MODE must be one of the following:
+-#
+-#       clean              remove files from the build directory
+-#       compile            compile a source file into a libtool object
+-#       execute            automatically set library path, then run a program
+-#       finish             complete the installation of libtool libraries
+-#       install            install libraries or executables
+-#       link               create a library or an executable
+-#       uninstall          remove libraries from an installed directory
+-#
+-# MODE-ARGS vary depending on the MODE.
+-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+-#
+-# When reporting a bug, please describe a test case to reproduce it and
+-# include the following information:
+-#
+-#       host-triplet:	$host
+-#       shell:		$SHELL
+-#       compiler:		$LTCC
+-#       compiler flags:		$LTCFLAGS
+-#       linker:		$LD (gnu? $with_gnu_ld)
+-#       $progname:		(GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
+-#       automake:		$automake_version
+-#       autoconf:		$autoconf_version
+-#
+-# Report bugs to <bug-libtool at gnu.org>.
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
+-TIMESTAMP=""
+-package_revision=1.2976
++VERSION="1.5.26 Debian 1.5.26-4"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+ 
+-# Be Bourne compatible
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -91,261 +60,104 @@ fi
+ BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-# NLS nuisances: We save the old values to restore during execute mode.
++# Check that we have a working $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, and then maybe $echo will work.
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit $EXIT_SUCCESS
++fi
++
++default_mode=
++help="Try \`$progname --help' for more information."
++magic="%%%MAGIC variable%%%"
++mkdir="mkdir"
++mv="mv -f"
++rm="rm -f"
++
++# 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'
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
++  ;;
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
++  ;;
++esac
++
++# NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+-lt_user_locale=
+-lt_safe_locale=
++# We save the old values to restore during execute mode.
++lt_env=
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+   eval "if test \"\${$lt_var+set}\" = set; then
+-          save_$lt_var=\$$lt_var
+-          $lt_var=C
++	  save_$lt_var=\$$lt_var
++	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
++	  $lt_var=C
+ 	  export $lt_var
+-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ 	fi"
+ done
+ 
+-$lt_unset CDPATH
+-
+-
+-
+-
+-
+-: ${CP="cp -f"}
+-: ${ECHO="echo"}
+-: ${EGREP="/bin/grep -E"}
+-: ${FGREP="/bin/grep -F"}
+-: ${GREP="/bin/grep"}
+-: ${LN_S="ln -s"}
+-: ${MAKE="make"}
+-: ${MKDIR="mkdir"}
+-: ${MV="mv -f"}
+-: ${RM="rm -f"}
+-: ${SED="/bin/sed"}
+-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+-: ${Xsed="$SED -e 1s/^X//"}
+-
+-# Global variables:
+-EXIT_SUCCESS=0
+-EXIT_FAILURE=1
+-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+-
+-exit_status=$EXIT_SUCCESS
++if test -n "$lt_env"; then
++  lt_env="env $lt_env"
++fi
+ 
+ # Make sure IFS has a sensible default
+ lt_nl='
+ '
+ IFS=" 	$lt_nl"
+ 
+-dirname="s,/[^/]*$,,"
+-basename="s,^.*/,,"
+-
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-#   dirname:  Compute the dirname of FILE.  If nonempty,
+-#             add APPEND to the result, otherwise set result
+-#             to NONDIR_REPLACEMENT.
+-#             value returned in "$func_dirname_result"
+-#   basename: Compute filename of FILE.
+-#             value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+-  # Extract subdirectory from the argument.
+-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+-  if test "X$func_dirname_result" = "X${1}"; then
+-    func_dirname_result="${3}"
+-  else
+-    func_dirname_result="$func_dirname_result${2}"
+-  fi
+-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+-}
+-
+-# Generated shell functions inserted here.
+-
+-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+-# is ksh but when the shell is invoked as "sh" and the current value of
+-# the _XPG environment variable is not equal to 1 (one), the special
+-# positional parameter $0, within a function call, is the name of the
+-# function.
+-progpath="$0"
+-
+-# The name of this program:
+-# In the unlikely event $progname began with a '-', it would play havoc with
+-# func_echo (imagine progname=-n), so we prepend ./ in that case:
+-func_dirname_and_basename "$progpath"
+-progname=$func_basename_result
+-case $progname in
+-  -*) progname=./$progname ;;
+-esac
+-
+-# Make sure we have an absolute path for reexecution:
+-case $progpath in
+-  [\\/]*|[A-Za-z]:\\*) ;;
+-  *[\\/]*)
+-     progdir=$func_dirname_result
+-     progdir=`cd "$progdir" && pwd`
+-     progpath="$progdir/$progname"
+-     ;;
+-  *)
+-     save_IFS="$IFS"
+-     IFS=:
+-     for progdir in $PATH; do
+-       IFS="$save_IFS"
+-       test -x "$progdir/$progname" && break
+-     done
+-     IFS="$save_IFS"
+-     test -n "$progdir" || progdir=`pwd`
+-     progpath="$progdir/$progname"
+-     ;;
+-esac
+-
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed="${SED}"' -e 1s/^X//'
+-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+-
+-# Re-`\' parameter expansions in output of double_quote_subst that were
+-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+-# in input to double_quote_subst, that '$' was protected from expansion.
+-# Since each input `\' is now two `\'s, look for any number of runs of
+-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+-bs='\\'
+-bs2='\\\\'
+-bs4='\\\\\\\\'
+-dollar='\$'
+-sed_double_backslash="\
+-  s/$bs4/&\\
+-/g
+-  s/^$bs2$dollar/$bs&/
+-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+-  s/\n//g"
+-
+-# Standard options:
+-opt_dry_run=false
+-opt_help=false
+-opt_quiet=false
+-opt_verbose=false
+-opt_warning=:
+-
+-# func_echo arg...
+-# Echo program name prefixed message, along with the current mode
+-# name if it has been set yet.
+-func_echo ()
+-{
+-    $ECHO "$progname${mode+: }$mode: $*"
+-}
+-
+-# func_verbose arg...
+-# Echo program name prefixed message in verbose mode only.
+-func_verbose ()
+-{
+-    $opt_verbose && func_echo ${1+"$@"}
+-
+-    # A bug in bash halts the script if the last line of a function
+-    # fails when set -e is in force, so we need another command to
+-    # work around that:
+-    :
+-}
+-
+-# func_error arg...
+-# Echo program name prefixed message to standard error.
+-func_error ()
+-{
+-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+-}
+-
+-# func_warning arg...
+-# Echo program name prefixed warning message to standard error.
+-func_warning ()
+-{
+-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+-
+-    # bash bug again:
+-    :
+-}
+-
+-# func_fatal_error arg...
+-# Echo program name prefixed message to standard error, and exit.
+-func_fatal_error ()
+-{
+-    func_error ${1+"$@"}
+-    exit $EXIT_FAILURE
+-}
+-
+-# func_fatal_help arg...
+-# Echo program name prefixed message to standard error, followed by
+-# a help hint, and exit.
+-func_fatal_help ()
+-{
+-    func_error ${1+"$@"}
+-    func_fatal_error "$help"
+-}
+-help="Try \`$progname --help' for more information."  ## default
+-
+-
+-# func_grep expression filename
+-# Check whether EXPRESSION matches any line of FILENAME, without output.
+-func_grep ()
+-{
+-    $GREP "$1" "$2" >/dev/null 2>&1
+-}
+-
+-
+-# func_mkdir_p directory-path
+-# Make sure the entire path to DIRECTORY-PATH is available.
+-func_mkdir_p ()
+-{
+-    my_directory_path="$1"
+-    my_dir_list=
+-
+-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+-
+-      # Protect directory names starting with `-'
+-      case $my_directory_path in
+-        -*) my_directory_path="./$my_directory_path" ;;
+-      esac
+-
+-      # While some portion of DIR does not yet exist...
+-      while test ! -d "$my_directory_path"; do
+-        # ...make a list in topmost first order.  Use a colon delimited
+-	# list incase some portion of path contains whitespace.
+-        my_dir_list="$my_directory_path:$my_dir_list"
+-
+-        # If the last portion added has no slash in it, the list is done
+-        case $my_directory_path in */*) ;; *) break ;; esac
+-
+-        # ...otherwise throw away the child directory and loop
+-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+-      done
+-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+-
+-      save_mkdir_p_IFS="$IFS"; IFS=':'
+-      for my_dir in $my_dir_list; do
+-	IFS="$save_mkdir_p_IFS"
+-        # mkdir can fail with a `File exist' error if two processes
+-        # try to create one of the directories concurrently.  Don't
+-        # stop in that case!
+-        $MKDIR "$my_dir" 2>/dev/null || :
+-      done
+-      IFS="$save_mkdir_p_IFS"
++if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++  $echo "$modename: not configured to build any kind of library" 1>&2
++  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++  exit $EXIT_FAILURE
++fi
+ 
+-      # Bail out if we (or some other process) failed to create a directory.
+-      test -d "$my_directory_path" || \
+-        func_fatal_error "Failed to create \`$1'"
+-    fi
+-}
++# Global variables.
++mode=$default_mode
++nonopt=
++prev=
++prevopt=
++run=
++show="$echo"
++show_help=
++execute_dlfiles=
++duplicate_deps=no
++preserve_args=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+ 
++#####################################
++# Shell function definitions:
++# This seems to be the best place for them
+ 
+ # func_mktempdir [string]
+ # Make a temporary directory that won't clash with other running
+@@ -355,7 +167,7 @@ func_mktempdir ()
+ {
+     my_template="${TMPDIR-/tmp}/${1-$progname}"
+ 
+-    if test "$opt_dry_run" = ":"; then
++    if test "$run" = ":"; then
+       # Return a directory name, but don't create it in dry-run mode
+       my_tmpdir="${my_template}-$$"
+     else
+@@ -364,783 +176,523 @@ func_mktempdir ()
+       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ 
+       if test ! -d "$my_tmpdir"; then
+-        # Failing that, at least try and use $RANDOM to avoid a race
+-        my_tmpdir="${my_template}-${RANDOM-0}$$"
++	# Failing that, at least try and use $RANDOM to avoid a race
++	my_tmpdir="${my_template}-${RANDOM-0}$$"
+ 
+-        save_mktempdir_umask=`umask`
+-        umask 0077
+-        $MKDIR "$my_tmpdir"
+-        umask $save_mktempdir_umask
++	save_mktempdir_umask=`umask`
++	umask 0077
++	$mkdir "$my_tmpdir"
++	umask $save_mktempdir_umask
+       fi
+ 
+       # If we're not in dry-run mode, bomb out on failure
+-      test -d "$my_tmpdir" || \
+-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
++      test -d "$my_tmpdir" || {
++        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++	exit $EXIT_FAILURE
++      }
+     fi
+ 
+-    $ECHO "X$my_tmpdir" | $Xsed
++    $echo "X$my_tmpdir" | $Xsed
+ }
+ 
+ 
+-# func_quote_for_eval arg
+-# Aesthetically quote ARG to be evaled later.
+-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+-# is double-quoted, suitable for a subsequent eval, whereas
+-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+-# which are still active within double quotes backslashified.
+-func_quote_for_eval ()
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
++# Need a lot of goo to handle *both* DLLs and import libs
++# Has to be a shell function in order to 'eat' the argument
++# that is supplied when $file_magic_command is called.
++func_win32_libid ()
+ {
+-    case $1 in
+-      *[\\\`\"\$]*)
+-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+-      *)
+-        func_quote_for_eval_unquoted_result="$1" ;;
+-    esac
+-
+-    case $func_quote_for_eval_unquoted_result in
+-      # Double-quote args containing shell metacharacters to delay
+-      # word splitting, command substitution and and variable
+-      # expansion for a subsequent eval.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+-        ;;
+-      *)
+-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
++  win32_libid_type="unknown"
++  win32_fileres=`file -L $1 2>/dev/null`
++  case $win32_fileres in
++  *ar\ archive\ import\ library*) # definitely import
++    win32_libid_type="x86 archive import"
++    ;;
++  *ar\ archive*) # could be an import, or static
++    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      win32_nmres=`eval $NM -f posix -A $1 | \
++	$SED -n -e '1,100{
++		/ I /{
++			s,.*,import,
++			p
++			q
++			}
++		}'`
++      case $win32_nmres in
++      import*)  win32_libid_type="x86 archive import";;
++      *)        win32_libid_type="x86 archive static";;
++      esac
++    fi
++    ;;
++  *DLL*)
++    win32_libid_type="x86 DLL"
++    ;;
++  *executable*) # but shell scripts are "executable" too...
++    case $win32_fileres in
++    *MS\ Windows\ PE\ Intel*)
++      win32_libid_type="x86 DLL"
++      ;;
+     esac
++    ;;
++  esac
++  $echo $win32_libid_type
+ }
+ 
+ 
+-# func_quote_for_expand arg
+-# Aesthetically quote ARG to be evaled later; same as above,
+-# but do not quote variable references.
+-func_quote_for_expand ()
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
+ {
+-    case $1 in
+-      *[\\\`\"]*)
+-	my_arg=`$ECHO "X$1" | $Xsed \
+-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
+       *)
+-        my_arg="$1" ;;
+-    esac
+-
+-    case $my_arg in
+-      # Double-quote args containing shell metacharacters to delay
+-      # word splitting and command substitution for a subsequent eval.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-        my_arg="\"$my_arg\""
+-        ;;
+-    esac
+-
+-    func_quote_for_expand_result="$my_arg"
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
+ }
+ 
+ 
+-# func_show_eval cmd [fail_exp]
+-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+-# is given, then evaluate it.
+-func_show_eval ()
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
+ {
+-    my_cmd="$1"
+-    my_fail_exp="${2-:}"
+-
+-    ${opt_silent-false} || {
+-      func_quote_for_expand "$my_cmd"
+-      eval "func_echo $func_quote_for_expand_result"
+-    }
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
+ 
+-    if ${opt_dry_run-false}; then :; else
+-      eval "$my_cmd"
+-      my_status=$?
+-      if test "$my_status" -eq 0; then :; else
+-	eval "(exit $my_status); $my_fail_exp"
+-      fi
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
+     fi
+ }
+ 
+-
+-# func_show_eval_locale cmd [fail_exp]
+-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+-# is given, then evaluate it.  Use the saved locale for evaluation.
+-func_show_eval_locale ()
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
+ {
+-    my_cmd="$1"
+-    my_fail_exp="${2-:}"
+-
+-    ${opt_silent-false} || {
+-      func_quote_for_expand "$my_cmd"
+-      eval "func_echo $func_quote_for_expand_result"
+-    }
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
+ 
+-    if ${opt_dry_run-false}; then :; else
+-      eval "$lt_user_locale
+-	    $my_cmd"
+-      my_status=$?
+-      eval "$lt_safe_locale"
+-      if test "$my_status" -eq 0; then :; else
+-	eval "(exit $my_status); $my_fail_exp"
+-      fi
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
+     fi
+-}
+-
+-
+ 
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
+ 
+-
+-# func_version
+-# Echo version message to standard output and exit.
+-func_version ()
+-{
+-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+-        s/^# //
+-	s/^# *$//
+-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+-        p
+-     }' < "$progpath"
+-     exit $?
+-}
+-
+-# func_usage
+-# Echo short help message to standard output and exit.
+-func_usage ()
+-{
+-    $SED -n '/^# Usage:/,/# -h/ {
+-        s/^# //
+-	s/^# *$//
+-	s/\$progname/'$progname'/
+-	p
+-    }' < "$progpath"
+-    $ECHO
+-    $ECHO "run \`$progname --help | more' for full usage"
+-    exit $?
+-}
+-
+-# func_help
+-# Echo long help message to standard output and exit.
+-func_help ()
+-{
+-    $SED -n '/^# Usage:/,/# Report bugs to/ {
+-        s/^# //
+-	s/^# *$//
+-	s*\$progname*'$progname'*
+-	s*\$host*'"$host"'*
+-	s*\$SHELL*'"$SHELL"'*
+-	s*\$LTCC*'"$LTCC"'*
+-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+-	s*\$LD*'"$LD"'*
+-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+-	p
+-     }' < "$progpath"
+-    exit $?
+-}
+-
+-# func_missing_arg argname
+-# Echo program name prefixed message to standard error and set global
+-# exit_cmd.
+-func_missing_arg ()
+-{
+-    func_error "missing argument for $1"
+-    exit_cmd=exit
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $exit_status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
+ }
++# End of Shell function definitions
++#####################################
+ 
+-exit_cmd=:
+-
+-
+-
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
+ 
++disable_libs=no
+ 
+-# Check that we have a working $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, and then maybe $ECHO will work.
+-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+-fi
+-
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
++# Parse our command line options once, thoroughly.
++while test "$#" -gt 0
++do
++  arg="$1"
+   shift
+-  cat <<EOF
+-$*
+-EOF
+-  exit $EXIT_SUCCESS
+-fi
+-
+-magic="%%%MAGIC variable%%%"
+-magic_exe="%%%MAGIC EXE variable%%%"
+-
+-# Global variables.
+-# $mode is unset
+-nonopt=
+-execute_dlfiles=
+-preserve_args=
+-lo2o="s/\\.lo\$/.${objext}/"
+-o2lo="s/\\.${objext}\$/.lo/"
+-extracted_archives=
+-extracted_serial=0
+ 
+-opt_dry_run=false
+-opt_duplicate_deps=false
+-opt_silent=false
+-opt_debug=:
++  case $arg in
++  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
+ 
+-# If this variable is set in any of the actions, the command in it
+-# will be execed at the end.  This prevents here-documents from being
+-# left over by shells.
+-exec_cmd=
++  # If the previous option needs an argument, assign it.
++  if test -n "$prev"; then
++    case $prev in
++    execute_dlfiles)
++      execute_dlfiles="$execute_dlfiles $arg"
++      ;;
++    tag)
++      tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
++
++      # Check whether tagname contains only valid characters
++      case $tagname in
++      *[!-_A-Za-z0-9,/]*)
++	$echo "$progname: invalid tag name: $tagname" 1>&2
++	exit $EXIT_FAILURE
++	;;
++      esac
+ 
+-# func_fatal_configuration arg...
+-# Echo program name prefixed message to standard error, followed by
+-# a configuration failure hint, and exit.
+-func_fatal_configuration ()
+-{
+-    func_error ${1+"$@"}
+-    func_error "See the $PACKAGE documentation for more information."
+-    func_fatal_error "Fatal configuration error."
+-}
++      case $tagname in
++      CC)
++	# Don't test for the "default" C tag, as we know, it's there, but
++	# not specially marked.
++	;;
++      *)
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
++	  taglist="$taglist $tagname"
++	  # Evaluate the configuration.
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
++	else
++	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
++	fi
++	;;
++      esac
++      ;;
++    *)
++      eval "$prev=\$arg"
++      ;;
++    esac
+ 
++    prev=
++    prevopt=
++    continue
++  fi
+ 
+-# func_config
+-# Display the configuration for all the tags in this script.
+-func_config ()
+-{
+-    re_begincf='^# ### BEGIN LIBTOOL'
+-    re_endcf='^# ### END LIBTOOL'
++  # Have we seen a non-optional argument yet?
++  case $arg in
++  --help)
++    show_help=yes
++    ;;
+ 
+-    # Default configuration.
+-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
++  --version)
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2008  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    exit $?
++    ;;
+ 
++  --config)
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-
+     exit $?
+-}
++    ;;
+ 
+-# func_features
+-# Display the features supported by this script.
+-func_features ()
+-{
+-    $ECHO "host: $host"
++  --debug)
++    $echo "$progname: enabling shell trace mode"
++    set -x
++    preserve_args="$preserve_args $arg"
++    ;;
++
++  --dry-run | -n)
++    run=:
++    ;;
++
++  --features)
++    $echo "host: $host"
+     if test "$build_libtool_libs" = yes; then
+-      $ECHO "enable shared libraries"
++      $echo "enable shared libraries"
+     else
+-      $ECHO "disable shared libraries"
++      $echo "disable shared libraries"
+     fi
+     if test "$build_old_libs" = yes; then
+-      $ECHO "enable static libraries"
++      $echo "enable static libraries"
+     else
+-      $ECHO "disable static libraries"
++      $echo "disable static libraries"
+     fi
+-
+     exit $?
+-}
+-
+-# func_enable_tag tagname
+-# Verify that TAGNAME is valid, and either flag an error and exit, or
+-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+-# variable here.
+-func_enable_tag ()
+-{
+-  # Global variable:
+-  tagname="$1"
+-
+-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+-
+-  # Validate tagname.
+-  case $tagname in
+-    *[!-_A-Za-z0-9,/]*)
+-      func_fatal_error "invalid tag name: $tagname"
+-      ;;
+-  esac
++    ;;
+ 
+-  # Don't test for the "default" C tag, as we know it's
+-  # there but not specially marked.
+-  case $tagname in
+-    CC) ;;
+-    *)
+-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+-	taglist="$taglist $tagname"
++  --finish) mode="finish" ;;
+ 
+-	# Evaluate the configuration.  Be careful to quote the path
+-	# and the sed script, to avoid splitting on whitespace, but
+-	# also don't use non-portable quotes within backquotes within
+-	# quotes we have to do it in 2 steps:
+-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+-	eval "$extractedcf"
+-      else
+-	func_error "ignoring unknown tag $tagname"
+-      fi
+-      ;;
+-  esac
+-}
++  --mode) prevopt="--mode" prev=mode ;;
++  --mode=*) mode="$optarg" ;;
+ 
+-# Parse options once, thoroughly.  This comes as soon as possible in
+-# the script to make things like `libtool --version' happen quickly.
+-{
++  --preserve-dup-deps) duplicate_deps="yes" ;;
+ 
+-  # Shorthand for --mode=foo, only valid as the first argument
+-  case $1 in
+-  clean|clea|cle|cl)
+-    shift; set dummy --mode clean ${1+"$@"}; shift
++  --quiet | --silent)
++    show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+-  compile|compil|compi|comp|com|co|c)
+-    shift; set dummy --mode compile ${1+"$@"}; shift
+-    ;;
+-  execute|execut|execu|exec|exe|ex|e)
+-    shift; set dummy --mode execute ${1+"$@"}; shift
++
++  --tag)
++    prevopt="--tag"
++    prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+-  finish|finis|fini|fin|fi|f)
+-    shift; set dummy --mode finish ${1+"$@"}; shift
++  --tag=*)
++    set tag "$optarg" ${1+"$@"}
++    shift
++    prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+-  install|instal|insta|inst|ins|in|i)
+-    shift; set dummy --mode install ${1+"$@"}; shift
++
++  -dlopen)
++    prevopt="-dlopen"
++    prev=execute_dlfiles
+     ;;
+-  link|lin|li|l)
+-    shift; set dummy --mode link ${1+"$@"}; shift
++
++  -*)
++    $echo "$modename: unrecognized option \`$arg'" 1>&2
++    $echo "$help" 1>&2
++    exit $EXIT_FAILURE
+     ;;
+-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+-    shift; set dummy --mode uninstall ${1+"$@"}; shift
++
++  *)
++    nonopt="$arg"
++    break
+     ;;
+   esac
++done
+ 
+-  # Parse non-mode specific arguments:
+-  while test "$#" -gt 0; do
+-    opt="$1"
+-    shift
+-
+-    case $opt in
+-      --config)		func_config					;;
+-
+-      --debug)		preserve_args="$preserve_args $opt"
+-			func_echo "enabling shell trace mode"
+-			opt_debug='set -x'
+-			$opt_debug
+-			;;
+-
+-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			execute_dlfiles="$execute_dlfiles $1"
+-			shift
+-			;;
+-
+-      --dry-run | -n)	opt_dry_run=:					;;
+-      --features)       func_features					;;
+-      --finish)		mode="finish"					;;
+-
+-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			case $1 in
+-			  # Valid mode arguments:
+-			  clean)	;;
+-			  compile)	;;
+-			  execute)	;;
+-			  finish)	;;
+-			  install)	;;
+-			  link)		;;
+-			  relink)	;;
+-			  uninstall)	;;
+-
+-			  # Catch anything else as an error
+-			  *) func_error "invalid argument for $opt"
+-			     exit_cmd=exit
+-			     break
+-			     ;;
+-		        esac
+-
+-			mode="$1"
+-			shift
+-			;;
+-
+-      --preserve-dup-deps)
+-			opt_duplicate_deps=:				;;
+-
+-      --quiet|--silent)	preserve_args="$preserve_args $opt"
+-			opt_silent=:
+-			;;
+-
+-      --verbose| -v)	preserve_args="$preserve_args $opt"
+-			opt_silent=false
+-			;;
+-
+-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			preserve_args="$preserve_args $opt $1"
+-			func_enable_tag "$1"	# tagname is set here
+-			shift
+-			;;
+-
+-      # Separate optargs to long options:
+-      -dlopen=*|--mode=*|--tag=*)
+-			func_opt_split "$opt"
+-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+-			shift
+-			;;
+-
+-      -\?|-h)		func_usage					;;
+-      --help)		opt_help=:					;;
+-      --version)	func_version					;;
++if test -n "$prevopt"; then
++  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
++  $echo "$help" 1>&2
++  exit $EXIT_FAILURE
++fi
+ 
+-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
++case $disable_libs in
++no) 
++  ;;
++shared)
++  build_libtool_libs=no
++  build_old_libs=yes
++  ;;
++static)
++  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++  ;;
++esac
+ 
+-      *)		nonopt="$opt"
+-			break
+-			;;
+-    esac
+-  done
++# If this variable is set in any of the actions, the command in it
++# will be execed at the end.  This prevents here-documents from being
++# left over by shells.
++exec_cmd=
+ 
++if test -z "$show_help"; then
+ 
+-  case $host in
+-    *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplications in $postdeps and $predeps
+-      opt_duplicate_compiler_generated_deps=:
++  # Infer the operation mode.
++  if test -z "$mode"; then
++    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
++    case $nonopt in
++    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
++      mode=link
++      for arg
++      do
++	case $arg in
++	-c)
++	   mode=compile
++	   break
++	   ;;
++	esac
++      done
+       ;;
+-    *)
+-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
++    *db | *dbx | *strace | *truss)
++      mode=execute
+       ;;
+-  esac
+-
+-  # Having warned about all mis-specified options, bail out if
+-  # anything was wrong.
+-  $exit_cmd $EXIT_FAILURE
+-}
++    *install*|cp|mv)
++      mode=install
++      ;;
++    *rm)
++      mode=uninstall
++      ;;
++    *)
++      # If we have no mode, but dlfiles were specified, then do execute mode.
++      test -n "$execute_dlfiles" && mode=execute
+ 
+-# func_check_version_match
+-# Ensure that we are using m4 macros, and libtool script from the same
+-# release of libtool.
+-func_check_version_match ()
+-{
+-  if test "$package_revision" != "$macro_revision"; then
+-    if test "$VERSION" != "$macro_version"; then
+-      if test -z "$macro_version"; then
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from an older release.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+-      else
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
++      # Just use the default operation mode.
++      if test -z "$mode"; then
++	if test -n "$nonopt"; then
++	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
++	else
++	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
++	fi
+       fi
+-    else
+-      cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+-$progname: of $PACKAGE $VERSION and run autoconf again.
+-_LT_EOF
+-    fi
+-
+-    exit $EXIT_MISMATCH
+-  fi
+-}
+-
+-
+-## ----------- ##
+-##    Main.    ##
+-## ----------- ##
+-
+-$opt_help || {
+-  # Sanity checks first:
+-  func_check_version_match
+-
+-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+-    func_fatal_configuration "not configured to build any kind of library"
++      ;;
++    esac
+   fi
+ 
+-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+-
+-
+-  # Darwin sucks
+-  eval std_shrext=\"$shrext_cmds\"
+-
+-
+   # Only execute mode is allowed to have -dlopen flags.
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+-    func_error "unrecognized option \`-dlopen'"
+-    $ECHO "$help" 1>&2
++    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
++    $echo "$help" 1>&2
+     exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+   generic_help="$help"
+-  help="Try \`$progname --help --mode=$mode' for more information."
+-}
++  help="Try \`$modename --help --mode=$mode' for more information."
+ 
++  # These modes are in order of execution frequency so that they run quickly.
++  case $mode in
++  # libtool compile mode
++  compile)
++    modename="$modename: compile"
++    # Get the compilation command and the source file.
++    base_compile=
++    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
++    suppress_output=
++    arg_mode=normal
++    libobj=
++    later=
+ 
+-# func_lalib_p file
+-# True iff FILE is a libtool `.la' library or `.lo' object file.
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_lalib_p ()
+-{
+-    $SED -e 4q "$1" 2>/dev/null \
+-      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+-}
++    for arg
++    do
++      case $arg_mode in
++      arg  )
++	# do not "continue".  Instead, add this to base_compile
++	lastarg="$arg"
++	arg_mode=normal
++	;;
+ 
+-# func_lalib_unsafe_p file
+-# True iff FILE is a libtool `.la' library or `.lo' object file.
+-# This function implements the same check as func_lalib_p without
+-# resorting to external programs.  To this end, it redirects stdin and
+-# closes it afterwards, without saving the original file descriptor.
+-# As a safety measure, use it only where a negative result would be
+-# fatal anyway.  Works if `file' does not exist.
+-func_lalib_unsafe_p ()
+-{
+-    lalib_p=no
+-    if test -r "$1" && exec 5<&0 <"$1"; then
+-	for lalib_p_l in 1 2 3 4
+-	do
+-	    read lalib_p_line
+-	    case "$lalib_p_line" in
+-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+-	    esac
+-	done
+-	exec 0<&5 5<&-
+-    fi
+-    test "$lalib_p" = yes
+-}
++      target )
++	libobj="$arg"
++	arg_mode=normal
++	continue
++	;;
+ 
+-# func_ltwrapper_script_p file
+-# True iff FILE is a libtool wrapper script
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_script_p ()
+-{
+-    func_lalib_p "$1"
+-}
++      normal )
++	# Accept any command-line options.
++	case $arg in
++	-o)
++	  if test -n "$libobj" ; then
++	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	  arg_mode=target
++	  continue
++	  ;;
+ 
+-# func_ltwrapper_executable_p file
+-# True iff FILE is a libtool wrapper executable
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_executable_p ()
+-{
+-    func_ltwrapper_exec_suffix=
+-    case $1 in
+-    *.exe) ;;
+-    *) func_ltwrapper_exec_suffix=.exe ;;
+-    esac
+-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+-}
+-
+-# func_ltwrapper_scriptname file
+-# Assumes file is an ltwrapper_executable
+-# uses $file to determine the appropriate filename for a
+-# temporary ltwrapper_script.
+-func_ltwrapper_scriptname ()
+-{
+-    func_ltwrapper_scriptname_result=""
+-    if func_ltwrapper_executable_p "$1"; then
+-	func_dirname_and_basename "$1" "" "."
+-	func_stripname '' '.exe' "$func_basename_result"
+-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+-    fi
+-}
+-
+-# func_ltwrapper_p file
+-# True iff FILE is a libtool wrapper script or wrapper executable
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_p ()
+-{
+-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+-}
+-
+-
+-# func_execute_cmds commands fail_cmd
+-# Execute tilde-delimited COMMANDS.
+-# If FAIL_CMD is given, eval that upon failure.
+-# FAIL_CMD may read-access the current command in variable CMD!
+-func_execute_cmds ()
+-{
+-    $opt_debug
+-    save_ifs=$IFS; IFS='~'
+-    for cmd in $1; do
+-      IFS=$save_ifs
+-      eval cmd=\"$cmd\"
+-      func_show_eval "$cmd" "${2-:}"
+-    done
+-    IFS=$save_ifs
+-}
+-
+-
+-# func_source file
+-# Source FILE, adding directory component if necessary.
+-# Note that it is not necessary on cygwin/mingw to append a dot to
+-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+-# `FILE.' does not work on cygwin managed mounts.
+-func_source ()
+-{
+-    $opt_debug
+-    case $1 in
+-    */* | *\\*)	. "$1" ;;
+-    *)		. "./$1" ;;
+-    esac
+-}
+-
+-
+-# func_infer_tag arg
+-# Infer tagged configuration to use if any are available and
+-# if one wasn't chosen via the "--tag" command line option.
+-# Only attempt this if the compiler in the base compile
+-# command doesn't match the default compiler.
+-# arg is usually of the form 'gcc ...'
+-func_infer_tag ()
+-{
+-    $opt_debug
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      CC_quoted=
+-      for arg in $CC; do
+-        func_quote_for_eval "$arg"
+-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+-      done
+-      case $@ in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+-	    CC_quoted=
+-	    for arg in $CC; do
+-	      # Double-quote args containing other shell metacharacters.
+-	      func_quote_for_eval "$arg"
+-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+-	    done
+-	    case "$@ " in
+-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with \`--tag'"
+-#	else
+-#	  func_verbose "using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
+-    fi
+-}
+-
+-
+-
+-# func_write_libtool_object output_name pic_name nonpic_name
+-# Create a libtool object file (analogous to a ".la" file),
+-# but don't create it if we're doing a dry run.
+-func_write_libtool_object ()
+-{
+-    write_libobj=${1}
+-    if test "$build_libtool_libs" = yes; then
+-      write_lobj=\'${2}\'
+-    else
+-      write_lobj=none
+-    fi
+-
+-    if test "$build_old_libs" = yes; then
+-      write_oldobj=\'${3}\'
+-    else
+-      write_oldobj=none
+-    fi
+-
+-    $opt_dry_run || {
+-      cat >${write_libobj}T <<EOF
+-# $write_libobj - a libtool object file
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
+-
+-# Name of the PIC object.
+-pic_object=$write_lobj
+-
+-# Name of the non-PIC object
+-non_pic_object=$write_oldobj
+-
+-EOF
+-      $MV "${write_libobj}T" "${write_libobj}"
+-    }
+-}
+-
+-# func_mode_compile arg...
+-func_mode_compile ()
+-{
+-    $opt_debug
+-    # Get the compilation command and the source file.
+-    base_compile=
+-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+-    suppress_opt=yes
+-    suppress_output=
+-    arg_mode=normal
+-    libobj=
+-    later=
+-    pie_flag=
+-
+-    for arg
+-    do
+-      case $arg_mode in
+-      arg  )
+-	# do not "continue".  Instead, add this to base_compile
+-	lastarg="$arg"
+-	arg_mode=normal
+-	;;
+-
+-      target )
+-	libobj="$arg"
+-	arg_mode=normal
+-	continue
+-	;;
+-
+-      normal )
+-	# Accept any command-line options.
+-	case $arg in
+-	-o)
+-	  test -n "$libobj" && \
+-	    func_fatal_error "you cannot specify \`-o' more than once"
+-	  arg_mode=target
+-	  continue
+-	  ;;
+-
+-	-pie | -fpie | -fPIE)
+-          pie_flag="$pie_flag $arg"
+-	  continue
+-	  ;;
+-
+-	-shared | -static | -prefer-pic | -prefer-non-pic)
++	-static | -prefer-pic | -prefer-non-pic)
+ 	  later="$later $arg"
+ 	  continue
+ 	  ;;
+@@ -1156,25 +708,31 @@ func_mode_compile ()
+ 	  ;;            #  replaced later.  I would guess that would be a bug.
+ 
+ 	-Wc,*)
+-	  func_stripname '-Wc,' '' "$arg"
+-	  args=$func_stripname_result
++	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+-	    func_quote_for_eval "$arg"
+-	    lastarg="$lastarg $func_quote_for_eval_result"
++
++	    # Double-quote args containing other shell metacharacters.
++	    # Many Bourne shells cannot handle close brackets correctly
++	    # in scan sets, so we specify it separately.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    lastarg="$lastarg $arg"
+ 	  done
+ 	  IFS="$save_ifs"
+-	  func_stripname ' ' '' "$lastarg"
+-	  lastarg=$func_stripname_result
++	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ 
+ 	  # Add the arguments to base_compile.
+ 	  base_compile="$base_compile $lastarg"
+ 	  continue
+ 	  ;;
+ 
+-	*)
++	* )
+ 	  # Accept the current argument as the source file.
+ 	  # The previous "srcfile" becomes the current argument.
+ 	  #
+@@ -1186,42 +744,66 @@ func_mode_compile ()
+       esac    #  case $arg_mode
+ 
+       # Aesthetically quote the previous argument.
+-      func_quote_for_eval "$lastarg"
+-      base_compile="$base_compile $func_quote_for_eval_result"
++      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
++
++      case $lastarg in
++      # Double-quote args containing other shell metacharacters.
++      # Many Bourne shells cannot handle close brackets correctly
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	lastarg="\"$lastarg\""
++	;;
++      esac
++
++      base_compile="$base_compile $lastarg"
+     done # for arg
+ 
+     case $arg_mode in
+     arg)
+-      func_fatal_error "you must specify an argument for -Xcompile"
++      $echo "$modename: you must specify an argument for -Xcompile"
++      exit $EXIT_FAILURE
+       ;;
+     target)
+-      func_fatal_error "you must specify a target with \`-o'"
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+-      test -z "$libobj" && {
+-	func_basename "$srcfile"
+-	libobj="$func_basename_result"
+-      }
++      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+       ;;
+     esac
+ 
+     # Recognize several different file suffixes.
+     # If the user specifies -o file.o, it is replaced with file.lo
++    xform='[cCFSifmso]'
+     case $libobj in
+-    *.[cCFSifmso] | \
+-    *.ada | *.adb | *.ads | *.asm | \
+-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+-      func_xform "$libobj"
+-      libobj=$func_xform_result
+-      ;;
++    *.ada) xform=ada ;;
++    *.adb) xform=adb ;;
++    *.ads) xform=ads ;;
++    *.asm) xform=asm ;;
++    *.c++) xform=c++ ;;
++    *.cc) xform=cc ;;
++    *.ii) xform=ii ;;
++    *.class) xform=class ;;
++    *.cpp) xform=cpp ;;
++    *.cxx) xform=cxx ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
++    *.for) xform=for ;;
++    *.java) xform=java ;;
++    *.obj) xform=obj ;;
++    *.sx) xform=sx ;;
+     esac
+ 
++    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
++
+     case $libobj in
+-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
++    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+-      func_fatal_error "cannot determine name of library object from \`$libobj'"
++      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+@@ -1229,15 +811,7 @@ func_mode_compile ()
+ 
+     for arg in $later; do
+       case $arg in
+-      -shared)
+-	test "$build_libtool_libs" != yes && \
+-	  func_fatal_configuration "can not build a shared library"
+-	build_old_libs=no
+-	continue
+-	;;
+-
+       -static)
+-	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	continue
+ 	;;
+@@ -1254,17 +828,28 @@ func_mode_compile ()
+       esac
+     done
+ 
+-    func_quote_for_eval "$libobj"
+-    test "X$libobj" != "X$func_quote_for_eval_result" \
+-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+-    func_dirname_and_basename "$obj" "/" ""
+-    objname="$func_basename_result"
+-    xdir="$func_dirname_result"
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
++    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++    if test "X$xdir" = "X$obj"; then
++      xdir=
++    else
++      xdir=$xdir/
++    fi
+     lobj=${xdir}$objdir/$objname
+ 
+-    test -z "$base_compile" && \
+-      func_fatal_help "you must specify a compilation command"
++    if test -z "$base_compile"; then
++      $echo "$modename: you must specify a compilation command" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+     # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+@@ -1273,6 +858,9 @@ func_mode_compile ()
+       removelist="$lobj $libobj ${libobj}T"
+     fi
+ 
++    $run $rm $removelist
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
++
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+     cygwin* | mingw* | pw32* | os2*)
+@@ -1287,8 +875,10 @@ func_mode_compile ()
+     # Calculate the filename of the output object if compiler does
+     # not support -o with -c
+     if test "$compiler_c_o" = no; then
+-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
++      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
++      removelist="$removelist $output_obj $lockfile"
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -1298,13 +888,13 @@ func_mode_compile ()
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+-	func_echo "Waiting for $lockfile to be removed"
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
++	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+     elif test "$need_locks" = warn; then
+       if test -f "$lockfile"; then
+-	$ECHO "\
++	$echo "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -1315,22 +905,34 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$opt_dry_run || $RM $removelist
++	$run $rm $removelist
+ 	exit $EXIT_FAILURE
+       fi
+-      removelist="$removelist $output_obj"
+-      $ECHO "$srcfile" > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
+     fi
+ 
+-    $opt_dry_run || $RM $removelist
+-    removelist="$removelist $lockfile"
+-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+-
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
+-    func_quote_for_eval "$srcfile"
+-    qsrcfile=$func_quote_for_eval_result
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
++
++    $run $rm "$libobj" "${libobj}T"
++
++    # Create a libtool object file (analogous to a ".la" file),
++    # but don't create it if we're doing a dry run.
++    test -z "$run" && cat > ${libobj}T <<EOF
++# $libobj - a libtool object file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# Name of the PIC object.
++EOF
+ 
+     # Only build a PIC object if we are building libtool libraries.
+     if test "$build_libtool_libs" = yes; then
+@@ -1344,19 +946,32 @@ compiler."
+ 	command="$base_compile $qsrcfile"
+       fi
+ 
+-      func_mkdir_p "$xdir$objdir"
++      if test ! -d "${xdir}$objdir"; then
++	$show "$mkdir ${xdir}$objdir"
++	$run $mkdir ${xdir}$objdir
++	exit_status=$?
++	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $exit_status
++	fi
++      fi
+ 
+       if test -z "$output_obj"; then
+ 	# Place PIC objects in $objdir
+ 	command="$command -o $lobj"
+       fi
+ 
+-      func_show_eval_locale "$command"	\
+-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
++      $run $rm "$lobj" "$output_obj"
++
++      $show "$command"
++      if $run eval $lt_env "$command"; then :
++      else
++	test -n "$output_obj" && $run $rm $removelist
++	exit $EXIT_FAILURE
++      fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-	$ECHO "\
++	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -1370,27 +985,45 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$opt_dry_run || $RM $removelist
++	$run $rm $removelist
+ 	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+-	func_show_eval '$MV "$output_obj" "$lobj"' \
+-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
++	$show "$mv $output_obj $lobj"
++	if $run $mv $output_obj $lobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
+       fi
+ 
++      # Append the name of the PIC object to the libtool object file.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object='$objdir/$objname'
++
++EOF
++
+       # Allow error messages only from the first compilation.
+       if test "$suppress_opt" = yes; then
+-	suppress_output=' >/dev/null 2>&1'
++        suppress_output=' >/dev/null 2>&1'
+       fi
++    else
++      # No PIC object so indicate it doesn't exist in the libtool
++      # object file.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object=none
++
++EOF
+     fi
+ 
+     # Only build a position-dependent object if we build old libraries.
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $qsrcfile$pie_flag"
++	command="$base_compile $qsrcfile"
+       else
+ 	command="$base_compile $qsrcfile $pic_flag"
+       fi
+@@ -1400,12 +1033,17 @@ compiler."
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+       command="$command$suppress_output"
+-      func_show_eval_locale "$command" \
+-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
++      $run $rm "$obj" "$output_obj"
++      $show "$command"
++      if $run eval $lt_env "$command"; then :
++      else
++	$run $rm $removelist
++	exit $EXIT_FAILURE
++      fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-	$ECHO "\
++	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -1419,2569 +1057,3460 @@ repeat this compilation, it may succeed,
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+-	$opt_dry_run || $RM $removelist
++	$run $rm $removelist
+ 	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+-	func_show_eval '$MV "$output_obj" "$obj"' \
+-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
++	$show "$mv $output_obj $obj"
++	if $run $mv $output_obj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
+       fi
++
++      # Append the name of the non-PIC object the libtool object file.
++      # Only append if the libtool object file exists.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object='$objname'
++
++EOF
++    else
++      # Append the name of the non-PIC object the libtool object file.
++      # Only append if the libtool object file exists.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object=none
++
++EOF
+     fi
+ 
+-    $opt_dry_run || {
+-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
++    $run $mv "${libobj}T" "${libobj}"
+ 
+-      # Unlock the critical section if it was locked
+-      if test "$need_locks" != no; then
+-	removelist=$lockfile
+-        $RM "$lockfile"
+-      fi
+-    }
++    # Unlock the critical section if it was locked
++    if test "$need_locks" != no; then
++      $run $rm "$lockfile"
++    fi
+ 
+     exit $EXIT_SUCCESS
+-}
++    ;;
+ 
+-$opt_help || {
+-test "$mode" = compile && func_mode_compile ${1+"$@"}
+-}
++  # libtool link mode
++  link | relink)
++    modename="$modename: link"
++    case $host in
++    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invocation.
++      # allow_undefined=no
+ 
+-func_mode_help ()
+-{
+-    # We need to display help for each of the modes.
+-    case $mode in
+-      "")
+-        # Generic help is extracted from the usage comments
+-        # at the start of this file.
+-        func_help
+-        ;;
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
++    libtool_args="$nonopt"
++    base_compile="$nonopt $@"
++    compile_command="$nonopt"
++    finalize_command="$nonopt"
+ 
+-      clean)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
++    compile_rpath=
++    finalize_rpath=
++    compile_shlibpath=
++    finalize_shlibpath=
++    convenience=
++    old_convenience=
++    deplibs=
++    old_deplibs=
++    compiler_flags=
++    linker_flags=
++    dllsearchpath=
++    lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+-Remove files from the build directory.
++    avoid_version=no
++    dlfiles=
++    dlprefiles=
++    dlself=no
++    export_dynamic=no
++    export_symbols=
++    export_symbols_regex=
++    generated=
++    libobjs=
++    ltlibs=
++    module=no
++    no_install=no
++    objs=
++    non_pic_objects=
++    notinst_path= # paths that contain not-installed libtool libraries
++    precious_files_regex=
++    prefer_static_libs=no
++    preload=no
++    prev=
++    prevarg=
++    release=
++    rpath=
++    xrpath=
++    perm_rpath=
++    temp_rpath=
++    thread_safe=no
++    vinfo=
++    vinfo_number=no
++    single_module="${wl}-single_module"
+ 
+-RM is the name of the program to use to delete files associated with each FILE
+-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+-to RM.
++    func_infer_tag $base_compile
+ 
+-If FILE is a libtool library, object or program, all the files associated
+-with it are deleted. Otherwise, only FILE itself is deleted using RM."
+-        ;;
+-
+-      compile)
+-      $ECHO \
+-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+-
+-Compile a source file into a libtool library object.
+-
+-This mode accepts the following additional options:
+-
+-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+-  -no-suppress      do not suppress compiler output for multiple passes
+-  -prefer-pic       try to building PIC objects only
+-  -prefer-non-pic   try to building non-PIC objects only
+-  -shared           do not build a \`.o' file suitable for static linking
+-  -static           only build a \`.o' file suitable for static linking
+-
+-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+-from the given SOURCEFILE.
+-
+-The output file name is determined by removing the directory component from
+-SOURCEFILE, then substituting the C source code suffix \`.c' with the
+-library object suffix, \`.lo'."
+-        ;;
+-
+-      execute)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+-
+-Automatically set library path, then run a program.
+-
+-This mode accepts the following additional options:
+-
+-  -dlopen FILE      add the directory containing FILE to the library path
+-
+-This mode sets the library path environment variable according to \`-dlopen'
+-flags.
+-
+-If any of the ARGS are libtool executable wrappers, then they are translated
+-into their corresponding uninstalled binary, and any of their required library
+-directories are added to the library path.
+-
+-Then, COMMAND is executed, with ARGS as arguments."
+-        ;;
+-
+-      finish)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
++    # We need to know -static, to get the right output filenames.
++    for arg
++    do
++      case $arg in
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
++	  fi
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	-static)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=built
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
++	build_libtool_libs=no
++	build_old_libs=yes
++	break
++	;;
++      esac
++    done
+ 
+-Complete the installation of libtool libraries.
++    # See if our shared archives depend on static archives.
++    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+-Each LIBDIR is a directory that contains libtool libraries.
++    # Go through the arguments, transforming them on the way.
++    while test "$#" -gt 0; do
++      arg="$1"
++      shift
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
++	;;
++      *) qarg=$arg ;;
++      esac
++      libtool_args="$libtool_args $qarg"
+ 
+-The commands that this mode executes may require superuser privileges.  Use
+-the \`--dry-run' option if you just want to see what would be executed."
+-        ;;
++      # If the previous option needs an argument, assign it.
++      if test -n "$prev"; then
++	case $prev in
++	output)
++	  compile_command="$compile_command @OUTPUT@"
++	  finalize_command="$finalize_command @OUTPUT@"
++	  ;;
++	esac
+ 
+-      install)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
++	case $prev in
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    compile_command="$compile_command @SYMFILE@"
++	    finalize_command="$finalize_command @SYMFILE@"
++	    preload=yes
++	  fi
++	  case $arg in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
++	    else
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  if test ! -f "$arg"; then
++	    $echo "$modename: symbol file \`$arg' does not exist"
++	    exit $EXIT_FAILURE
++	  fi
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
++	release)
++	  release="-$arg"
++	  prev=
++	  continue
++	  ;;
++	objectlist)
++	  if test -f "$arg"; then
++	    save_arg=$arg
++	    moreargs=
++	    for fil in `cat $save_arg`
++	    do
++#	      moreargs="$moreargs $fil"
++	      arg=$fil
++	      # A libtool-controlled object.
+ 
+-Install executables or libraries.
++	      # Check to see that this really is a libtool object.
++	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++		pic_object=
++		non_pic_object=
+ 
+-INSTALL-COMMAND is the installation command.  The first component should be
+-either the \`install' or \`cp' program.
++		# Read the .lo file
++		# If there is no directory component, then add one.
++		case $arg in
++		*/* | *\\*) . $arg ;;
++		*) . ./$arg ;;
++		esac
+ 
+-The following components of INSTALL-COMMAND are treated specially:
++		if test -z "$pic_object" || \
++		   test -z "$non_pic_object" ||
++		   test "$pic_object" = none && \
++		   test "$non_pic_object" = none; then
++		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++		  exit $EXIT_FAILURE
++		fi
+ 
+-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
++		# Extract subdirectory from the argument.
++		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++		if test "X$xdir" = "X$arg"; then
++		  xdir=
++		else
++		  xdir="$xdir/"
++		fi
+ 
+-The rest of the components are interpreted as arguments to that command (only
+-BSD-compatible install options are recognized)."
+-        ;;
++		if test "$pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  pic_object="$xdir$pic_object"
+ 
+-      link)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
++		  if test "$prev" = dlfiles; then
++		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		      dlfiles="$dlfiles $pic_object"
++		      prev=
++		      continue
++		    else
++		      # If libtool objects are unsupported, then we need to preload.
++		      prev=dlprefiles
++		    fi
++		  fi
+ 
+-Link object files or libraries together to form another library, or to
+-create an executable program.
++		  # CHECK ME:  I think I busted this.  -Ossama
++		  if test "$prev" = dlprefiles; then
++		    # Preload the old-style object.
++		    dlprefiles="$dlprefiles $pic_object"
++		    prev=
++		  fi
+ 
+-LINK-COMMAND is a command using the C compiler that you would use to create
+-a program from several object files.
++		  # A PIC object.
++		  libobjs="$libobjs $pic_object"
++		  arg="$pic_object"
++		fi
+ 
+-The following components of LINK-COMMAND are treated specially:
++		# Non-PIC object.
++		if test "$non_pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  non_pic_object="$xdir$non_pic_object"
+ 
+-  -all-static       do not do any dynamic linking at all
+-  -avoid-version    do not add a version suffix if possible
+-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+-  -export-symbols SYMFILE
+-                    try to export only the symbols listed in SYMFILE
+-  -export-symbols-regex REGEX
+-                    try to export only the symbols matching REGEX
+-  -LLIBDIR          search LIBDIR for required installed libraries
+-  -lNAME            OUTPUT-FILE requires the installed library libNAME
+-  -module           build a library that can dlopened
+-  -no-fast-install  disable the fast-install mode
+-  -no-install       link a not-installable executable
+-  -no-undefined     declare that a library does not refer to external symbols
+-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+-  -precious-files-regex REGEX
+-                    don't remove output files matching REGEX
+-  -release RELEASE  specify package release information
+-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+-  -shared           only do dynamic linking of libtool libraries
+-  -shrext SUFFIX    override the standard shared library file extension
+-  -static           do not do any dynamic linking of uninstalled libtool libraries
+-  -static-libtool-libs
+-                    do not do any dynamic linking of libtool libraries
+-  -version-info CURRENT[:REVISION[:AGE]]
+-                    specify library version info [each variable defaults to 0]
+-  -weak LIBNAME     declare that the target provides the LIBNAME interface
++		  # A standard non-PIC object
++		  non_pic_objects="$non_pic_objects $non_pic_object"
++		  if test -z "$pic_object" || test "$pic_object" = none ; then
++		    arg="$non_pic_object"
++		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
++		fi
++	      else
++		# Only an error if not doing a dry-run.
++		if test -z "$run"; then
++		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++		  exit $EXIT_FAILURE
++		else
++		  # Dry-run case.
+ 
+-All other options (arguments beginning with \`-') are ignored.
++		  # Extract subdirectory from the argument.
++		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++		  if test "X$xdir" = "X$arg"; then
++		    xdir=
++		  else
++		    xdir="$xdir/"
++		  fi
+ 
+-Every other argument is treated as a filename.  Files ending in \`.la' are
+-treated as uninstalled libtool libraries, other files are standard or library
+-object files.
+-
+-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+-required, except when creating a convenience library.
+-
+-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+-using \`ar' and \`ranlib', or on Windows using \`lib'.
+-
+-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+-is created, otherwise an executable program is created."
+-        ;;
+-
+-      uninstall)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++		  libobjs="$libobjs $pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
++		fi
++	      fi
++	    done
++	  else
++	    $echo "$modename: link input file \`$save_arg' does not exist"
++	    exit $EXIT_FAILURE
++	  fi
++	  arg=$save_arg
++	  prev=
++	  continue
++	  ;;
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case $arg in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
++	  *)
++	    $echo "$modename: only absolute run-paths are allowed" 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	xcompiler)
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  compile_command="$compile_command $qarg"
++	  finalize_command="$finalize_command $qarg"
++	  continue
++	  ;;
++	xlinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $wl$qarg"
++	  prev=
++	  compile_command="$compile_command $wl$qarg"
++	  finalize_command="$finalize_command $wl$qarg"
++	  continue
++	  ;;
++	xcclinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  compile_command="$compile_command $qarg"
++	  finalize_command="$finalize_command $qarg"
++	  continue
++	  ;;
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++	darwin_framework|darwin_framework_skip)
++	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
++	  prev=
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
++	  prev=
++	  continue
++	  ;;
++	esac
++      fi # test -n "$prev"
+ 
+-Remove libraries from an installation directory.
++      prevarg="$arg"
+ 
+-RM is the name of the program to use to delete files associated with each FILE
+-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+-to RM.
++      case $arg in
++      -all-static)
++	if test -n "$link_static_flag"; then
++	  compile_command="$compile_command $link_static_flag"
++	  finalize_command="$finalize_command $link_static_flag"
++	fi
++	continue
++	;;
+ 
+-If FILE is a libtool library, all the files associated with it are deleted.
+-Otherwise, only FILE itself is deleted using RM."
+-        ;;
++      -allow-undefined)
++	# FIXME: remove this flag sometime in the future.
++	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
++	continue
++	;;
+ 
+-      *)
+-        func_fatal_help "invalid operation mode \`$mode'"
+-        ;;
+-    esac
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
+ 
+-    $ECHO
+-    $ECHO "Try \`$progname --help' for more information about other modes."
++      -dlopen)
++	prev=dlfiles
++	continue
++	;;
+ 
+-    exit $?
+-}
++      -dlpreopen)
++	prev=dlprefiles
++	continue
++	;;
+ 
+-  # Now that we've collected a possible --mode arg, show help if necessary
+-  $opt_help && func_mode_help
++      -export-dynamic)
++	export_dynamic=yes
++	continue
++	;;
+ 
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  $echo "$modename: more than one -exported-symbols argument is not allowed"
++	  exit $EXIT_FAILURE
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
++	else
++	  prev=expsyms_regex
++	fi
++	continue
++	;;
+ 
+-# func_mode_execute arg...
+-func_mode_execute ()
+-{
+-    $opt_debug
+-    # The first argument is the command name.
+-    cmd="$nonopt"
+-    test -z "$cmd" && \
+-      func_fatal_help "you must specify a COMMAND"
++      -framework|-arch|-isysroot)
++	case " $CC " in
++	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
++		prev=darwin_framework_skip ;;
++	  *) compiler_flags="$compiler_flags $arg"
++	     prev=darwin_framework ;;
++	esac
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
+ 
+-    # Handle -dlopen flags immediately.
+-    for file in $execute_dlfiles; do
+-      test -f "$file" \
+-	|| func_fatal_help "\`$file' is not a file"
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
+ 
+-      dir=
+-      case $file in
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$file" \
+-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
++      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
++      # so, if we see these flags be careful not to treat them like -L
++      -L[A-Z][A-Z]*:*)
++	case $with_gcc/$host in
++	no/*-*-irix* | /*-*-irix*)
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
++	  ;;
++	esac
++	continue
++	;;
+ 
+-	# Read the libtool library.
+-	dlname=
+-	library_names=
+-	func_source "$file"
++      -L*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  if test -z "$absdir"; then
++	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
++	    absdir="$dir"
++	    notinst_path="$notinst_path $dir"
++	  fi
++	  dir="$absdir"
++	  ;;
++	esac
++	case "$deplibs " in
++	*" -L$dir "*) ;;
++	*)
++	  deplibs="$deplibs -L$dir"
++	  lib_search_path="$lib_search_path $dir"
++	  ;;
++	esac
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
++	  case :$dllsearchpath: in
++	  *":$dir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
++	  ;;
++	esac
++	continue
++	;;
+ 
+-	# Skip this library if it cannot be dlopened.
+-	if test -z "$dlname"; then
+-	  # Warn if it was a shared library.
+-	  test -n "$library_names" && \
+-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+-	  continue
++      -l*)
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
++	    # These systems don't actually have a C or math library (as such)
++	    continue
++	    ;;
++	  *-*-os2*)
++	    # These systems don't actually have a C library (as such)
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	    # Do not include libc due to us having libc/libc_r.
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C and math libraries are in the System framework
++	    deplibs="$deplibs -framework System"
++	    continue
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  esac
++	elif test "X$arg" = "X-lc_r"; then
++	 case $host in
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	   # Do not include libc_r directly, use -pthread flag.
++	   continue
++	   ;;
++	 esac
+ 	fi
++	deplibs="$deplibs $arg"
++	continue
++	;;
+ 
+-	func_dirname "$file" "" "."
+-	dir="$func_dirname_result"
+-
+-	if test -f "$dir/$objdir/$dlname"; then
+-	  dir="$dir/$objdir"
+-	else
+-	  if test ! -f "$dir/$dlname"; then
+-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+-	  fi
+-	fi
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
+ 	;;
+ 
+-      *.lo)
+-	# Just add the directory containing the .lo file.
+-	func_dirname "$file" "" "."
+-	dir="$func_dirname_result"
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
+ 	;;
+ 
+-      *)
+-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
++      -multi_module)
++	single_module="${wl}-multi_module"
+ 	continue
+ 	;;
+-      esac
+ 
+-      # Get the absolute pathname.
+-      absdir=`cd "$dir" && pwd`
+-      test -n "$absdir" && dir="$absdir"
++      -module)
++	module=yes
++	continue
++	;;
+ 
+-      # Now add the directory to shlibpath_var.
+-      if eval "test -z \"\$$shlibpath_var\""; then
+-	eval "$shlibpath_var=\"\$dir\""
+-      else
+-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+-      fi
+-    done
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ 
+-    # This variable tells wrapper scripts just to set shlibpath_var
+-    # rather than running their programs.
+-    libtool_execute_magic="$magic"
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++        compile_command="$compile_command $arg"
++        finalize_command="$finalize_command $arg"
++        compiler_flags="$compiler_flags $arg"
++        continue
++        ;;
+ 
+-    # Check if any of the arguments is a wrapper script.
+-    args=
+-    for file
+-    do
+-      case $file in
+-      -*) ;;
+-      *)
+-	# Do a test to see if this is really a libtool program.
+-	if func_ltwrapper_script_p "$file"; then
+-	  func_source "$file"
+-	  # Transform arg to wrapped name.
+-	  file="$progdir/$program"
+-	elif func_ltwrapper_executable_p "$file"; then
+-	  func_ltwrapper_scriptname "$file"
+-	  func_source "$func_ltwrapper_scriptname_result"
+-	  # Transform arg to wrapped name.
+-	  file="$progdir/$program"
+-	fi
++      -shrext)
++	prev=shrext
++	continue
+ 	;;
+-      esac
+-      # Quote arguments (to preserve shell metacharacters).
+-      func_quote_for_eval "$file"
+-      args="$args $func_quote_for_eval_result"
+-    done
+-
+-    if test "X$opt_dry_run" = Xfalse; then
+-      if test -n "$shlibpath_var"; then
+-	# Export the shlibpath_var.
+-	eval "export $shlibpath_var"
+-      fi
+-
+-      # Restore saved environment variables
+-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-      do
+-	eval "if test \"\${save_$lt_var+set}\" = set; then
+-                $lt_var=\$save_$lt_var; export $lt_var
+-	      else
+-		$lt_unset $lt_var
+-	      fi"
+-      done
+-
+-      # Now prepare to actually exec the command.
+-      exec_cmd="\$cmd$args"
+-    else
+-      # Display what would be done.
+-      if test -n "$shlibpath_var"; then
+-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+-	$ECHO "export $shlibpath_var"
+-      fi
+-      $ECHO "$cmd$args"
+-      exit $EXIT_SUCCESS
+-    fi
+-}
+-
+-test "$mode" = execute && func_mode_execute ${1+"$@"}
+-
+-
+-# func_mode_finish arg...
+-func_mode_finish ()
+-{
+-    $opt_debug
+-    libdirs="$nonopt"
+-    admincmds=
+-
+-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+-      for dir
+-      do
+-	libdirs="$libdirs $dir"
+-      done
+-
+-      for libdir in $libdirs; do
+-	if test -n "$finish_cmds"; then
+-	  # Do each command in the finish commands.
+-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+-'"$cmd"'"'
+-	fi
+-	if test -n "$finish_eval"; then
+-	  # Do the single finish_eval.
+-	  eval cmds=\"$finish_eval\"
+-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+-       $cmds"
+-	fi
+-      done
+-    fi
+ 
+-    # Exit here if they wanted silent mode.
+-    $opt_silent && exit $EXIT_SUCCESS
++      -no-fast-install)
++	fast_install=no
++	continue
++	;;
+ 
+-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+-    $ECHO "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      $ECHO "   $libdir"
+-    done
+-    $ECHO
+-    $ECHO "If you ever happen to want to link against installed libraries"
+-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    $ECHO "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      $ECHO "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      $ECHO "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
++      -no-install)
++	case $host in
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
++	  # The PATH hackery in wrapper scripts is required on Windows
++	  # and Darwin in order for the loader to find any dlls it needs.
++	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
++	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
++	  fast_install=no
++	  ;;
++	*) no_install=yes ;;
++	esac
++	continue
++	;;
+ 
+-      $ECHO "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      $ECHO "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    $ECHO
++      -no-undefined)
++	allow_undefined=no
++	continue
++	;;
+ 
+-    $ECHO "See any operating system documentation about shared libraries for"
+-    case $host in
+-      solaris2.[6789]|solaris2.1[0-9])
+-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+-	$ECHO "pages."
++      -objectlist)
++	prev=objectlist
++	continue
+ 	;;
+-      *)
+-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+-        ;;
+-    esac
+-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+-    exit $EXIT_SUCCESS
+-}
+ 
+-test "$mode" = finish && func_mode_finish ${1+"$@"}
++      -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
+ 
+-# func_mode_install arg...
+-func_mode_install ()
+-{
+-    $opt_debug
+-    # There may be an optional sh(1) argument at the beginning of
+-    # install_prog (especially on Windows NT).
+-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+-       # Allow the use of GNU shtool's install command.
+-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+-      # Aesthetically quote it.
+-      func_quote_for_eval "$nonopt"
+-      install_prog="$func_quote_for_eval_result "
+-      arg=$1
+-      shift
+-    else
+-      install_prog=
+-      arg=$nonopt
+-    fi
++      -release)
++	prev=release
++	continue
++	;;
+ 
+-    # The real first argument should be the name of the installation program.
+-    # Aesthetically quote it.
+-    func_quote_for_eval "$arg"
+-    install_prog="$install_prog$func_quote_for_eval_result"
++      -rpath)
++	prev=rpath
++	continue
++	;;
+ 
+-    # We need to accept at least all the BSD install flags.
+-    dest=
+-    files=
+-    opts=
+-    prev=
+-    install_type=
+-    isdir=no
+-    stripme=
+-    for arg
+-    do
+-      if test -n "$dest"; then
+-	files="$files $dest"
+-	dest=$arg
++      -R)
++	prev=xrpath
+ 	continue
+-      fi
++	;;
+ 
+-      case $arg in
+-      -d) isdir=yes ;;
+-      -f)
+-	case " $install_prog " in
+-	*[\\\ /]cp\ *) ;;
+-	*) prev=$arg ;;
++      -R*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
++	# We need an absolute path.
++	case $dir in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  $echo "$modename: only absolute run-paths are allowed" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$xrpath $dir" ;;
+ 	esac
++	continue
+ 	;;
+-      -g | -m | -o)
+-	prev=$arg
++
++      -static | -static-libtool-libs)
++	# The effects of -static are defined in a previous loop.
++	# We used to do the same as -all-static on platforms that
++	# didn't have a PIC flag, but the assumption that the effects
++	# would be equivalent was wrong.  It would break on at least
++	# Digital Unix and AIX.
++	continue
+ 	;;
+-      -s)
+-	stripme=" -s"
++
++      -thread-safe)
++	thread_safe=yes
+ 	continue
+ 	;;
+-      -*)
++
++      -version-info)
++	prev=vinfo
++	continue
+ 	;;
+-      *)
+-	# If the previous option needed an argument, then skip it.
+-	if test -n "$prev"; then
+-	  prev=
+-	else
+-	  dest=$arg
+-	  continue
+-	fi
++      -version-number)
++	prev=vinfo
++	vinfo_number=yes
++	continue
+ 	;;
+-      esac
+ 
+-      # Aesthetically quote the argument.
+-      func_quote_for_eval "$arg"
+-      install_prog="$install_prog $func_quote_for_eval_result"
+-    done
++      -Wc,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
+ 
+-    test -z "$install_prog" && \
+-      func_fatal_help "you must specify an install program"
++      -Wl,*)
++	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
++	arg=
++	save_ifs="$IFS"; IFS=','
++	for flag in $args; do
++	  IFS="$save_ifs"
++	  case $flag in
++	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	    flag="\"$flag\""
++	    ;;
++	  esac
++	  arg="$arg $wl$flag"
++	  compiler_flags="$compiler_flags $wl$flag"
++	  linker_flags="$linker_flags $flag"
++	done
++	IFS="$save_ifs"
++	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
++	;;
+ 
+-    test -n "$prev" && \
+-      func_fatal_help "the \`$prev' option requires an argument"
++      -Xcompiler)
++	prev=xcompiler
++	continue
++	;;
+ 
+-    if test -z "$files"; then
+-      if test -z "$dest"; then
+-	func_fatal_help "no file or destination specified"
+-      else
+-	func_fatal_help "you must specify a destination"
+-      fi
+-    fi
+-
+-    # Strip any trailing slash from the destination.
+-    func_stripname '' '/' "$dest"
+-    dest=$func_stripname_result
++      -Xlinker)
++	prev=xlinker
++	continue
++	;;
+ 
+-    # Check to see that the destination is a directory.
+-    test -d "$dest" && isdir=yes
+-    if test "$isdir" = yes; then
+-      destdir="$dest"
+-      destname=
+-    else
+-      func_dirname_and_basename "$dest" "" "."
+-      destdir="$func_dirname_result"
+-      destname="$func_basename_result"
++      -XCClinker)
++	prev=xcclinker
++	continue
++	;;
+ 
+-      # Not a directory, so check to see that there is only one file specified.
+-      set dummy $files; shift
+-      test "$#" -gt 1 && \
+-	func_fatal_help "\`$dest' is not a directory"
+-    fi
+-    case $destdir in
+-    [\\/]* | [A-Za-z]:[\\/]*) ;;
+-    *)
+-      for file in $files; do
+-	case $file in
+-	*.lo) ;;
+-	*)
+-	  func_fatal_help "\`$destdir' must be an absolute directory name"
++      # Some other compiler flag.
++      -* | +*)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-      done
+-      ;;
+-    esac
+-
+-    # This variable tells wrapper scripts just to set variables rather
+-    # than running their programs.
+-    libtool_install_magic="$magic"
+-
+-    staticlibs=
+-    future_libdirs=
+-    current_libdirs=
+-    for file in $files; do
++	;;
+ 
+-      # Do each installation.
+-      case $file in
+-      *.$libext)
+-	# Do the static libraries later.
+-	staticlibs="$staticlibs $file"
++      *.$objext)
++	# A standard object.
++	objs="$objs $arg"
+ 	;;
+ 
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$file" \
+-	  || func_fatal_help "\`$file' is not a valid libtool archive"
++      *.lo)
++	# A libtool-controlled object.
+ 
+-	library_names=
+-	old_library=
+-	relink_command=
+-	func_source "$file"
++	# Check to see that this really is a libtool object.
++	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  pic_object=
++	  non_pic_object=
+ 
+-	# Add the libdir to current_libdirs if it is the destination.
+-	if test "X$destdir" = "X$libdir"; then
+-	  case "$current_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) current_libdirs="$current_libdirs $libdir" ;;
+-	  esac
+-	else
+-	  # Note the libdir as a future libdir.
+-	  case "$future_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  # Read the .lo file
++	  # If there is no directory component, then add one.
++	  case $arg in
++	  */* | *\\*) . $arg ;;
++	  *) . ./$arg ;;
+ 	  esac
+-	fi
+-
+-	func_dirname "$file" "/" ""
+-	dir="$func_dirname_result"
+-	dir="$dir$objdir"
+-
+-	if test -n "$relink_command"; then
+-	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ 
+-	  # Don't allow the user to place us outside of our expected
+-	  # location b/c this prevents finding dependent libraries that
+-	  # are installed to the same prefix.
+-	  # At present, this check doesn't affect windows .dll's that
+-	  # are installed into $libdir/../bin (currently, that works fine)
+-	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  if test -z "$pic_object" || \
++	     test -z "$non_pic_object" ||
++	     test "$pic_object" = none && \
++	     test "$non_pic_object" = none; then
++	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 
+-	  if test -n "$inst_prefix_dir"; then
+-	    # Stick the inst_prefix_dir data into the link command.
+-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+-	  else
+-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
++	  # Extract subdirectory from the argument.
++	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$xdir" = "X$arg"; then
++	    xdir=
++ 	  else
++	    xdir="$xdir/"
+ 	  fi
+ 
+-	  func_warning "relinking \`$file'"
+-	  func_show_eval "$relink_command" \
+-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+-	fi
++	  if test "$pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    pic_object="$xdir$pic_object"
+ 
+-	# See the names of the shared library.
+-	set dummy $library_names; shift
+-	if test -n "$1"; then
+-	  realname="$1"
+-	  shift
++	    if test "$prev" = dlfiles; then
++	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		dlfiles="$dlfiles $pic_object"
++		prev=
++		continue
++	      else
++		# If libtool objects are unsupported, then we need to preload.
++		prev=dlprefiles
++	      fi
++	    fi
+ 
+-	  srcname="$realname"
+-	  test -n "$relink_command" && srcname="$realname"T
++	    # CHECK ME:  I think I busted this.  -Ossama
++	    if test "$prev" = dlprefiles; then
++	      # Preload the old-style object.
++	      dlprefiles="$dlprefiles $pic_object"
++	      prev=
++	    fi
+ 
+-	  # Install the shared library and build the symlinks.
+-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+-	      'exit $?'
+-	  tstripme="$stripme"
+-	  case $host_os in
+-	  cygwin* | mingw* | pw32*)
+-	    case $realname in
+-	    *.dll.a)
+-	      tstripme=""
+-	      ;;
+-	    esac
+-	    ;;
+-	  esac
+-	  if test -n "$tstripme" && test -n "$striplib"; then
+-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
++	    # A PIC object.
++	    libobjs="$libobjs $pic_object"
++	    arg="$pic_object"
+ 	  fi
+ 
+-	  if test "$#" -gt 0; then
+-	    # Delete the old symlinks, and create new ones.
+-	    # Try `ln -sf' first, because the `ln' binary might depend on
+-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+-	    # so we also need to try rm && ln -s.
+-	    for linkname
+-	    do
+-	      test "$linkname" != "$realname" \
+-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+-	    done
++	  # Non-PIC object.
++	  if test "$non_pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    non_pic_object="$xdir$non_pic_object"
++
++	    # A standard non-PIC object
++	    non_pic_objects="$non_pic_objects $non_pic_object"
++	    if test -z "$pic_object" || test "$pic_object" = none ; then
++	      arg="$non_pic_object"
++	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
++	else
++	  # Only an error if not doing a dry-run.
++	  if test -z "$run"; then
++	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++	    exit $EXIT_FAILURE
++	  else
++	    # Dry-run case.
+ 
+-	  # Do each command in the postinstall commands.
+-	  lib="$destdir/$realname"
+-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+-	fi
++	    # Extract subdirectory from the argument.
++	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	    if test "X$xdir" = "X$arg"; then
++	      xdir=
++	    else
++	      xdir="$xdir/"
++	    fi
+ 
+-	# Install the pseudo-library for information purposes.
+-	func_basename "$file"
+-	name="$func_basename_result"
+-	instname="$dir/$name"i
+-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
++	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++	    libobjs="$libobjs $pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
++	  fi
++	fi
++	;;
+ 
+-	# Maybe install the static library, too.
+-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++      *.$libext)
++	# An archive.
++	deplibs="$deplibs $arg"
++	old_deplibs="$old_deplibs $arg"
++	continue
+ 	;;
+ 
+-      *.lo)
+-	# Install (i.e. copy) a libtool object.
++      *.la)
++	# A libtool-controlled library.
+ 
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
++	if test "$prev" = dlfiles; then
++	  # This library was specified with -dlopen.
++	  dlfiles="$dlfiles $arg"
++	  prev=
++	elif test "$prev" = dlprefiles; then
++	  # The library was specified with -dlpreopen.
++	  dlprefiles="$dlprefiles $arg"
++	  prev=
+ 	else
+-	  func_basename "$file"
+-	  destfile="$func_basename_result"
+-	  destfile="$destdir/$destfile"
++	  deplibs="$deplibs $arg"
+ 	fi
++	continue
++	;;
+ 
+-	# Deduce the name of the destination old-style object file.
+-	case $destfile in
+-	*.lo)
+-	  func_lo2o "$destfile"
+-	  staticdest=$func_lo2o_result
+-	  ;;
+-	*.$objext)
+-	  staticdest="$destfile"
+-	  destfile=
+-	  ;;
+-	*)
+-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
++      # Some other compiler argument.
++      *)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-
+-	# Install the libtool object if requested.
+-	test -n "$destfile" && \
+-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+-
+-	# Install the old object if enabled.
+-	if test "$build_old_libs" = yes; then
+-	  # Deduce the name of the old-style object file.
+-	  func_lo2o "$file"
+-	  staticobj=$func_lo2o_result
+-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+-	fi
+-	exit $EXIT_SUCCESS
+ 	;;
++      esac # arg
+ 
+-      *)
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
+-	else
+-	  func_basename "$file"
+-	  destfile="$func_basename_result"
+-	  destfile="$destdir/$destfile"
+-	fi
+-
+-	# If the file is missing, and there is a .exe on the end, strip it
+-	# because it is most likely a libtool script we actually want to
+-	# install
+-	stripped_ext=""
+-	case $file in
+-	  *.exe)
+-	    if test ! -f "$file"; then
+-	      func_stripname '' '.exe' "$file"
+-	      file=$func_stripname_result
+-	      stripped_ext=".exe"
+-	    fi
+-	    ;;
+-	esac
++      # Now actually substitute the argument into the commands.
++      if test -n "$arg"; then
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++      fi
++    done # argument parsing loop
+ 
+-	# Do a test to see if this is really a libtool program.
+-	case $host in
+-	*cygwin*|*mingw*)
+-	    if func_ltwrapper_executable_p "$file"; then
+-	      func_ltwrapper_scriptname "$file"
+-	      wrapper=$func_ltwrapper_scriptname_result
+-	    else
+-	      func_stripname '' '.exe' "$file"
+-	      wrapper=$func_stripname_result
+-	    fi
+-	    ;;
+-	*)
+-	    wrapper=$file
+-	    ;;
+-	esac
+-	if func_ltwrapper_script_p "$wrapper"; then
+-	  notinst_deplibs=
+-	  relink_command=
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+-	  func_source "$wrapper"
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      compile_command="$compile_command $arg"
++      finalize_command="$finalize_command $arg"
++    fi
+ 
+-	  # Check the variables that should have been set.
+-	  test -z "$generated_by_libtool_version" && \
+-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
++    oldlibs=
++    # calculate the name of the file, without its directory
++    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
++    libobjs_save="$libobjs"
+ 
+-	  finalize=yes
+-	  for lib in $notinst_deplibs; do
+-	    # Check to see that each library is installed.
+-	    libdir=
+-	    if test -f "$lib"; then
+-	      func_source "$lib"
+-	    fi
+-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+-	    if test -n "$libdir" && test ! -f "$libfile"; then
+-	      func_warning "\`$lib' has not been installed in \`$libdir'"
+-	      finalize=no
+-	    fi
+-	  done
+-
+-	  relink_command=
+-	  func_source "$wrapper"
+-
+-	  outputname=
+-	  if test "$fast_install" = no && test -n "$relink_command"; then
+-	    $opt_dry_run || {
+-	      if test "$finalize" = yes; then
+-	        tmpdir=`func_mktempdir`
+-		func_basename "$file$stripped_ext"
+-		file="$func_basename_result"
+-	        outputname="$tmpdir/$file"
+-	        # Replace the output file specification.
+-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+-
+-	        $opt_silent || {
+-	          func_quote_for_expand "$relink_command"
+-		  eval "func_echo $func_quote_for_expand_result"
+-	        }
+-	        if eval "$relink_command"; then :
+-	          else
+-		  func_error "error: relink \`$file' with the above command before installing it"
+-		  $opt_dry_run || ${RM}r "$tmpdir"
+-		  continue
+-	        fi
+-	        file="$outputname"
+-	      else
+-	        func_warning "cannot relink \`$file'"
+-	      fi
+-	    }
+-	  else
+-	    # Install the binary that we compiled earlier.
+-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+-	  fi
+-	fi
+-
+-	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyway
+-	case $install_prog,$host in
+-	*/usr/bin/install*,*cygwin*)
+-	  case $file:$destfile in
+-	  *.exe:*.exe)
+-	    # this is ok
+-	    ;;
+-	  *.exe:*)
+-	    destfile=$destfile.exe
+-	    ;;
+-	  *:*.exe)
+-	    func_stripname '' '.exe' "$destfile"
+-	    destfile=$func_stripname_result
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+-	$opt_dry_run || if test -n "$outputname"; then
+-	  ${RM}r "$tmpdir"
+-	fi
+-	;;
+-      esac
+-    done
+-
+-    for file in $staticlibs; do
+-      func_basename "$file"
+-      name="$func_basename_result"
+-
+-      # Set up the ranlib parameters.
+-      oldlib="$destdir/$name"
+-
+-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+-
+-      if test -n "$stripme" && test -n "$old_striplib"; then
+-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+-      fi
+-
+-      # Do each command in the postinstall commands.
+-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+-    done
+-
+-    test -n "$future_libdirs" && \
+-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+-
+-    if test -n "$current_libdirs"; then
+-      # Maybe just do a dry run.
+-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+     else
+-      exit $EXIT_SUCCESS
++      shlib_search_path=
+     fi
+-}
+-
+-test "$mode" = install && func_mode_install ${1+"$@"}
+-
++    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+-# func_generate_dlsyms outputname originator pic_p
+-# Extract symbols from dlprefiles and create ${outputname}S.o with
+-# a dlpreopen symbol table.
+-func_generate_dlsyms ()
+-{
+-    $opt_debug
+-    my_outputname="$1"
+-    my_originator="$2"
+-    my_pic_p="${3-no}"
+-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+-    my_dlsyms=
+-
+-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+-	my_dlsyms="${my_outputname}S.c"
+-      else
+-	func_error "not configured to extract global symbols from dlpreopened files"
++    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++    if test "X$output_objdir" = "X$output"; then
++      output_objdir="$objdir"
++    else
++      output_objdir="$output_objdir/$objdir"
++    fi
++    # Create the object directory.
++    if test ! -d "$output_objdir"; then
++      $show "$mkdir $output_objdir"
++      $run $mkdir $output_objdir
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++	exit $exit_status
+       fi
+     fi
+ 
+-    if test -n "$my_dlsyms"; then
+-      case $my_dlsyms in
+-      "") ;;
+-      *.c)
+-	# Discover the nlist of each of the dlfiles.
+-	nlist="$output_objdir/${my_outputname}.nm"
+-
+-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+-
+-	# Parse the name list into a source file.
+-	func_verbose "creating $output_objdir/$my_dlsyms"
+-
+-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+-
+-#ifdef __cplusplus
+-extern \"C\" {
+-#endif
+-
+-/* External symbol declarations for the compiler. */\
+-"
+-
+-	if test "$dlself" = yes; then
+-	  func_verbose "generating symbol list for \`$output'"
+-
+-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+-
+-	  # Add our own program objects to the symbol list.
+-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-	  for progfile in $progfiles; do
+-	    func_verbose "extracting global C symbols from \`$progfile'"
+-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+-	  done
+-
+-	  if test -n "$exclude_expsyms"; then
+-	    $opt_dry_run || {
+-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	    }
+-	  fi
+-
+-	  if test -n "$export_symbols_regex"; then
+-	    $opt_dry_run || {
+-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	    }
+-	  fi
+-
+-	  # Prepare the list of exported symbols
+-	  if test -z "$export_symbols"; then
+-	    export_symbols="$output_objdir/$outputname.exp"
+-	    $opt_dry_run || {
+-	      $RM $export_symbols
+-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+-	      case $host in
+-	      *cygwin* | *mingw* )
+-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+-	        ;;
+-	      esac
+-	    }
+-	  else
+-	    $opt_dry_run || {
+-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	      case $host in
+-	        *cygwin | *mingw* )
+-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+-	          ;;
+-	      esac
+-	    }
+-	  fi
+-	fi
+-
+-	for dlprefile in $dlprefiles; do
+-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+-	  func_basename "$dlprefile"
+-	  name="$func_basename_result"
+-	  $opt_dry_run || {
+-	    eval '$ECHO ": $name " >> "$nlist"'
+-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+-	  }
+-	done
+-
+-	$opt_dry_run || {
+-	  # Make sure we have at least an empty file.
+-	  test -f "$nlist" || : > "$nlist"
+-
+-	  if test -n "$exclude_expsyms"; then
+-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+-	    $MV "$nlist"T "$nlist"
+-	  fi
+-
+-	  # Try sorting and uniquifying the output.
+-	  if $GREP -v "^: " < "$nlist" |
+-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+-		sort -k 3
+-	      else
+-		sort +2
+-	      fi |
+-	      uniq > "$nlist"S; then
+-	    :
+-	  else
+-	    $GREP -v "^: " < "$nlist" > "$nlist"S
+-	  fi
+-
+-	  if test -f "$nlist"S; then
+-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+-	  else
+-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+-	  fi
++    # Determine the type of output
++    case $output in
++    "")
++      $echo "$modename: you must specify an output file" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++      ;;
++    *.$libext) linkmode=oldlib ;;
++    *.lo | *.$objext) linkmode=obj ;;
++    *.la) linkmode=lib ;;
++    *) linkmode=prog ;; # Anything else should be a program.
++    esac
+ 
+-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
++    case $host in
++    *cygwin* | *mingw* | *pw32*)
++      # don't eliminate duplications in $postdeps and $predeps
++      duplicate_compiler_generated_deps=yes
++      ;;
++    *)
++      duplicate_compiler_generated_deps=$duplicate_deps
++      ;;
++    esac
++    specialdeplibs=
+ 
+-/* The mapping between symbol names and symbols.  */
+-typedef struct {
+-  const char *name;
+-  void *address;
+-} lt_dlsymlist;
+-"
+-	  case $host in
+-	  *cygwin* | *mingw* )
+-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+-/* DATA imports from DLLs on WIN32 con't be const, because
+-   runtime relocations are performed -- see ld's documentation
+-   on pseudo-relocs.  */"
+-	    lt_dlsym_const= ;;
+-	  *osf5*)
+-	    echo >> "$output_objdir/$my_dlsyms" "\
+-/* This system does not cope well with relocations in const data */"
+-	    lt_dlsym_const= ;;
+-	  *)
+-	    lt_dlsym_const=const ;;
+-	  esac
++    libs=
++    # Find all interdependent deplibs by searching for libraries
++    # that are linked more than once (e.g. -la -lb -la)
++    for deplib in $deplibs; do
++      if test "X$duplicate_deps" = "Xyes" ; then
++	case "$libs " in
++	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	esac
++      fi
++      libs="$libs $deplib"
++    done
+ 
+-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+-extern $lt_dlsym_const lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[];
+-$lt_dlsym_const lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[] =
+-{\
+-  { \"$my_originator\", (void *) 0 },"
++    if test "$linkmode" = lib; then
++      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+ 
+-	  case $need_lib_prefix in
+-	  no)
+-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+-	    ;;
+-	  *)
+-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+-	    ;;
++      # Compute libraries that are listed more than once in $predeps
++      # $postdeps and mark them as special (i.e., whose duplicates are
++      # not to be eliminated).
++      pre_post_deps=
++      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
++	for pre_post_dep in $predeps $postdeps; do
++	  case "$pre_post_deps " in
++	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ 	  esac
+-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+-  {0, (void *) 0}
+-};
+-
+-/* This works around a problem in FreeBSD linker */
+-#ifdef FREEBSD_WORKAROUND
+-static const void *lt_preloaded_setup() {
+-  return lt_${my_prefix}_LTX_preloaded_symbols;
+-}
+-#endif
+-
+-#ifdef __cplusplus
+-}
+-#endif\
+-"
+-	} # !$opt_dry_run
++	  pre_post_deps="$pre_post_deps $pre_post_dep"
++	done
++      fi
++      pre_post_deps=
++    fi
+ 
+-	pic_flag_for_symtable=
+-	case "$compile_command " in
+-	*" -static "*) ;;
+-	*)
+-	  case $host in
+-	  # compiling the symbol table file with pic_flag works around
+-	  # a FreeBSD bug that causes programs to crash when -lm is
+-	  # linked before any other PIC object.  But we must not use
+-	  # pic_flag when linking with -static.  The problem exists in
+-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+-	  *-*-hpux*)
+-	    pic_flag_for_symtable=" $pic_flag"  ;;
++    deplibs=
++    newdependency_libs=
++    newlib_search_path=
++    need_relink=no # whether we're linking any uninstalled libtool libraries
++    notinst_deplibs= # not-installed libtool libraries
++    case $linkmode in
++    lib)
++	passes="conv link"
++	for file in $dlfiles $dlprefiles; do
++	  case $file in
++	  *.la) ;;
+ 	  *)
+-	    if test "X$my_pic_p" != Xno; then
+-	      pic_flag_for_symtable=" $pic_flag"
+-	    fi
++	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
++	done
++	;;
++    prog)
++	compile_deplibs=
++	finalize_deplibs=
++	alldeplibs=no
++	newdlfiles=
++	newdlprefiles=
++	passes="conv scan dlopen dlpreopen link"
++	;;
++    *)  passes="conv"
++	;;
++    esac
++    for pass in $passes; do
++      if test "$linkmode,$pass" = "lib,link" ||
++	 test "$linkmode,$pass" = "prog,scan"; then
++	libs="$deplibs"
++	deplibs=
++      fi
++      if test "$linkmode" = prog; then
++	case $pass in
++	dlopen) libs="$dlfiles" ;;
++	dlpreopen) libs="$dlprefiles" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ 	  ;;
+ 	esac
+-	symtab_cflags=
+-	for arg in $LTCFLAGS; do
+-	  case $arg in
+-	  -pie | -fpie | -fPIE) ;;
+-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+-	  esac
+-	done
+-
+-	# Now compile the dynamic symbol file.
+-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+-
+-	# Clean up the generated files.
+-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+-
+-	# Transform the symbol file into the correct name.
+-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+-	case $host in
+-	*cygwin* | *mingw* )
+-	  if test -f "$output_objdir/$my_outputname.def"; then
+-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++      fi
++      if test "$pass" = dlopen; then
++	# Collect dlpreopened libraries
++	save_deplibs="$deplibs"
++	deplibs=
++      fi
++      for deplib in $libs; do
++	lib=
++	found=no
++	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
+ 	  else
+-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++	    compiler_flags="$compiler_flags $deplib"
+ 	  fi
++	  continue
+ 	  ;;
+-	*)
+-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+-	  ;;
+-	esac
+-	;;
+-      *)
+-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+-	;;
+-      esac
+-    else
+-      # We keep going just in case the user didn't refer to
+-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+-      # really was required.
+-
+-      # Nullify the symbol file.
+-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+-    fi
+-}
+-
+-# func_win32_libid arg
+-# return the library type of file 'arg'
+-#
+-# Need a lot of goo to handle *both* DLLs and import libs
+-# Has to be a shell function in order to 'eat' the argument
+-# that is supplied when $file_magic_command is called.
+-func_win32_libid ()
+-{
+-  $opt_debug
+-  win32_libid_type="unknown"
+-  win32_fileres=`file -L $1 2>/dev/null`
+-  case $win32_fileres in
+-  *ar\ archive\ import\ library*) # definitely import
+-    win32_libid_type="x86 archive import"
+-    ;;
+-  *ar\ archive*) # could be an import, or static
+-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+-      win32_nmres=`eval $NM -f posix -A $1 |
+-	$SED -n -e '
+-	    1,100{
+-		/ I /{
+-		    s,.*,import,
+-		    p
+-		    q
+-		}
+-	    }'`
+-      case $win32_nmres in
+-      import*)  win32_libid_type="x86 archive import";;
+-      *)        win32_libid_type="x86 archive static";;
+-      esac
+-    fi
+-    ;;
+-  *DLL*)
+-    win32_libid_type="x86 DLL"
+-    ;;
+-  *executable*) # but shell scripts are "executable" too...
+-    case $win32_fileres in
+-    *MS\ Windows\ PE\ Intel*)
+-      win32_libid_type="x86 DLL"
+-      ;;
+-    esac
+-    ;;
+-  esac
+-  $ECHO "$win32_libid_type"
+-}
+-
++	-l*)
++	  if test "$linkmode" != lib && test "$linkmode" != prog; then
++	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
++	    continue
++	  fi
++	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
++	  if test "$linkmode" = lib; then
++	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++	  else
++	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++	  fi
++	  for searchdir in $searchdirs; do
++	    for search_ext in .la $std_shrext .so .a; do
++	      # Search the libtool library
++	      lib="$searchdir/lib${name}${search_ext}"
++	      if test -f "$lib"; then
++		if test "$search_ext" = ".la"; then
++		  found=yes
++		else
++		  found=no
++		fi
++		break 2
++	      fi
++	    done
++	  done
++	  if test "$found" != yes; then
++	    # deplib doesn't seem to be a libtool library
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	  else # deplib is a libtool library
++	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
++	    # We need to do some special things here, and not later.
++	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      case " $predeps $postdeps " in
++	      *" $deplib "*)
++		if (${SED} -e '2q' $lib |
++                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++		  library_names=
++		  old_library=
++		  case $lib in
++		  */* | *\\*) . $lib ;;
++		  *) . ./$lib ;;
++		  esac
++		  for l in $old_library $library_names; do
++		    ll="$l"
++		  done
++		  if test "X$ll" = "X$old_library" ; then # only static version available
++		    found=no
++		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++		    test "X$ladir" = "X$lib" && ladir="."
++		    lib=$ladir/$old_library
++		    if test "$linkmode,$pass" = "prog,link"; then
++		      compile_deplibs="$deplib $compile_deplibs"
++		      finalize_deplibs="$deplib $finalize_deplibs"
++		    else
++		      deplibs="$deplib $deplibs"
++		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++		    fi
++		    continue
++		  fi
++		fi
++	        ;;
++	      *) ;;
++	      esac
++	    fi
++	  fi
++	  ;; # -l
++	-L*)
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test "$pass" = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    ;;
++	  prog)
++	    if test "$pass" = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
++	    fi
++	    if test "$pass" = scan; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++	    ;;
++	  *)
++	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
++	    ;;
++	  esac # linkmode
++	  continue
++	  ;; # -L
++	-R*)
++	  if test "$pass" = link; then
++	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
++	    # Make sure the xrpath contains only unique directories.
++	    case "$xrpath " in
++	    *" $dir "*) ;;
++	    *) xrpath="$xrpath $dir" ;;
++	    esac
++	  fi
++	  deplibs="$deplib $deplibs"
++	  continue
++	  ;;
++	*.la) lib="$deplib" ;;
++	*.$libext)
++	  if test "$pass" = conv; then
++	    deplibs="$deplib $deplibs"
++	    continue
++	  fi
++	  case $linkmode in
++	  lib)
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
++	      $echo
++	      $echo "*** Warning: Trying to link with static lib archive $deplib."
++	      $echo "*** I have the capability to make that library automatically link in when"
++	      $echo "*** you link to this library.  But I can only do this if you have a"
++	      $echo "*** shared version of the library, which you do not appear to have"
++	      $echo "*** because the file extensions .$libext of this argument makes me believe"
++	      $echo "*** that it is just a static archive that I should not used here."
++	    else
++	      $echo
++	      $echo "*** Warning: Linking the shared library $output against the"
++	      $echo "*** static library $deplib is not portable!"
++	      deplibs="$deplib $deplibs"
++	    fi
++	    continue
++	    ;;
++	  prog)
++	    if test "$pass" != link; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    continue
++	    ;;
++	  esac # linkmode
++	  ;; # *.$libext
++	*.lo | *.$objext)
++	  if test "$pass" = conv; then
++	    deplibs="$deplib $deplibs"
++	  elif test "$linkmode" = prog; then
++	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	      # If there is no dlopen support or we're linking statically,
++	      # we need to preload.
++	      newdlprefiles="$newdlprefiles $deplib"
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      newdlfiles="$newdlfiles $deplib"
++	    fi
++	  fi
++	  continue
++	  ;;
++	%DEPLIBS%)
++	  alldeplibs=yes
++	  continue
++	  ;;
++	esac # case $deplib
++	if test "$found" = yes || test -f "$lib"; then :
++	else
++	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++	  exit $EXIT_FAILURE
++	fi
+ 
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  exit $EXIT_FAILURE
++	fi
+ 
+-# func_extract_an_archive dir oldlib
+-func_extract_an_archive ()
+-{
+-    $opt_debug
+-    f_ex_an_ar_dir="$1"; shift
+-    f_ex_an_ar_oldlib="$1"
+-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+-     :
+-    else
+-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+-    fi
+-}
++	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$ladir" = "X$lib" && ladir="."
+ 
++	dlname=
++	dlopen=
++	dlpreopen=
++	libdir=
++	library_names=
++	old_library=
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variables installed, or shouldnotlink
++	installed=yes
++	shouldnotlink=no
++	avoidtemprpath=
+ 
+-# func_extract_archives gentop oldlib ...
+-func_extract_archives ()
+-{
+-    $opt_debug
+-    my_gentop="$1"; shift
+-    my_oldlibs=${1+"$@"}
+-    my_oldobjs=""
+-    my_xlib=""
+-    my_xabs=""
+-    my_xdir=""
+ 
+-    for my_xlib in $my_oldlibs; do
+-      # Extract the objects.
+-      case $my_xlib in
+-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+-	*) my_xabs=`pwd`"/$my_xlib" ;;
+-      esac
+-      func_basename "$my_xlib"
+-      my_xlib="$func_basename_result"
+-      my_xlib_u=$my_xlib
+-      while :; do
+-        case " $extracted_archives " in
+-	*" $my_xlib_u "*)
+-	  func_arith $extracted_serial + 1
+-	  extracted_serial=$func_arith_result
+-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+-	*) break ;;
++	# Read the .la file
++	case $lib in
++	*/* | *\\*) . $lib ;;
++	*) . ./$lib ;;
+ 	esac
+-      done
+-      extracted_archives="$extracted_archives $my_xlib_u"
+-      my_xdir="$my_gentop/$my_xlib_u"
+ 
+-      func_mkdir_p "$my_xdir"
+-
+-      case $host in
+-      *-darwin*)
+-	func_verbose "Extracting $my_xabs"
+-	# Do not bother doing anything if just a dry run
+-	$opt_dry_run || {
+-	  darwin_orig_dir=`pwd`
+-	  cd $my_xdir || exit $?
+-	  darwin_archive=$my_xabs
+-	  darwin_curdir=`pwd`
+-	  darwin_base_archive=`basename "$darwin_archive"`
+-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+-	  if test -n "$darwin_arches"; then
+-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+-	    darwin_arch=
+-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+-	    for darwin_arch in  $darwin_arches ; do
+-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+-	      cd "$darwin_curdir"
+-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+-	    done # $darwin_arches
+-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+-	    darwin_file=
+-	    darwin_files=
+-	    for darwin_file in $darwin_filelist; do
+-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+-	      $LIPO -create -output "$darwin_file" $darwin_files
+-	    done # $darwin_filelist
+-	    $RM -rf unfat-$$
+-	    cd "$darwin_orig_dir"
+-	  else
+-	    cd $darwin_orig_dir
+-	    func_extract_an_archive "$my_xdir" "$my_xabs"
+-	  fi # $darwin_arches
+-	} # !$opt_dry_run
+-	;;
+-      *)
+-        func_extract_an_archive "$my_xdir" "$my_xabs"
+-	;;
+-      esac
+-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-    done
+-
+-    func_extract_archives_result="$my_oldobjs"
+-}
++	if test "$linkmode,$pass" = "lib,link" ||
++	   test "$linkmode,$pass" = "prog,scan" ||
++	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
++	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
++	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++	fi
+ 
++	if test "$pass" = conv; then
++	  # Only check for convenience libraries
++	  deplibs="$lib $deplibs"
++	  if test -z "$libdir"; then
++	    if test -z "$old_library"; then
++	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	      exit $EXIT_FAILURE
++	    fi
++	    # It is a libtool convenience library, so add in its objects.
++	    convenience="$convenience $ladir/$objdir/$old_library"
++	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++              if test "X$duplicate_deps" = "Xyes" ; then
++	        case "$tmp_libs " in
++	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	        esac
++              fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
++	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	  continue
++	fi # $pass = conv
+ 
+ 
+-# func_emit_wrapper arg
+-#
+-# emit a libtool wrapper script on stdout
+-# don't directly open a file because we may want to
+-# incorporate the script contents within a cygwin/mingw
+-# wrapper executable.  Must ONLY be called from within
+-# func_mode_link because it depends on a number of variable
+-# set therein.
+-#
+-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+-# variable will take.  If 'yes', then the emitted script
+-# will assume that the directory in which it is stored is
+-# the '.lib' directory.  This is a cygwin/mingw-specific
+-# behavior.
+-func_emit_wrapper ()
+-{
+-	func_emit_wrapper_arg1=no
+-	if test -n "$1" ; then
+-	  func_emit_wrapper_arg1=$1
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++	if test -z "$linklib"; then
++	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+-	$ECHO "\
+-#! $SHELL
+-
+-# $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# The $output program cannot be directly executed until all the libtool
+-# libraries that it depends on are installed.
+-#
+-# This wrapper script should never be moved out of the build directory.
+-# If it is, it will not operate correctly.
++	# This library was specified with -dlopen.
++	if test "$pass" = dlopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking
++	    # statically, we need to preload.  We also need to preload any
++	    # dependent libraries so libltdl's deplib preloader doesn't
++	    # bomb out in the load deplibs phase.
++	    dlprefiles="$dlprefiles $lib $dependency_libs"
++	  else
++	    newdlfiles="$newdlfiles $lib"
++	  fi
++	  continue
++	fi # $pass = dlopen
+ 
+-# 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='$sed_quote_subst'
++	# We need an absolute path.
++	case $ladir in
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
++	*)
++	  abs_ladir=`cd "$ladir" && pwd`
++	  if test -z "$abs_ladir"; then
++	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
++	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	    abs_ladir="$ladir"
++	  fi
++	  ;;
++	esac
++	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 
+-# Be Bourne compatible
+-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+-fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++	# Find the relevant object directory and library name.
++	if test "X$installed" = Xyes; then
++	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	  else
++	    dir="$libdir"
++	    absdir="$libdir"
++	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
++	else
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
++	fi # $installed = yes
++	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+-# 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
++	# This library was specified with -dlpreopen.
++	if test "$pass" = dlpreopen; then
++	  if test -z "$libdir"; then
++	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    newdlprefiles="$newdlprefiles $dir/$old_library"
++	  # Otherwise, use the dlname, so that lt_dlopen finds it.
++	  elif test -n "$dlname"; then
++	    newdlprefiles="$newdlprefiles $dir/$dlname"
++	  else
++	    newdlprefiles="$newdlprefiles $dir/$linklib"
++	  fi
++	fi # $pass = dlpreopen
+ 
+-relink_command=\"$relink_command\"
++	if test -z "$libdir"; then
++	  # Link the convenience library
++	  if test "$linkmode" = lib; then
++	    deplibs="$dir/$old_library $deplibs"
++	  elif test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$dir/$old_library $compile_deplibs"
++	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
++	  else
++	    deplibs="$lib $deplibs" # used for prog,scan pass
++	  fi
++	  continue
++	fi
+ 
+-# This environment variable determines our operation mode.
+-if test \"\$libtool_install_magic\" = \"$magic\"; then
+-  # install mode needs the following variables:
+-  generated_by_libtool_version='$macro_version'
+-  notinst_deplibs='$notinst_deplibs'
+-else
+-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+-    ECHO=\"$qecho\"
+-    file=\"\$0\"
+-    # Make sure echo works.
+-    if test \"X\$1\" = X--no-reexec; then
+-      # Discard the --no-reexec flag, and continue.
+-      shift
+-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+-      # Yippee, \$ECHO works!
+-      :
+-    else
+-      # Restart under the correct shell, and then maybe \$ECHO will work.
+-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+-    fi
+-  fi\
+-"
+-	$ECHO "\
+ 
+-  # Find the directory that this script lives in.
+-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
++	if test "$linkmode" = prog && test "$pass" != link; then
++	  newlib_search_path="$newlib_search_path $ladir"
++	  deplibs="$lib $deplibs"
+ 
+-  # Follow symbolic links until we get to the real thisdir.
+-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+-  while test -n \"\$file\"; do
+-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
++	  fi
+ 
+-    # If there was a directory component, then change thisdir.
+-    if test \"x\$destdir\" != \"x\$file\"; then
+-      case \"\$destdir\" in
+-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+-      *) thisdir=\"\$thisdir/\$destdir\" ;;
+-      esac
+-    fi
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    case $deplib in
++	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
++	    esac
++	    # Need to link against all dependency_libs?
++	    if test "$linkalldeplibs" = yes; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      # Need to hardcode shared library paths
++	      # or/and link against static libraries
++	      newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done # for deplib
++	  continue
++	fi # $linkmode = prog...
+ 
+-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+-  done
++	if test "$linkmode,$pass" = "prog,link"; then
++	  if test -n "$library_names" &&
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
++	    # We need to hardcode the library path
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
++	      # Make sure the rpath contains only unique directories.
++	      case "$temp_rpath " in
++	      *" $dir "*) ;;
++	      *" $absdir "*) ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
++	      esac
++	    fi
+ 
+-  # Usually 'no', except on cygwin/mingw when embedded into
+-  # the cwrapper.
+-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+-    # special case for '.'
+-    if test \"\$thisdir\" = \".\"; then
+-      thisdir=\`pwd\`
+-    fi
+-    # remove .libs from thisdir
+-    case \"\$thisdir\" in
+-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+-    $objdir )   thisdir=. ;;
+-    esac
+-  fi
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	  fi # $linkmode,$pass = prog,link...
+ 
+-  # Try to get the absolute directory name.
+-  absdir=\`cd \"\$thisdir\" && pwd\`
+-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+-"
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
++		 test -n "$library_names"; }; }; then
++	    # We only need to search for static libraries
++	    continue
++	  fi
++	fi
+ 
+-	if test "$fast_install" = yes; then
+-	  $ECHO "\
+-  program=lt-'$outputname'$exeext
+-  progdir=\"\$thisdir/$objdir\"
++	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
++	if test -n "$library_names" &&
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
++	  if test "$installed" = no; then
++	    notinst_deplibs="$notinst_deplibs $lib"
++	    need_relink=yes
++	  fi
++	  # This is a shared library
+ 
+-  if test ! -f \"\$progdir/\$program\" ||
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
++	    $echo
++	    if test "$linkmode" = prog; then
++	      $echo "*** Warning: Linking the executable $output against the loadable module"
++	    else
++	      $echo "*** Warning: Linking the shared library $output against the loadable module"
++	    fi
++	    $echo "*** $linklib is not portable!"
++	  fi
++	  if test "$linkmode" = lib &&
++	     test "$hardcode_into_libs" = yes; then
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	  fi
+ 
+-    file=\"\$\$-\$program\"
++	  if test -n "$old_archive_from_expsyms_cmds"; then
++	    # figure out the soname
++	    set dummy $library_names
++	    realname="$2"
++	    shift; shift
++	    libname=`eval \\$echo \"$libname_spec\"`
++	    # use dlname if we got it. it's perfectly good, no?
++	    if test -n "$dlname"; then
++	      soname="$dlname"
++	    elif test -n "$soname_spec"; then
++	      # bleh windows
++	      case $host in
++	      *cygwin* | mingw*)
++		major=`expr $current - $age`
++		versuffix="-$major"
++		;;
++	      esac
++	      eval soname=\"$soname_spec\"
++	    else
++	      soname="$realname"
++	    fi
+ 
+-    if test ! -d \"\$progdir\"; then
+-      $MKDIR \"\$progdir\"
+-    else
+-      $RM \"\$progdir/\$file\"
+-    fi"
++	    # Make a new name for the extract_expsyms_cmds to use
++	    soroot="$soname"
++	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
++	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ 
+-	  $ECHO "\
++	    # If the library has no export list, then create one now
++	    if test -f "$output_objdir/$soname-def"; then :
++	    else
++	      $show "extracting exported symbol list from \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      cmds=$extract_expsyms_cmds
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
+ 
+-    # relink executable if necessary
+-    if test -n \"\$relink_command\"; then
+-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+-      else
+-	$ECHO \"\$relink_command_output\" >&2
+-	$RM \"\$progdir/\$file\"
+-	exit 1
+-      fi
+-    fi
++	    # Create $newlib
++	    if test -f "$output_objdir/$newlib"; then :; else
++	      $show "generating import library for \`$soname'"
++	      save_ifs="$IFS"; IFS='~'
++	      cmds=$old_archive_from_expsyms_cmds
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
++		$show "$cmd"
++		$run eval "$cmd" || exit $?
++	      done
++	      IFS="$save_ifs"
++	    fi
++	    # make sure the library variables are pointing to the new library
++	    dir=$output_objdir
++	    linklib=$newlib
++	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+-    { $RM \"\$progdir/\$program\";
+-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+-    $RM \"\$progdir/\$file\"
+-  fi"
+-	else
+-	  $ECHO "\
+-  program='$outputname'
+-  progdir=\"\$thisdir/$objdir\"
+-"
+-	fi
++	  if test "$linkmode" = prog || test "$mode" != relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    lib_linked=yes
++	    case $hardcode_action in
++	    immediate | unsupported)
++	      if test "$hardcode_direct" = no; then
++		add="$dir/$linklib"
++		case $host in
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++		    *-*-unixware7*) add_dir="-L$dir" ;;
++		  *-*-darwin* )
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null |
++                      $EGREP ": [^:]* bundle" >/dev/null ; then
++		      $echo "** Warning, lib $linklib is a module, not a shared library"
++		      if test -z "$old_library" ; then
++		        $echo
++		        $echo "** And there doesn't seem to be a static archive available"
++		        $echo "** The link will probably fail, sorry"
++		      else
++		        add="$dir/$old_library"
++		      fi
++		    fi
++		esac
++	      elif test "$hardcode_minus_L" = no; then
++		case $host in
++		*-*-sunos*) add_shlibpath="$dir" ;;
++		esac
++		add_dir="-L$dir"
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = no; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    relink)
++	      if test "$hardcode_direct" = yes; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = yes; then
++		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case $libdir in
++		    [\\/]*)
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		      ;;
++		  esac
++		fi
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = yes; then
++		add_shlibpath="$dir"
++		add="-l$name"
++	      else
++		lib_linked=no
++	      fi
++	      ;;
++	    *) lib_linked=no ;;
++	    esac
+ 
+-	$ECHO "\
++	    if test "$lib_linked" != yes; then
++	      $echo "$modename: configuration error: unsupported hardcode properties"
++	      exit $EXIT_FAILURE
++	    fi
+ 
+-  if test -f \"\$progdir/\$program\"; then"
++	    if test -n "$add_shlibpath"; then
++	      case :$compile_shlibpath: in
++	      *":$add_shlibpath:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
++	      esac
++	    fi
++	    if test "$linkmode" = prog; then
++	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
++	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	      if test "$hardcode_direct" != yes && \
++		 test "$hardcode_minus_L" != yes && \
++		 test "$hardcode_shlibpath_var" = yes; then
++		case :$finalize_shlibpath: in
++		*":$libdir:"*) ;;
++		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++		esac
++	      fi
++	    fi
++	  fi
+ 
+-	# Export our shlibpath_var if we have one.
+-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-	  $ECHO "\
+-    # Add our own library path to $shlibpath_var
+-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
++	  if test "$linkmode" = prog || test "$mode" = relink; then
++	    add_shlibpath=
++	    add_dir=
++	    add=
++	    # Finalize command for both is simple: just hardcode it.
++	    if test "$hardcode_direct" = yes; then
++	      add="$libdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      add_dir="-L$libdir"
++	      add="-l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case :$finalize_shlibpath: in
++	      *":$libdir:"*) ;;
++	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++	      esac
++	      add="-l$name"
++	    elif test "$hardcode_automatic" = yes; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	        add="$inst_prefix_dir$libdir/$linklib"
++	      else
++	        add="$libdir/$linklib"
++	      fi
++	    else
++	      # We cannot seem to hardcode it, guess we'll fake it.
++	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++		case $libdir in
++		  [\\/]*)
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    ;;
++		esac
++	      fi
++	      add="-l$name"
++	    fi
+ 
+-    # Some systems cannot cope with colon-terminated $shlibpath_var
+-    # The second colon is a workaround for a bug in BeOS R4 sed
+-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++	    if test "$linkmode" = prog; then
++	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
++	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
++	    else
++	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
++	      test -n "$add" && deplibs="$add $deplibs"
++	    fi
++	  fi
++	elif test "$linkmode" = prog; then
++	  # Here we assume that one of hardcode_direct or hardcode_minus_L
++	  # is not unsupported.  This is valid on all known static and
++	  # shared platforms.
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
++	    compile_deplibs="$dir/$linklib $compile_deplibs"
++	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
++	  else
++	    compile_deplibs="-l$name -L$dir $compile_deplibs"
++	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
++	  fi
++	elif test "$build_libtool_libs" = yes; then
++	  # Not a shared library
++	  if test "$deplibs_check_method" != pass_all; then
++	    # We're trying link a shared library against a static one
++	    # but the system doesn't support it.
+ 
+-    export $shlibpath_var
+-"
+-	fi
++	    # Just print a warning and add the library to dependency_libs so
++	    # that the program can be linked against the static library.
++	    $echo
++	    $echo "*** Warning: This system can not link to static lib archive $lib."
++	    $echo "*** I have the capability to make that library automatically link in when"
++	    $echo "*** you link to this library.  But I can only do this if you have a"
++	    $echo "*** shared version of the library, which you do not appear to have."
++	    if test "$module" = yes; then
++	      $echo "*** But as you try to build a module library, libtool will still create "
++	      $echo "*** a static module, that should work as long as the dlopening application"
++	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      if test -z "$global_symbol_pipe"; then
++		$echo
++		$echo "*** However, this would only work if libtool was able to extract symbol"
++		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		$echo "*** not find such a program.  So, this module is probably useless."
++		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      fi
++	      if test "$build_old_libs" = no; then
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  else
++	    deplibs="$dir/$old_library $deplibs"
++	    link_static=yes
++	  fi
++	fi # link shared/static library?
+ 
+-	# fixup the dll searchpath if we need to.
+-	if test -n "$dllsearchpath"; then
+-	  $ECHO "\
+-    # Add the dll search path components to the executable PATH
+-    PATH=$dllsearchpath:\$PATH
+-"
+-	fi
++	if test "$linkmode" = lib; then
++	  if test -n "$dependency_libs" &&
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
++	    # Extract -R from dependency_libs
++	    temp_deplibs=
++	    for libdir in $dependency_libs; do
++	      case $libdir in
++	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
++		   case " $xrpath " in
++		   *" $temp_xrpath "*) ;;
++		   *) xrpath="$xrpath $temp_xrpath";;
++		   esac;;
++	      *) temp_deplibs="$temp_deplibs $libdir";;
++	      esac
++	    done
++	    dependency_libs="$temp_deplibs"
++	  fi
+ 
+-	$ECHO "\
+-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+-      # Run the actual program with our arguments.
+-"
+-	case $host in
+-	# Backslashes separate directories on plain windows
+-	*-*-mingw | *-*-os2*)
+-	  $ECHO "\
+-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+-"
+-	  ;;
++	  newlib_search_path="$newlib_search_path $absdir"
++	  # Link against this library
++	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  # ... and its dependency_libs
++	  tmp_libs=
++	  for deplib in $dependency_libs; do
++	    newdependency_libs="$deplib $newdependency_libs"
++	    if test "X$duplicate_deps" = "Xyes" ; then
++	      case "$tmp_libs " in
++	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++	      esac
++	    fi
++	    tmp_libs="$tmp_libs $deplib"
++	  done
+ 
+-	*)
+-	  $ECHO "\
+-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+-"
++	  if test "$link_all_deplibs" != no; then
++	    # Add the search paths of all dependency libraries
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      -L*) path="$deplib" ;;
++	      *.la)
++		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
++		test "X$dir" = "X$deplib" && dir="."
++		# We need an absolute path.
++		case $dir in
++		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++		*)
++		  absdir=`cd "$dir" && pwd`
++		  if test -z "$absdir"; then
++		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++		    absdir="$dir"
++		  fi
++		  ;;
++		esac
++		if grep "^installed=no" $deplib > /dev/null; then
++		  path="$absdir/$objdir"
++		else
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  if test -z "$libdir"; then
++		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		    exit $EXIT_FAILURE
++		  fi
++		  if test "$absdir" != "$libdir"; then
++		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++		  fi
++		  path="$absdir"
++		fi
++		depdepl=
++		case $host in
++		*-*-darwin*)
++		  # we do not want to link against static libs,
++		  # but need to link against shared
++		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  if test -n "$deplibrary_names" ; then
++		    for tmp in $deplibrary_names ; do
++		      depdepl=$tmp
++		    done
++		    if test -f "$deplibdir/$depdepl" ; then
++		      depdepl="$deplibdir/$depdepl"
++	      	    elif test -f "$path/$depdepl" ; then
++		      depdepl="$path/$depdepl"
++		    else
++		      # Can't find it, oh well...
++		      depdepl=
++		    fi
++		    # do not add paths which are already there
++		    case " $newlib_search_path " in
++		    *" $path "*) ;;
++		    *) newlib_search_path="$newlib_search_path $path";;
++		    esac
++		  fi
++		  path=""
++		  ;;
++		*)
++		  path="-L$path"
++		  ;;
++		esac
++		;;
++	      -l*)
++		case $host in
++		*-*-darwin*)
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
++		  ;;
++		*) continue ;;
++		esac
++		;;
++	      *) continue ;;
++	      esac
++	      case " $deplibs " in
++	      *" $path "*) ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
++	      esac
++	    done
++	  fi # link_all_deplibs != no
++	fi # linkmode = lib
++      done # for deplib in $libs
++      dependency_libs="$newdependency_libs"
++      if test "$pass" = dlpreopen; then
++	# Link the dlpreopened libraries before other libraries
++	for deplib in $save_deplibs; do
++	  deplibs="$deplib $deplibs"
++	done
++      fi
++      if test "$pass" != dlopen; then
++	if test "$pass" != conv; then
++	  # Make sure lib_search_path contains only unique directories.
++	  lib_search_path=
++	  for dir in $newlib_search_path; do
++	    case "$lib_search_path " in
++	    *" $dir "*) ;;
++	    *) lib_search_path="$lib_search_path $dir" ;;
++	    esac
++	  done
++	  newlib_search_path=
++	fi
++
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
++	else
++	  vars="compile_deplibs finalize_deplibs"
++	fi
++	for var in $vars dependency_libs; do
++	  # Add libraries to $var in reverse order
++	  eval tmp_libs=\"\$$var\"
++	  new_libs=
++	  for deplib in $tmp_libs; do
++	    # FIXME: Pedantically, this is the right thing to do, so
++	    #        that some nasty dependency loop isn't accidentally
++	    #        broken:
++	    #new_libs="$deplib $new_libs"
++	    # Pragmatically, this seems to cause very few problems in
++	    # practice:
++	    case $deplib in
++	    -L*) new_libs="$deplib $new_libs" ;;
++	    -R*) ;;
++	    *)
++	      # And here is the reason: when a library appears more
++	      # than once as an explicit dependence of a library, or
++	      # is implicitly linked in more than once by the
++	      # compiler, it is considered special, and multiple
++	      # occurrences thereof are not removed.  Compare this
++	      # with having the same library being listed as a
++	      # dependency of multiple other libraries: in this case,
++	      # we know (pedantically, we assume) the library does not
++	      # need to be listed more than once, so we keep only the
++	      # last copy.  This is not always right, but it is rare
++	      # enough that we require users that really mean to play
++	      # such unportable linking tricks to link the library
++	      # using -Wl,-lname, so that libtool does not consider it
++	      # for duplicate removal.
++	      case " $specialdeplibs " in
++	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
++	      *)
++		case " $new_libs " in
++		*" $deplib "*) ;;
++		*) new_libs="$deplib $new_libs" ;;
++		esac
++		;;
++	      esac
++	      ;;
++	    esac
++	  done
++	  tmp_libs=
++	  for deplib in $new_libs; do
++	    case $deplib in
++	    -L*)
++	      case " $tmp_libs " in
++	      *" $deplib "*) ;;
++	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      esac
++	      ;;
++	    *) tmp_libs="$tmp_libs $deplib" ;;
++	    esac
++	  done
++	  eval $var=\"$tmp_libs\"
++	done # for var
++      fi
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
++      tmp_libs=
++      for i in $dependency_libs ; do
++	case " $predeps $postdeps $compiler_lib_search_path " in
++	*" $i "*)
++	  i=""
+ 	  ;;
+ 	esac
+-	$ECHO "\
+-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+-      exit 1
++	if test -n "$i" ; then
++	  tmp_libs="$tmp_libs $i"
++	fi
++      done
++      dependency_libs=$tmp_libs
++    done # for pass
++    if test "$linkmode" = prog; then
++      dlfiles="$newdlfiles"
++      dlprefiles="$newdlprefiles"
+     fi
+-  else
+-    # The program doesn't exist.
+-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
+-  fi
+-fi\
+-"
+-}
+-# end: func_emit_wrapper
+ 
+-# func_emit_cwrapperexe_src
+-# emit the source code for a wrapper executable on stdout
+-# Must ONLY be called from within func_mode_link because
+-# it depends on a number of variable set therein.
+-func_emit_cwrapperexe_src ()
+-{
+-	cat <<EOF
++    case $linkmode in
++    oldlib)
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++      esac
+ 
+-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
++      fi
+ 
+-   The $output program cannot be directly executed until all the libtool
+-   libraries that it depends on are installed.
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
++      fi
+ 
+-   This wrapper executable should never be moved out of the build directory.
+-   If it is, it will not operate correctly.
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
++      fi
+ 
+-   Currently, it simply execs the wrapper *script* "$SHELL $output",
+-   but could eventually absorb all of the scripts functionality and
+-   exec $objdir/$outputname directly.
+-*/
+-EOF
+-	    cat <<"EOF"
+-#include <stdio.h>
+-#include <stdlib.h>
+-#ifdef _MSC_VER
+-# include <direct.h>
+-# include <process.h>
+-# include <io.h>
+-# define setmode _setmode
+-#else
+-# include <unistd.h>
+-# include <stdint.h>
+-# ifdef __CYGWIN__
+-#  include <io.h>
+-# endif
+-#endif
+-#include <malloc.h>
+-#include <stdarg.h>
+-#include <assert.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/stat.h>
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
++      fi
+ 
+-#if defined(PATH_MAX)
+-# define LT_PATHMAX PATH_MAX
+-#elif defined(MAXPATHLEN)
+-# define LT_PATHMAX MAXPATHLEN
+-#else
+-# define LT_PATHMAX 1024
+-#endif
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
++      fi
+ 
+-#ifndef S_IXOTH
+-# define S_IXOTH 0
+-#endif
+-#ifndef S_IXGRP
+-# define S_IXGRP 0
+-#endif
++      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
++      fi
+ 
+-#ifdef _MSC_VER
+-# define S_IXUSR _S_IEXEC
+-# define stat _stat
+-# ifndef _INTPTR_T_DEFINED
+-#  define intptr_t int
+-# endif
+-#endif
++      # Now set the variables for building old libraries.
++      build_libtool_libs=no
++      oldlibs="$output"
++      objs="$objs$old_deplibs"
++      ;;
+ 
+-#ifndef DIR_SEPARATOR
+-# define DIR_SEPARATOR '/'
+-# define PATH_SEPARATOR ':'
+-#endif
+-
+-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+-  defined (__OS2__)
+-# define HAVE_DOS_BASED_FILE_SYSTEM
+-# define FOPEN_WB "wb"
+-# ifndef DIR_SEPARATOR_2
+-#  define DIR_SEPARATOR_2 '\\'
+-# endif
+-# ifndef PATH_SEPARATOR_2
+-#  define PATH_SEPARATOR_2 ';'
+-# endif
+-#endif
++    lib)
++      # Make sure we only generate libraries of the form `libNAME.la'.
++      case $outputname in
++      lib*)
++	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval shared_ext=\"$shrext_cmds\"
++	eval libname=\"$libname_spec\"
++	;;
++      *)
++	if test "$module" = no; then
++	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
++	fi
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval shared_ext=\"$shrext_cmds\"
++	  eval libname=\"$libname_spec\"
++	else
++	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	fi
++	;;
++      esac
+ 
+-#ifndef DIR_SEPARATOR_2
+-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+-#else /* DIR_SEPARATOR_2 */
+-# define IS_DIR_SEPARATOR(ch) \
+-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+-#endif /* DIR_SEPARATOR_2 */
++      if test -n "$objs"; then
++	if test "$deplibs_check_method" != pass_all; then
++	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
++	  exit $EXIT_FAILURE
++	else
++	  $echo
++	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
++	  $echo "*** objects $objs is not portable!"
++	  libobjs="$libobjs $objs"
++	fi
++      fi
+ 
+-#ifndef PATH_SEPARATOR_2
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+-#else /* PATH_SEPARATOR_2 */
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+-#endif /* PATH_SEPARATOR_2 */
++      if test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
++      fi
+ 
+-#ifdef __CYGWIN__
+-# define FOPEN_WB "wb"
+-#endif
++      set dummy $rpath
++      if test "$#" -gt 2; then
++	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
++      fi
++      install_libdir="$2"
+ 
+-#ifndef FOPEN_WB
+-# define FOPEN_WB "w"
+-#endif
+-#ifndef _O_BINARY
+-# define _O_BINARY 0
+-#endif
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  # Some compilers have problems with a `.al' extension so
++	  # convenience libraries should have the same extension an
++	  # archive normally would.
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
+ 
+-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+-#define XFREE(stale) do { \
+-  if (stale) { free ((void *) stale); stale = 0; } \
+-} while (0)
++	if test -n "$vinfo"; then
++	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
++	fi
+ 
+-#undef LTWRAPPER_DEBUGPRINTF
+-#if defined DEBUGWRAPPER
+-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+-static void
+-ltwrapper_debugprintf (const char *fmt, ...)
+-{
+-    va_list args;
+-    va_start (args, fmt);
+-    (void) vfprintf (stderr, fmt, args);
+-    va_end (args);
+-}
+-#else
+-# define LTWRAPPER_DEBUGPRINTF(args)
+-#endif
++	if test -n "$release"; then
++	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
++	fi
++      else
+ 
+-const char *program_name = NULL;
++	# Parse the version information argument.
++	save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	IFS="$save_ifs"
+ 
+-void *xmalloc (size_t num);
+-char *xstrdup (const char *string);
+-const char *base_name (const char *name);
+-char *find_executable (const char *wrapper);
+-char *chase_symlinks (const char *pathspec);
+-int make_executable (const char *path);
+-int check_executable (const char *path);
+-char *strendzap (char *str, const char *pat);
+-void lt_fatal (const char *message, ...);
++	if test -n "$8"; then
++	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
++	fi
+ 
+-static const char *script_text =
+-EOF
++	# convert absolute version numbers to libtool ages
++	# this retains compatibility with .la files and attempts
++	# to make the code below a bit more comprehensible
+ 
+-	    func_emit_wrapper yes |
+-	        $SED -e 's/\([\\"]\)/\\\1/g' \
+-	             -e 's/^/  "/' -e 's/$/\\n"/'
+-	    echo ";"
++	case $vinfo_number in
++	yes)
++	  number_major="$2"
++	  number_minor="$3"
++	  number_revision="$4"
++	  #
++	  # There are really only two kinds -- those that
++	  # use the current revision as the major version
++	  # and those that subtract age and use age as
++	  # a minor version.  But, then there is irix
++	  # which has an extra 1 added just for fun
++	  #
++	  case $version_type in
++	  darwin|linux|osf|windows|none)
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
++	    ;;
++	  freebsd-aout|freebsd-elf|sunos)
++	    current="$number_major"
++	    revision="$number_minor"
++	    age="0"
++	    ;;
++	  irix|nonstopux)
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_minor"
++	    lt_irix_increment=no
++	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
++	  esac
++	  ;;
++	no)
++	  current="$2"
++	  revision="$3"
++	  age="$4"
++	  ;;
++	esac
+ 
+-	    cat <<EOF
+-const char * MAGIC_EXE = "$magic_exe";
++	# Check that each of the things are valid numbers.
++	case $current in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
+ 
+-int
+-main (int argc, char *argv[])
+-{
+-  char **newargz;
+-  char *tmp_pathspec;
+-  char *actual_cwrapper_path;
+-  char *shwrapper_name;
+-  intptr_t rval = 127;
+-  FILE *shwrapper;
++	case $revision in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
+ 
+-  const char *dumpscript_opt = "--lt-dump-script";
+-  int i;
++	case $age in
++	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
++	*)
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
+ 
+-  program_name = (char *) xstrdup (base_name (argv[0]));
+-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
++	if test "$age" -gt "$current"; then
++	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit $EXIT_FAILURE
++	fi
+ 
+-  /* very simple arg parsing; don't want to rely on getopt */
+-  for (i = 1; i < argc; i++)
+-    {
+-      if (strcmp (argv[i], dumpscript_opt) == 0)
+-	{
+-EOF
+-	    case "$host" in
+-	      *mingw* | *cygwin* )
+-		# make stdout use "unix" line endings
+-		echo "          setmode(1,_O_BINARY);"
+-		;;
+-	      esac
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case $version_type in
++	none) ;;
+ 
+-	    cat <<EOF
+-	  printf ("%s", script_text);
+-	  return 0;
+-	}
+-    }
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  minor_current=`expr $current + 1`
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
+ 
+-  newargz = XMALLOC (char *, argc + 2);
+-EOF
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
+ 
+-	    if test -n "$TARGETSHELL" ; then
+-	      # no path translation at all
+-	      lt_newargv0=$TARGETSHELL
+-	    else
+-	      case "$host" in
+-		*mingw* )
+-		  # awkward: cmd appends spaces to result
+-		  lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+-		  lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
+-		  case $lt_newargv0 in
+-		    *.exe | *.EXE) ;;
+-		    *) lt_newargv0=$lt_newargv0.exe ;;
+-		  esac
+-		  ;;
+-		* ) lt_newargv0=$SHELL ;;
+-	      esac
+-	    fi
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current";
++	  ;;
+ 
+-		cat <<EOF
+-  newargz[0] = (char *) xstrdup ("$lt_newargv0");
+-EOF
++	irix | nonstopux)
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
++	  case $version_type in
++	    nonstopux) verstring_prefix=nonstopux ;;
++	    *)         verstring_prefix=sgi ;;
++	  esac
++	  verstring="$verstring_prefix$major.$revision"
+ 
+-	    cat <<"EOF"
+-  tmp_pathspec = find_executable (argv[0]);
+-  if (tmp_pathspec == NULL)
+-    lt_fatal ("Couldn't find %s", argv[0]);
+-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+-			  tmp_pathspec));
+-
+-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+-			  actual_cwrapper_path));
+-  XFREE (tmp_pathspec);
+-
+-  shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
+-  strendzap (actual_cwrapper_path, shwrapper_name);
+-
+-  /* shwrapper_name transforms */
+-  strendzap (shwrapper_name, ".exe");
+-  tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
+-				 strlen ("_ltshwrapperTMP") + 1));
+-  strcpy (tmp_pathspec, shwrapper_name);
+-  strcat (tmp_pathspec, "_ltshwrapperTMP");
+-  XFREE (shwrapper_name);
+-  shwrapper_name = tmp_pathspec;
+-  tmp_pathspec = 0;
+-  LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
+-			  shwrapper_name));
+-EOF
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test "$loop" -ne 0; do
++	    iface=`expr $revision - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring_prefix$major.$iface:$verstring"
++	  done
+ 
+-	    cat <<EOF
+-  newargz[1] =
+-    XMALLOC (char, (strlen (actual_cwrapper_path) +
+-		    strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
+-  strcpy (newargz[1], actual_cwrapper_path);
+-  strcat (newargz[1], "$objdir");
+-  strcat (newargz[1], "/");
+-  strcat (newargz[1], shwrapper_name);
+-EOF
++	  # Before this point, $major must not contain `.'.
++	  major=.$major
++	  versuffix="$major.$revision"
++	  ;;
+ 
++	linux)
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  ;;
+ 
+-	    case $host_os in
+-	      mingw*)
+-	    cat <<"EOF"
+-  {
+-    char* p;
+-    while ((p = strchr (newargz[1], '\\')) != NULL)
+-      {
+-	*p = '/';
+-      }
+-  }
+-EOF
+-	    ;;
+-	    esac
++	osf)
++	  major=.`expr $current - $age`
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
+ 
+-	    cat <<"EOF"
+-  XFREE (shwrapper_name);
+-  XFREE (actual_cwrapper_path);
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test "$loop" -ne 0; do
++	    iface=`expr $current - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring:${iface}.0"
++	  done
+ 
+-  /* always write in binary mode */
+-  if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
+-    {
+-      lt_fatal ("Could not open %s for writing", newargz[1]);
+-    }
+-  fprintf (shwrapper, "%s", script_text);
+-  fclose (shwrapper);
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
+ 
+-  make_executable (newargz[1]);
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
+ 
+-  for (i = 1; i < argc; i++)
+-    newargz[i + 1] = xstrdup (argv[i]);
+-  newargz[argc + 1] = NULL;
++	windows)
++	  # Use '-' rather than '.', since we only want one
++	  # extension on DOS 8.3 filesystems.
++	  major=`expr $current - $age`
++	  versuffix="-$major"
++	  ;;
+ 
+-  for (i = 0; i < argc + 1; i++)
+-    {
+-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
+-    }
++	*)
++	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
+ 
+-EOF
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  case $version_type in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
+ 
+-	    case $host_os in
+-	      mingw*)
+-		cat <<EOF
+-  /* execv doesn't actually work on mingw as expected on unix */
+-  rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
+-  if (rval == -1)
+-    {
+-      /* failed to start process */
+-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
+-      return 127;
+-    }
+-  return rval;
+-}
+-EOF
+-		;;
+-	      *)
+-		cat <<EOF
+-  execv ("$lt_newargv0", newargz);
+-  return rval; /* =127, but avoids unused variable warning */
+-}
+-EOF
+-		;;
+-	    esac
+-
+-	    cat <<"EOF"
+-
+-void *
+-xmalloc (size_t num)
+-{
+-  void *p = (void *) malloc (num);
+-  if (!p)
+-    lt_fatal ("Memory exhausted");
+-
+-  return p;
+-}
+-
+-char *
+-xstrdup (const char *string)
+-{
+-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+-			  string) : NULL;
+-}
+-
+-const char *
+-base_name (const char *name)
+-{
+-  const char *base;
+-
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+-    name += 2;
+-#endif
+-
+-  for (base = name; *name; name++)
+-    if (IS_DIR_SEPARATOR (*name))
+-      base = name + 1;
+-  return base;
+-}
+-
+-int
+-check_executable (const char *path)
+-{
+-  struct stat st;
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+-  if ((!path) || (!*path))
+-    return 0;
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++      fi
+ 
+-  if ((stat (path, &st) >= 0)
+-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+-    return 1;
+-  else
+-    return 0;
+-}
++      if test "$mode" != relink; then
++	# Remove our outputs, but don't remove object files since they
++	# may have been created when compiling PIC objects.
++	removelist=
++	tempremovelist=`$echo "$output_objdir/*"`
++	for p in $tempremovelist; do
++	  case $p in
++	    *.$objext)
++	       ;;
++	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
++	       removelist="$removelist $p"
++	       ;;
++	    *) ;;
++	  esac
++	done
++	if test -n "$removelist"; then
++	  $show "${rm}r $removelist"
++	  $run ${rm}r $removelist
++	fi
++      fi
+ 
+-int
+-make_executable (const char *path)
+-{
+-  int rval = 0;
+-  struct stat st;
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+-  if ((!path) || (!*path))
+-    return 0;
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++      fi
+ 
+-  if (stat (path, &st) >= 0)
+-    {
+-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+-    }
+-  return rval;
+-}
++      # Eliminate all temporary directories.
++      #for path in $notinst_path; do
++      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++      #done
+ 
+-/* Searches for the full path of the wrapper.  Returns
+-   newly allocated full path name if found, NULL otherwise
+-   Does not chase symlinks, even on platforms that support them.
+-*/
+-char *
+-find_executable (const char *wrapper)
+-{
+-  int has_slash = 0;
+-  const char *p;
+-  const char *p_next;
+-  /* static buffer for getcwd */
+-  char tmp[LT_PATHMAX + 1];
+-  int tmp_len;
+-  char *concat_name;
++      if test -n "$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	  dependency_libs="$temp_xrpath $dependency_libs"
++	fi
++      fi
+ 
+-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
++      # Make sure dlfiles contains only unique files that won't be dlpreopened
++      old_dlfiles="$dlfiles"
++      dlfiles=
++      for lib in $old_dlfiles; do
++	case " $dlprefiles $dlfiles " in
++	*" $lib "*) ;;
++	*) dlfiles="$dlfiles $lib" ;;
++	esac
++      done
+ 
+-  if ((wrapper == NULL) || (*wrapper == '\0'))
+-    return NULL;
++      # Make sure dlprefiles contains only unique files
++      old_dlprefiles="$dlprefiles"
++      dlprefiles=
++      for lib in $old_dlprefiles; do
++	case "$dlprefiles " in
++	*" $lib "*) ;;
++	*) dlprefiles="$dlprefiles $lib" ;;
++	esac
++      done
+ 
+-  /* Absolute path? */
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+-    {
+-      concat_name = xstrdup (wrapper);
+-      if (check_executable (concat_name))
+-	return concat_name;
+-      XFREE (concat_name);
+-    }
+-  else
+-    {
+-#endif
+-      if (IS_DIR_SEPARATOR (wrapper[0]))
+-	{
+-	  concat_name = xstrdup (wrapper);
+-	  if (check_executable (concat_name))
+-	    return concat_name;
+-	  XFREE (concat_name);
+-	}
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-    }
+-#endif
++      if test "$build_libtool_libs" = yes; then
++	if test -n "$rpath"; then
++	  case $host in
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
++	    # these systems don't actually have a c library (as such)!
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    ;;
++	  *-*-netbsd*)
++	    # Don't link with libc until the a.out ld.so is fixed.
++	    ;;
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	    # Do not include libc due to us having libc/libc_r.
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    ;;
++ 	  *)
++	    # Add libc to deplibs on all other systems if necessary.
++	    if test "$build_libtool_need_lc" = "yes"; then
++	      deplibs="$deplibs -lc"
++	    fi
++	    ;;
++	  esac
++	fi
+ 
+-  for (p = wrapper; *p; p++)
+-    if (*p == '/')
+-      {
+-	has_slash = 1;
+-	break;
+-      }
+-  if (!has_slash)
+-    {
+-      /* no slashes; search PATH */
+-      const char *path = getenv ("PATH");
+-      if (path != NULL)
+-	{
+-	  for (p = path; *p; p = p_next)
+-	    {
+-	      const char *q;
+-	      size_t p_len;
+-	      for (q = p; *q; q++)
+-		if (IS_PATH_SEPARATOR (*q))
+-		  break;
+-	      p_len = q - p;
+-	      p_next = (*q == '\0' ? q : q + 1);
+-	      if (p_len == 0)
+-		{
+-		  /* empty path: current directory */
+-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+-		    lt_fatal ("getcwd failed");
+-		  tmp_len = strlen (tmp);
+-		  concat_name =
+-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+-		  memcpy (concat_name, tmp, tmp_len);
+-		  concat_name[tmp_len] = '/';
+-		  strcpy (concat_name + tmp_len + 1, wrapper);
+-		}
++	# Transform deplibs into only deplibs that can be linked in shared.
++	name_save=$name
++	libname_save=$libname
++	release_save=$release
++	versuffix_save=$versuffix
++	major_save=$major
++	# I'm not sure if I'm treating the release correctly.  I think
++	# release should show up in the -l (ie -lgmp5) so we don't want to
++	# add it in twice.  Is that correct?
++	release=""
++	versuffix=""
++	major=""
++	newdeplibs=
++	droppeddeps=no
++	case $deplibs_check_method in
++	pass_all)
++	  # Don't check for shared/static.  Everything works.
++	  # This might be a little naive.  We might want to check
++	  # whether the library exists or not.  But this is on
++	  # osf3 & osf4 and I'm not really sure... Just
++	  # implementing what was already the behavior.
++	  newdeplibs=$deplibs
++	  ;;
++	test_compile)
++	  # This code stresses the "libraries are programs" paradigm to its
++	  # limits. Maybe even breaks it.  We compile a program, linking it
++	  # against the deplibs as a proxy for the library.  Then we can check
++	  # whether they linked in statically or dynamically with ldd.
++	  $rm conftest.c
++	  cat > conftest.c <<EOF
++	  int main() { return 0; }
++EOF
++	  $rm conftest
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
++	    ldd_output=`ldd conftest`
++	    for i in $deplibs; do
++	      name=`expr $i : '-l\(.*\)'`
++	      # If $name is empty we are operating on a -L argument.
++              if test "$name" != "" && test "$name" != "0"; then
++		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		  case " $predeps $postdeps " in
++		  *" $i "*)
++		    newdeplibs="$newdeplibs $i"
++		    i=""
++		    ;;
++		  esac
++	        fi
++		if test -n "$i" ; then
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    $echo
++		    $echo "*** Warning: dynamic linker does not accept needed library $i."
++		    $echo "*** I have the capability to make that library automatically link in when"
++		    $echo "*** you link to this library.  But I can only do this if you have a"
++		    $echo "*** shared version of the library, which I believe you do not have"
++		    $echo "*** because a test_compile did reveal that the linker did not use it for"
++		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
++		  fi
++		fi
+ 	      else
+-		{
+-		  concat_name =
+-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+-		  memcpy (concat_name, p, p_len);
+-		  concat_name[p_len] = '/';
+-		  strcpy (concat_name + p_len + 1, wrapper);
+-		}
+-	      if (check_executable (concat_name))
+-		return concat_name;
+-	      XFREE (concat_name);
+-	    }
+-	}
+-      /* not found in PATH; assume curdir */
+-    }
+-  /* Relative path | not found in path: prepend cwd */
+-  if (getcwd (tmp, LT_PATHMAX) == NULL)
+-    lt_fatal ("getcwd failed");
+-  tmp_len = strlen (tmp);
+-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+-  memcpy (concat_name, tmp, tmp_len);
+-  concat_name[tmp_len] = '/';
+-  strcpy (concat_name + tmp_len + 1, wrapper);
+-
+-  if (check_executable (concat_name))
+-    return concat_name;
+-  XFREE (concat_name);
+-  return NULL;
+-}
+-
+-char *
+-chase_symlinks (const char *pathspec)
+-{
+-#ifndef S_ISLNK
+-  return xstrdup (pathspec);
+-#else
+-  char buf[LT_PATHMAX];
+-  struct stat s;
+-  char *tmp_pathspec = xstrdup (pathspec);
+-  char *p;
+-  int has_symlinks = 0;
+-  while (strlen (tmp_pathspec) && !has_symlinks)
+-    {
+-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+-			      tmp_pathspec));
+-      if (lstat (tmp_pathspec, &s) == 0)
+-	{
+-	  if (S_ISLNK (s.st_mode) != 0)
+-	    {
+-	      has_symlinks = 1;
+-	      break;
+-	    }
+-
+-	  /* search backwards for last DIR_SEPARATOR */
+-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+-	    p--;
+-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+-	    {
+-	      /* no more DIR_SEPARATORS left */
+-	      break;
+-	    }
+-	  *p = '\0';
+-	}
+-      else
+-	{
+-	  char *errstr = strerror (errno);
+-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+-	}
+-    }
+-  XFREE (tmp_pathspec);
+-
+-  if (!has_symlinks)
+-    {
+-      return xstrdup (pathspec);
+-    }
+-
+-  tmp_pathspec = realpath (pathspec, buf);
+-  if (tmp_pathspec == 0)
+-    {
+-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+-    }
+-  return xstrdup (tmp_pathspec);
+-#endif
+-}
+-
+-char *
+-strendzap (char *str, const char *pat)
+-{
+-  size_t len, patlen;
+-
+-  assert (str != NULL);
+-  assert (pat != NULL);
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  else
++	    # Error occurred in the first compile.  Let's try to salvage
++	    # the situation: Compile a separate program for each library.
++	    for i in $deplibs; do
++	      name=`expr $i : '-l\(.*\)'`
++	      # If $name is empty we are operating on a -L argument.
++              if test "$name" != "" && test "$name" != "0"; then
++		$rm conftest
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
++		  ldd_output=`ldd conftest`
++		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		    case " $predeps $postdeps " in
++		    *" $i "*)
++		      newdeplibs="$newdeplibs $i"
++		      i=""
++		      ;;
++		    esac
++		  fi
++		  if test -n "$i" ; then
++		    libname=`eval \\$echo \"$libname_spec\"`
++		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		    set dummy $deplib_matches
++		    deplib_match=$2
++		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		      newdeplibs="$newdeplibs $i"
++		    else
++		      droppeddeps=yes
++		      $echo
++		      $echo "*** Warning: dynamic linker does not accept needed library $i."
++		      $echo "*** I have the capability to make that library automatically link in when"
++		      $echo "*** you link to this library.  But I can only do this if you have a"
++		      $echo "*** shared version of the library, which you do not appear to have"
++		      $echo "*** because a test_compile did reveal that the linker did not use this one"
++		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		    fi
++		  fi
++		else
++		  droppeddeps=yes
++		  $echo
++		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  $echo "*** make it link in!  You will probably need to install it or some"
++		  $echo "*** library that it depends on before this library will be fully"
++		  $echo "*** functional.  Installing it before continuing would be even better."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  fi
++	  ;;
++	file_magic*)
++	  set dummy $deplibs_check_method
++	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name=`expr $a_deplib : '-l\(.*\)'`
++	    # If $name is empty we are operating on a -L argument.
++            if test "$name" != "" && test  "$name" != "0"; then
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		case " $predeps $postdeps " in
++		*" $a_deplib "*)
++		  newdeplibs="$newdeplibs $a_deplib"
++		  a_deplib=""
++		  ;;
++		esac
++	      fi
++	      if test -n "$a_deplib" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		  for potent_lib in $potential_libs; do
++		      # Follow soft links.
++		      if ls -lLd "$potent_lib" 2>/dev/null \
++			 | grep " -> " >/dev/null; then
++			continue
++		      fi
++		      # The statement above tries to avoid entering an
++		      # endless loop below, in case of cyclic links.
++		      # We might still enter an endless loop, since a link
++		      # loop can be closed while we follow links,
++		      # but so what?
++		      potlib="$potent_lib"
++		      while test -h "$potlib" 2>/dev/null; do
++			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
++			case $potliblink in
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
++			 | ${SED} 10q \
++			 | $EGREP "$file_magic_regex" > /dev/null; then
++			newdeplibs="$newdeplibs $a_deplib"
++			a_deplib=""
++			break 2
++		      fi
++		  done
++		done
++	      fi
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		$echo
++		$echo "*** Warning: linker path does not have real file for library $a_deplib."
++		$echo "*** I have the capability to make that library automatically link in when"
++		$echo "*** you link to this library.  But I can only do this if you have a"
++		$echo "*** shared version of the library, which you do not appear to have"
++		$echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
++		else
++		  $echo "*** with $libname and none of the candidates passed a file format test"
++		  $echo "*** using a file magic. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	match_pattern*)
++	  set dummy $deplibs_check_method
++	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++	  for a_deplib in $deplibs; do
++	    name=`expr $a_deplib : '-l\(.*\)'`
++	    # If $name is empty we are operating on a -L argument.
++	    if test -n "$name" && test "$name" != "0"; then
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		case " $predeps $postdeps " in
++		*" $a_deplib "*)
++		  newdeplibs="$newdeplibs $a_deplib"
++		  a_deplib=""
++		  ;;
++		esac
++	      fi
++	      if test -n "$a_deplib" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		  for potent_lib in $potential_libs; do
++		    potlib="$potent_lib" # see symlink-check above in file_magic test
++		    if eval $echo \"$potent_lib\" 2>/dev/null \
++		        | ${SED} 10q \
++		        | $EGREP "$match_pattern_regex" > /dev/null; then
++		      newdeplibs="$newdeplibs $a_deplib"
++		      a_deplib=""
++		      break 2
++		    fi
++		  done
++		done
++	      fi
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		$echo
++		$echo "*** Warning: linker path does not have real file for library $a_deplib."
++		$echo "*** I have the capability to make that library automatically link in when"
++		$echo "*** you link to this library.  But I can only do this if you have a"
++		$echo "*** shared version of the library, which you do not appear to have"
++		$echo "*** because I did check the linker path looking for a file starting"
++		if test -z "$potlib" ; then
++		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
++		else
++		  $echo "*** with $libname and none of the candidates passed a file format test"
++		  $echo "*** using a regex pattern. Last file checked: $potlib"
++		fi
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	    -e 's/ -[LR][^ ]*//g'`
++	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	    for i in $predeps $postdeps ; do
++	      # can't use Xsed below, because $i might contain '/'
++	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
++	    done
++	  fi
++	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
++	    | grep . >/dev/null; then
++	    $echo
++	    if test "X$deplibs_check_method" = "Xnone"; then
++	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
++	    else
++	      $echo "*** Warning: inter-library dependencies are not known to be supported."
++	    fi
++	    $echo "*** All declared inter-library dependencies are being dropped."
++	    droppeddeps=yes
++	  fi
++	  ;;
++	esac
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
+ 
+-  len = strlen (str);
+-  patlen = strlen (pat);
++	case $host in
++	*-*-rhapsody* | *-*-darwin1.[012])
++	  # On Rhapsody replace the C library is the System framework
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	  ;;
++	esac
+ 
+-  if (patlen <= len)
+-    {
+-      str += len - patlen;
+-      if (strcmp (str, pat) == 0)
+-	*str = '\0';
+-    }
+-  return str;
+-}
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
++	    $echo
++	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    $echo "*** a static module, that should work as long as the dlopening"
++	    $echo "*** application is linked with the -dlopen flag."
++	    if test -z "$global_symbol_pipe"; then
++	      $echo
++	      $echo "*** However, this would only work if libtool was able to extract symbol"
++	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      $echo "*** not find such a program.  So, this module is probably useless."
++	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	    fi
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
++	      build_libtool_libs=module
++	      build_old_libs=yes
++	    else
++	      build_libtool_libs=no
++	    fi
++	  else
++	    $echo "*** The inter-library dependencies that have been dropped here will be"
++	    $echo "*** automatically added whenever a program is linked with this library"
++	    $echo "*** or is declared to -dlopen it."
+ 
+-static void
+-lt_error_core (int exit_status, const char *mode,
+-	       const char *message, va_list ap)
+-{
+-  fprintf (stderr, "%s: %s: ", program_name, mode);
+-  vfprintf (stderr, message, ap);
+-  fprintf (stderr, ".\n");
++	    if test "$allow_undefined" = no; then
++	      $echo
++	      $echo "*** Since this library must not contain undefined symbols,"
++	      $echo "*** because either the platform does not support them or"
++	      $echo "*** it was explicitly requested with -no-undefined,"
++	      $echo "*** libtool will only create a static version of it."
++	      if test "$build_old_libs" = no; then
++		oldlibs="$output_objdir/$libname.$libext"
++		build_libtool_libs=module
++		build_old_libs=yes
++	      else
++		build_libtool_libs=no
++	      fi
++	    fi
++	  fi
++	fi
++	# Done checking deplibs!
++	deplibs=$newdeplibs
++      fi
+ 
+-  if (exit_status >= 0)
+-    exit (exit_status);
+-}
+ 
+-void
+-lt_fatal (const char *message, ...)
+-{
+-  va_list ap;
+-  va_start (ap, message);
+-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+-  va_end (ap);
+-}
+-EOF
+-}
+-# end: func_emit_cwrapperexe_src
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      deplibs="$new_libs"
+ 
+-# func_mode_link arg...
+-func_mode_link ()
+-{
+-    $opt_debug
+-    case $host in
+-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-      # It is impossible to link a dll without this setting, and
+-      # we shouldn't force the makefile maintainer to figure out
+-      # which system we are compiling for in order to pass an extra
+-      # flag for every libtool invocation.
+-      # allow_undefined=no
+ 
+-      # FIXME: Unfortunately, there are problems with the above when trying
+-      # to make a dll which has undefined symbols, in which case not
+-      # even a static library is built.  For now, we need to specify
+-      # -no-undefined on the libtool link line when we can be certain
+-      # that all symbols are satisfied, otherwise we get a static library.
+-      allow_undefined=yes
+-      ;;
+-    *)
+-      allow_undefined=yes
+-      ;;
+-    esac
+-    libtool_args=$nonopt
+-    base_compile="$nonopt $@"
+-    compile_command=$nonopt
+-    finalize_command=$nonopt
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
+ 
+-    compile_rpath=
+-    finalize_rpath=
+-    compile_shlibpath=
+-    finalize_shlibpath=
+-    convenience=
+-    old_convenience=
+-    deplibs=
+-    old_deplibs=
+-    compiler_flags=
+-    linker_flags=
+-    dllsearchpath=
+-    lib_search_path=`pwd`
+-    inst_prefix_dir=
+-    new_inherited_linker_flags=
++      # Test again, we may have decided not to build it any more
++      if test "$build_libtool_libs" = yes; then
++	if test "$hardcode_into_libs" = yes; then
++	  # Hardcode the library paths
++	  hardcode_libdirs=
++	  dep_rpath=
++	  rpath="$finalize_rpath"
++	  test "$mode" != relink && rpath="$compile_rpath$rpath"
++	  for libdir in $rpath; do
++	    if test -n "$hardcode_libdir_flag_spec"; then
++	      if test -n "$hardcode_libdir_separator"; then
++		if test -z "$hardcode_libdirs"; then
++		  hardcode_libdirs="$libdir"
++		else
++		  # Just accumulate the unique libdirs.
++		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		    ;;
++		  *)
++		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		    ;;
++		  esac
++		fi
++	      else
++		eval flag=\"$hardcode_libdir_flag_spec\"
++		dep_rpath="$dep_rpath $flag"
++	      fi
++	    elif test -n "$runpath_var"; then
++	      case "$perm_rpath " in
++	      *" $libdir "*) ;;
++	      *) perm_rpath="$perm_rpath $libdir" ;;
++	      esac
++	    fi
++	  done
++	  # Substitute the hardcoded libdirs into the rpath.
++	  if test -n "$hardcode_libdir_separator" &&
++	     test -n "$hardcode_libdirs"; then
++	    libdir="$hardcode_libdirs"
++	    if test -n "$hardcode_libdir_flag_spec_ld"; then
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
++	    else
++	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	    fi
++	  fi
++	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
++	    # We should set the runpath_var.
++	    rpath=
++	    for dir in $perm_rpath; do
++	      rpath="$rpath$dir:"
++	    done
++	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
++	  fi
++	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
++	fi
+ 
+-    avoid_version=no
+-    dlfiles=
+-    dlprefiles=
+-    dlself=no
+-    export_dynamic=no
+-    export_symbols=
+-    export_symbols_regex=
+-    generated=
+-    libobjs=
+-    ltlibs=
+-    module=no
+-    no_install=no
+-    objs=
+-    non_pic_objects=
+-    precious_files_regex=
+-    prefer_static_libs=no
+-    preload=no
+-    prev=
+-    prevarg=
+-    release=
+-    rpath=
+-    xrpath=
+-    perm_rpath=
+-    temp_rpath=
+-    thread_safe=no
+-    vinfo=
+-    vinfo_number=no
+-    weak_libs=
+-    single_module="${wl}-single_module"
+-    func_infer_tag $base_compile
++	shlibpath="$finalize_shlibpath"
++	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	if test -n "$shlibpath"; then
++	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
++	fi
+ 
+-    # We need to know -static, to get the right output filenames.
+-    for arg
+-    do
+-      case $arg in
+-      -shared)
+-	test "$build_libtool_libs" != yes && \
+-	  func_fatal_configuration "can not build a shared library"
+-	build_old_libs=no
+-	break
+-	;;
+-      -all-static | -static | -static-libtool-libs)
+-	case $arg in
+-	-all-static)
+-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+-	    func_warning "complete static linking is impossible in this configuration"
++	# Get the real and link names of the library.
++	eval shared_ext=\"$shrext_cmds\"
++	eval library_names=\"$library_names_spec\"
++	set dummy $library_names
++	realname="$2"
++	shift; shift
++
++	if test -n "$soname_spec"; then
++	  eval soname=\"$soname_spec\"
++	else
++	  soname="$realname"
++	fi
++	if test -z "$dlname"; then
++	  dlname=$soname
++	fi
++
++	lib="$output_objdir/$realname"
++	linknames=
++	for link
++	do
++	  linknames="$linknames $link"
++	done
++
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++
++	# Prepare the list of exported symbols
++	if test -z "$export_symbols"; then
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    cmds=$export_symbols_cmds
++	    save_ifs="$IFS"; IFS='~'
++	    for cmd in $cmds; do
++	      IFS="$save_ifs"
++	      eval cmd=\"$cmd\"
++	      if len=`expr "X$cmd" : ".*"` &&
++	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	        $show "$cmd"
++	        $run eval "$cmd" || exit $?
++	        skipped_export=false
++	      else
++	        # The command line is too long to execute in one step.
++	        $show "using reloadable object file for export list..."
++	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
++	      fi
++	    done
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex"; then
++	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
++	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	    fi
+ 	  fi
+-	  if test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
++	fi
++
++	if test -n "$export_symbols" && test -n "$include_expsyms"; then
++	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	fi
++
++	tmp_deplibs=
++	for test_deplib in $deplibs; do
++		case " $convenience " in
++		*" $test_deplib "*) ;;
++		*)
++			tmp_deplibs="$tmp_deplibs $test_deplib"
++			;;
++		esac
++	done
++	deplibs="$tmp_deplibs"
++
++	if test -n "$convenience"; then
++	  if test -n "$whole_archive_flag_spec"; then
++	    save_libobjs=$libobjs
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  else
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+-	  prefer_static_libs=yes
+-	  ;;
+-	-static)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
++	fi
++	
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linker_flags="$linker_flags $flag"
++	fi
++
++	# Make a backup of the uninstalled library when relinking
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
++	fi
++
++	# Do each of the archive commands.
++	if test "$module" = yes && test -n "$module_cmds" ; then
++	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
++	  else
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
+ 	  fi
+-	  prefer_static_libs=built
+-	  ;;
+-	-static-libtool-libs)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
++	else
++	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
++	else
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
+ 	  fi
+-	  prefer_static_libs=yes
+-	  ;;
+-	esac
+-	build_libtool_libs=no
+-	build_old_libs=yes
+-	break
+-	;;
+-      esac
+-    done
++	fi
+ 
+-    # See if our shared archives depend on static archives.
+-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	  :
++	else
++	  # The command line is too long to link in one step, link piecewise.
++	  $echo "creating reloadable object files..."
+ 
+-    # Go through the arguments, transforming them on the way.
+-    while test "$#" -gt 0; do
+-      arg="$1"
+-      shift
+-      func_quote_for_eval "$arg"
+-      qarg=$func_quote_for_eval_unquoted_result
+-      func_append libtool_args " $func_quote_for_eval_result"
++	  # Save the value of $output and $libobjs because we want to
++	  # use them later.  If we have whole_archive_flag_spec, we
++	  # want to use save_libobjs as it was before
++	  # whole_archive_flag_spec was expanded, because we can't
++	  # assume the linker understands whole_archive_flag_spec.
++	  # This may have to be revisited, in case too many
++	  # convenience libraries get linked in and end up exceeding
++	  # the spec.
++	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
++	    save_libobjs=$libobjs
++	  fi
++	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+-      # If the previous option needs an argument, assign it.
+-      if test -n "$prev"; then
+-	case $prev in
+-	output)
+-	  func_append compile_command " @OUTPUT@"
+-	  func_append finalize_command " @OUTPUT@"
+-	  ;;
+-	esac
++	  # Clear the reloadable object creation command queue and
++	  # initialize k to one.
++	  test_cmds=
++	  concat_cmds=
++	  objlist=
++	  delfiles=
++	  last_robj=
++	  k=1
++	  output=$output_objdir/$output_la-${k}.$objext
++	  # Loop over the list of objects to be linked.
++	  for obj in $save_libobjs
++	  do
++	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
++	    if test "X$objlist" = X ||
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++		 test "$len" -le "$max_cmd_len"; }; then
++	      objlist="$objlist $obj"
++	    else
++	      # The command $test_cmds is almost too long, add a
++	      # command to the queue.
++	      if test "$k" -eq 1 ; then
++		# The first file doesn't have a previous command to add.
++		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++	      else
++		# All subsequent reloadable object files will link in
++		# the last one created.
++		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
++	      fi
++	      last_robj=$output_objdir/$output_la-${k}.$objext
++	      k=`expr $k + 1`
++	      output=$output_objdir/$output_la-${k}.$objext
++	      objlist=$obj
++	      len=1
++	    fi
++	  done
++	  # Handle the remaining objects by creating one last
++	  # reloadable object file.  All subsequent reloadable object
++	  # files will link in the last one created.
++	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ 
+-	case $prev in
+-	dlfiles|dlprefiles)
+-	  if test "$preload" = no; then
+-	    # Add the symbol object into the linking commands.
+-	    func_append compile_command " @SYMFILE@"
+-	    func_append finalize_command " @SYMFILE@"
+-	    preload=yes
++	  if ${skipped_export-false}; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    libobjs=$output
++	    # Append the command to create the export file.
++	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
++          fi
++
++	  # Set up a command to remove the reloadable object files
++	  # after they are used.
++	  i=0
++	  while test "$i" -lt "$k"
++	  do
++	    i=`expr $i + 1`
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
++	  done
++
++	  $echo "creating a temporary reloadable object file: $output"
++
++	  # Loop through the commands generated above and execute them.
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $concat_cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++
++	  libobjs=$output
++	  # Restore the value of output.
++	  output=$save_output
++
++	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  fi
+-	  case $arg in
+-	  *.la | *.lo) ;;  # We handle these cases below.
+-	  force)
+-	    if test "$dlself" = no; then
+-	      dlself=needless
+-	      export_dynamic=yes
+-	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  self)
+-	    if test "$prev" = dlprefiles; then
+-	      dlself=yes
+-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+-	      dlself=yes
++	  # Expand the library linking commands again to reset the
++	  # value of $libobjs for piecewise linking.
++
++	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
+ 	    else
+-	      dlself=needless
+-	      export_dynamic=yes
++	      cmds=$module_cmds
+ 	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  *)
+-	    if test "$prev" = dlfiles; then
+-	      dlfiles="$dlfiles $arg"
+-	    else
+-	      dlprefiles="$dlprefiles $arg"
++	  else
++	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	    cmds=$archive_expsym_cmds
++	  else
++	    cmds=$archive_cmds
+ 	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  esac
+-	  ;;
+-	expsyms)
+-	  export_symbols="$arg"
+-	  test -f "$arg" \
+-	    || func_fatal_error "symbol file \`$arg' does not exist"
+-	  prev=
+-	  continue
+-	  ;;
+-	expsyms_regex)
+-	  export_symbols_regex="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-		*" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-	      esac
+-	      ;;
+-	  esac
+-	  prev=
+-	  continue
+-	  ;;
+-	inst_prefix)
+-	  inst_prefix_dir="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	objectlist)
+-	  if test -f "$arg"; then
+-	    save_arg=$arg
+-	    moreargs=
+-	    for fil in `cat "$save_arg"`
+-	    do
+-#	      moreargs="$moreargs $fil"
+-	      arg=$fil
+-	      # A libtool-controlled object.
++	  fi
+ 
+-	      # Check to see that this really is a libtool object.
+-	      if func_lalib_unsafe_p "$arg"; then
+-		pic_object=
+-		non_pic_object=
++	  # Append the command to remove the reloadable object files
++	  # to the just-reset $cmds.
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
++	fi
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
++	  $show "$cmd"
++	  $run eval "$cmd" || {
++	    lt_exit=$?
+ 
+-		# Read the .lo file
+-		func_source "$arg"
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
+ 
+-		if test -z "$pic_object" ||
+-		   test -z "$non_pic_object" ||
+-		   test "$pic_object" = none &&
+-		   test "$non_pic_object" = none; then
+-		  func_fatal_error "cannot find name of object for \`$arg'"
+-		fi
++	    exit $lt_exit
++	  }
++	done
++	IFS="$save_ifs"
+ 
+-		# Extract subdirectory from the argument.
+-		func_dirname "$arg" "/" ""
+-		xdir="$func_dirname_result"
++	# Restore the uninstalled library and exit
++	if test "$mode" = relink; then
++	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ 
+-		if test "$pic_object" != none; then
+-		  # Prepend the subdirectory the object is found in.
+-		  pic_object="$xdir$pic_object"
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
+ 
+-		  if test "$prev" = dlfiles; then
+-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		      dlfiles="$dlfiles $pic_object"
+-		      prev=
+-		      continue
+-		    else
+-		      # If libtool objects are unsupported, then we need to preload.
+-		      prev=dlprefiles
+-		    fi
+-		  fi
++	  exit $EXIT_SUCCESS
++	fi
+ 
+-		  # CHECK ME:  I think I busted this.  -Ossama
+-		  if test "$prev" = dlprefiles; then
+-		    # Preload the old-style object.
+-		    dlprefiles="$dlprefiles $pic_object"
+-		    prev=
+-		  fi
++	# Create links to the real library.
++	for linkname in $linknames; do
++	  if test "$realname" != "$linkname"; then
++	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
++	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	  fi
++	done
+ 
+-		  # A PIC object.
+-		  func_append libobjs " $pic_object"
+-		  arg="$pic_object"
+-		fi
++	# If -module or -export-dynamic was specified, set the dlname.
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++      fi
++      ;;
+ 
+-		# Non-PIC object.
+-		if test "$non_pic_object" != none; then
+-		  # Prepend the subdirectory the object is found in.
+-		  non_pic_object="$xdir$non_pic_object"
++    obj)
++      case " $deplibs" in
++      *\ -l* | *\ -L*)
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++      esac
+ 
+-		  # A standard non-PIC object
+-		  func_append non_pic_objects " $non_pic_object"
+-		  if test -z "$pic_object" || test "$pic_object" = none ; then
+-		    arg="$non_pic_object"
+-		  fi
+-		else
+-		  # If the PIC object exists, use it instead.
+-		  # $xdir was prepended to $pic_object above.
+-		  non_pic_object="$pic_object"
+-		  func_append non_pic_objects " $non_pic_object"
+-		fi
+-	      else
+-		# Only an error if not doing a dry-run.
+-		if $opt_dry_run; then
+-		  # Extract subdirectory from the argument.
+-		  func_dirname "$arg" "/" ""
+-		  xdir="$func_dirname_result"
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
++      fi
+ 
+-		  func_lo2o "$arg"
+-		  pic_object=$xdir$objdir/$func_lo2o_result
+-		  non_pic_object=$xdir$func_lo2o_result
+-		  func_append libobjs " $pic_object"
+-		  func_append non_pic_objects " $non_pic_object"
+-	        else
+-		  func_fatal_error "\`$arg' is not a valid libtool object"
+-		fi
+-	      fi
+-	    done
+-	  else
+-	    func_fatal_error "link input file \`$arg' does not exist"
+-	  fi
+-	  arg=$save_arg
+-	  prev=
+-	  continue
+-	  ;;
+-	precious_regex)
+-	  precious_files_regex="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	release)
+-	  release="-$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	rpath | xrpath)
+-	  # We need an absolute path.
+-	  case $arg in
+-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+-	  *)
+-	    func_fatal_error "only absolute run-paths are allowed"
+-	    ;;
+-	  esac
+-	  if test "$prev" = rpath; then
+-	    case "$rpath " in
+-	    *" $arg "*) ;;
+-	    *) rpath="$rpath $arg" ;;
+-	    esac
+-	  else
+-	    case "$xrpath " in
+-	    *" $arg "*) ;;
+-	    *) xrpath="$xrpath $arg" ;;
+-	    esac
+-	  fi
+-	  prev=
+-	  continue
+-	  ;;
+-	shrext)
+-	  shrext_cmds="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	weak)
+-	  weak_libs="$weak_libs $arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	xcclinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  func_append compile_command " $qarg"
+-	  func_append finalize_command " $qarg"
+-	  continue
+-	  ;;
+-	xcompiler)
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  func_append compile_command " $qarg"
+-	  func_append finalize_command " $qarg"
+-	  continue
+-	  ;;
+-	xlinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $wl$qarg"
+-	  prev=
+-	  func_append compile_command " $wl$qarg"
+-	  func_append finalize_command " $wl$qarg"
+-	  continue
+-	  ;;
+-	*)
+-	  eval "$prev=\"\$arg\""
+-	  prev=
+-	  continue
+-	  ;;
+-	esac
+-      fi # test -n "$prev"
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
++      fi
+ 
+-      prevarg="$arg"
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
++      fi
+ 
+-      case $arg in
+-      -all-static)
+-	if test -n "$link_static_flag"; then
+-	  # See comment for -static flag below, for more details.
+-	  func_append compile_command " $link_static_flag"
+-	  func_append finalize_command " $link_static_flag"
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
++      fi
++
++      case $output in
++      *.lo)
++	if test -n "$objs$old_deplibs"; then
++	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
++	  exit $EXIT_FAILURE
+ 	fi
+-	continue
++	libobj="$output"
++	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ 	;;
+-
+-      -allow-undefined)
+-	# FIXME: remove this flag sometime in the future.
+-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
++      *)
++	libobj=
++	obj="$output"
+ 	;;
++      esac
+ 
+-      -avoid-version)
+-	avoid_version=yes
+-	continue
+-	;;
++      # Delete the old objects.
++      $run $rm $obj $libobj
+ 
+-      -dlopen)
+-	prev=dlfiles
+-	continue
+-	;;
++      # Objects from convenience libraries.  This assumes
++      # single-version convenience libraries.  Whenever we create
++      # different ones for PIC/non-PIC, this we'll have to duplicate
++      # the extraction.
++      reload_conv_objs=
++      gentop=
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
++      wl=
+ 
+-      -dlpreopen)
+-	prev=dlprefiles
+-	continue
+-	;;
++      if test -n "$convenience"; then
++	if test -n "$whole_archive_flag_spec"; then
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
++	else
++	  gentop="$output_objdir/${obj}x"
++	  generated="$generated $gentop"
+ 
+-      -export-dynamic)
+-	export_dynamic=yes
+-	continue
+-	;;
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
++	fi
++      fi
+ 
+-      -export-symbols | -export-symbols-regex)
+-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
++      # Create the old-style object.
++      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++
++      output="$obj"
++      cmds=$reload_cmds
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++
++      # Exit if we aren't doing a library object file.
++      if test -z "$libobj"; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
+ 	fi
+-	if test "X$arg" = "X-export-symbols"; then
+-	  prev=expsyms
+-	else
+-	  prev=expsyms_regex
++
++	exit $EXIT_SUCCESS
++      fi
++
++      if test "$build_libtool_libs" != yes; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
+ 	fi
+-	continue
+-	;;
+ 
+-      -framework)
+-	prev=framework
+-	continue
+-	;;
++	# Create an invalid libtool object if no PIC, so that we don't
++	# accidentally link it into a program.
++	# $show "echo timestamp > $libobj"
++	# $run eval "echo timestamp > $libobj" || exit $?
++	exit $EXIT_SUCCESS
++      fi
+ 
+-      -inst-prefix-dir)
+-	prev=inst_prefix
+-	continue
+-	;;
++      if test -n "$pic_flag" || test "$pic_mode" != default; then
++	# Only do commands if we really have different PIC objects.
++	reload_objs="$libobjs $reload_conv_objs"
++	output="$libobj"
++	cmds=$reload_cmds
++	save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++      fi
+ 
+-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+-      # so, if we see these flags be careful not to treat them like -L
+-      -L[A-Z][A-Z]*:*)
+-	case $with_gcc/$host in
+-	no/*-*-irix* | /*-*-irix*)
+-	  func_append compile_command " $arg"
+-	  func_append finalize_command " $arg"
+-	  ;;
+-	esac
+-	continue
++      if test -n "$gentop"; then
++	$show "${rm}r $gentop"
++	$run ${rm}r $gentop
++      fi
++
++      exit $EXIT_SUCCESS
++      ;;
++
++    prog)
++      case $host in
++	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++      esac
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
++      fi
++
++      if test "$preload" = yes; then
++	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
++	   test "$dlopen_self_static" = unknown; then
++	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
++	fi
++      fi
++
++      case $host in
++      *-*-rhapsody* | *-*-darwin1.[012])
++	# On Rhapsody replace the C library is the System framework
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
++      esac
+ 
+-      -L*)
+-	func_stripname '-L' '' "$arg"
+-	dir=$func_stripname_result
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
++      case $host in
++      *darwin*)
++        # Don't allow lazy linking, it breaks C++ global constructors
++        if test "$tagname" = CXX ; then
++        compile_command="$compile_command ${wl}-bind_at_load"
++        finalize_command="$finalize_command ${wl}-bind_at_load"
++        fi
++        ;;
++      esac
++
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
+ 	*)
+-	  absdir=`cd "$dir" && pwd`
+-	  test -z "$absdir" && \
+-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+-	  dir="$absdir"
++	  case " $compile_deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
+ 	  ;;
+ 	esac
+-	case "$deplibs " in
+-	*" -L$dir "*) ;;
+-	*)
+-	  deplibs="$deplibs -L$dir"
+-	  lib_search_path="$lib_search_path $dir"
++      done
++      for deplib in $compile_deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
+ 	  ;;
++	*) new_libs="$new_libs $deplib" ;;
+ 	esac
++      done
++      compile_deplibs="$new_libs"
++
++
++      compile_command="$compile_command $compile_deplibs"
++      finalize_command="$finalize_command $finalize_deplibs"
++
++      if test -n "$rpath$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	for libdir in $rpath $xrpath; do
++	  # This is the magic to use -rpath.
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++      fi
++
++      # Now hardcode the library paths
++      rpath=
++      hardcode_libdirs=
++      for libdir in $compile_rpath $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  esac
++	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
++	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+-	  *":$dir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$dir";;
++	  *":$libdir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
+ 	  case :$dllsearchpath: in
+ 	  *":$testbindir:"*) ;;
+@@ -3989,3682 +4518,2024 @@ func_mode_link ()
+ 	  esac
+ 	  ;;
+ 	esac
+-	continue
+-	;;
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      compile_rpath="$rpath"
+ 
+-      -l*)
+-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+-	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+-	    # These systems don't actually have a C or math library (as such)
+-	    continue
+-	    ;;
+-	  *-*-os2*)
+-	    # These systems don't actually have a C library (as such)
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-rhapsody* | *-*-darwin1.[012])
+-	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
+-	    continue
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  esac
+-	elif test "X$arg" = "X-lc_r"; then
+-	 case $host in
+-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	   # Do not include libc_r directly, use -pthread flag.
+-	   continue
+-	   ;;
+-	 esac
+-	fi
+-	deplibs="$deplibs $arg"
+-	continue
+-	;;
++      rpath=
++      hardcode_libdirs=
++      for libdir in $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      finalize_rpath="$rpath"
+ 
+-      -module)
+-	module=yes
+-	continue
+-	;;
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
++	# Transform all the library objects into standard objects.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++      fi
+ 
+-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+-      # classes, name mangling, and exception handling.
+-      # Darwin uses the -arch flag to determine output architecture.
+-      -model|-arch|-isysroot)
+-	compiler_flags="$compiler_flags $arg"
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
+-	prev=xcompiler
+-	continue
+-	;;
++      dlsyms=
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	  dlsyms="${outputname}S.c"
++	else
++	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
++	fi
++      fi
+ 
+-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+-	compiler_flags="$compiler_flags $arg"
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
+-	case "$new_inherited_linker_flags " in
+-	    *" $arg "*) ;;
+-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+-	esac
+-	continue
+-	;;
++      if test -n "$dlsyms"; then
++	case $dlsyms in
++	"") ;;
++	*.c)
++	  # Discover the nlist of each of the dlfiles.
++	  nlist="$output_objdir/${outputname}.nm"
+ 
+-      -multi_module)
+-	single_module="${wl}-multi_module"
+-	continue
+-	;;
++	  $show "$rm $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+ 
+-      -no-fast-install)
+-	fast_install=no
+-	continue
+-	;;
++	  # Parse the name list into a source file.
++	  $show "creating $output_objdir/$dlsyms"
+ 
+-      -no-install)
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+-	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # and Darwin in order for the loader to find any dlls it needs.
+-	  func_warning "\`-no-install' is ignored for $host"
+-	  func_warning "assuming \`-no-fast-install' instead"
+-	  fast_install=no
+-	  ;;
+-	*) no_install=yes ;;
+-	esac
+-	continue
+-	;;
++	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+ 
+-      -no-undefined)
+-	allow_undefined=no
+-	continue
+-	;;
++#ifdef __cplusplus
++extern \"C\" {
++#endif
+ 
+-      -objectlist)
+-	prev=objectlist
+-	continue
+-	;;
++/* Prevent the only kind of declaration conflicts we can make. */
++#define lt_preloaded_symbols some_other_symbol
+ 
+-      -o) prev=output ;;
++/* External symbol declarations for the compiler. */\
++"
+ 
+-      -precious-files-regex)
+-	prev=precious_regex
+-	continue
+-	;;
++	  if test "$dlself" = yes; then
++	    $show "generating symbol list for \`$output'"
+ 
+-      -release)
+-	prev=release
+-	continue
+-	;;
++	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+ 
+-      -rpath)
+-	prev=rpath
+-	continue
+-	;;
++	    # Add our own program objects to the symbol list.
++	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	    for arg in $progfiles; do
++	      $show "extracting global C symbols from \`$arg'"
++	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	    done
+ 
+-      -R)
+-	prev=xrpath
+-	continue
+-	;;
++	    if test -n "$exclude_expsyms"; then
++	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    if test -n "$export_symbols_regex"; then
++	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    # Prepare the list of exported symbols
++	    if test -z "$export_symbols"; then
++	      export_symbols="$output_objdir/$outputname.exp"
++	      $run $rm $export_symbols
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
++	    else
++	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
++	      $run eval 'mv "$nlist"T "$nlist"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
++	    fi
++	  fi
+ 
+-      -R*)
+-	func_stripname '-R' '' "$arg"
+-	dir=$func_stripname_result
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
+-	*)
+-	  func_fatal_error "only absolute run-paths are allowed"
+-	  ;;
+-	esac
+-	case "$xrpath " in
+-	*" $dir "*) ;;
+-	*) xrpath="$xrpath $dir" ;;
+-	esac
+-	continue
+-	;;
++	  for arg in $dlprefiles; do
++	    $show "extracting global C symbols from \`$arg'"
++	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
++	    $run eval '$echo ": $name " >> "$nlist"'
++	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	  done
+ 
+-      -shared)
+-	# The effects of -shared are defined in a previous loop.
+-	continue
+-	;;
++	  if test -z "$run"; then
++	    # Make sure we have at least an empty file.
++	    test -f "$nlist" || : > "$nlist"
++
++	    if test -n "$exclude_expsyms"; then
++	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $mv "$nlist"T "$nlist"
++	    fi
+ 
+-      -shrext)
+-	prev=shrext
+-	continue
+-	;;
++	    # Try sorting and uniquifying the output.
++	    if grep -v "^: " < "$nlist" |
++		if sort -k 3 </dev/null >/dev/null 2>&1; then
++		  sort -k 3
++		else
++		  sort +2
++		fi |
++		uniq > "$nlist"S; then
++	      :
++	    else
++	      grep -v "^: " < "$nlist" > "$nlist"S
++	    fi
+ 
+-      -static | -static-libtool-libs)
+-	# The effects of -static are defined in a previous loop.
+-	# We used to do the same as -all-static on platforms that
+-	# didn't have a PIC flag, but the assumption that the effects
+-	# would be equivalent was wrong.  It would break on at least
+-	# Digital Unix and AIX.
+-	continue
+-	;;
++	    if test -f "$nlist"S; then
++	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
++	    else
++	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
++	    fi
+ 
+-      -thread-safe)
+-	thread_safe=yes
+-	continue
+-	;;
++	    $echo >> "$output_objdir/$dlsyms" "\
+ 
+-      -version-info)
+-	prev=vinfo
+-	continue
+-	;;
++#undef lt_preloaded_symbols
+ 
+-      -version-number)
+-	prev=vinfo
+-	vinfo_number=yes
+-	continue
+-	;;
++#if defined (__STDC__) && __STDC__
++# define lt_ptr void *
++#else
++# define lt_ptr char *
++# define const
++#endif
+ 
+-      -weak)
+-        prev=weak
+-	continue
+-	;;
++/* The mapping between symbol names and symbols. */
++"
+ 
+-      -Wc,*)
+-	func_stripname '-Wc,' '' "$arg"
+-	args=$func_stripname_result
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	for flag in $args; do
+-	  IFS="$save_ifs"
+-          func_quote_for_eval "$flag"
+-	  arg="$arg $wl$func_quote_for_eval_result"
+-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+-	done
+-	IFS="$save_ifs"
+-	func_stripname ' ' '' "$arg"
+-	arg=$func_stripname_result
+-	;;
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
++const struct {
++"
++	      ;;
++	    esac
+ 
+-      -Wl,*)
+-	func_stripname '-Wl,' '' "$arg"
+-	args=$func_stripname_result
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	for flag in $args; do
+-	  IFS="$save_ifs"
+-          func_quote_for_eval "$flag"
+-	  arg="$arg $wl$func_quote_for_eval_result"
+-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+-	done
+-	IFS="$save_ifs"
+-	func_stripname ' ' '' "$arg"
+-	arg=$func_stripname_result
+-	;;
+ 
+-      -Xcompiler)
+-	prev=xcompiler
+-	continue
+-	;;
++	  $echo >> "$output_objdir/$dlsyms" "\
++  const char *name;
++  lt_ptr address;
++}
++lt_preloaded_symbols[] =
++{\
++"
+ 
+-      -Xlinker)
+-	prev=xlinker
+-	continue
+-	;;
++	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+ 
+-      -XCClinker)
+-	prev=xcclinker
+-	continue
+-	;;
++	    $echo >> "$output_objdir/$dlsyms" "\
++  {0, (lt_ptr) 0}
++};
+ 
+-      # -msg_* for osf cc
+-      -msg_*)
+-	func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-	;;
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_preloaded_symbols;
++}
++#endif
+ 
+-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+-      # +DA*, +DD* enable 64-bit mode on the HP compiler
+-      # -q* pass through compiler args for the IBM compiler
+-      # -m*, -t[45]*, -txscale* pass through architecture-specific
+-      # compiler args for GCC
+-      # -F/path gives path to uninstalled frameworks, gcc on darwin
+-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+-      # @file GCC response files
+-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+-        func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-        func_append compile_command " $arg"
+-        func_append finalize_command " $arg"
+-        compiler_flags="$compiler_flags $arg"
+-        continue
+-        ;;
++#ifdef __cplusplus
++}
++#endif\
++"
++	  fi
+ 
+-      # Some other compiler flag.
+-      -* | +*)
+-        func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-	;;
++	  pic_flag_for_symtable=
++	  case $host in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
++	    esac;;
++	  *-*-hpux*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag";;
++	    esac
++	  esac
+ 
+-      *.$objext)
+-	# A standard object.
+-	objs="$objs $arg"
+-	;;
++	  # Now compile the dynamic symbol file.
++	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++
++	  # Clean up the generated files.
++	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Transform the symbol file into the correct name.
++          case $host in
++          *cygwin* | *mingw* )
++            if test -f "$output_objdir/${outputname}.def" ; then
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            else
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            ;;
++          esac
++	  ;;
++	*)
++	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
++      else
++	# We keep going just in case the user didn't refer to
++	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++	# really was required.
+ 
+-      *.lo)
+-	# A libtool-controlled object.
++	# Nullify the symbol file.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++      fi
+ 
+-	# Check to see that this really is a libtool object.
+-	if func_lalib_unsafe_p "$arg"; then
+-	  pic_object=
+-	  non_pic_object=
++      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
++	# Replace the output file specification.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
++	link_command="$compile_command$compile_rpath"
+ 
+-	  # Read the .lo file
+-	  func_source "$arg"
++	# We have no uninstalled library dependencies, so finalize right now.
++	$show "$link_command"
++	$run eval "$link_command"
++	exit_status=$?
+ 
+-	  if test -z "$pic_object" ||
+-	     test -z "$non_pic_object" ||
+-	     test "$pic_object" = none &&
+-	     test "$non_pic_object" = none; then
+-	    func_fatal_error "cannot find name of object for \`$arg'"
+-	  fi
++	# Delete the generated files.
++	if test -n "$dlsyms"; then
++	  $show "$rm $output_objdir/${outputname}S.${objext}"
++	  $run $rm "$output_objdir/${outputname}S.${objext}"
++	fi
+ 
+-	  # Extract subdirectory from the argument.
+-	  func_dirname "$arg" "/" ""
+-	  xdir="$func_dirname_result"
++	exit $exit_status
++      fi
+ 
+-	  if test "$pic_object" != none; then
+-	    # Prepend the subdirectory the object is found in.
+-	    pic_object="$xdir$pic_object"
++      if test -n "$shlibpath_var"; then
++	# We should set the shlibpath_var
++	rpath=
++	for dir in $temp_rpath; do
++	  case $dir in
++	  [\\/]* | [A-Za-z]:[\\/]*)
++	    # Absolute path.
++	    rpath="$rpath$dir:"
++	    ;;
++	  *)
++	    # Relative path: add a thisdir entry.
++	    rpath="$rpath\$thisdir/$dir:"
++	    ;;
++	  esac
++	done
++	temp_rpath="$rpath"
++      fi
+ 
+-	    if test "$prev" = dlfiles; then
+-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		dlfiles="$dlfiles $pic_object"
+-		prev=
+-		continue
+-	      else
+-		# If libtool objects are unsupported, then we need to preload.
+-		prev=dlprefiles
+-	      fi
+-	    fi
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
++      fi
++      if test -n "$finalize_shlibpath"; then
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++      fi
+ 
+-	    # CHECK ME:  I think I busted this.  -Ossama
+-	    if test "$prev" = dlprefiles; then
+-	      # Preload the old-style object.
+-	      dlprefiles="$dlprefiles $pic_object"
+-	      prev=
+-	    fi
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++      fi
+ 
+-	    # A PIC object.
+-	    func_append libobjs " $pic_object"
+-	    arg="$pic_object"
+-	  fi
++      if test "$no_install" = yes; then
++	# We don't need to create a wrapper script.
++	link_command="$compile_var$compile_command$compile_rpath"
++	# Replace the output file specification.
++	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	# Delete the old output file.
++	$run $rm $output
++	# Link the executable and exit
++	$show "$link_command"
++	$run eval "$link_command" || exit $?
++	exit $EXIT_SUCCESS
++      fi
+ 
+-	  # Non-PIC object.
+-	  if test "$non_pic_object" != none; then
+-	    # Prepend the subdirectory the object is found in.
+-	    non_pic_object="$xdir$non_pic_object"
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 
+-	    # A standard non-PIC object
+-	    func_append non_pic_objects " $non_pic_object"
+-	    if test -z "$pic_object" || test "$pic_object" = none ; then
+-	      arg="$non_pic_object"
+-	    fi
++	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
++	$echo "$modename: \`$output' will be relinked during installation" 1>&2
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ 	  else
+-	    # If the PIC object exists, use it instead.
+-	    # $xdir was prepended to $pic_object above.
+-	    non_pic_object="$pic_object"
+-	    func_append non_pic_objects " $non_pic_object"
++	    # fast_install is set to needless
++	    relink_command=
+ 	  fi
+ 	else
+-	  # Only an error if not doing a dry-run.
+-	  if $opt_dry_run; then
+-	    # Extract subdirectory from the argument.
+-	    func_dirname "$arg" "/" ""
+-	    xdir="$func_dirname_result"
+-
+-	    func_lo2o "$arg"
+-	    pic_object=$xdir$objdir/$func_lo2o_result
+-	    non_pic_object=$xdir$func_lo2o_result
+-	    func_append libobjs " $pic_object"
+-	    func_append non_pic_objects " $non_pic_object"
+-	  else
+-	    func_fatal_error "\`$arg' is not a valid libtool object"
+-	  fi
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 	fi
+-	;;
++      fi
+ 
+-      *.$libext)
+-	# An archive.
+-	deplibs="$deplibs $arg"
+-	old_deplibs="$old_deplibs $arg"
+-	continue
+-	;;
++      # Replace the output file specification.
++      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ 
+-      *.la)
+-	# A libtool-controlled library.
++      # Delete the old output files.
++      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 
+-	if test "$prev" = dlfiles; then
+-	  # This library was specified with -dlopen.
+-	  dlfiles="$dlfiles $arg"
+-	  prev=
+-	elif test "$prev" = dlprefiles; then
+-	  # The library was specified with -dlpreopen.
+-	  dlprefiles="$dlprefiles $arg"
+-	  prev=
+-	else
+-	  deplibs="$deplibs $arg"
+-	fi
+-	continue
+-	;;
++      $show "$link_command"
++      $run eval "$link_command" || exit $?
+ 
+-      # Some other compiler argument.
+-      *)
+-	# Unknown arguments in both finalize_command and compile_command need
+-	# to be aesthetically quoted because they are evaled later.
+-	func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-	;;
+-      esac # arg
++      # Now create the wrapper script.
++      $show "creating $output"
+ 
+-      # Now actually substitute the argument into the commands.
+-      if test -n "$arg"; then
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
++      # Quote the relink command for shipping.
++      if test -n "$relink_command"; then
++	# Preserve any variables that may affect compiler behavior
++	for var in $variables_saved_for_relink; do
++	  if eval test -z \"\${$var+set}\"; then
++	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	  elif eval var_value=\$$var; test -z "$var_value"; then
++	    relink_command="$var=; export $var; $relink_command"
++	  else
++	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
++	  fi
++	done
++	relink_command="(cd `pwd`; $relink_command)"
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       fi
+-    done # argument parsing loop
+-
+-    test -n "$prev" && \
+-      func_fatal_help "the \`$prevarg' option requires an argument"
+-
+-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+-      eval arg=\"$export_dynamic_flag_spec\"
+-      func_append compile_command " $arg"
+-      func_append finalize_command " $arg"
+-    fi
+ 
+-    oldlibs=
+-    # calculate the name of the file, without its directory
+-    func_basename "$output"
+-    outputname="$func_basename_result"
+-    libobjs_save="$libobjs"
++      # Quote $echo for shipping.
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
++	esac
++	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      fi
+ 
+-    if test -n "$shlibpath_var"; then
+-      # get the directories listed in $shlibpath_var
+-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+-    else
+-      shlib_search_path=
+-    fi
+-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
++      # Only actually do things if our run command is non-null.
++      if test -z "$run"; then
++	# win32 will think the script is a binary if it has
++	# a .exe suffix, so we strip it off here.
++	case $output in
++	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
++	esac
++	# test for cygwin because mv fails w/o .exe extensions
++	case $host in
++	  *cygwin*)
++	    exeext=.exe
++	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
++	  *) exeext= ;;
++	esac
++	case $host in
++	  *cygwin* | *mingw* )
++            output_name=`basename $output`
++            output_path=`dirname $output`
++            cwrappersource="$output_path/$objdir/lt-$output_name.c"
++            cwrapper="$output_path/$output_name.exe"
++            $rm $cwrappersource $cwrapper
++            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+-    func_dirname "$output" "/" ""
+-    output_objdir="$func_dirname_result$objdir"
+-    # Create the object directory.
+-    func_mkdir_p "$output_objdir"
++	    cat > $cwrappersource <<EOF
+ 
+-    # Determine the type of output
+-    case $output in
+-    "")
+-      func_fatal_help "you must specify an output file"
+-      ;;
+-    *.$libext) linkmode=oldlib ;;
+-    *.lo | *.$objext) linkmode=obj ;;
+-    *.la) linkmode=lib ;;
+-    *) linkmode=prog ;; # Anything else should be a program.
+-    esac
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ 
+-    specialdeplibs=
++   The $output program cannot be directly executed until all the libtool
++   libraries that it depends on are installed.
+ 
+-    libs=
+-    # Find all interdependent deplibs by searching for libraries
+-    # that are linked more than once (e.g. -la -lb -la)
+-    for deplib in $deplibs; do
+-      if $opt_duplicate_deps ; then
+-	case "$libs " in
+-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	esac
+-      fi
+-      libs="$libs $deplib"
+-    done
++   This wrapper executable should never be moved out of the build directory.
++   If it is, it will not operate correctly.
+ 
+-    if test "$linkmode" = lib; then
+-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
++   Currently, it simply execs the wrapper *script* "/bin/sh $output",
++   but could eventually absorb all of the scripts functionality and
++   exec $objdir/$outputname directly.
++*/
++EOF
++	    cat >> $cwrappersource<<"EOF"
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+ 
+-      # Compute libraries that are listed more than once in $predeps
+-      # $postdeps and mark them as special (i.e., whose duplicates are
+-      # not to be eliminated).
+-      pre_post_deps=
+-      if $opt_duplicate_compiler_generated_deps; then
+-	for pre_post_dep in $predeps $postdeps; do
+-	  case "$pre_post_deps " in
+-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+-	  esac
+-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+-	done
+-      fi
+-      pre_post_deps=
+-    fi
++#if defined(PATH_MAX)
++# define LT_PATHMAX PATH_MAX
++#elif defined(MAXPATHLEN)
++# define LT_PATHMAX MAXPATHLEN
++#else
++# define LT_PATHMAX 1024
++#endif
+ 
+-    deplibs=
+-    newdependency_libs=
+-    newlib_search_path=
+-    need_relink=no # whether we're linking any uninstalled libtool libraries
+-    notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
++#ifndef DIR_SEPARATOR
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
++#endif
+ 
+-    case $linkmode in
+-    lib)
+-	passes="conv dlpreopen link"
+-	for file in $dlfiles $dlprefiles; do
+-	  case $file in
+-	  *.la) ;;
+-	  *)
+-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+-	    ;;
+-	  esac
+-	done
+-	;;
+-    prog)
+-	compile_deplibs=
+-	finalize_deplibs=
+-	alldeplibs=no
+-	newdlfiles=
+-	newdlprefiles=
+-	passes="conv scan dlopen dlpreopen link"
+-	;;
+-    *)  passes="conv"
+-	;;
+-    esac
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++  defined (__OS2__)
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++#  define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++#  define PATH_SEPARATOR_2 ';'
++# endif
++#endif
+ 
+-    for pass in $passes; do
+-      # The preopen pass in lib mode reverses $deplibs; put it back here
+-      # so that -L comes before libs that need it for instance...
+-      if test "$linkmode,$pass" = "lib,link"; then
+-	## FIXME: Find the place where the list is rebuilt in the wrong
+-	##        order, and fix it there properly
+-        tmp_deplibs=
+-	for deplib in $deplibs; do
+-	  tmp_deplibs="$deplib $tmp_deplibs"
+-	done
+-	deplibs="$tmp_deplibs"
+-      fi
++#ifndef DIR_SEPARATOR_2
++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else /* DIR_SEPARATOR_2 */
++# define IS_DIR_SEPARATOR(ch) \
++        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif /* DIR_SEPARATOR_2 */
+ 
+-      if test "$linkmode,$pass" = "lib,link" ||
+-	 test "$linkmode,$pass" = "prog,scan"; then
+-	libs="$deplibs"
+-	deplibs=
+-      fi
+-      if test "$linkmode" = prog; then
+-	case $pass in
+-	dlopen) libs="$dlfiles" ;;
+-	dlpreopen) libs="$dlprefiles" ;;
+-	link)
+-	  libs="$deplibs %DEPLIBS%"
+-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+-	  ;;
+-	esac
+-      fi
+-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+-	# Collect and forward deplibs of preopened libtool libs
+-	for lib in $dlprefiles; do
+-	  # Ignore non-libtool-libs
+-	  dependency_libs=
+-	  case $lib in
+-	  *.la)	func_source "$lib" ;;
+-	  esac
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
+ 
+-	  # Collect preopened libtool deplibs, except any this library
+-	  # has declared as weak libs
+-	  for deplib in $dependency_libs; do
+-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+-	    case " $weak_libs " in
+-	    *" $deplib_base "*) ;;
+-	    *) deplibs="$deplibs $deplib" ;;
+-	    esac
+-	  done
+-	done
+-	libs="$dlprefiles"
+-      fi
+-      if test "$pass" = dlopen; then
+-	# Collect dlpreopened libraries
+-	save_deplibs="$deplibs"
+-	deplibs=
+-      fi
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XFREE(stale) do { \
++  if (stale) { free ((void *) stale); stale = 0; } \
++} while (0)
+ 
+-      for deplib in $libs; do
+-	lib=
+-	found=no
+-	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    compiler_flags="$compiler_flags $deplib"
+-	    if test "$linkmode" = lib ; then
+-		case "$new_inherited_linker_flags " in
+-		    *" $deplib "*) ;;
+-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		esac
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	-l*)
+-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+-	    func_warning "\`-l' is ignored for archives/objects"
+-	    continue
+-	  fi
+-	  func_stripname '-l' '' "$deplib"
+-	  name=$func_stripname_result
+-	  if test "$linkmode" = lib; then
+-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+-	  else
+-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+-	  fi
+-	  for searchdir in $searchdirs; do
+-	    for search_ext in .la $std_shrext .so .a; do
+-	      # Search the libtool library
+-	      lib="$searchdir/lib${name}${search_ext}"
+-	      if test -f "$lib"; then
+-		if test "$search_ext" = ".la"; then
+-		  found=yes
+-		else
+-		  found=no
+-		fi
+-		break 2
+-	      fi
+-	    done
+-	  done
+-	  if test "$found" != yes; then
+-	    # deplib doesn't seem to be a libtool library
+-	    if test "$linkmode,$pass" = "prog,link"; then
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    else
+-	      deplibs="$deplib $deplibs"
+-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	    continue
+-	  else # deplib is a libtool library
+-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+-	    # We need to do some special things here, and not later.
+-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-	      case " $predeps $postdeps " in
+-	      *" $deplib "*)
+-		if func_lalib_p "$lib"; then
+-		  library_names=
+-		  old_library=
+-		  func_source "$lib"
+-		  for l in $old_library $library_names; do
+-		    ll="$l"
+-		  done
+-		  if test "X$ll" = "X$old_library" ; then # only static version available
+-		    found=no
+-		    func_dirname "$lib" "" "."
+-		    ladir="$func_dirname_result"
+-		    lib=$ladir/$old_library
+-		    if test "$linkmode,$pass" = "prog,link"; then
+-		      compile_deplibs="$deplib $compile_deplibs"
+-		      finalize_deplibs="$deplib $finalize_deplibs"
+-		    else
+-		      deplibs="$deplib $deplibs"
+-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+-		    fi
+-		    continue
+-		  fi
+-		fi
+-		;;
+-	      *) ;;
+-	      esac
+-	    fi
+-	  fi
+-	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-		case "$new_inherited_linker_flags " in
+-		    *" $deplib "*) ;;
+-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		esac
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	-L*)
+-	  case $linkmode in
+-	  lib)
+-	    deplibs="$deplib $deplibs"
+-	    test "$pass" = conv && continue
+-	    newdependency_libs="$deplib $newdependency_libs"
+-	    func_stripname '-L' '' "$deplib"
+-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+-	    ;;
+-	  prog)
+-	    if test "$pass" = conv; then
+-	      deplibs="$deplib $deplibs"
+-	      continue
+-	    fi
+-	    if test "$pass" = scan; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    fi
+-	    func_stripname '-L' '' "$deplib"
+-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+-	    ;;
+-	  *)
+-	    func_warning "\`-L' is ignored for archives/objects"
+-	    ;;
+-	  esac # linkmode
+-	  continue
+-	  ;; # -L
+-	-R*)
+-	  if test "$pass" = link; then
+-	    func_stripname '-R' '' "$deplib"
+-	    dir=$func_stripname_result
+-	    # Make sure the xrpath contains only unique directories.
+-	    case "$xrpath " in
+-	    *" $dir "*) ;;
+-	    *) xrpath="$xrpath $dir" ;;
+-	    esac
+-	  fi
+-	  deplibs="$deplib $deplibs"
+-	  continue
+-	  ;;
+-	*.la) lib="$deplib" ;;
+-	*.$libext)
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+-	  case $linkmode in
+-	  lib)
+-	    # Linking convenience modules into shared libraries is allowed,
+-	    # but linking other static libraries is non-portable.
+-	    case " $dlpreconveniencelibs " in
+-	    *" $deplib "*) ;;
+-	    *)
+-	      valid_a_lib=no
+-	      case $deplibs_check_method in
+-		match_pattern*)
+-		  set dummy $deplibs_check_method; shift
+-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+-		    | $EGREP "$match_pattern_regex" > /dev/null; then
+-		    valid_a_lib=yes
+-		  fi
+-		;;
+-		pass_all)
+-		  valid_a_lib=yes
+-		;;
+-	      esac
+-	      if test "$valid_a_lib" != yes; then
+-		$ECHO
+-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+-		$ECHO "*** I have the capability to make that library automatically link in when"
+-		$ECHO "*** you link to this library.  But I can only do this if you have a"
+-		$ECHO "*** shared version of the library, which you do not appear to have"
+-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+-		$ECHO "*** that it is just a static archive that I should not use here."
+-	      else
+-		$ECHO
+-		$ECHO "*** Warning: Linking the shared library $output against the"
+-		$ECHO "*** static library $deplib is not portable!"
+-		deplibs="$deplib $deplibs"
+-	      fi
+-	      ;;
+-	    esac
+-	    continue
+-	    ;;
+-	  prog)
+-	    if test "$pass" != link; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    fi
+-	    continue
+-	    ;;
+-	  esac # linkmode
+-	  ;; # *.$libext
+-	*.lo | *.$objext)
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	  elif test "$linkmode" = prog; then
+-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+-	      # If there is no dlopen support or we're linking statically,
+-	      # we need to preload.
+-	      newdlprefiles="$newdlprefiles $deplib"
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    else
+-	      newdlfiles="$newdlfiles $deplib"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	%DEPLIBS%)
+-	  alldeplibs=yes
+-	  continue
+-	  ;;
+-	esac # case $deplib
+-
+-	if test "$found" = yes || test -f "$lib"; then :
+-	else
+-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+-	fi
+-
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$lib" \
+-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+-
+-	func_dirname "$lib" "" "."
+-	ladir="$func_dirname_result"
+-
+-	dlname=
+-	dlopen=
+-	dlpreopen=
+-	libdir=
+-	library_names=
+-	old_library=
+-	inherited_linker_flags=
+-	# If the library was installed with an old release of libtool,
+-	# it will not redefine variables installed, or shouldnotlink
+-	installed=yes
+-	shouldnotlink=no
+-	avoidtemprpath=
+-
+-
+-	# Read the .la file
+-	func_source "$lib"
+-
+-	# Convert "-framework foo" to "foo.ltframework"
+-	if test -n "$inherited_linker_flags"; then
+-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+-	    case " $new_inherited_linker_flags " in
+-	      *" $tmp_inherited_linker_flag "*) ;;
+-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+-	    esac
+-	  done
+-	fi
+-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	if test "$linkmode,$pass" = "lib,link" ||
+-	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+-	fi
+-
+-	if test "$pass" = conv; then
+-	  # Only check for convenience libraries
+-	  deplibs="$lib $deplibs"
+-	  if test -z "$libdir"; then
+-	    if test -z "$old_library"; then
+-	      func_fatal_error "cannot find name of link library for \`$lib'"
+-	    fi
+-	    # It is a libtool convenience library, so add in its objects.
+-	    convenience="$convenience $ladir/$objdir/$old_library"
+-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+-	    func_fatal_error "\`$lib' is not a convenience library"
+-	  fi
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    deplibs="$deplib $deplibs"
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+-	  continue
+-	fi # $pass = conv
++/* -DDEBUG is fairly common in CFLAGS.  */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
+ 
++const char *program_name = NULL;
+ 
+-	# Get the name of the library we link against.
+-	linklib=
+-	for l in $old_library $library_names; do
+-	  linklib="$l"
+-	done
+-	if test -z "$linklib"; then
+-	  func_fatal_error "cannot find name of link library for \`$lib'"
+-	fi
++void * xmalloc (size_t num);
++char * xstrdup (const char *string);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int    check_executable(const char *path);
++char * strendzap(char *str, const char *pat);
++void lt_fatal (const char *message, ...);
+ 
+-	# This library was specified with -dlopen.
+-	if test "$pass" = dlopen; then
+-	  if test -z "$libdir"; then
+-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+-	  fi
+-	  if test -z "$dlname" ||
+-	     test "$dlopen_support" != yes ||
+-	     test "$build_libtool_libs" = no; then
+-	    # If there is no dlname, no dlopen support or we're linking
+-	    # statically, we need to preload.  We also need to preload any
+-	    # dependent libraries so libltdl's deplib preloader doesn't
+-	    # bomb out in the load deplibs phase.
+-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+-	  else
+-	    newdlfiles="$newdlfiles $lib"
+-	  fi
+-	  continue
+-	fi # $pass = dlopen
++int
++main (int argc, char *argv[])
++{
++  char **newargz;
++  int i;
+ 
+-	# We need an absolute path.
+-	case $ladir in
+-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+-	*)
+-	  abs_ladir=`cd "$ladir" && pwd`
+-	  if test -z "$abs_ladir"; then
+-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+-	    func_warning "passing it literally to the linker, although it might fail"
+-	    abs_ladir="$ladir"
+-	  fi
+-	  ;;
+-	esac
+-	func_basename "$lib"
+-	laname="$func_basename_result"
++  program_name = (char *) xstrdup (base_name (argv[0]));
++  DEBUG("(main) argv[0]      : %s\n",argv[0]);
++  DEBUG("(main) program_name : %s\n",program_name);
++  newargz = XMALLOC(char *, argc+2);
++EOF
+ 
+-	# Find the relevant object directory and library name.
+-	if test "X$installed" = Xyes; then
+-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    func_warning "library \`$lib' was moved."
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    libdir="$abs_ladir"
+-	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
+-	  fi
+-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+-	else
+-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  else
+-	    dir="$ladir/$objdir"
+-	    absdir="$abs_ladir/$objdir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  fi
+-	fi # $installed = yes
+-	func_stripname 'lib' '.la' "$laname"
+-	name=$func_stripname_result
++            cat >> $cwrappersource <<EOF
++  newargz[0] = (char *) xstrdup("$SHELL");
++EOF
+ 
+-	# This library was specified with -dlpreopen.
+-	if test "$pass" = dlpreopen; then
+-	  if test -z "$libdir" && test "$linkmode" = prog; then
+-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+-	  fi
+-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+-	  # are required to link).
+-	  if test -n "$old_library"; then
+-	    newdlprefiles="$newdlprefiles $dir/$old_library"
+-	    # Keep a list of preopened convenience libraries to check
+-	    # that they are being used correctly in the link pass.
+-	    test -z "$libdir" && \
+-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+-	  elif test -n "$dlname"; then
+-	    newdlprefiles="$newdlprefiles $dir/$dlname"
+-	  else
+-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+-	  fi
+-	fi # $pass = dlpreopen
++            cat >> $cwrappersource <<"EOF"
++  newargz[1] = find_executable(argv[0]);
++  if (newargz[1] == NULL)
++    lt_fatal("Couldn't find %s", argv[0]);
++  DEBUG("(main) found exe at : %s\n",newargz[1]);
++  /* we know the script has the same name, without the .exe */
++  /* so make sure newargz[1] doesn't end in .exe */
++  strendzap(newargz[1],".exe");
++  for (i = 1; i < argc; i++)
++    newargz[i+1] = xstrdup(argv[i]);
++  newargz[argc+1] = NULL;
+ 
+-	if test -z "$libdir"; then
+-	  # Link the convenience library
+-	  if test "$linkmode" = lib; then
+-	    deplibs="$dir/$old_library $deplibs"
+-	  elif test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$dir/$old_library $compile_deplibs"
+-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+-	  else
+-	    deplibs="$lib $deplibs" # used for prog,scan pass
+-	  fi
+-	  continue
+-	fi
++  for (i=0; i<argc+1; i++)
++  {
++    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
++    ;
++  }
+ 
++EOF
+ 
+-	if test "$linkmode" = prog && test "$pass" != link; then
+-	  newlib_search_path="$newlib_search_path $ladir"
+-	  deplibs="$lib $deplibs"
++            case $host_os in
++              mingw*)
++                cat >> $cwrappersource <<EOF
++  execv("$SHELL",(char const **)newargz);
++EOF
++              ;;
++              *)
++                cat >> $cwrappersource <<EOF
++  execv("$SHELL",newargz);
++EOF
++              ;;
++            esac
+ 
+-	  linkalldeplibs=no
+-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+-	     test "$build_libtool_libs" = no; then
+-	    linkalldeplibs=yes
+-	  fi
++            cat >> $cwrappersource <<"EOF"
++  return 127;
++}
+ 
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    case $deplib in
+-	    -L*) func_stripname '-L' '' "$deplib"
+-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+-		 ;;
+-	    esac
+-	    # Need to link against all dependency_libs?
+-	    if test "$linkalldeplibs" = yes; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      # Need to hardcode shared library paths
+-	      # or/and link against static libraries
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done # for deplib
+-	  continue
+-	fi # $linkmode = prog...
++void *
++xmalloc (size_t num)
++{
++  void * p = (void *) malloc (num);
++  if (!p)
++    lt_fatal ("Memory exhausted");
+ 
+-	if test "$linkmode,$pass" = "prog,link"; then
+-	  if test -n "$library_names" &&
+-	     { { test "$prefer_static_libs" = no ||
+-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+-	       test -z "$old_library"; }; then
+-	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+-	      # Make sure the rpath contains only unique directories.
+-	      case "$temp_rpath:" in
+-	      *"$absdir:"*) ;;
+-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+-	      esac
+-	    fi
++  return p;
++}
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+-	  fi # $linkmode,$pass = prog,link...
++char *
++xstrdup (const char *string)
++{
++  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
++;
++}
+ 
+-	  if test "$alldeplibs" = yes &&
+-	     { test "$deplibs_check_method" = pass_all ||
+-	       { test "$build_libtool_libs" = yes &&
+-		 test -n "$library_names"; }; }; then
+-	    # We only need to search for static libraries
+-	    continue
+-	  fi
+-	fi
++const char *
++base_name (const char *name)
++{
++  const char *base;
+ 
+-	link_static=no # Whether the deplib will be linked statically
+-	use_static_libs=$prefer_static_libs
+-	if test "$use_static_libs" = built && test "$installed" = yes; then
+-	  use_static_libs=no
+-	fi
+-	if test -n "$library_names" &&
+-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+-	  case $host in
+-	  *cygwin* | *mingw*)
+-	      # No point in relinking DLLs because paths are not encoded
+-	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=no
+-	    ;;
+-	  *)
+-	    if test "$installed" = no; then
+-	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
+-	    fi
+-	    ;;
+-	  esac
+-	  # This is a shared library
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  /* Skip over the disk name in MSDOS pathnames. */
++  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
++    name += 2;
++#endif
+ 
+-	  # Warn about portability, can't link against -module's on some
+-	  # systems (darwin).  Don't bleat about dlopened modules though!
+-	  dlopenmodule=""
+-	  for dlpremoduletest in $dlprefiles; do
+-	    if test "X$dlpremoduletest" = "X$lib"; then
+-	      dlopenmodule="$dlpremoduletest"
+-	      break
+-	    fi
+-	  done
+-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+-	    $ECHO
+-	    if test "$linkmode" = prog; then
+-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+-	    else
+-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+-	    fi
+-	    $ECHO "*** $linklib is not portable!"
+-	  fi
+-	  if test "$linkmode" = lib &&
+-	     test "$hardcode_into_libs" = yes; then
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+-	  fi
+-
+-	  if test -n "$old_archive_from_expsyms_cmds"; then
+-	    # figure out the soname
+-	    set dummy $library_names
+-	    shift
+-	    realname="$1"
+-	    shift
+-	    libname=`eval "\\$ECHO \"$libname_spec\""`
+-	    # use dlname if we got it. it's perfectly good, no?
+-	    if test -n "$dlname"; then
+-	      soname="$dlname"
+-	    elif test -n "$soname_spec"; then
+-	      # bleh windows
+-	      case $host in
+-	      *cygwin* | mingw*)
+-	        func_arith $current - $age
+-		major=$func_arith_result
+-		versuffix="-$major"
+-		;;
+-	      esac
+-	      eval soname=\"$soname_spec\"
+-	    else
+-	      soname="$realname"
+-	    fi
+-
+-	    # Make a new name for the extract_expsyms_cmds to use
+-	    soroot="$soname"
+-	    func_basename "$soroot"
+-	    soname="$func_basename_result"
+-	    func_stripname 'lib' '.dll' "$soname"
+-	    newlib=libimp-$func_stripname_result.a
+-
+-	    # If the library has no export list, then create one now
+-	    if test -f "$output_objdir/$soname-def"; then :
+-	    else
+-	      func_verbose "extracting exported symbol list from \`$soname'"
+-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+-	    fi
+-
+-	    # Create $newlib
+-	    if test -f "$output_objdir/$newlib"; then :; else
+-	      func_verbose "generating import library for \`$soname'"
+-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+-	    fi
+-	    # make sure the library variables are pointing to the new library
+-	    dir=$output_objdir
+-	    linklib=$newlib
+-	  fi # test -n "$old_archive_from_expsyms_cmds"
+-
+-	  if test "$linkmode" = prog || test "$mode" != relink; then
+-	    add_shlibpath=
+-	    add_dir=
+-	    add=
+-	    lib_linked=yes
+-	    case $hardcode_action in
+-	    immediate | unsupported)
+-	      if test "$hardcode_direct" = no; then
+-		add="$dir/$linklib"
+-		case $host in
+-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+-		    *-*-unixware7*) add_dir="-L$dir" ;;
+-		  *-*-darwin* )
+-		    # if the lib is a (non-dlopened) module then we can not
+-		    # link against it, someone is ignoring the earlier warnings
+-		    if /usr/bin/file -L $add 2> /dev/null |
+-			 $GREP ": [^:]* bundle" >/dev/null ; then
+-		      if test "X$dlopenmodule" != "X$lib"; then
+-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+-			if test -z "$old_library" ; then
+-			  $ECHO
+-			  $ECHO "*** And there doesn't seem to be a static archive available"
+-			  $ECHO "*** The link will probably fail, sorry"
+-			else
+-			  add="$dir/$old_library"
+-			fi
+-		      elif test -n "$old_library"; then
+-			add="$dir/$old_library"
+-		      fi
+-		    fi
+-		esac
+-	      elif test "$hardcode_minus_L" = no; then
+-		case $host in
+-		*-*-sunos*) add_shlibpath="$dir" ;;
+-		esac
+-		add_dir="-L$dir"
+-		add="-l$name"
+-	      elif test "$hardcode_shlibpath_var" = no; then
+-		add_shlibpath="$dir"
+-		add="-l$name"
+-	      else
+-		lib_linked=no
+-	      fi
+-	      ;;
+-	    relink)
+-	      if test "$hardcode_direct" = yes &&
+-	         test "$hardcode_direct_absolute" = no; then
+-		add="$dir/$linklib"
+-	      elif test "$hardcode_minus_L" = yes; then
+-		add_dir="-L$dir"
+-		# Try looking first in the location we're being installed to.
+-		if test -n "$inst_prefix_dir"; then
+-		  case $libdir in
+-		    [\\/]*)
+-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+-		      ;;
+-		  esac
+-		fi
+-		add="-l$name"
+-	      elif test "$hardcode_shlibpath_var" = yes; then
+-		add_shlibpath="$dir"
+-		add="-l$name"
+-	      else
+-		lib_linked=no
+-	      fi
+-	      ;;
+-	    *) lib_linked=no ;;
+-	    esac
+-
+-	    if test "$lib_linked" != yes; then
+-	      func_fatal_configuration "unsupported hardcode properties"
+-	    fi
+-
+-	    if test -n "$add_shlibpath"; then
+-	      case :$compile_shlibpath: in
+-	      *":$add_shlibpath:"*) ;;
+-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+-	      esac
+-	    fi
+-	    if test "$linkmode" = prog; then
+-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+-	    else
+-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+-	      test -n "$add" && deplibs="$add $deplibs"
+-	      if test "$hardcode_direct" != yes &&
+-		 test "$hardcode_minus_L" != yes &&
+-		 test "$hardcode_shlibpath_var" = yes; then
+-		case :$finalize_shlibpath: in
+-		*":$libdir:"*) ;;
+-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+-		esac
+-	      fi
+-	    fi
+-	  fi
+-
+-	  if test "$linkmode" = prog || test "$mode" = relink; then
+-	    add_shlibpath=
+-	    add_dir=
+-	    add=
+-	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes &&
+-	       test "$hardcode_direct_absolute" = no; then
+-	      add="$libdir/$linklib"
+-	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+-	      add="-l$name"
+-	    elif test "$hardcode_shlibpath_var" = yes; then
+-	      case :$finalize_shlibpath: in
+-	      *":$libdir:"*) ;;
+-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+-	      esac
+-	      add="-l$name"
+-	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" &&
+-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+-		add="$inst_prefix_dir$libdir/$linklib"
+-	      else
+-		add="$libdir/$linklib"
+-	      fi
+-	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+-	      # Try looking first in the location we're being installed to.
+-	      if test -n "$inst_prefix_dir"; then
+-		case $libdir in
+-		  [\\/]*)
+-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+-		    ;;
+-		esac
+-	      fi
+-	      add="-l$name"
+-	    fi
+-
+-	    if test "$linkmode" = prog; then
+-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+-	    else
+-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+-	      test -n "$add" && deplibs="$add $deplibs"
+-	    fi
+-	  fi
+-	elif test "$linkmode" = prog; then
+-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+-	  # is not unsupported.  This is valid on all known static and
+-	  # shared platforms.
+-	  if test "$hardcode_direct" != unsupported; then
+-	    test -n "$old_library" && linklib="$old_library"
+-	    compile_deplibs="$dir/$linklib $compile_deplibs"
+-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+-	  else
+-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+-	  fi
+-	elif test "$build_libtool_libs" = yes; then
+-	  # Not a shared library
+-	  if test "$deplibs_check_method" != pass_all; then
+-	    # We're trying link a shared library against a static one
+-	    # but the system doesn't support it.
+-
+-	    # Just print a warning and add the library to dependency_libs so
+-	    # that the program can be linked against the static library.
+-	    $ECHO
+-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+-	    $ECHO "*** I have the capability to make that library automatically link in when"
+-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+-	    $ECHO "*** shared version of the library, which you do not appear to have."
+-	    if test "$module" = yes; then
+-	      $ECHO "*** But as you try to build a module library, libtool will still create "
+-	      $ECHO "*** a static module, that should work as long as the dlopening application"
+-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+-	      if test -z "$global_symbol_pipe"; then
+-		$ECHO
+-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+-		$ECHO "*** not find such a program.  So, this module is probably useless."
+-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+-	      fi
+-	      if test "$build_old_libs" = no; then
+-		build_libtool_libs=module
+-		build_old_libs=yes
+-	      else
+-		build_libtool_libs=no
+-	      fi
+-	    fi
+-	  else
+-	    deplibs="$dir/$old_library $deplibs"
+-	    link_static=yes
+-	  fi
+-	fi # link shared/static library?
+-
+-	if test "$linkmode" = lib; then
+-	  if test -n "$dependency_libs" &&
+-	     { test "$hardcode_into_libs" != yes ||
+-	       test "$build_old_libs" = yes ||
+-	       test "$link_static" = yes; }; then
+-	    # Extract -R from dependency_libs
+-	    temp_deplibs=
+-	    for libdir in $dependency_libs; do
+-	      case $libdir in
+-	      -R*) func_stripname '-R' '' "$libdir"
+-	           temp_xrpath=$func_stripname_result
+-		   case " $xrpath " in
+-		   *" $temp_xrpath "*) ;;
+-		   *) xrpath="$xrpath $temp_xrpath";;
+-		   esac;;
+-	      *) temp_deplibs="$temp_deplibs $libdir";;
+-	      esac
+-	    done
+-	    dependency_libs="$temp_deplibs"
+-	  fi
+-
+-	  newlib_search_path="$newlib_search_path $absdir"
+-	  # Link against this library
+-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+-	  # ... and its dependency_libs
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    newdependency_libs="$deplib $newdependency_libs"
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+-
+-	  if test "$link_all_deplibs" != no; then
+-	    # Add the search paths of all dependency libraries
+-	    for deplib in $dependency_libs; do
+-	      case $deplib in
+-	      -L*) path="$deplib" ;;
+-	      *.la)
+-	        func_dirname "$deplib" "" "."
+-		dir="$func_dirname_result"
+-		# We need an absolute path.
+-		case $dir in
+-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+-		*)
+-		  absdir=`cd "$dir" && pwd`
+-		  if test -z "$absdir"; then
+-		    func_warning "cannot determine absolute directory name of \`$dir'"
+-		    absdir="$dir"
+-		  fi
+-		  ;;
+-		esac
+-		if $GREP "^installed=no" $deplib > /dev/null; then
+-		case $host in
+-		*-*-darwin*)
+-		  depdepl=
+-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+-		  if test -n "$deplibrary_names" ; then
+-		    for tmp in $deplibrary_names ; do
+-		      depdepl=$tmp
+-		    done
+-		    if test -f "$absdir/$objdir/$depdepl" ; then
+-		      depdepl="$absdir/$objdir/$depdepl"
+-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+-                      if test -z "$darwin_install_name"; then
+-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+-                      fi
+-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+-		      path=
+-		    fi
+-		  fi
+-		  ;;
+-		*)
+-		  path="-L$absdir/$objdir"
+-		  ;;
+-		esac
+-		else
+-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		  test -z "$libdir" && \
+-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		  test "$absdir" != "$libdir" && \
+-		    func_warning "\`$deplib' seems to be moved"
+-
+-		  path="-L$absdir"
+-		fi
+-		;;
+-	      esac
+-	      case " $deplibs " in
+-	      *" $path "*) ;;
+-	      *) deplibs="$path $deplibs" ;;
+-	      esac
+-	    done
+-	  fi # link_all_deplibs != no
+-	fi # linkmode = lib
+-      done # for deplib in $libs
+-      if test "$pass" = link; then
+-	if test "$linkmode" = "prog"; then
+-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+-	else
+-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	fi
+-      fi
+-      dependency_libs="$newdependency_libs"
+-      if test "$pass" = dlpreopen; then
+-	# Link the dlpreopened libraries before other libraries
+-	for deplib in $save_deplibs; do
+-	  deplibs="$deplib $deplibs"
+-	done
+-      fi
+-      if test "$pass" != dlopen; then
+-	if test "$pass" != conv; then
+-	  # Make sure lib_search_path contains only unique directories.
+-	  lib_search_path=
+-	  for dir in $newlib_search_path; do
+-	    case "$lib_search_path " in
+-	    *" $dir "*) ;;
+-	    *) lib_search_path="$lib_search_path $dir" ;;
+-	    esac
+-	  done
+-	  newlib_search_path=
+-	fi
+-
+-	if test "$linkmode,$pass" != "prog,link"; then
+-	  vars="deplibs"
+-	else
+-	  vars="compile_deplibs finalize_deplibs"
+-	fi
+-	for var in $vars dependency_libs; do
+-	  # Add libraries to $var in reverse order
+-	  eval tmp_libs=\"\$$var\"
+-	  new_libs=
+-	  for deplib in $tmp_libs; do
+-	    # FIXME: Pedantically, this is the right thing to do, so
+-	    #        that some nasty dependency loop isn't accidentally
+-	    #        broken:
+-	    #new_libs="$deplib $new_libs"
+-	    # Pragmatically, this seems to cause very few problems in
+-	    # practice:
+-	    case $deplib in
+-	    -L*) new_libs="$deplib $new_libs" ;;
+-	    -R*) ;;
+-	    *)
+-	      # And here is the reason: when a library appears more
+-	      # than once as an explicit dependence of a library, or
+-	      # is implicitly linked in more than once by the
+-	      # compiler, it is considered special, and multiple
+-	      # occurrences thereof are not removed.  Compare this
+-	      # with having the same library being listed as a
+-	      # dependency of multiple other libraries: in this case,
+-	      # we know (pedantically, we assume) the library does not
+-	      # need to be listed more than once, so we keep only the
+-	      # last copy.  This is not always right, but it is rare
+-	      # enough that we require users that really mean to play
+-	      # such unportable linking tricks to link the library
+-	      # using -Wl,-lname, so that libtool does not consider it
+-	      # for duplicate removal.
+-	      case " $specialdeplibs " in
+-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+-	      *)
+-		case " $new_libs " in
+-		*" $deplib "*) ;;
+-		*) new_libs="$deplib $new_libs" ;;
+-		esac
+-		;;
+-	      esac
+-	      ;;
+-	    esac
+-	  done
+-	  tmp_libs=
+-	  for deplib in $new_libs; do
+-	    case $deplib in
+-	    -L*)
+-	      case " $tmp_libs " in
+-	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
+-	      esac
+-	      ;;
+-	    *) tmp_libs="$tmp_libs $deplib" ;;
+-	    esac
+-	  done
+-	  eval $var=\"$tmp_libs\"
+-	done # for var
+-      fi
+-      # Last step: remove runtime libs from dependency_libs
+-      # (they stay in deplibs)
+-      tmp_libs=
+-      for i in $dependency_libs ; do
+-	case " $predeps $postdeps $compiler_lib_search_path " in
+-	*" $i "*)
+-	  i=""
+-	  ;;
+-	esac
+-	if test -n "$i" ; then
+-	  tmp_libs="$tmp_libs $i"
+-	fi
+-      done
+-      dependency_libs=$tmp_libs
+-    done # for pass
+-    if test "$linkmode" = prog; then
+-      dlfiles="$newdlfiles"
+-    fi
+-    if test "$linkmode" = prog || test "$linkmode" = lib; then
+-      dlprefiles="$newdlprefiles"
+-    fi
+-
+-    case $linkmode in
+-    oldlib)
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	func_warning "\`-dlopen' is ignored for archives"
+-      fi
+-
+-      case " $deplibs" in
+-      *\ -l* | *\ -L*)
+-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+-      esac
+-
+-      test -n "$rpath" && \
+-	func_warning "\`-rpath' is ignored for archives"
+-
+-      test -n "$xrpath" && \
+-	func_warning "\`-R' is ignored for archives"
+-
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info/-version-number' is ignored for archives"
+-
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for archives"
+-
+-      test -n "$export_symbols$export_symbols_regex" && \
+-	func_warning "\`-export-symbols' is ignored for archives"
+-
+-      # Now set the variables for building old libraries.
+-      build_libtool_libs=no
+-      oldlibs="$output"
+-      objs="$objs$old_deplibs"
+-      ;;
+-
+-    lib)
+-      # Make sure we only generate libraries of the form `libNAME.la'.
+-      case $outputname in
+-      lib*)
+-	func_stripname 'lib' '.la' "$outputname"
+-	name=$func_stripname_result
+-	eval shared_ext=\"$shrext_cmds\"
+-	eval libname=\"$libname_spec\"
+-	;;
+-      *)
+-	test "$module" = no && \
+-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+-
+-	if test "$need_lib_prefix" != no; then
+-	  # Add the "lib" prefix for modules if required
+-	  func_stripname '' '.la' "$outputname"
+-	  name=$func_stripname_result
+-	  eval shared_ext=\"$shrext_cmds\"
+-	  eval libname=\"$libname_spec\"
+-	else
+-	  func_stripname '' '.la' "$outputname"
+-	  libname=$func_stripname_result
+-	fi
+-	;;
+-      esac
+-
+-      if test -n "$objs"; then
+-	if test "$deplibs_check_method" != pass_all; then
+-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+-	else
+-	  $ECHO
+-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+-	  $ECHO "*** objects $objs is not portable!"
+-	  libobjs="$libobjs $objs"
+-	fi
+-      fi
+-
+-      test "$dlself" != no && \
+-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+-
+-      set dummy $rpath
+-      shift
+-      test "$#" -gt 1 && \
+-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+-
+-      install_libdir="$1"
+-
+-      oldlibs=
+-      if test -z "$rpath"; then
+-	if test "$build_libtool_libs" = yes; then
+-	  # Building a libtool convenience library.
+-	  # Some compilers have problems with a `.al' extension so
+-	  # convenience libraries should have the same extension an
+-	  # archive normally would.
+-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+-	  build_libtool_libs=convenience
+-	  build_old_libs=yes
+-	fi
+-
+-	test -n "$vinfo" && \
+-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+-
+-	test -n "$release" && \
+-	  func_warning "\`-release' is ignored for convenience libraries"
+-      else
+-
+-	# Parse the version information argument.
+-	save_ifs="$IFS"; IFS=':'
+-	set dummy $vinfo 0 0 0
+-	shift
+-	IFS="$save_ifs"
+-
+-	test -n "$7" && \
+-	  func_fatal_help "too many parameters to \`-version-info'"
+-
+-	# convert absolute version numbers to libtool ages
+-	# this retains compatibility with .la files and attempts
+-	# to make the code below a bit more comprehensible
+-
+-	case $vinfo_number in
+-	yes)
+-	  number_major="$1"
+-	  number_minor="$2"
+-	  number_revision="$3"
+-	  #
+-	  # There are really only two kinds -- those that
+-	  # use the current revision as the major version
+-	  # and those that subtract age and use age as
+-	  # a minor version.  But, then there is irix
+-	  # which has an extra 1 added just for fun
+-	  #
+-	  case $version_type in
+-	  darwin|linux|osf|windows|none)
+-	    func_arith $number_major + $number_minor
+-	    current=$func_arith_result
+-	    age="$number_minor"
+-	    revision="$number_revision"
+-	    ;;
+-	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
+-	    ;;
+-	  irix|nonstopux)
+-	    func_arith $number_major + $number_minor
+-	    current=$func_arith_result
+-	    age="$number_minor"
+-	    revision="$number_minor"
+-	    lt_irix_increment=no
+-	    ;;
+-	  *)
+-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+-	    ;;
+-	  esac
+-	  ;;
+-	no)
+-	  current="$1"
+-	  revision="$2"
+-	  age="$3"
+-	  ;;
+-	esac
+-
+-	# Check that each of the things are valid numbers.
+-	case $current in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "CURRENT \`$current' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	case $revision in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "REVISION \`$revision' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	case $age in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "AGE \`$age' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	if test "$age" -gt "$current"; then
+-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	fi
+-
+-	# Calculate the version variables.
+-	major=
+-	versuffix=
+-	verstring=
+-	case $version_type in
+-	none) ;;
+-
+-	darwin)
+-	  # Like Linux, but with the current version available in
+-	  # verstring for coding it into the library header
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix="$major.$age.$revision"
+-	  # Darwin ld doesn't like 0 for these options...
+-	  func_arith $current + 1
+-	  minor_current=$func_arith_result
+-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+-	  ;;
+-
+-	freebsd-aout)
+-	  major=".$current"
+-	  versuffix=".$current.$revision";
+-	  ;;
+-
+-	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
+-	  ;;
+-
+-	irix | nonstopux)
+-	  if test "X$lt_irix_increment" = "Xno"; then
+-	    func_arith $current - $age
+-	  else
+-	    func_arith $current - $age + 1
+-	  fi
+-	  major=$func_arith_result
+-
+-	  case $version_type in
+-	    nonstopux) verstring_prefix=nonstopux ;;
+-	    *)         verstring_prefix=sgi ;;
+-	  esac
+-	  verstring="$verstring_prefix$major.$revision"
+-
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$revision
+-	  while test "$loop" -ne 0; do
+-	    func_arith $revision - $loop
+-	    iface=$func_arith_result
+-	    func_arith $loop - 1
+-	    loop=$func_arith_result
+-	    verstring="$verstring_prefix$major.$iface:$verstring"
+-	  done
+-
+-	  # Before this point, $major must not contain `.'.
+-	  major=.$major
+-	  versuffix="$major.$revision"
+-	  ;;
+-
+-	linux)
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix="$major.$age.$revision"
+-	  ;;
+-
+-	osf)
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix=".$current.$age.$revision"
+-	  verstring="$current.$age.$revision"
+-
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$age
+-	  while test "$loop" -ne 0; do
+-	    func_arith $current - $loop
+-	    iface=$func_arith_result
+-	    func_arith $loop - 1
+-	    loop=$func_arith_result
+-	    verstring="$verstring:${iface}.0"
+-	  done
+-
+-	  # Make executables depend on our current version.
+-	  verstring="$verstring:${current}.0"
+-	  ;;
+-
+-	qnx)
+-	  major=".$current"
+-	  versuffix=".$current"
+-	  ;;
+-
+-	sunos)
+-	  major=".$current"
+-	  versuffix=".$current.$revision"
+-	  ;;
+-
+-	windows)
+-	  # Use '-' rather than '.', since we only want one
+-	  # extension on DOS 8.3 filesystems.
+-	  func_arith $current - $age
+-	  major=$func_arith_result
+-	  versuffix="-$major"
+-	  ;;
+-
+-	*)
+-	  func_fatal_configuration "unknown library version type \`$version_type'"
+-	  ;;
+-	esac
+-
+-	# Clear the version info if we defaulted, and they specified a release.
+-	if test -z "$vinfo" && test -n "$release"; then
+-	  major=
+-	  case $version_type in
+-	  darwin)
+-	    # we can't check for "0.0" in archive_cmds due to quoting
+-	    # problems, so we reset it completely
+-	    verstring=
+-	    ;;
+-	  *)
+-	    verstring="0.0"
+-	    ;;
+-	  esac
+-	  if test "$need_version" = no; then
+-	    versuffix=
+-	  else
+-	    versuffix=".0.0"
+-	  fi
+-	fi
+-
+-	# Remove version info from name if versioning should be avoided
+-	if test "$avoid_version" = yes && test "$need_version" = no; then
+-	  major=
+-	  versuffix=
+-	  verstring=""
+-	fi
+-
+-	# Check to see if the archive will have undefined symbols.
+-	if test "$allow_undefined" = yes; then
+-	  if test "$allow_undefined_flag" = unsupported; then
+-	    func_warning "undefined symbols not allowed in $host shared libraries"
+-	    build_libtool_libs=no
+-	    build_old_libs=yes
+-	  fi
+-	else
+-	  # Don't allow undefined symbols.
+-	  allow_undefined_flag="$no_undefined_flag"
+-	fi
+-
+-      fi
+-
+-      func_generate_dlsyms "$libname" "$libname" "yes"
+-      libobjs="$libobjs $symfileobj"
+-      test "X$libobjs" = "X " && libobjs=
+-
+-      if test "$mode" != relink; then
+-	# Remove our outputs, but don't remove object files since they
+-	# may have been created when compiling PIC objects.
+-	removelist=
+-	tempremovelist=`$ECHO "$output_objdir/*"`
+-	for p in $tempremovelist; do
+-	  case $p in
+-	    *.$objext)
+-	       ;;
+-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+-	       if test "X$precious_files_regex" != "X"; then
+-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+-		 then
+-		   continue
+-		 fi
+-	       fi
+-	       removelist="$removelist $p"
+-	       ;;
+-	    *) ;;
+-	  esac
+-	done
+-	test -n "$removelist" && \
+-	  func_show_eval "${RM}r \$removelist"
+-      fi
+-
+-      # Now set the variables for building old libraries.
+-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+-
+-	# Transform .lo files to .o files.
+-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+-      fi
+-
+-      # Eliminate all temporary directories.
+-      #for path in $notinst_path; do
+-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+-      #done
+-
+-      if test -n "$xrpath"; then
+-	# If the user specified any rpath flags, then add them.
+-	temp_xrpath=
+-	for libdir in $xrpath; do
+-	  temp_xrpath="$temp_xrpath -R$libdir"
+-	  case "$finalize_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+-	  esac
+-	done
+-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+-	  dependency_libs="$temp_xrpath $dependency_libs"
+-	fi
+-      fi
+-
+-      # Make sure dlfiles contains only unique files that won't be dlpreopened
+-      old_dlfiles="$dlfiles"
+-      dlfiles=
+-      for lib in $old_dlfiles; do
+-	case " $dlprefiles $dlfiles " in
+-	*" $lib "*) ;;
+-	*) dlfiles="$dlfiles $lib" ;;
+-	esac
+-      done
+-
+-      # Make sure dlprefiles contains only unique files
+-      old_dlprefiles="$dlprefiles"
+-      dlprefiles=
+-      for lib in $old_dlprefiles; do
+-	case "$dlprefiles " in
+-	*" $lib "*) ;;
+-	*) dlprefiles="$dlprefiles $lib" ;;
+-	esac
+-      done
+-
+-      if test "$build_libtool_libs" = yes; then
+-	if test -n "$rpath"; then
+-	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+-	    # these systems don't actually have a c library (as such)!
+-	    ;;
+-	  *-*-rhapsody* | *-*-darwin1.[012])
+-	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
+-	    ;;
+-	  *-*-netbsd*)
+-	    # Don't link with libc until the a.out ld.so is fixed.
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
+-	    ;;
+-	  *)
+-	    # Add libc to deplibs on all other systems if necessary.
+-	    if test "$build_libtool_need_lc" = "yes"; then
+-	      deplibs="$deplibs -lc"
+-	    fi
+-	    ;;
+-	  esac
+-	fi
+-
+-	# Transform deplibs into only deplibs that can be linked in shared.
+-	name_save=$name
+-	libname_save=$libname
+-	release_save=$release
+-	versuffix_save=$versuffix
+-	major_save=$major
+-	# I'm not sure if I'm treating the release correctly.  I think
+-	# release should show up in the -l (ie -lgmp5) so we don't want to
+-	# add it in twice.  Is that correct?
+-	release=""
+-	versuffix=""
+-	major=""
+-	newdeplibs=
+-	droppeddeps=no
+-	case $deplibs_check_method in
+-	pass_all)
+-	  # Don't check for shared/static.  Everything works.
+-	  # This might be a little naive.  We might want to check
+-	  # whether the library exists or not.  But this is on
+-	  # osf3 & osf4 and I'm not really sure... Just
+-	  # implementing what was already the behavior.
+-	  newdeplibs=$deplibs
+-	  ;;
+-	test_compile)
+-	  # This code stresses the "libraries are programs" paradigm to its
+-	  # limits. Maybe even breaks it.  We compile a program, linking it
+-	  # against the deplibs as a proxy for the library.  Then we can check
+-	  # whether they linked in statically or dynamically with ldd.
+-	  $opt_dry_run || $RM conftest.c
+-	  cat > conftest.c <<EOF
+-	  int main() { return 0; }
+-EOF
+-	  $opt_dry_run || $RM conftest
+-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+-	    ldd_output=`ldd conftest`
+-	    for i in $deplibs; do
+-	      case $i in
+-	      -l*)
+-		func_stripname -l '' "$i"
+-		name=$func_stripname_result
+-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		  case " $predeps $postdeps " in
+-		  *" $i "*)
+-		    newdeplibs="$newdeplibs $i"
+-		    i=""
+-		    ;;
+-		  esac
+-		fi
+-		if test -n "$i" ; then
+-		  libname=`eval "\\$ECHO \"$libname_spec\""`
+-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+-		  set dummy $deplib_matches; shift
+-		  deplib_match=$1
+-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		    newdeplibs="$newdeplibs $i"
+-		  else
+-		    droppeddeps=yes
+-		    $ECHO
+-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+-		    $ECHO "*** I have the capability to make that library automatically link in when"
+-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+-		    $ECHO "*** shared version of the library, which I believe you do not have"
+-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+-		  fi
+-		fi
+-		;;
+-	      *)
+-		newdeplibs="$newdeplibs $i"
+-		;;
+-	      esac
+-	    done
+-	  else
+-	    # Error occurred in the first compile.  Let's try to salvage
+-	    # the situation: Compile a separate program for each library.
+-	    for i in $deplibs; do
+-	      case $i in
+-	      -l*)
+-		func_stripname -l '' "$i"
+-		name=$func_stripname_result
+-		$opt_dry_run || $RM conftest
+-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+-		  ldd_output=`ldd conftest`
+-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		    case " $predeps $postdeps " in
+-		    *" $i "*)
+-		      newdeplibs="$newdeplibs $i"
+-		      i=""
+-		      ;;
+-		    esac
+-		  fi
+-		  if test -n "$i" ; then
+-		    libname=`eval "\\$ECHO \"$libname_spec\""`
+-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+-		    set dummy $deplib_matches; shift
+-		    deplib_match=$1
+-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		      newdeplibs="$newdeplibs $i"
+-		    else
+-		      droppeddeps=yes
+-		      $ECHO
+-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+-		      $ECHO "*** I have the capability to make that library automatically link in when"
+-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+-		      $ECHO "*** shared version of the library, which you do not appear to have"
+-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+-		    fi
+-		  fi
+-		else
+-		  droppeddeps=yes
+-		  $ECHO
+-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  $ECHO "*** make it link in!  You will probably need to install it or some"
+-		  $ECHO "*** library that it depends on before this library will be fully"
+-		  $ECHO "*** functional.  Installing it before continuing would be even better."
+-		fi
+-		;;
+-	      *)
+-		newdeplibs="$newdeplibs $i"
+-		;;
+-	      esac
+-	    done
+-	  fi
+-	  ;;
+-	file_magic*)
+-	  set dummy $deplibs_check_method; shift
+-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    case $a_deplib in
+-	    -l*)
+-	      func_stripname -l '' "$a_deplib"
+-	      name=$func_stripname_result
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$newdeplibs $a_deplib"
+-		  a_deplib=""
+-		  ;;
+-		esac
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		libname=`eval "\\$ECHO \"$libname_spec\""`
+-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		  for potent_lib in $potential_libs; do
+-		      # Follow soft links.
+-		      if ls -lLd "$potent_lib" 2>/dev/null |
+-			 $GREP " -> " >/dev/null; then
+-			continue
+-		      fi
+-		      # The statement above tries to avoid entering an
+-		      # endless loop below, in case of cyclic links.
+-		      # We might still enter an endless loop, since a link
+-		      # loop can be closed while we follow links,
+-		      # but so what?
+-		      potlib="$potent_lib"
+-		      while test -h "$potlib" 2>/dev/null; do
+-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+-			case $potliblink in
+-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+-			esac
+-		      done
+-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+-			 $SED -e 10q |
+-			 $EGREP "$file_magic_regex" > /dev/null; then
+-			newdeplibs="$newdeplibs $a_deplib"
+-			a_deplib=""
+-			break 2
+-		      fi
+-		  done
+-		done
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		droppeddeps=yes
+-		$ECHO
+-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+-		$ECHO "*** I have the capability to make that library automatically link in when"
+-		$ECHO "*** you link to this library.  But I can only do this if you have a"
+-		$ECHO "*** shared version of the library, which you do not appear to have"
+-		$ECHO "*** because I did check the linker path looking for a file starting"
+-		if test -z "$potlib" ; then
+-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+-		else
+-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+-		  $ECHO "*** using a file magic. Last file checked: $potlib"
+-		fi
+-	      fi
+-	      ;;
+-	    *)
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
+-	      ;;
+-	    esac
+-	  done # Gone through all deplibs.
+-	  ;;
+-	match_pattern*)
+-	  set dummy $deplibs_check_method; shift
+-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    case $a_deplib in
+-	    -l*)
+-	      func_stripname -l '' "$a_deplib"
+-	      name=$func_stripname_result
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$newdeplibs $a_deplib"
+-		  a_deplib=""
+-		  ;;
+-		esac
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		libname=`eval "\\$ECHO \"$libname_spec\""`
+-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		  for potent_lib in $potential_libs; do
+-		    potlib="$potent_lib" # see symlink-check above in file_magic test
+-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+-		       $EGREP "$match_pattern_regex" > /dev/null; then
+-		      newdeplibs="$newdeplibs $a_deplib"
+-		      a_deplib=""
+-		      break 2
+-		    fi
+-		  done
+-		done
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		droppeddeps=yes
+-		$ECHO
+-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+-		$ECHO "*** I have the capability to make that library automatically link in when"
+-		$ECHO "*** you link to this library.  But I can only do this if you have a"
+-		$ECHO "*** shared version of the library, which you do not appear to have"
+-		$ECHO "*** because I did check the linker path looking for a file starting"
+-		if test -z "$potlib" ; then
+-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+-		else
+-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+-		fi
+-	      fi
+-	      ;;
+-	    *)
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
+-	      ;;
+-	    esac
+-	  done # Gone through all deplibs.
+-	  ;;
+-	none | unknown | *)
+-	  newdeplibs=""
+-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-	    for i in $predeps $postdeps ; do
+-	      # can't use Xsed below, because $i might contain '/'
+-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+-	    done
+-	  fi
+-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+-	     $GREP . >/dev/null; then
+-	    $ECHO
+-	    if test "X$deplibs_check_method" = "Xnone"; then
+-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+-	    else
+-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+-	    fi
+-	    $ECHO "*** All declared inter-library dependencies are being dropped."
+-	    droppeddeps=yes
+-	  fi
+-	  ;;
+-	esac
+-	versuffix=$versuffix_save
+-	major=$major_save
+-	release=$release_save
+-	libname=$libname_save
+-	name=$name_save
++  for (base = name; *name; name++)
++    if (IS_DIR_SEPARATOR (*name))
++      base = name + 1;
++  return base;
++}
+ 
+-	case $host in
+-	*-*-rhapsody* | *-*-darwin1.[012])
+-	  # On Rhapsody replace the C library with the System framework
+-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	  ;;
+-	esac
++int
++check_executable(const char * path)
++{
++  struct stat st;
+ 
+-	if test "$droppeddeps" = yes; then
+-	  if test "$module" = yes; then
+-	    $ECHO
+-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+-	    $ECHO "*** a static module, that should work as long as the dlopening"
+-	    $ECHO "*** application is linked with the -dlopen flag."
+-	    if test -z "$global_symbol_pipe"; then
+-	      $ECHO
+-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+-	      $ECHO "*** not find such a program.  So, this module is probably useless."
+-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+-	    fi
+-	    if test "$build_old_libs" = no; then
+-	      oldlibs="$output_objdir/$libname.$libext"
+-	      build_libtool_libs=module
+-	      build_old_libs=yes
+-	    else
+-	      build_libtool_libs=no
+-	    fi
+-	  else
+-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+-	    $ECHO "*** automatically added whenever a program is linked with this library"
+-	    $ECHO "*** or is declared to -dlopen it."
++  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++  if ((!path) || (!*path))
++    return 0;
+ 
+-	    if test "$allow_undefined" = no; then
+-	      $ECHO
+-	      $ECHO "*** Since this library must not contain undefined symbols,"
+-	      $ECHO "*** because either the platform does not support them or"
+-	      $ECHO "*** it was explicitly requested with -no-undefined,"
+-	      $ECHO "*** libtool will only create a static version of it."
+-	      if test "$build_old_libs" = no; then
+-		oldlibs="$output_objdir/$libname.$libext"
+-		build_libtool_libs=module
+-		build_old_libs=yes
+-	      else
+-		build_libtool_libs=no
+-	      fi
+-	    fi
+-	  fi
+-	fi
+-	# Done checking deplibs!
+-	deplibs=$newdeplibs
+-      fi
+-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-      case $host in
+-	*-*-darwin*)
+-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	  ;;
+-      esac
++  if ((stat (path, &st) >= 0) &&
++      (
++        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++       ((st.st_mode & S_IXUSR) == S_IXUSR))
++      )
++    return 1;
++  else
++    return 0;
++}
+ 
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
+-	*)
+-	  case " $deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
+-	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+-	esac
+-      done
+-      deplibs="$new_libs"
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
++{
++  int has_slash = 0;
++  const char* p;
++  const char* p_next;
++  /* static buffer for getcwd */
++  char tmp[LT_PATHMAX + 1];
++  int tmp_len;
++  char* concat_name;
+ 
+-      # All the library-specific variables (install_libdir is set above).
+-      library_names=
+-      old_library=
+-      dlname=
++  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+ 
+-      # Test again, we may have decided not to build it any more
+-      if test "$build_libtool_libs" = yes; then
+-	if test "$hardcode_into_libs" = yes; then
+-	  # Hardcode the library paths
+-	  hardcode_libdirs=
+-	  dep_rpath=
+-	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+-	  for libdir in $rpath; do
+-	    if test -n "$hardcode_libdir_flag_spec"; then
+-	      if test -n "$hardcode_libdir_separator"; then
+-		if test -z "$hardcode_libdirs"; then
+-		  hardcode_libdirs="$libdir"
+-		else
+-		  # Just accumulate the unique libdirs.
+-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		    ;;
+-		  *)
+-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		    ;;
+-		  esac
+-		fi
+-	      else
+-		eval flag=\"$hardcode_libdir_flag_spec\"
+-		dep_rpath="$dep_rpath $flag"
+-	      fi
+-	    elif test -n "$runpath_var"; then
+-	      case "$perm_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) perm_rpath="$perm_rpath $libdir" ;;
+-	      esac
+-	    fi
+-	  done
+-	  # Substitute the hardcoded libdirs into the rpath.
+-	  if test -n "$hardcode_libdir_separator" &&
+-	     test -n "$hardcode_libdirs"; then
+-	    libdir="$hardcode_libdirs"
+-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+-	    else
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+-	    fi
+-	  fi
+-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+-	    # We should set the runpath_var.
+-	    rpath=
+-	    for dir in $perm_rpath; do
+-	      rpath="$rpath$dir:"
+-	    done
+-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+-	  fi
+-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+-	fi
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
++
++  /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++  {
++    concat_name = xstrdup (wrapper);
++    if (check_executable(concat_name))
++      return concat_name;
++    XFREE(concat_name);
++  }
++  else
++  {
++#endif
++    if (IS_DIR_SEPARATOR (wrapper[0]))
++    {
++      concat_name = xstrdup (wrapper);
++      if (check_executable(concat_name))
++        return concat_name;
++      XFREE(concat_name);
++    }
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  }
++#endif
++
++  for (p = wrapper; *p; p++)
++    if (*p == '/')
++    {
++      has_slash = 1;
++      break;
++    }
++  if (!has_slash)
++  {
++    /* no slashes; search PATH */
++    const char* path = getenv ("PATH");
++    if (path != NULL)
++    {
++      for (p = path; *p; p = p_next)
++      {
++        const char* q;
++        size_t p_len;
++        for (q = p; *q; q++)
++          if (IS_PATH_SEPARATOR(*q))
++            break;
++        p_len = q - p;
++        p_next = (*q == '\0' ? q : q + 1);
++        if (p_len == 0)
++        {
++          /* empty path: current directory */
++          if (getcwd (tmp, LT_PATHMAX) == NULL)
++            lt_fatal ("getcwd failed");
++          tmp_len = strlen(tmp);
++          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, tmp, tmp_len);
++          concat_name[tmp_len] = '/';
++          strcpy (concat_name + tmp_len + 1, wrapper);
++        }
++        else
++        {
++          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, p, p_len);
++          concat_name[p_len] = '/';
++          strcpy (concat_name + p_len + 1, wrapper);
++        }
++        if (check_executable(concat_name))
++          return concat_name;
++        XFREE(concat_name);
++      }
++    }
++    /* not found in PATH; assume curdir */
++  }
++  /* Relative path | not found in path: prepend cwd */
++  if (getcwd (tmp, LT_PATHMAX) == NULL)
++    lt_fatal ("getcwd failed");
++  tmp_len = strlen(tmp);
++  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++  memcpy (concat_name, tmp, tmp_len);
++  concat_name[tmp_len] = '/';
++  strcpy (concat_name + tmp_len + 1, wrapper);
++
++  if (check_executable(concat_name))
++    return concat_name;
++  XFREE(concat_name);
++  return NULL;
++}
++
++char *
++strendzap(char *str, const char *pat)
++{
++  size_t len, patlen;
++
++  assert(str != NULL);
++  assert(pat != NULL);
++
++  len = strlen(str);
++  patlen = strlen(pat);
++
++  if (patlen <= len)
++  {
++    str += len - patlen;
++    if (strcmp(str, pat) == 0)
++      *str = '\0';
++  }
++  return str;
++}
++
++static void
++lt_error_core (int exit_status, const char * mode,
++          const char * message, va_list ap)
++{
++  fprintf (stderr, "%s: %s: ", program_name, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
++
++  if (exit_status >= 0)
++    exit (exit_status);
++}
++
++void
++lt_fatal (const char *message, ...)
++{
++  va_list ap;
++  va_start (ap, message);
++  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
++EOF
++          # we should really use a build-platform specific compiler
++          # here, but OTOH, the wrappers (shell script and this C one)
++          # are only useful if you want to execute the "real" binary.
++          # Since the "real" binary is built for $host, then this
++          # wrapper might as well be built for $host, too.
++          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++          ;;
++        esac
++        $rm $output
++        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
++
++	$echo > $output "\
++#! $SHELL
++
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# The $output program cannot be directly executed until all the libtool
++# libraries that it depends on are installed.
++#
++# This wrapper script should never be moved out of the build directory.
++# If it is, it will not operate correctly.
++
++# 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='$sed_quote_subst'
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# 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
++
++relink_command=\"$relink_command\"
++
++# This environment variable determines our operation mode.
++if test \"\$libtool_install_magic\" = \"$magic\"; then
++  # install mode needs the following variable:
++  notinst_deplibs='$notinst_deplibs'
++else
++  # When we are sourced in execute mode, \$file and \$echo are already set.
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
++    echo=\"$qecho\"
++    file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$echo works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$echo will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
++  fi\
++"
++	$echo >> $output "\
+ 
+-	shlibpath="$finalize_shlibpath"
+-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+-	if test -n "$shlibpath"; then
+-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+-	fi
++  # Find the directory that this script lives in.
++  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
++  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+-	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext_cmds\"
+-	eval library_names=\"$library_names_spec\"
+-	set dummy $library_names
+-	shift
+-	realname="$1"
+-	shift
++  # Follow symbolic links until we get to the real thisdir.
++  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
++  while test -n \"\$file\"; do
++    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+-	if test -n "$soname_spec"; then
+-	  eval soname=\"$soname_spec\"
+-	else
+-	  soname="$realname"
+-	fi
+-	if test -z "$dlname"; then
+-	  dlname=$soname
+-	fi
++    # If there was a directory component, then change thisdir.
++    if test \"x\$destdir\" != \"x\$file\"; then
++      case \"\$destdir\" in
++      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
++      *) thisdir=\"\$thisdir/\$destdir\" ;;
++      esac
++    fi
+ 
+-	lib="$output_objdir/$realname"
+-	linknames=
+-	for link
+-	do
+-	  linknames="$linknames $link"
+-	done
++    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++  done
+ 
+-	# Use standard objects if they are pic
+-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-	test "X$libobjs" = "X " && libobjs=
++  # Try to get the absolute directory name.
++  absdir=\`cd \"\$thisdir\" && pwd\`
++  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
+ 
+-	delfiles=
+-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+-	  export_symbols="$output_objdir/$libname.uexp"
+-	  delfiles="$delfiles $export_symbols"
+-	fi
+-
+-	orig_export_symbols=
+-	case $host_os in
+-	cygwin* | mingw*)
+-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+-	    # exporting using user supplied symfile
+-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+-	      # and it's NOT already a .def file. Must figure out
+-	      # which of the given symbols are data symbols and tag
+-	      # them as such. So, trigger use of export_symbols_cmds.
+-	      # export_symbols gets reassigned inside the "prepare
+-	      # the list of exported symbols" if statement, so the
+-	      # include_expsyms logic still works.
+-	      orig_export_symbols="$export_symbols"
+-	      export_symbols=
+-	      always_export_symbols=yes
+-	    fi
+-	  fi
+-	  ;;
+-	esac
++	if test "$fast_install" = yes; then
++	  $echo >> $output "\
++  program=lt-'$outputname'$exeext
++  progdir=\"\$thisdir/$objdir\"
+ 
+-	# Prepare the list of exported symbols
+-	if test -z "$export_symbols"; then
+-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+-	    func_verbose "generating symbol list for \`$libname.la'"
+-	    export_symbols="$output_objdir/$libname.exp"
+-	    $opt_dry_run || $RM $export_symbols
+-	    cmds=$export_symbols_cmds
+-	    save_ifs="$IFS"; IFS='~'
+-	    for cmd in $cmds; do
+-	      IFS="$save_ifs"
+-	      eval cmd=\"$cmd\"
+-	      func_len " $cmd"
+-	      len=$func_len_result
+-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-		func_show_eval "$cmd" 'exit $?'
+-		skipped_export=false
+-	      else
+-		# The command line is too long to execute in one step.
+-		func_verbose "using reloadable object file for export list..."
+-		skipped_export=:
+-		# Break out early, otherwise skipped_export may be
+-		# set to false by a later but shorter cmd.
+-		break
+-	      fi
+-	    done
+-	    IFS="$save_ifs"
+-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+-	    fi
+-	  fi
+-	fi
++  if test ! -f \"\$progdir/\$program\" || \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	  tmp_export_symbols="$export_symbols"
+-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+-	fi
+-
+-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+-	  # The given exports_symbols file has to be filtered, so filter it.
+-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+-	  # 's' commands which not all seds can handle. GNU sed should be fine
+-	  # though. Also, the filter scales superlinearly with the number of
+-	  # global variables. join(1) would be nice here, but unfortunately
+-	  # isn't a blessed tool.
+-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+-	  export_symbols=$output_objdir/$libname.def
+-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+-	fi
++    file=\"\$\$-\$program\"
+ 
+-	tmp_deplibs=
+-	for test_deplib in $deplibs; do
+-	  case " $convenience " in
+-	  *" $test_deplib "*) ;;
+-	  *)
+-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+-	    ;;
+-	  esac
+-	done
+-	deplibs="$tmp_deplibs"
++    if test ! -d \"\$progdir\"; then
++      $mkdir \"\$progdir\"
++    else
++      $rm \"\$progdir/\$file\"
++    fi"
+ 
+-	if test -n "$convenience"; then
+-	  if test -n "$whole_archive_flag_spec" &&
+-	    test "$compiler_needs_object" = yes &&
+-	    test -z "$libobjs"; then
+-	    # extract the archives, so we have objects to list.
+-	    # TODO: could optimize this to just extract one archive.
+-	    whole_archive_flag_spec=
+-	  fi
+-	  if test -n "$whole_archive_flag_spec"; then
+-	    save_libobjs=$libobjs
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  else
+-	    gentop="$output_objdir/${outputname}x"
+-	    generated="$generated $gentop"
++	  $echo >> $output "\
+ 
+-	    func_extract_archives $gentop $convenience
+-	    libobjs="$libobjs $func_extract_archives_result"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  fi
+-	fi
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
++      else
++	$echo \"\$relink_command_output\" >&2
++	$rm \"\$progdir/\$file\"
++	exit $EXIT_FAILURE
++      fi
++    fi
+ 
+-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+-	  eval flag=\"$thread_safe_flag_spec\"
+-	  linker_flags="$linker_flags $flag"
++    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $rm \"\$progdir/\$program\";
++      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $rm \"\$progdir/\$file\"
++  fi"
++	else
++	  $echo >> $output "\
++  program='$outputname'
++  progdir=\"\$thisdir/$objdir\"
++"
+ 	fi
+ 
+-	# Make a backup of the uninstalled library when relinking
+-	if test "$mode" = relink; then
+-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+-	fi
++	$echo >> $output "\
+ 
+-	# Do each of the archive commands.
+-	if test "$module" = yes && test -n "$module_cmds" ; then
+-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval test_cmds=\"$module_expsym_cmds\"
+-	    cmds=$module_expsym_cmds
+-	  else
+-	    eval test_cmds=\"$module_cmds\"
+-	    cmds=$module_cmds
+-	  fi
+-	else
+-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval test_cmds=\"$archive_expsym_cmds\"
+-	    cmds=$archive_expsym_cmds
+-	  else
+-	    eval test_cmds=\"$archive_cmds\"
+-	    cmds=$archive_cmds
+-	  fi
+-	fi
++  if test -f \"\$progdir/\$program\"; then"
+ 
+-	if test "X$skipped_export" != "X:" &&
+-	   func_len " $test_cmds" &&
+-	   len=$func_len_result &&
+-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
+-	else
+-	  # The command line is too long to link in one step, link piecewise
+-	  # or, if using GNU ld and skipped_export is not :, use a linker
+-	  # script.
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $echo >> $output "\
++    # Add our own library path to $shlibpath_var
++    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ 
+-	  # Save the value of $output and $libobjs because we want to
+-	  # use them later.  If we have whole_archive_flag_spec, we
+-	  # want to use save_libobjs as it was before
+-	  # whole_archive_flag_spec was expanded, because we can't
+-	  # assume the linker understands whole_archive_flag_spec.
+-	  # This may have to be revisited, in case too many
+-	  # convenience libraries get linked in and end up exceeding
+-	  # the spec.
+-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+-	    save_libobjs=$libobjs
+-	  fi
+-	  save_output=$output
+-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
++    # Some systems cannot cope with colon-terminated $shlibpath_var
++    # The second colon is a workaround for a bug in BeOS R4 sed
++    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ 
+-	  # Clear the reloadable object creation command queue and
+-	  # initialize k to one.
+-	  test_cmds=
+-	  concat_cmds=
+-	  objlist=
+-	  last_robj=
+-	  k=1
++    export $shlibpath_var
++"
++	fi
+ 
+-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+-	    output=${output_objdir}/${output_la}.lnkscript
+-	    func_verbose "creating GNU ld script: $output"
+-	    $ECHO 'INPUT (' > $output
+-	    for obj in $save_libobjs
+-	    do
+-	      $ECHO "$obj" >> $output
+-	    done
+-	    $ECHO ')' >> $output
+-	    delfiles="$delfiles $output"
+-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+-	    output=${output_objdir}/${output_la}.lnk
+-	    func_verbose "creating linker input file list: $output"
+-	    : > $output
+-	    set x $save_libobjs
+-	    shift
+-	    firstobj=
+-	    if test "$compiler_needs_object" = yes; then
+-	      firstobj="$1 "
+-	      shift
+-	    fi
+-	    for obj
+-	    do
+-	      $ECHO "$obj" >> $output
+-	    done
+-	    delfiles="$delfiles $output"
+-	    output=$firstobj\"$file_list_spec$output\"
+-	  else
+-	    if test -n "$save_libobjs"; then
+-	      func_verbose "creating reloadable object files..."
+-	      output=$output_objdir/$output_la-${k}.$objext
+-	      eval test_cmds=\"$reload_cmds\"
+-	      func_len " $test_cmds"
+-	      len0=$func_len_result
+-	      len=$len0
+-
+-	      # Loop over the list of objects to be linked.
+-	      for obj in $save_libobjs
+-	      do
+-		func_len " $obj"
+-		func_arith $len + $func_len_result
+-		len=$func_arith_result
+-		if test "X$objlist" = X ||
+-		   test "$len" -lt "$max_cmd_len"; then
+-		  func_append objlist " $obj"
+-		else
+-		  # The command $test_cmds is almost too long, add a
+-		  # command to the queue.
+-		  if test "$k" -eq 1 ; then
+-		    # The first file doesn't have a previous command to add.
+-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+-		  else
+-		    # All subsequent reloadable object files will link in
+-		    # the last one created.
+-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+-		  fi
+-		  last_robj=$output_objdir/$output_la-${k}.$objext
+-		  func_arith $k + 1
+-		  k=$func_arith_result
+-		  output=$output_objdir/$output_la-${k}.$objext
+-		  objlist=$obj
+-		  func_len " $last_robj"
+-		  func_arith $len0 + $func_len_result
+-		  len=$func_arith_result
+-		fi
+-	      done
+-	      # Handle the remaining objects by creating one last
+-	      # reloadable object file.  All subsequent reloadable object
+-	      # files will link in the last one created.
+-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+-	      if test -n "$last_robj"; then
+-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+-	      fi
+-	      delfiles="$delfiles $output"
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $echo >> $output "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
+ 
+-	    else
+-	      output=
+-	    fi
++	$echo >> $output "\
++    if test \"\$libtool_execute_magic\" != \"$magic\"; then
++      # Run the actual program with our arguments.
++"
++	case $host in
++	# Backslashes separate directories on plain windows
++	*-*-mingw | *-*-os2*)
++	  $echo >> $output "\
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
++	  ;;
+ 
+-	    if ${skipped_export-false}; then
+-	      func_verbose "generating symbol list for \`$libname.la'"
+-	      export_symbols="$output_objdir/$libname.exp"
+-	      $opt_dry_run || $RM $export_symbols
+-	      libobjs=$output
+-	      # Append the command to create the export file.
+-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+-	      if test -n "$last_robj"; then
+-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+-	      fi
+-	    fi
++	*)
++	  $echo >> $output "\
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
++	  ;;
++	esac
++	$echo >> $output "\
++      \$echo \"\$0: cannot exec \$program \$*\"
++      exit $EXIT_FAILURE
++    fi
++  else
++    # The program doesn't exist.
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
++    \$echo \"This script is just a wrapper for \$program.\" 1>&2
++    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
++    exit $EXIT_FAILURE
++  fi
++fi\
++"
++	chmod +x $output
++      fi
++      exit $EXIT_SUCCESS
++      ;;
++    esac
+ 
+-	    test -n "$save_libobjs" &&
+-	      func_verbose "creating a temporary reloadable object file: $output"
++    # See if we need to build an old-fashioned archive.
++    for oldlib in $oldlibs; do
+ 
+-	    # Loop through the commands generated above and execute them.
+-	    save_ifs="$IFS"; IFS='~'
+-	    for cmd in $concat_cmds; do
+-	      IFS="$save_ifs"
+-	      $opt_silent || {
+-		  func_quote_for_expand "$cmd"
+-		  eval "func_echo $func_quote_for_expand_result"
+-	      }
+-	      $opt_dry_run || eval "$cmd" || {
+-		lt_exit=$?
+-
+-		# Restore the uninstalled library and exit
+-		if test "$mode" = relink; then
+-		  ( cd "$output_objdir" && \
+-		    $RM "${realname}T" && \
+-		    $MV "${realname}U" "$realname" )
+-		fi
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
++	  build_libtool_libs=no
++	else
++	  oldobjs="$old_deplibs $non_pic_objects"
++	fi
++	addlibs="$old_convenience"
++      fi
+ 
+-		exit $lt_exit
+-	      }
+-	    done
+-	    IFS="$save_ifs"
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	generated="$generated $gentop"
++
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
++      fi
++
++      # Do each command in the archive commands.
++      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
++       cmds=$old_archive_from_new_cmds
++      else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
+ 
+-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+-	    fi
+-	  fi
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
+ 
+-          if ${skipped_export-false}; then
+-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	      tmp_export_symbols="$export_symbols"
+-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+-	    fi
+-
+-	    if test -n "$orig_export_symbols"; then
+-	      # The given exports_symbols file has to be filtered, so filter it.
+-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+-	      # 's' commands which not all seds can handle. GNU sed should be fine
+-	      # though. Also, the filter scales superlinearly with the number of
+-	      # global variables. join(1) would be nice here, but unfortunately
+-	      # isn't a blessed tool.
+-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+-	      export_symbols=$output_objdir/$libname.def
+-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    exit_status=$?
++	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++	      exit $exit_status
+ 	    fi
+ 	  fi
+ 
+-	  libobjs=$output
+-	  # Restore the value of output.
+-	  output=$save_output
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
+ 
+-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  fi
+-	  # Expand the library linking commands again to reset the
+-	  # value of $libobjs for piecewise linking.
++	eval cmds=\"$old_archive_cmds\"
+ 
+-	  # Do each of the archive commands.
+-	  if test "$module" = yes && test -n "$module_cmds" ; then
+-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	      cmds=$module_expsym_cmds
++	if len=`expr "X$cmds" : ".*"` &&
++	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	  cmds=$old_archive_cmds
++	else
++	  # the command line is too long to link in one step, link in parts
++	  $echo "using piecewise archive linking..."
++	  save_RANLIB=$RANLIB
++	  RANLIB=:
++	  objlist=
++	  concat_cmds=
++	  save_oldobjs=$oldobjs
++
++	  # Is there a better way of finding the last object in the list?
++	  for obj in $save_oldobjs
++	  do
++	    last_oldobj=$obj
++	  done
++	  for obj in $save_oldobjs
++	  do
++	    oldobjs="$objlist $obj"
++	    objlist="$objlist $obj"
++	    eval test_cmds=\"$old_archive_cmds\"
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++	       test "$len" -le "$max_cmd_len"; then
++	      :
+ 	    else
+-	      cmds=$module_cmds
++	      # the above command should be used before it gets too long
++	      oldobjs=$objlist
++	      if test "$obj" = "$last_oldobj" ; then
++	        RANLIB=$save_RANLIB
++	      fi
++	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
++	      objlist=
+ 	    fi
++	  done
++	  RANLIB=$save_RANLIB
++	  oldobjs=$objlist
++	  if test "X$oldobjs" = "X" ; then
++	    eval cmds=\"\$concat_cmds\"
+ 	  else
+-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	      cmds=$archive_expsym_cmds
+-	    else
+-	      cmds=$archive_cmds
+-	    fi
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+ 	fi
+-
+-	if test -n "$delfiles"; then
+-	  # Append the command to remove temporary files to $cmds.
+-	  eval cmds=\"\$cmds~\$RM $delfiles\"
+-	fi
+-
+-	# Add any objects from preloaded convenience libraries
+-	if test -n "$dlprefiles"; then
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
+-
+-	  func_extract_archives $gentop $dlprefiles
+-	  libobjs="$libobjs $func_extract_archives_result"
+-	  test "X$libobjs" = "X " && libobjs=
+-	fi
+-
+-	save_ifs="$IFS"; IFS='~'
+-	for cmd in $cmds; do
+-	  IFS="$save_ifs"
+-	  eval cmd=\"$cmd\"
+-	  $opt_silent || {
+-	    func_quote_for_expand "$cmd"
+-	    eval "func_echo $func_quote_for_expand_result"
+-	  }
+-	  $opt_dry_run || eval "$cmd" || {
+-	    lt_exit=$?
+-
+-	    # Restore the uninstalled library and exit
+-	    if test "$mode" = relink; then
+-	      ( cd "$output_objdir" && \
+-	        $RM "${realname}T" && \
+-		$MV "${realname}U" "$realname" )
+-	    fi
+-
+-	    exit $lt_exit
+-	  }
+-	done
++      fi
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
+ 
+-	# Restore the uninstalled library and exit
+-	if test "$mode" = relink; then
+-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+-
+-	  if test -n "$convenience"; then
+-	    if test -z "$whole_archive_flag_spec"; then
+-	      func_show_eval '${RM}r "$gentop"'
+-	    fi
+-	  fi
+-
+-	  exit $EXIT_SUCCESS
+-	fi
++    if test -n "$generated"; then
++      $show "${rm}r$generated"
++      $run ${rm}r$generated
++    fi
+ 
+-	# Create links to the real library.
+-	for linkname in $linknames; do
+-	  if test "$realname" != "$linkname"; then
+-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+-	  fi
+-	done
++    # Now create the libtool archive.
++    case $output in
++    *.la)
++      old_library=
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
++      $show "creating $output"
+ 
+-	# If -module or -export-dynamic was specified, set the dlname.
+-	if test "$module" = yes || test "$export_dynamic" = yes; then
+-	  # On all known operating systems, these are identical.
+-	  dlname="$soname"
++      # Preserve any variables that may affect compiler behavior
++      for var in $variables_saved_for_relink; do
++	if eval test -z \"\${$var+set}\"; then
++	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
++	elif eval var_value=\$$var; test -z "$var_value"; then
++	  relink_command="$var=; export $var; $relink_command"
++	else
++	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
++	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	fi
++      done
++      # Quote the link command for shipping.
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
++      if test "$hardcode_automatic" = yes ; then
++	relink_command=
+       fi
+-      ;;
+-
+-    obj)
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	func_warning "\`-dlopen' is ignored for objects"
+-      fi
+-
+-      case " $deplibs" in
+-      *\ -l* | *\ -L*)
+-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+-      esac
+-
+-      test -n "$rpath" && \
+-	func_warning "\`-rpath' is ignored for objects"
+-
+-      test -n "$xrpath" && \
+-	func_warning "\`-R' is ignored for objects"
+ 
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info' is ignored for objects"
+-
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for objects"
+-
+-      case $output in
+-      *.lo)
+-	test -n "$objs$old_deplibs" && \
+-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+-
+-	libobj=$output
+-	func_lo2o "$libobj"
+-	obj=$func_lo2o_result
+-	;;
+-      *)
+-	libobj=
+-	obj="$output"
+-	;;
+-      esac
+-
+-      # Delete the old objects.
+-      $opt_dry_run || $RM $obj $libobj
+-
+-      # Objects from convenience libraries.  This assumes
+-      # single-version convenience libraries.  Whenever we create
+-      # different ones for PIC/non-PIC, this we'll have to duplicate
+-      # the extraction.
+-      reload_conv_objs=
+-      gentop=
+-      # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec and hope we can get by with
+-      # turning comma into space..
+-      wl=
+ 
+-      if test -n "$convenience"; then
+-	if test -n "$whole_archive_flag_spec"; then
+-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+-	else
+-	  gentop="$output_objdir/${obj}x"
+-	  generated="$generated $gentop"
++      # Only create the output if not a dry run.
++      if test -z "$run"; then
++	for installed in no yes; do
++	  if test "$installed" = yes; then
++	    if test -z "$install_libdir"; then
++	      break
++	    fi
++	    output="$output_objdir/$outputname"i
++	    # Replace all uninstalled libtool libraries with the installed ones
++	    newdependency_libs=
++	    for deplib in $dependency_libs; do
++	      case $deplib in
++	      *.la)
++		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		if test -z "$libdir"; then
++		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++		  exit $EXIT_FAILURE
++		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
++		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
++	      esac
++	    done
++	    dependency_libs="$newdependency_libs"
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit $EXIT_FAILURE
++	      fi
++	      newdlfiles="$newdlfiles $libdir/$name"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      if test -z "$libdir"; then
++		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++		exit $EXIT_FAILURE
++	      fi
++	      newdlprefiles="$newdlprefiles $libdir/$name"
++	    done
++	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
++	  fi
++	  $rm $output
++	  # place dlname in correct position for cygwin
++	  tdlname=$dlname
++	  case $host,$output,$installed,$module,$dlname in
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	  esac
++	  $echo > $output "\
++# $outputname - a libtool library file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
+ 
+-	  func_extract_archives $gentop $convenience
+-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+-	fi
+-      fi
++# The name that we can dlopen(3).
++dlname='$tdlname'
+ 
+-      # Create the old-style object.
+-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++# Names of this library.
++library_names='$library_names'
+ 
+-      output="$obj"
+-      func_execute_cmds "$reload_cmds" 'exit $?'
++# The name of the static archive.
++old_library='$old_library'
+ 
+-      # Exit if we aren't doing a library object file.
+-      if test -z "$libobj"; then
+-	if test -n "$gentop"; then
+-	  func_show_eval '${RM}r "$gentop"'
+-	fi
++# Libraries that this one depends upon.
++dependency_libs='$dependency_libs'
+ 
+-	exit $EXIT_SUCCESS
+-      fi
++# Version information for $libname.
++current=$current
++age=$age
++revision=$revision
+ 
+-      if test "$build_libtool_libs" != yes; then
+-	if test -n "$gentop"; then
+-	  func_show_eval '${RM}r "$gentop"'
+-	fi
++# Is this an already installed library?
++installed=$installed
+ 
+-	# Create an invalid libtool object if no PIC, so that we don't
+-	# accidentally link it into a program.
+-	# $show "echo timestamp > $libobj"
+-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+-	exit $EXIT_SUCCESS
+-      fi
++# Should we warn about portability when linking against -modules?
++shouldnotlink=$module
+ 
+-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+-	# Only do commands if we really have different PIC objects.
+-	reload_objs="$libobjs $reload_conv_objs"
+-	output="$libobj"
+-	func_execute_cmds "$reload_cmds" 'exit $?'
+-      fi
++# Files to dlopen/dlpreopen
++dlopen='$dlfiles'
++dlpreopen='$dlprefiles'
+ 
+-      if test -n "$gentop"; then
+-	func_show_eval '${RM}r "$gentop"'
++# Directory that this library needs to be installed in:
++libdir='$install_libdir'"
++	  if test "$installed" = no && test "$need_relink" = yes; then
++	    $echo >> $output "\
++relink_command=\"$relink_command\""
++	  fi
++	done
+       fi
+ 
+-      exit $EXIT_SUCCESS
++      # Do a symbolic link so that the libtool archive can be found in
++      # LD_LIBRARY_PATH before the program is installed.
++      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
++      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
++    esac
++    exit $EXIT_SUCCESS
++    ;;
+ 
+-    prog)
+-      case $host in
+-	*cygwin*) func_stripname '' '.exe' "$output"
+-	          output=$func_stripname_result.exe;;
++  # libtool install mode
++  install)
++    modename="$modename: install"
++
++    # There may be an optional sh(1) argument at the beginning of
++    # install_prog (especially on Windows NT).
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++       # Allow the use of GNU shtool's install command.
++       $echo "X$nonopt" | grep shtool > /dev/null; then
++      # Aesthetically quote it.
++      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	arg="\"$arg\""
++	;;
+       esac
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info' is ignored for programs"
++      install_prog="$arg "
++      arg="$1"
++      shift
++    else
++      install_prog=
++      arg=$nonopt
++    fi
+ 
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for programs"
++    # The real first argument should be the name of the installation program.
++    # Aesthetically quote it.
++    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++    case $arg in
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      arg="\"$arg\""
++      ;;
++    esac
++    install_prog="$install_prog$arg"
+ 
+-      test "$preload" = yes \
+-        && test "$dlopen_support" = unknown \
+-	&& test "$dlopen_self" = unknown \
+-	&& test "$dlopen_self_static" = unknown && \
+-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
++    # We need to accept at least all the BSD install flags.
++    dest=
++    files=
++    opts=
++    prev=
++    install_type=
++    isdir=no
++    stripme=
++    for arg
++    do
++      if test -n "$dest"; then
++	files="$files $dest"
++	dest=$arg
++	continue
++      fi
+ 
+-      case $host in
+-      *-*-rhapsody* | *-*-darwin1.[012])
+-	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++      case $arg in
++      -d) isdir=yes ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
++      -s)
++	stripme=" -s"
++	continue
++	;;
++      -*)
++	;;
++      *)
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest=$arg
++	  continue
++	fi
+ 	;;
+       esac
+ 
+-      case $host in
+-      *-*-darwin*)
+-	# Don't allow lazy linking, it breaks C++ global constructors
+-	# But is supposedly fixed on 10.4 or later (yay!).
+-	if test "$tagname" = CXX ; then
+-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+-	    10.[0123])
+-	      compile_command="$compile_command ${wl}-bind_at_load"
+-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+-	    ;;
+-	  esac
+-	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++      # Aesthetically quote the argument.
++      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++      case $arg in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	arg="\"$arg\""
+ 	;;
+       esac
++      install_prog="$install_prog $arg"
++    done
+ 
++    if test -z "$install_prog"; then
++      $echo "$modename: you must specify an install program" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
++    if test -n "$prev"; then
++      $echo "$modename: the \`$prev' option requires an argument" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
++
++    if test -z "$files"; then
++      if test -z "$dest"; then
++	$echo "$modename: no file or destination specified" 1>&2
++      else
++	$echo "$modename: you must specify a destination" 1>&2
++      fi
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
++
++    # Strip any trailing slash from the destination.
++    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
++
++    # Check to see that the destination is a directory.
++    test -d "$dest" && isdir=yes
++    if test "$isdir" = yes; then
++      destdir="$dest"
++      destname=
++    else
++      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
++      test "X$destdir" = "X$dest" && destdir=.
++      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
++
++      # Not a directory, so check to see that there is only one file specified.
++      set dummy $files
++      if test "$#" -gt 2; then
++	$echo "$modename: \`$dest' is not a directory" 1>&2
++	$echo "$help" 1>&2
++	exit $EXIT_FAILURE
++      fi
++    fi
++    case $destdir in
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
++    *)
++      for file in $files; do
++	case $file in
++	*.lo) ;;
+ 	*)
+-	  case " $compile_deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $compile_deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
++	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
+ 	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+ 	esac
+       done
+-      compile_deplibs="$new_libs"
++      ;;
++    esac
+ 
++    # This variable tells wrapper scripts just to set variables rather
++    # than running their programs.
++    libtool_install_magic="$magic"
+ 
+-      compile_command="$compile_command $compile_deplibs"
+-      finalize_command="$finalize_command $finalize_deplibs"
++    staticlibs=
++    future_libdirs=
++    current_libdirs=
++    for file in $files; do
+ 
+-      if test -n "$rpath$xrpath"; then
+-	# If the user specified any rpath flags, then add them.
+-	for libdir in $rpath $xrpath; do
+-	  # This is the magic to use -rpath.
+-	  case "$finalize_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+-	  esac
+-	done
+-      fi
++      # Do each installation.
++      case $file in
++      *.$libext)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
+ 
+-      # Now hardcode the library paths
+-      rpath=
+-      hardcode_libdirs=
+-      for libdir in $compile_rpath $finalize_rpath; do
+-	if test -n "$hardcode_libdir_flag_spec"; then
+-	  if test -n "$hardcode_libdir_separator"; then
+-	    if test -z "$hardcode_libdirs"; then
+-	      hardcode_libdirs="$libdir"
+-	    else
+-	      # Just accumulate the unique libdirs.
+-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
+-	    fi
+-	  else
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
+-	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$perm_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) perm_rpath="$perm_rpath $libdir" ;;
+-	  esac
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
+ 	fi
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+-	  case :$dllsearchpath: in
+-	  *":$libdir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+-	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+-	  esac
+-	  ;;
++
++	library_names=
++	old_library=
++	relink_command=
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
+ 	esac
+-      done
+-      # Substitute the hardcoded libdirs into the rpath.
+-      if test -n "$hardcode_libdir_separator" &&
+-	 test -n "$hardcode_libdirs"; then
+-	libdir="$hardcode_libdirs"
+-	eval rpath=\" $hardcode_libdir_flag_spec\"
+-      fi
+-      compile_rpath="$rpath"
+ 
+-      rpath=
+-      hardcode_libdirs=
+-      for libdir in $finalize_rpath; do
+-	if test -n "$hardcode_libdir_flag_spec"; then
+-	  if test -n "$hardcode_libdir_separator"; then
+-	    if test -z "$hardcode_libdirs"; then
+-	      hardcode_libdirs="$libdir"
+-	    else
+-	      # Just accumulate the unique libdirs.
+-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
+-	    fi
+-	  else
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
+-	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$finalize_perm_rpath " in
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
+ 	  *" $libdir "*) ;;
+-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
+ 	  esac
+ 	fi
+-      done
+-      # Substitute the hardcoded libdirs into the rpath.
+-      if test -n "$hardcode_libdir_separator" &&
+-	 test -n "$hardcode_libdirs"; then
+-	libdir="$hardcode_libdirs"
+-	eval rpath=\" $hardcode_libdir_flag_spec\"
+-      fi
+-      finalize_rpath="$rpath"
+-
+-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+-	# Transform all the library objects into standard objects.
+-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+-      fi
+ 
+-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
++	test "X$dir" = "X$file/" && dir=
++	dir="$dir$objdir"
+ 
+-      # template prelinking step
+-      if test -n "$prelink_cmds"; then
+-	func_execute_cmds "$prelink_cmds" 'exit $?'
+-      fi
++	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+ 
+-      wrappers_required=yes
+-      case $host in
+-      *cygwin* | *mingw* )
+-        if test "$build_libtool_libs" != yes; then
+-          wrappers_required=no
+-        fi
+-        ;;
+-      *)
+-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+-          wrappers_required=no
+-        fi
+-        ;;
+-      esac
+-      if test "$wrappers_required" = no; then
+-	# Replace the output file specification.
+-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	link_command="$compile_command$compile_rpath"
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  # At present, this check doesn't affect windows .dll's that
++	  # are installed into $libdir/../bin (currently, that works fine)
++	  # but it's something to keep an eye on.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 
+-	# We have no uninstalled library dependencies, so finalize right now.
+-	exit_status=0
+-	func_show_eval "$link_command" 'exit_status=$?'
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
++	  else
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
++	  fi
+ 
+-	# Delete the generated files.
+-	if test -f "$output_objdir/${outputname}S.${objext}"; then
+-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
++	  $echo "$modename: warning: relinking \`$file'" 1>&2
++	  $show "$relink_command"
++	  if $run eval "$relink_command"; then :
++	  else
++	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 	fi
+ 
+-	exit $exit_status
+-      fi
++	# See the names of the shared library.
++	set dummy $library_names
++	if test -n "$2"; then
++	  realname="$2"
++	  shift
++	  shift
+ 
+-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+-      fi
+-      if test -n "$finalize_shlibpath"; then
+-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+-      fi
++	  srcname="$realname"
++	  test -n "$relink_command" && srcname="$realname"T
+ 
+-      compile_var=
+-      finalize_var=
+-      if test -n "$runpath_var"; then
+-	if test -n "$perm_rpath"; then
+-	  # We should set the runpath_var.
+-	  rpath=
+-	  for dir in $perm_rpath; do
+-	    rpath="$rpath$dir:"
+-	  done
+-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+-	fi
+-	if test -n "$finalize_perm_rpath"; then
+-	  # We should set the runpath_var.
+-	  rpath=
+-	  for dir in $finalize_perm_rpath; do
+-	    rpath="$rpath$dir:"
++	  # Install the shared library and build the symlinks.
++	  $show "$install_prog $dir/$srcname $destdir/$realname"
++	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
++	  if test -n "$stripme" && test -n "$striplib"; then
++	    $show "$striplib $destdir/$realname"
++	    $run eval "$striplib $destdir/$realname" || exit $?
++	  fi
++
++	  if test "$#" -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
++	    for linkname
++	    do
++	      if test "$linkname" != "$realname"; then
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++	      fi
++	    done
++	  fi
++
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  cmds=$postinstall_cmds
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
++	    $show "$cmd"
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
+ 	  done
+-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	  IFS="$save_ifs"
+ 	fi
+-      fi
+ 
+-      if test "$no_install" = yes; then
+-	# We don't need to create a wrapper script.
+-	link_command="$compile_var$compile_command$compile_rpath"
+-	# Replace the output file specification.
+-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	# Delete the old output file.
+-	$opt_dry_run || $RM $output
+-	# Link the executable and exit
+-	func_show_eval "$link_command" 'exit $?'
+-	exit $EXIT_SUCCESS
+-      fi
++	# Install the pseudo-library for information purposes.
++	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	instname="$dir/$name"i
++	$show "$install_prog $instname $destdir/$name"
++	$run eval "$install_prog $instname $destdir/$name" || exit $?
+ 
+-      if test "$hardcode_action" = relink; then
+-	# Fast installation is not supported
+-	link_command="$compile_var$compile_command$compile_rpath"
+-	relink_command="$finalize_var$finalize_command$finalize_rpath"
++	# Maybe install the static library, too.
++	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	;;
+ 
+-	func_warning "this platform does not like uninstalled shared libraries"
+-	func_warning "\`$output' will be relinked during installation"
+-      else
+-	if test "$fast_install" != no; then
+-	  link_command="$finalize_var$compile_command$finalize_rpath"
+-	  if test "$fast_install" = yes; then
+-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+-	  else
+-	    # fast_install is set to needless
+-	    relink_command=
+-	  fi
++      *.lo)
++	# Install (i.e. copy) a libtool object.
++
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
+ 	else
+-	  link_command="$compile_var$compile_command$compile_rpath"
+-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
+ 	fi
+-      fi
+ 
+-      # Replace the output file specification.
+-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++	# Deduce the name of the destination old-style object file.
++	case $destfile in
++	*.lo)
++	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
++	  ;;
++	*.$objext)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
++	  ;;
++	esac
+ 
+-      # Delete the old output files.
+-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
++	# Install the libtool object if requested.
++	if test -n "$destfile"; then
++	  $show "$install_prog $file $destfile"
++	  $run eval "$install_prog $file $destfile" || exit $?
++	fi
+ 
+-      func_show_eval "$link_command" 'exit $?'
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+ 
+-      # Now create the wrapper script.
+-      func_verbose "creating $output"
++	  $show "$install_prog $staticobj $staticdest"
++	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++	fi
++	exit $EXIT_SUCCESS
++	;;
+ 
+-      # Quote the relink command for shipping.
+-      if test -n "$relink_command"; then
+-	# Preserve any variables that may affect compiler behavior
+-	for var in $variables_saved_for_relink; do
+-	  if eval test -z \"\${$var+set}\"; then
+-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+-	  elif eval var_value=\$$var; test -z "$var_value"; then
+-	    relink_command="$var=; export $var; $relink_command"
+-	  else
+-	    func_quote_for_eval "$var_value"
+-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+-	  fi
+-	done
+-	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+-      fi
++      *)
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
+ 
+-      # Quote $ECHO for shipping.
+-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+-	case $progpath in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
++	# If the file is missing, and there is a .exe on the end, strip it
++	# because it is most likely a libtool script we actually want to
++	# install
++	stripped_ext=""
++	case $file in
++	  *.exe)
++	    if test ! -f "$file"; then
++	      file=`$echo $file|${SED} 's,.exe$,,'`
++	      stripped_ext=".exe"
++	    fi
++	    ;;
+ 	esac
+-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+-      else
+-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+-      fi
+ 
+-      # Only actually do things if not in dry run mode.
+-      $opt_dry_run || {
+-	# win32 will think the script is a binary if it has
+-	# a .exe suffix, so we strip it off here.
+-	case $output in
+-	  *.exe) func_stripname '' '.exe' "$output"
+-	         output=$func_stripname_result ;;
+-	esac
+-	# test for cygwin because mv fails w/o .exe extensions
++	# Do a test to see if this is really a libtool program.
+ 	case $host in
+-	  *cygwin*)
+-	    exeext=.exe
+-	    func_stripname '' '.exe' "$outputname"
+-	    outputname=$func_stripname_result ;;
+-	  *) exeext= ;;
++	*cygwin*|*mingw*)
++	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
++	    ;;
++	*)
++	    wrapper=$file
++	    ;;
+ 	esac
+-	case $host in
+-	  *cygwin* | *mingw* )
+-	    func_dirname_and_basename "$output" "" "."
+-	    output_name=$func_basename_result
+-	    output_path=$func_dirname_result
+-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+-	    cwrapper="$output_path/$output_name.exe"
+-	    $RM $cwrappersource $cwrapper
+-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+-
+-	    func_emit_cwrapperexe_src > $cwrappersource
+-
+-	    # we should really use a build-platform specific compiler
+-	    # here, but OTOH, the wrappers (shell script and this C one)
+-	    # are only useful if you want to execute the "real" binary.
+-	    # Since the "real" binary is built for $host, then this
+-	    # wrapper might as well be built for $host, too.
+-	    $opt_dry_run || {
+-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+-	      $STRIP $cwrapper
+-	    }
++	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
++	  notinst_deplibs=
++	  relink_command=
++
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
++	  # If there is no directory component, then add one.
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
++	  esac
++
++	  # Check the variables that should have been set.
++	  if test -z "$notinst_deplibs"; then
++	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++
++	  finalize=yes
++	  for lib in $notinst_deplibs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      # If there is no directory component, then add one.
++	      case $lib in
++	      */* | *\\*) . $lib ;;
++	      *) . ./$lib ;;
++	      esac
++	    fi
++	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
++	      finalize=no
++	    fi
++	  done
+ 
+-	    # Now, create the wrapper script for func_source use:
+-	    func_ltwrapper_scriptname $cwrapper
+-	    $RM $func_ltwrapper_scriptname_result
+-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+-	    $opt_dry_run || {
+-	      # note: this script will not be executed, so do not chmod.
+-	      if test "x$build" = "x$host" ; then
+-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
++	  relink_command=
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
++	  # If there is no directory component, then add one.
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
++	  esac
++
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    if test "$finalize" = yes && test -z "$run"; then
++	      tmpdir=`func_mktempdir`
++	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
++	      outputname="$tmpdir/$file"
++	      # Replace the output file specification.
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
++
++	      $show "$relink_command"
++	      if $run eval "$relink_command"; then :
+ 	      else
+-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
++		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++		${rm}r "$tmpdir"
++		continue
+ 	      fi
+-	    }
+-	  ;;
+-	  * )
+-	    $RM $output
+-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
++	      file="$outputname"
++	    else
++	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
++	    fi
++	  else
++	    # Install the binary that we compiled earlier.
++	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	  fi
++	fi
+ 
+-	    func_emit_wrapper no > $output
+-	    chmod +x $output
++	# remove .exe since cygwin /usr/bin/install will append another
++	# one anyway 
++	case $install_prog,$host in
++	*/usr/bin/install*,*cygwin*)
++	  case $file:$destfile in
++	  *.exe:*.exe)
++	    # this is ok
++	    ;;
++	  *.exe:*)
++	    destfile=$destfile.exe
++	    ;;
++	  *:*.exe)
++	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      }
+-      exit $EXIT_SUCCESS
+-      ;;
+-    esac
++	$show "$install_prog$stripme $file $destfile"
++	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
++	test -n "$outputname" && ${rm}r "$tmpdir"
++	;;
++      esac
++    done
+ 
+-    # See if we need to build an old-fashioned archive.
+-    for oldlib in $oldlibs; do
++    for file in $staticlibs; do
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 
+-      if test "$build_libtool_libs" = convenience; then
+-	oldobjs="$libobjs_save $symfileobj"
+-	addlibs="$convenience"
+-	build_libtool_libs=no
+-      else
+-	if test "$build_libtool_libs" = module; then
+-	  oldobjs="$libobjs_save"
+-	  build_libtool_libs=no
+-	else
+-	  oldobjs="$old_deplibs $non_pic_objects"
+-	  if test "$preload" = yes && test -f "$symfileobj"; then
+-	    oldobjs="$oldobjs $symfileobj"
+-	  fi
+-	fi
+-	addlibs="$old_convenience"
+-      fi
++      # Set up the ranlib parameters.
++      oldlib="$destdir/$name"
+ 
+-      if test -n "$addlibs"; then
+-	gentop="$output_objdir/${outputname}x"
+-	generated="$generated $gentop"
++      $show "$install_prog $file $oldlib"
++      $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-	func_extract_archives $gentop $addlibs
+-	oldobjs="$oldobjs $func_extract_archives_result"
++      if test -n "$stripme" && test -n "$old_striplib"; then
++	$show "$old_striplib $oldlib"
++	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+-      # Do each command in the archive commands.
+-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	cmds=$old_archive_from_new_cmds
+-      else
++      # Do each command in the postinstall commands.
++      cmds=$old_postinstall_cmds
++      save_ifs="$IFS"; IFS='~'
++      for cmd in $cmds; do
++	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
++      done
++      IFS="$save_ifs"
++    done
+ 
+-	# Add any objects from preloaded convenience libraries
+-	if test -n "$dlprefiles"; then
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
++    if test -n "$future_libdirs"; then
++      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
++    fi
+ 
+-	  func_extract_archives $gentop $dlprefiles
+-	  oldobjs="$oldobjs $func_extract_archives_result"
+-	fi
++    if test -n "$current_libdirs"; then
++      # Maybe just do a dry run.
++      test -n "$run" && current_libdirs=" -n$current_libdirs"
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
++    else
++      exit $EXIT_SUCCESS
++    fi
++    ;;
+ 
+-	# POSIX demands no paths to be encoded in archives.  We have
+-	# to avoid creating archives with duplicate basenames if we
+-	# might have to extract them afterwards, e.g., when creating a
+-	# static archive out of a convenience library, or when linking
+-	# the entirety of a libtool archive into another (currently
+-	# not supported by libtool).
+-	if (for obj in $oldobjs
+-	    do
+-	      func_basename "$obj"
+-	      $ECHO "$func_basename_result"
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	  :
+-	else
+-	  $ECHO "copying selected object files to avoid basename conflicts..."
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
+-	  func_mkdir_p "$gentop"
+-	  save_oldobjs=$oldobjs
+-	  oldobjs=
+-	  counter=1
+-	  for obj in $save_oldobjs
+-	  do
+-	    func_basename "$obj"
+-	    objbase="$func_basename_result"
+-	    case " $oldobjs " in
+-	    " ") oldobjs=$obj ;;
+-	    *[\ /]"$objbase "*)
+-	      while :; do
+-		# Make sure we don't pick an alternate name that also
+-		# overlaps.
+-		newobj=lt$counter-$objbase
+-		func_arith $counter + 1
+-		counter=$func_arith_result
+-		case " $oldobjs " in
+-		*[\ /]"$newobj "*) ;;
+-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+-		esac
+-	      done
+-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+-	      oldobjs="$oldobjs $gentop/$newobj"
+-	      ;;
+-	    *) oldobjs="$oldobjs $obj" ;;
+-	    esac
+-	  done
+-	fi
+-	eval cmds=\"$old_archive_cmds\"
++  # libtool finish mode
++  finish)
++    modename="$modename: finish"
++    libdirs="$nonopt"
++    admincmds=
+ 
+-	func_len " $cmds"
+-	len=$func_len_result
+-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  cmds=$old_archive_cmds
+-	else
+-	  # the command line is too long to link in one step, link in parts
+-	  func_verbose "using piecewise archive linking..."
+-	  save_RANLIB=$RANLIB
+-	  RANLIB=:
+-	  objlist=
+-	  concat_cmds=
+-	  save_oldobjs=$oldobjs
+-	  oldobjs=
+-	  # Is there a better way of finding the last object in the list?
+-	  for obj in $save_oldobjs
+-	  do
+-	    last_oldobj=$obj
+-	  done
+-	  eval test_cmds=\"$old_archive_cmds\"
+-	  func_len " $test_cmds"
+-	  len0=$func_len_result
+-	  len=$len0
+-	  for obj in $save_oldobjs
+-	  do
+-	    func_len " $obj"
+-	    func_arith $len + $func_len_result
+-	    len=$func_arith_result
+-	    func_append objlist " $obj"
+-	    if test "$len" -lt "$max_cmd_len"; then
+-	      :
+-	    else
+-	      # the above command should be used before it gets too long
+-	      oldobjs=$objlist
+-	      if test "$obj" = "$last_oldobj" ; then
+-		RANLIB=$save_RANLIB
+-	      fi
+-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+-	      objlist=
+-	      len=$len0
+-	    fi
++    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++      for dir
++      do
++	libdirs="$libdirs $dir"
++      done
++
++      for libdir in $libdirs; do
++	if test -n "$finish_cmds"; then
++	  # Do each command in the finish commands.
++	  cmds=$finish_cmds
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
++	    $show "$cmd"
++	    $run eval "$cmd" || admincmds="$admincmds
++       $cmd"
+ 	  done
+-	  RANLIB=$save_RANLIB
+-	  oldobjs=$objlist
+-	  if test "X$oldobjs" = "X" ; then
+-	    eval cmds=\"\$concat_cmds\"
+-	  else
+-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+-	  fi
++	  IFS="$save_ifs"
+ 	fi
+-      fi
+-      func_execute_cmds "$cmds" 'exit $?'
++	if test -n "$finish_eval"; then
++	  # Do the single finish_eval.
++	  eval cmds=\"$finish_eval\"
++	  $run eval "$cmds" || admincmds="$admincmds
++       $cmds"
++	fi
++      done
++    fi
++
++    # Exit here if they wanted silent mode.
++    test "$show" = : && exit $EXIT_SUCCESS
++
++    $echo "X----------------------------------------------------------------------" | $Xsed
++    $echo "Libraries have been installed in:"
++    for libdir in $libdirs; do
++      $echo "   $libdir"
+     done
++    $echo
++    $echo "If you ever happen to want to link against installed libraries"
++    $echo "in a given directory, LIBDIR, you must either use libtool, and"
++    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++    $echo "flag during linking and do at least one of the following:"
++    if test -n "$shlibpath_var"; then
++      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++      $echo "     during execution"
++    fi
++    if test -n "$runpath_var"; then
++      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++      $echo "     during linking"
++    fi
++    if test -n "$hardcode_libdir_flag_spec"; then
++      libdir=LIBDIR
++      eval flag=\"$hardcode_libdir_flag_spec\"
+ 
+-    test -n "$generated" && \
+-      func_show_eval "${RM}r$generated"
++      $echo "   - use the \`$flag' linker flag"
++    fi
++    if test -n "$admincmds"; then
++      $echo "   - have your system administrator run these commands:$admincmds"
++    fi
++    if test -f /etc/ld.so.conf; then
++      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++    fi
++    $echo
++    $echo "See any operating system documentation about shared libraries for"
++    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
++    $echo "X----------------------------------------------------------------------" | $Xsed
++    exit $EXIT_SUCCESS
++    ;;
+ 
+-    # Now create the libtool archive.
+-    case $output in
+-    *.la)
+-      old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+-      func_verbose "creating $output"
++  # libtool execute mode
++  execute)
++    modename="$modename: execute"
+ 
+-      # Preserve any variables that may affect compiler behavior
+-      for var in $variables_saved_for_relink; do
+-	if eval test -z \"\${$var+set}\"; then
+-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+-	elif eval var_value=\$$var; test -z "$var_value"; then
+-	  relink_command="$var=; export $var; $relink_command"
+-	else
+-	  func_quote_for_eval "$var_value"
+-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+-	fi
+-      done
+-      # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+-      if test "$hardcode_automatic" = yes ; then
+-	relink_command=
+-      fi
++    # The first argument is the command name.
++    cmd="$nonopt"
++    if test -z "$cmd"; then
++      $echo "$modename: you must specify a COMMAND" 1>&2
++      $echo "$help"
++      exit $EXIT_FAILURE
++    fi
+ 
+-      # Only create the output if not a dry run.
+-      $opt_dry_run || {
+-	for installed in no yes; do
+-	  if test "$installed" = yes; then
+-	    if test -z "$install_libdir"; then
+-	      break
+-	    fi
+-	    output="$output_objdir/$outputname"i
+-	    # Replace all uninstalled libtool libraries with the installed ones
+-	    newdependency_libs=
+-	    for deplib in $dependency_libs; do
+-	      case $deplib in
+-	      *.la)
+-		func_basename "$deplib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		newdependency_libs="$newdependency_libs $libdir/$name"
+-		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+-	      esac
+-	    done
+-	    dependency_libs="$newdependency_libs"
+-	    newdlfiles=
++    # Handle -dlopen flags immediately.
++    for file in $execute_dlfiles; do
++      if test ! -f "$file"; then
++	$echo "$modename: \`$file' is not a file" 1>&2
++	$echo "$help" 1>&2
++	exit $EXIT_FAILURE
++      fi
+ 
+-	    for lib in $dlfiles; do
+-	      case $lib in
+-	      *.la)
+-	        func_basename "$lib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+-		newdlfiles="$newdlfiles $libdir/$name"
+-		;;
+-	      *) newdlfiles="$newdlfiles $lib" ;;
+-	      esac
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      case $lib in
+-	      *.la)
+-		# Only pass preopened files to the pseudo-archive (for
+-		# eventual linking with the app. that links it) if we
+-		# didn't already link the preopened objects directly into
+-		# the library:
+-		func_basename "$lib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+-		newdlprefiles="$newdlprefiles $libdir/$name"
+-		;;
+-	      esac
+-	    done
+-	    dlprefiles="$newdlprefiles"
+-	  else
+-	    newdlfiles=
+-	    for lib in $dlfiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlfiles="$newdlfiles $abs"
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlprefiles="$newdlprefiles $abs"
+-	    done
+-	    dlprefiles="$newdlprefiles"
+-	  fi
+-	  $RM $output
+-	  # place dlname in correct position for cygwin
+-	  tdlname=$dlname
+-	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+-	  esac
+-	  $ECHO > $output "\
+-# $outputname - a libtool library file
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
++      dir=
++      case $file in
++      *.la)
++	# Check to see that this really is a libtool archive.
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit $EXIT_FAILURE
++	fi
+ 
+-# The name that we can dlopen(3).
+-dlname='$tdlname'
++	# Read the libtool library.
++	dlname=
++	library_names=
+ 
+-# Names of this library.
+-library_names='$library_names'
++	# If there is no directory component, then add one.
++	case $file in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
+ 
+-# The name of the static archive.
+-old_library='$old_library'
++	# Skip this library if it cannot be dlopened.
++	if test -z "$dlname"; then
++	  # Warn if it was a shared library.
++	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
++	  continue
++	fi
+ 
+-# Linker flags that can not go in dependency_libs.
+-inherited_linker_flags='$new_inherited_linker_flags'
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
+ 
+-# Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++	if test -f "$dir/$objdir/$dlname"; then
++	  dir="$dir/$objdir"
++	else
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	fi
++	;;
+ 
+-# Names of additional weak libraries provided by this library
+-weak_library_names='$weak_libs'
++      *.lo)
++	# Just add the directory containing the .lo file.
++	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++	test "X$dir" = "X$file" && dir=.
++	;;
+ 
+-# Version information for $libname.
+-current=$current
+-age=$age
+-revision=$revision
++      *)
++	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
++	continue
++	;;
++      esac
+ 
+-# Is this an already installed library?
+-installed=$installed
++      # Get the absolute pathname.
++      absdir=`cd "$dir" && pwd`
++      test -n "$absdir" && dir="$absdir"
+ 
+-# Should we warn about portability when linking against -modules?
+-shouldnotlink=$module
++      # Now add the directory to shlibpath_var.
++      if eval "test -z \"\$$shlibpath_var\""; then
++	eval "$shlibpath_var=\"\$dir\""
++      else
++	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
++      fi
++    done
+ 
+-# Files to dlopen/dlpreopen
+-dlopen='$dlfiles'
+-dlpreopen='$dlprefiles'
++    # This variable tells wrapper scripts just to set shlibpath_var
++    # rather than running their programs.
++    libtool_execute_magic="$magic"
+ 
+-# Directory that this library needs to be installed in:
+-libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes; then
+-	    $ECHO >> $output "\
+-relink_command=\"$relink_command\""
+-	  fi
+-	done
+-      }
++    # Check if any of the arguments is a wrapper script.
++    args=
++    for file
++    do
++      case $file in
++      -*) ;;
++      *)
++	# Do a test to see if this is really a libtool program.
++	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  # If there is no directory component, then add one.
++	  case $file in
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
++	  esac
+ 
+-      # Do a symbolic link so that the libtool archive can be found in
+-      # LD_LIBRARY_PATH before the program is installed.
+-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+-      ;;
+-    esac
+-    exit $EXIT_SUCCESS
+-}
++	  # Transform arg to wrapped name.
++	  file="$progdir/$program"
++	fi
++	;;
++      esac
++      # Quote arguments (to preserve shell metacharacters).
++      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
++      args="$args \"$file\""
++    done
++
++    if test -z "$run"; then
++      if test -n "$shlibpath_var"; then
++	# Export the shlibpath_var.
++	eval "export $shlibpath_var"
++      fi
+ 
+-{ test "$mode" = link || test "$mode" = relink; } &&
+-    func_mode_link ${1+"$@"}
++      # Restore saved environment variables
++      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
+ 
++      # Now prepare to actually exec the command.
++      exec_cmd="\$cmd$args"
++    else
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
++	$echo "export $shlibpath_var"
++      fi
++      $echo "$cmd$args"
++      exit $EXIT_SUCCESS
++    fi
++    ;;
+ 
+-# func_mode_uninstall arg...
+-func_mode_uninstall ()
+-{
+-    $opt_debug
+-    RM="$nonopt"
++  # libtool clean and uninstall mode
++  clean | uninstall)
++    modename="$modename: $mode"
++    rm="$nonopt"
+     files=
+     rmforce=
+     exit_status=0
+@@ -7676,28 +6547,30 @@ func_mode_uninstall ()
+     for arg
+     do
+       case $arg in
+-      -f) RM="$RM $arg"; rmforce=yes ;;
+-      -*) RM="$RM $arg" ;;
++      -f) rm="$rm $arg"; rmforce=yes ;;
++      -*) rm="$rm $arg" ;;
+       *) files="$files $arg" ;;
+       esac
+     done
+ 
+-    test -z "$RM" && \
+-      func_fatal_help "you must specify an RM program"
++    if test -z "$rm"; then
++      $echo "$modename: you must specify an RM program" 1>&2
++      $echo "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
+ 
+     rmdirs=
+ 
+     origobjdir="$objdir"
+     for file in $files; do
+-      func_dirname "$file" "" "."
+-      dir="$func_dirname_result"
+-      if test "X$dir" = X.; then
++      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$dir" = "X$file"; then
++	dir=.
+ 	objdir="$origobjdir"
+       else
+ 	objdir="$dir/$origobjdir"
+       fi
+-      func_basename "$file"
+-      name="$func_basename_result"
++      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+       test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+@@ -7709,9 +6582,9 @@ func_mode_uninstall ()
+       fi
+ 
+       # Don't error if the file doesn't exist and rm -f was used.
+-      if { test -L "$file"; } >/dev/null 2>&1 ||
+-	 { test -h "$file"; } >/dev/null 2>&1 ||
+-	 test -f "$file"; then
++      if (test -L "$file") >/dev/null 2>&1 \
++	|| (test -h "$file") >/dev/null 2>&1 \
++	|| test -f "$file"; then
+ 	:
+       elif test -d "$file"; then
+ 	exit_status=1
+@@ -7725,8 +6598,8 @@ func_mode_uninstall ()
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+-	if func_lalib_p "$file"; then
+-	  func_source $dir/$name
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  . $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+ 	  for n in $library_names; do
+@@ -7741,17 +6614,39 @@ func_mode_uninstall ()
+ 	    *" $dlname "*) ;;
+ 	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ 	    esac
+-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 	    ;;
+ 	  uninstall)
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
++	      cmds=$postuninstall_cmds
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
+ 	    fi
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
++	      cmds=$old_postuninstall_cmds
++	      save_ifs="$IFS"; IFS='~'
++	      for cmd in $cmds; do
++		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
++		$show "$cmd"
++		$run eval "$cmd"
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
++		  exit_status=1
++		fi
++	      done
++	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+ 	    ;;
+@@ -7761,20 +6656,20 @@ func_mode_uninstall ()
+ 
+       *.lo)
+ 	# Possibly a libtool object, so verify it.
+-	if func_lalib_p "$file"; then
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 
+ 	  # Read the .lo file
+-	  func_source $dir/$name
++	  . $dir/$name
+ 
+ 	  # Add PIC object to the list of files to remove.
+-	  if test -n "$pic_object" &&
+-	     test "$pic_object" != none; then
++	  if test -n "$pic_object" \
++	     && test "$pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$pic_object"
+ 	  fi
+ 
+ 	  # Add non-PIC object to the list of files to remove.
+-	  if test -n "$non_pic_object" &&
+-	     test "$non_pic_object" != none; then
++	  if test -n "$non_pic_object" \
++	     && test "$non_pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$non_pic_object"
+ 	  fi
+ 	fi
+@@ -7785,26 +6680,17 @@ func_mode_uninstall ()
+ 	  noexename=$name
+ 	  case $file in
+ 	  *.exe)
+-	    func_stripname '' '.exe' "$file"
+-	    file=$func_stripname_result
+-	    func_stripname '' '.exe' "$name"
+-	    noexename=$func_stripname_result
++	    file=`$echo $file|${SED} 's,.exe$,,'`
++	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+ 	    # add $file without .exe
+ 	    rmfiles="$rmfiles $file"
+ 	    ;;
+ 	  esac
+ 	  # Do a test to see if this is a libtool program.
+-	  if func_ltwrapper_p "$file"; then
+-	    if func_ltwrapper_executable_p "$file"; then
+-	      func_ltwrapper_scriptname "$file"
+-	      relink_command=
+-	      func_source $func_ltwrapper_scriptname_result
+-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+-	    else
+-	      relink_command=
+-	      func_source $dir/$noexename
+-	    fi
++	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	    relink_command=
++	    . $dir/$noexename
+ 
+ 	    # note $name still contains .exe if it was in $file originally
+ 	    # as does the version of $file that was added into $rmfiles
+@@ -7819,38 +6705,239 @@ func_mode_uninstall ()
+ 	fi
+ 	;;
+       esac
+-      func_show_eval "$RM $rmfiles" 'exit_status=1'
++      $show "$rm $rmfiles"
++      $run $rm $rmfiles || exit_status=1
+     done
+     objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+       if test -d "$dir"; then
+-	func_show_eval "rmdir $dir >/dev/null 2>&1"
++	$show "rmdir $dir"
++	$run rmdir $dir >/dev/null 2>&1
+       fi
+     done
+ 
+     exit $exit_status
+-}
+-
+-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+-    func_mode_uninstall ${1+"$@"}
++    ;;
+ 
+-test -z "$mode" && {
+-  help="$generic_help"
+-  func_fatal_help "you must specify a MODE"
+-}
++  "")
++    $echo "$modename: you must specify a MODE" 1>&2
++    $echo "$generic_help" 1>&2
++    exit $EXIT_FAILURE
++    ;;
++  esac
+ 
+-test -z "$exec_cmd" && \
+-  func_fatal_help "invalid operation mode \`$mode'"
++  if test -z "$exec_cmd"; then
++    $echo "$modename: invalid operation mode \`$mode'" 1>&2
++    $echo "$generic_help" 1>&2
++    exit $EXIT_FAILURE
++  fi
++fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+-  eval exec "$exec_cmd"
++  eval exec $exec_cmd
+   exit $EXIT_FAILURE
+ fi
+ 
+-exit $exit_status
++# We need to display help for each of the modes.
++case $mode in
++"") $echo \
++"Usage: $modename [OPTION]... [MODE-ARG]...
++
++Provide generalized library-building support services.
++
++    --config          show all configuration variables
++    --debug           enable verbose shell tracing
++-n, --dry-run         display commands without modifying any files
++    --features        display basic configuration information and exit
++    --finish          same as \`--mode=finish'
++    --help            display this help message and exit
++    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
++    --quiet           same as \`--silent'
++    --silent          don't print informational messages
++    --tag=TAG         use configuration variables from tag TAG
++    --version         print version information
++
++MODE must be one of the following:
++
++      clean           remove files from the build directory
++      compile         compile a source file into a libtool object
++      execute         automatically set library path, then run a program
++      finish          complete the installation of libtool libraries
++      install         install libraries or executables
++      link            create a library or an executable
++      uninstall       remove libraries from an installed directory
++
++MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
++a more detailed description of MODE.
++
++Report bugs to <bug-libtool at gnu.org>."
++  exit $EXIT_SUCCESS
++  ;;
++
++clean)
++  $echo \
++"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
++
++Remove files from the build directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, object or program, all the files associated
++with it are deleted. Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++compile)
++  $echo \
++"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
++
++Compile a source file into a libtool library object.
++
++This mode accepts the following additional options:
++
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -prefer-pic       try to building PIC objects only
++  -prefer-non-pic   try to building non-PIC objects only
++  -static           always build a \`.o' file suitable for static linking
++
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
++from the given SOURCEFILE.
++
++The output file name is determined by removing the directory component from
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
++  ;;
++
++execute)
++  $echo \
++"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
++
++Automatically set library path, then run a program.
++
++This mode accepts the following additional options:
++
++  -dlopen FILE      add the directory containing FILE to the library path
++
++This mode sets the library path environment variable according to \`-dlopen'
++flags.
++
++If any of the ARGS are libtool executable wrappers, then they are translated
++into their corresponding uninstalled binary, and any of their required library
++directories are added to the library path.
++
++Then, COMMAND is executed, with ARGS as arguments."
++  ;;
++
++finish)
++  $echo \
++"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
++
++Complete the installation of libtool libraries.
++
++Each LIBDIR is a directory that contains libtool libraries.
++
++The commands that this mode executes may require superuser privileges.  Use
++the \`--dry-run' option if you just want to see what would be executed."
++  ;;
++
++install)
++  $echo \
++"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
++
++Install executables or libraries.
++
++INSTALL-COMMAND is the installation command.  The first component should be
++either the \`install' or \`cp' program.
++
++The rest of the components are interpreted as arguments to that command (only
++BSD-compatible install options are recognized)."
++  ;;
++
++link)
++  $echo \
++"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
++
++Link object files or libraries together to form another library, or to
++create an executable program.
+ 
++LINK-COMMAND is a command using the C compiler that you would use to create
++a program from several object files.
++
++The following components of LINK-COMMAND are treated specially:
++
++  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
++  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
++  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++                    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++                    try to export only the symbols matching REGEX
++  -LLIBDIR          search LIBDIR for required installed libraries
++  -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
++  -no-fast-install  disable the fast-install mode
++  -no-install       link a not-installable executable
++  -no-undefined     declare that a library does not refer to external symbols
++  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
++  -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
++  -release RELEASE  specify package release information
++  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
++  -version-info CURRENT[:REVISION[:AGE]]
++                    specify library version info [each variable defaults to 0]
++
++All other options (arguments beginning with \`-') are ignored.
++
++Every other argument is treated as a filename.  Files ending in \`.la' are
++treated as uninstalled libtool libraries, other files are standard or library
++object files.
++
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
++
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
++
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
++  ;;
++
++uninstall)
++  $echo \
++"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++
++Remove libraries from an installation directory.
++
++RM is the name of the program to use to delete files associated with each FILE
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
++to RM.
++
++If FILE is a libtool library, all the files associated with it are deleted.
++Otherwise, only FILE itself is deleted using RM."
++  ;;
++
++*)
++  $echo "$modename: invalid operation mode \`$mode'" 1>&2
++  $echo "$help" 1>&2
++  exit $EXIT_FAILURE
++  ;;
++esac
++
++$echo
++$echo "Try \`$modename --help' for more information about other modes."
++
++exit $?
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+@@ -7864,17 +6951,14 @@ exit $exit_status
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
+ # mode:shell-script
+ # sh-indentation:2
+ # End:
+-# vi:sw=2
+-
+diff -pruN gnome-applets-2.24.2.orig/Makefile.in gnome-applets-2.24.2/Makefile.in
+--- gnome-applets-2.24.2.orig/Makefile.in	2008-11-25 00:57:34.000000000 +0100
++++ gnome-applets-2.24.2/Makefile.in	2008-12-26 21:30:38.303586558 +0100
+@@ -207,6 +207,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1886,29 +21340,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -227,9 +227,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -251,7 +252,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/mini-commander/help/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/help/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/help/Makefile.in	2008-08-29 10:51:36.335985440 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/man/Makefile.in gnome-applets-2.24.2/man/Makefile.in
+--- gnome-applets-2.24.2.orig/man/Makefile.in	2008-11-25 00:57:28.000000000 +0100
++++ gnome-applets-2.24.2/man/Makefile.in	2008-12-26 21:30:35.919586078 +0100
+@@ -183,6 +183,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1916,29 +21359,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -227,7 +228,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/mini-commander/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/Makefile.in	2008-08-29 10:51:36.179985375 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -209,6 +208,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/mini-commander/help/Makefile.in gnome-applets-2.24.2/mini-commander/help/Makefile.in
+--- gnome-applets-2.24.2.orig/mini-commander/help/Makefile.in	2008-11-25 00:57:29.000000000 +0100
++++ gnome-applets-2.24.2/mini-commander/help/Makefile.in	2008-12-26 21:30:36.183585623 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1946,29 +21378,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -245,9 +245,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/mini-commander/src/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/src/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mini-commander/src/Makefile.in	2008-08-29 10:51:36.491985504 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -240,6 +239,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/mini-commander/Makefile.in gnome-applets-2.24.2/mini-commander/Makefile.in
+--- gnome-applets-2.24.2.orig/mini-commander/Makefile.in	2008-11-25 00:57:28.000000000 +0100
++++ gnome-applets-2.24.2/mini-commander/Makefile.in	2008-12-26 21:30:36.031586137 +0100
+@@ -201,6 +201,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1976,29 +21397,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -276,9 +276,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -245,7 +246,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/mixer/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/mixer/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/mixer/docs/Makefile.in	2008-08-29 10:51:36.831485148 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/mini-commander/src/Makefile.in gnome-applets-2.24.2/mini-commander/src/Makefile.in
+--- gnome-applets-2.24.2.orig/mini-commander/src/Makefile.in	2008-11-25 00:57:29.000000000 +0100
++++ gnome-applets-2.24.2/mini-commander/src/Makefile.in	2008-12-26 21:30:36.343585776 +0100
+@@ -231,6 +231,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2006,29 +21416,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -275,7 +276,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/mixer/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/mixer/Makefile.in	2008-06-30 11:29:39.000000000 +0200
-+++ gnome-applets-2.22.3/mixer/Makefile.in	2008-08-29 10:51:36.675985706 +0200
-@@ -42,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -237,6 +236,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/mixer/docs/Makefile.in gnome-applets-2.24.2/mixer/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/mixer/docs/Makefile.in	2008-11-25 00:57:30.000000000 +0100
++++ gnome-applets-2.24.2/mixer/docs/Makefile.in	2008-12-26 21:30:36.647585725 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2036,29 +21435,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/modemlights/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/modemlights/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/modemlights/Makefile.in	2008-08-29 10:51:36.975484454 +0200
-@@ -43,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -226,6 +225,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/mixer/Makefile.in gnome-applets-2.24.2/mixer/Makefile.in
+--- gnome-applets-2.24.2.orig/mixer/Makefile.in	2008-11-25 00:57:30.000000000 +0100
++++ gnome-applets-2.24.2/mixer/Makefile.in	2008-12-26 21:30:36.491588106 +0100
+@@ -229,6 +229,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2066,41 +21454,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -262,9 +262,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -273,7 +274,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -335,8 +333,9 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--INCLUDES = -I. -I$(srcdir) 				\
--	$(GNOME_APPLETS_CFLAGS)				\
-+INCLUDES = -I. -I$(srcdir) 	\
-+	$(GNOME_APPLETS_CFLAGS)	\
-+	$(MODEMLIGHTS_CFLAGS)	\
- 	$(LIBGLADE_CFLAGS)
- 
- modem_applet_SOURCES = \
-Index: gnome-applets-2.22.3/multiload/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/multiload/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/multiload/docs/Makefile.in	2008-08-29 10:51:37.363988859 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/modemlights/Makefile.in gnome-applets-2.24.2/modemlights/Makefile.in
+--- gnome-applets-2.24.2.orig/modemlights/Makefile.in	2008-11-25 00:57:30.000000000 +0100
++++ gnome-applets-2.24.2/modemlights/Makefile.in	2008-12-26 21:30:36.791586010 +0100
+@@ -218,6 +218,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2108,29 +21473,26 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -262,7 +263,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/multiload/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/multiload/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/multiload/Makefile.in	2008-08-29 10:51:37.187984926 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -237,6 +236,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+@@ -336,6 +336,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I. -I$(srcdir) 				\
++	$(MODEMLIGHTS_CFLAGS)				\
+ 	$(GNOME_APPLETS_CFLAGS)	
+ 
+ modem_applet_SOURCES = \
+diff -pruN gnome-applets-2.24.2.orig/multiload/docs/Makefile.in gnome-applets-2.24.2/multiload/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/multiload/docs/Makefile.in	2008-11-25 00:57:31.000000000 +0100
++++ gnome-applets-2.24.2/multiload/docs/Makefile.in	2008-12-26 21:30:37.099588494 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2138,29 +21500,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/null_applet/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/null_applet/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/null_applet/Makefile.in	2008-08-29 10:51:37.495985943 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -220,6 +219,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/multiload/Makefile.in gnome-applets-2.24.2/multiload/Makefile.in
+--- gnome-applets-2.24.2.orig/multiload/Makefile.in	2008-11-25 00:57:31.000000000 +0100
++++ gnome-applets-2.24.2/multiload/Makefile.in	2008-12-26 21:30:36.935588740 +0100
+@@ -229,6 +229,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2168,29 +21519,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -256,9 +256,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -273,7 +274,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/stickynotes/data/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/data/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/data/Makefile.in	2008-08-29 10:51:37.747985219 +0200
-@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -200,6 +199,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/null_applet/Makefile.in gnome-applets-2.24.2/null_applet/Makefile.in
+--- gnome-applets-2.24.2.orig/null_applet/Makefile.in	2008-11-25 00:57:31.000000000 +0100
++++ gnome-applets-2.24.2/null_applet/Makefile.in	2008-12-26 21:30:37.227586955 +0100
+@@ -212,6 +212,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2198,29 +21538,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -236,9 +236,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -256,7 +257,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/stickynotes/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/docs/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in	2008-08-29 10:51:37.907984884 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/stickynotes/data/Makefile.in gnome-applets-2.24.2/stickynotes/data/Makefile.in
+--- gnome-applets-2.24.2.orig/stickynotes/data/Makefile.in	2008-11-25 00:57:32.000000000 +0100
++++ gnome-applets-2.24.2/stickynotes/data/Makefile.in	2008-12-26 21:30:37.503588235 +0100
+@@ -192,6 +192,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2228,29 +21557,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -236,7 +237,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/stickynotes/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/Makefile.in	2008-06-30 11:29:40.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/Makefile.in	2008-08-29 10:51:37.643985828 +0200
-@@ -42,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -249,6 +248,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/stickynotes/docs/Makefile.in gnome-applets-2.24.2/stickynotes/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/stickynotes/docs/Makefile.in	2008-11-25 00:57:32.000000000 +0100
++++ gnome-applets-2.24.2/stickynotes/docs/Makefile.in	2008-12-26 21:30:37.655585277 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2258,29 +21576,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -285,9 +285,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/pixmaps/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in	2008-08-29 10:51:38.015985342 +0200
-@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/stickynotes/Makefile.in gnome-applets-2.24.2/stickynotes/Makefile.in
+--- gnome-applets-2.24.2.orig/stickynotes/Makefile.in	2008-11-25 00:57:32.000000000 +0100
++++ gnome-applets-2.24.2/stickynotes/Makefile.in	2008-12-26 21:30:37.395586310 +0100
+@@ -241,6 +241,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2288,29 +21595,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -285,7 +286,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/trashapplet/docs/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/docs/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in	2008-08-29 10:51:38.279984887 +0200
-@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/stickynotes/pixmaps/Makefile.in gnome-applets-2.24.2/stickynotes/pixmaps/Makefile.in
+--- gnome-applets-2.24.2.orig/stickynotes/pixmaps/Makefile.in	2008-11-25 00:57:33.000000000 +0100
++++ gnome-applets-2.24.2/stickynotes/pixmaps/Makefile.in	2008-12-26 21:30:37.763585734 +0100
+@@ -189,6 +189,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2318,29 +21614,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -233,7 +234,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-Index: gnome-applets-2.22.3/trashapplet/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/Makefile.in	2008-08-29 10:51:38.127984912 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -213,6 +212,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/trashapplet/docs/Makefile.in gnome-applets-2.24.2/trashapplet/docs/Makefile.in
+--- gnome-applets-2.24.2.orig/trashapplet/docs/Makefile.in	2008-11-25 00:57:33.000000000 +0100
++++ gnome-applets-2.24.2/trashapplet/docs/Makefile.in	2008-12-26 21:30:38.043585636 +0100
+@@ -204,6 +204,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2348,53 +21633,18 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -249,9 +249,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -248,7 +249,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -330,7 +328,7 @@ uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_Panel_TrashApplet.xml
- 
- # here for now until i here of a better place
--glade_DATA = trashapplet-empty-progress.ui
-+glade_DATA = trashapplet.glade
- EXTRA_DIST = \
- 	$(ui_DATA) \
- 	GNOME_Panel_TrashApplet.server.in.in \
-Index: gnome-applets-2.22.3/trashapplet/src/Makefile.in
-===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/src/Makefile.in	2008-06-30 11:29:41.000000000 +0200
-+++ gnome-applets-2.22.3/trashapplet/src/Makefile.in	2008-08-29 10:51:38.415985482 +0200
-@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/acinclude.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
--	$(top_srcdir)/m4/system-tools-backends.m4 \
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-@@ -49,11 +48,12 @@ CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(libexecdir)"
- libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(libexec_PROGRAMS)
--am_trashapplet_OBJECTS = trashapplet.$(OBJEXT) trash-empty.$(OBJEXT) \
-+am_trashapplet_OBJECTS = trashapplet.$(OBJEXT) trash-monitor.$(OBJEXT) \
- 	xstuff.$(OBJEXT)
- trashapplet_OBJECTS = $(am_trashapplet_OBJECTS)
- am__DEPENDENCIES_1 =
--trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -211,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+diff -pruN gnome-applets-2.24.2.orig/trashapplet/Makefile.in gnome-applets-2.24.2/trashapplet/Makefile.in
+--- gnome-applets-2.24.2.orig/trashapplet/Makefile.in	2008-11-25 00:57:33.000000000 +0100
++++ gnome-applets-2.24.2/trashapplet/Makefile.in	2008-12-26 21:30:37.879585882 +0100
+@@ -205,6 +205,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
  MIXER_LIBS = @MIXER_LIBS@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2402,48 +21652,30 @@
  MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
  MSGFMT = @MSGFMT@
  MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -247,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
- SED = @SED@
+@@ -249,7 +250,6 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
  STRIP = @STRIP@
 -SU_TOOL = @SU_TOOL@
  SYSCONFDIR = @SYSCONFDIR@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-@@ -322,18 +321,21 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)		\
- 	   $(GNOME_APPLETS_CFLAGS)	\
--	   $(GIO_CFLAGS)
-+	   $(GNOME_VFS_APPLETS_CFLAGS)	\
-+	   $(LIBGLADE_CFLAGS)
- 
- trashapplet_SOURCES = \
- 	trashapplet.c \
--	trash-empty.h \
--	trash-empty.c \
-+	trashapplet.h \
-+	trash-monitor.h \
-+	trash-monitor.c \
- 	xstuff.c \
- 	xstuff.h
- 
- trashapplet_LDADD = \
- 	$(GNOME_APPLETS_LIBS) 	\
--	$(GIO_LIBS)
-+	$(GNOME_VFS_APPLETS_LIBS) \
-+	$(LIBGLADE_LIBS)
- 
- all: all-am
- 
-@@ -406,7 +408,7 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trash-empty.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trash-monitor.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trashapplet.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xstuff.Po at am__quote@
- 
+diff -pruN gnome-applets-2.24.2.orig/trashapplet/src/Makefile.in gnome-applets-2.24.2/trashapplet/src/Makefile.in
+--- gnome-applets-2.24.2.orig/trashapplet/src/Makefile.in	2008-11-25 00:57:34.000000000 +0100
++++ gnome-applets-2.24.2/trashapplet/src/Makefile.in	2008-12-26 21:30:38.167585963 +0100
+@@ -203,6 +203,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -247,7 +248,6 @@ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@

Modified: desktop/experimental/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/series?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/series (original)
+++ desktop/experimental/gnome-applets/debian/patches/series Fri Dec 26 21:52:06 2008
@@ -1,6 +1,4 @@
 01_distclean.patch
-02_trashapplet_2.20.patch
 09_modemlights_use_new_gst.patch
-80_mixer_user_gstreamer_signals.patch
 98_autoreconf.patch
 99_ltmain_as-needed.patch

Modified: desktop/experimental/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/rules?rev=18004&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/rules (original)
+++ desktop/experimental/gnome-applets/debian/rules Fri Dec 26 21:52:06 2008
@@ -14,6 +14,8 @@
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-battstat
 endif
+
+DEB_MAKE_ENVVARS += echo=/bin/echo
 
 MANPAGES += debian/gnome-keyboard-layout.1
 DEB_INSTALL_MANPAGES_gnome-applets = $(MANPAGES)
@@ -37,4 +39,3 @@
 
 clean::
 	rm -f $(MANPAGES)
-	debconf-updatepo




More information about the pkg-gnome-commits mailing list